january update version 1.5

diff --git a/fishladder.c b/fishladder.c
index 22438c9c45f7fa3133a1c3c4d6102c22a336a308..b8f6d5ba1d692a126ef5e75761bb93a2488fc325 100644 (file)
--- a/fishladder.c
+++ b/fishladder.c
@@ -1,7 +1,8 @@
 // Copyright (C) 2021 Harry Godden (hgn) - All Rights Reserved
 
+#define MARBLE_COMP_VERSION 4
 //#define VG_CAPTURE_MODE
-//#define VG_STEAM
+#define VG_STEAM
 #define VG_STEAM_APPID 1218140U
 #include "vg/vg.h"
 
@@ -68,7 +69,8 @@ enum e_world_button
 enum e_game_state
 {
        k_game_state_main,
-       k_game_state_settings
+       k_game_state_settings,
+   k_game_state_update
 };
 
 #define FLAG_CANAL             0x1
@@ -121,7 +123,7 @@ static struct cell_description
 cell_descriptions[] =
 {
        // 0-3
-       {},
+       { .trigger_pos = { 0.5f, 0.25f }, .trigger_sprite = k_sprite_brk_d },
        { .start = {  1,  0 }, .end = { -1,  0 }, .trigger_pos = { 0.5f, 0.25f }, .trigger_sprite = k_sprite_brk_d },
        { .start = {  0,  1 }, .end = {  0, -1 }, .trigger_pos = { 0.25f, 0.5f }, .trigger_sprite = k_sprite_brk_l },
        { .start = {  0,  1 }, .end = {  1,  0 }, .trigger_pos = { 0.25f, 0.5f }, .trigger_sprite = k_sprite_brk_l },
@@ -280,7 +282,8 @@ world =
                        { .mode = k_world_button_mode_toggle },
                        { .mode = k_world_button_mode_toggle },
                        { .mode = k_world_button_mode_toggle } }
-       }
+       },
+   .selected = -1
 };
 
 // Forward declerations
@@ -310,7 +313,7 @@ static void io_reset(void);
 static struct cell *pcell( v2i pos );
 static void lcell( int id, v2i pos );
 static void map_reclassify( v2i start, v2i end, int update_texbuffer );
-static void gen_level_text( struct cmp_level *pLevel );
+static void gen_level_text(void);
 static int map_load( const char *str, const char *name );
 static void map_serialize( FILE *stream );
 
@@ -401,16 +404,16 @@ static struct world_theme
 }
 world_themes[] =
 {
-   {
-      "Wood",
-      { 0.89f, 0.8f, 0.7f },
-      &tex_tiles_wood
-   },
    {
       "Minimal",
       { 0.8f, 0.8f, 0.8f },
       &tex_tiles_min
    },
+   {
+      "Wood",
+      { 0.89f, 0.8f, 0.7f },
+      &tex_tiles_wood
+   },
    {
       "Lab",
       { 0.7f, 0.7f, 0.7f },
@@ -643,33 +646,66 @@ static void map_reclassify( v2i start, v2i end, int update_texbuffer )
        }
 }
 
-static void gen_level_text( struct cmp_level *pLevel )
+static void gen_level_text(void)
 {
    // Old style UI.
    ui_px const unit_scale_px = 4*UI_GLYPH_SPACING_X; // 4 char per unit
    ui_begin( &world.st.world_text, world.w*unit_scale_px, world.h*unit_scale_px );
-
-   for( int i = 0; i < vg_list_size( pLevel->strings ); i ++ )
+   
+   if( world.pCmpLevel )
    {
-      struct world_string *wstr = &pLevel->strings[i];
-
-      if( wstr->str )
+      for( int i = 0; i < vg_list_size( world.pCmpLevel->strings ); i ++ )
       {
-         ui_px pos[2];
+         struct world_string *wstr = &world.pCmpLevel->strings[i];
 
-         pos[0] = -UI_GLYPH_SPACING_X/2;
+         if( wstr->str )
+         {
+            ui_px pos[2];
 
-         if( wstr->placement == k_placement_bottom )
-            pos[1] = 2*-unit_scale_px;
-         else
-            pos[1] = (world.h-1)*-unit_scale_px -6;
+            pos[0] = -UI_GLYPH_SPACING_X/2;
 
-         ui_text( &world.st.world_text, pos, wstr->str, 1, k_text_align_left );
+            if( wstr->placement == k_placement_bottom )
+               pos[1] = 2*-unit_scale_px;
+            else
+               pos[1] = (world.h-1)*-unit_scale_px -6;
+
+            ui_text( &world.st.world_text, pos, wstr->str, 1, k_text_align_left );
+         }
       }
    }
 
    // re-create level scores
-   
+   for( int i = 0; i < vg_list_size( career_packs ); i ++ )
+   {
+      struct career_level_pack *set = &career_packs[i];
+
+      ui_text( &world.st.world_text,
+         (ui_px [2]){
+             set->origin[0]*unit_scale_px,
+            -(set->origin[1]+set->dims[1]+1)*unit_scale_px + 18
+         },
+         set->title, 1, k_text_align_left );
+
+      for( int j = 0; j < set->count; j ++ )
+      {
+         struct cmp_level *lvl = &set->pack[j];
+
+         if( lvl->completed_score && !lvl->is_tutorial )
+         {
+            char num[10];
+            snprintf( num, 9, "%d", lvl->completed_score );
+
+            ui_text( &world.st.world_text, 
+               (ui_px [2]){ 
+                   lvl->btn.position[0]*unit_scale_px + unit_scale_px/2,
+                  -lvl->btn.position[1]*unit_scale_px - unit_scale_px/2 
+               },
+               num, 1, k_text_align_center );
+         }
+      }
+   }
+
+   //ui_text( &world.st.world_text, (ui_px [2]){ 0, 0 }, "Preview", 1, k_text_align_left );
 
    ui_resolve( &world.st.world_text );
 }
@@ -1172,6 +1208,7 @@ struct dcareer_state
        struct dlevel_state
        {
                i32 score;
+
                i32 unlocked;
                i32 reserved[2];
        }
@@ -1187,7 +1224,7 @@ static void career_serialize(void)
                return;
 
        struct dcareer_state encoded;
-       encoded.version = 2;
+       encoded.version = MARBLE_COMP_VERSION;
        encoded.in_map = world.pCmpLevel? world.pCmpLevel->serial_id: -1;
        
        memset( encoded.reserved, 0, sizeof( encoded.reserved ) );
@@ -1204,7 +1241,7 @@ static void career_serialize(void)
                        dest->score = lvl->completed_score;
                        dest->unlocked = lvl->unlocked;
                        dest->reserved[0] = 0;
-                       dest->reserved[1] = 0;
+         dest->reserved[1] = 0;
                }
        }
 
@@ -1223,24 +1260,16 @@ static void career_unlock_level( struct cmp_level *lvl )
 static void career_pass_level( struct cmp_level *lvl, int score, int upload )
 {
        if( score > 0 )
-       {
-               if( score < lvl->completed_score || lvl->completed_score == 0 )
-               {
-                       #ifdef VG_STEAM
-                       if( !lvl->is_tutorial && upload )
-                               leaderboard_set_score( lvl, score );
-                       #endif
-
-                       lvl->completed_score = score;
-               }
+   {
+      lvl->completed_score = score;
+      gen_level_text();
                
-               if( lvl->unlock ) career_unlock_level( lvl->unlock );
+               if( lvl->unlock ) 
+         career_unlock_level( lvl->unlock );
                
                #ifdef VG_STEAM
                if( lvl->achievement )
-               {
                        sw_set_achievement( lvl->achievement );
-               }
 
                // Check ALL maps to trigger master engineer
                for( int i = 0; i < vg_list_size( career_packs ); i ++ )
@@ -1320,7 +1349,14 @@ static void career_load(void)
                        struct dlevel_state *src = &encoded.levels[lvl->serial_id];
                        
                        if( src->unlocked ) career_unlock_level( lvl );
-                       if( src->score ) lvl->completed_score = src->score;
+                       if( src->score )
+         {
+            lvl->completed_score = src->score;
+
+            // Apply unlocking to next levels in case there was an update
+            if( lvl->unlock )
+               career_unlock_level( lvl->unlock );
+         }
                        
                        if( lvl->serial_id == encoded.in_map )
                                lvl_to_load = lvl;
@@ -1330,10 +1366,13 @@ static void career_load(void)
        if( console_changelevel( 1, &lvl_to_load->map_name ) )
        {
                world.pCmpLevel = lvl_to_load;
-               gen_level_text( world.pCmpLevel );
+               gen_level_text();
        }
 
        career_load_success = 1;
+
+   if( encoded.version < MARBLE_COMP_VERSION || 1 )
+      world.st.state = k_game_state_update;
 }
 
 // MAIN GAMEPLAY
@@ -1393,6 +1432,7 @@ static void simulation_start(void)
        if( world.pCmpLevel )
        {
                world.pCmpLevel->completed_score = 0;
+      gen_level_text();
        }
 }
 
@@ -1507,7 +1547,7 @@ static void vg_update(void)
                        if( console_changelevel( 1, &world.st.lvl_to_load->map_name ) )
                        {
                                world.pCmpLevel = world.st.lvl_to_load;
-                               gen_level_text( world.pCmpLevel );
+                               gen_level_text();
                        }
 
                        world.st.lvl_to_load = NULL;
@@ -1555,6 +1595,9 @@ static void vg_update(void)
        m3x3_translate( m_view, origin_current );
        m3x3_mul( m_projection, m_view, vg_pv );
        vg_projection_update();
+
+   if( world.st.state == k_game_state_update )
+      return;
        
        // Mouse input
        // ========================================================================================================
@@ -1974,21 +2017,26 @@ static void vg_update(void)
                                                // Spawn new marble
                                                if( (target_peice->state & FLAG_EMITTER) && !(target_peice->state & FLAG_TRIGGERED))
                                                {
-                                                       struct fish *fish = &world.fishes[ world.num_fishes ];
-                                                       lcell( cell_current->links[trigger_id], fish->pos );
-
-                                                       fish->state = k_fish_state_soon_alive;
-                                                       fish->colour = target_peice->emit[ trigger_id ];
-                                                       
-                                                       if( target_peice->config != k_cell_type_stub )
-                                                       {
-                                                               struct cell_description *desc = &cell_descriptions[ target_peice->config ];
-                                                               v2i_copy( desc->start, fish->dir );
-                                                               fish->flow_reversed = 1;
-
-                                                               world.num_fishes ++;
-                                                               alive_count ++;
-                                                       }
+                     if( world.num_fishes < vg_list_size( world.fishes ) )
+                     {
+                        struct fish *fish = &world.fishes[ world.num_fishes ];
+                        lcell( cell_current->links[trigger_id], fish->pos );
+
+                        fish->state = k_fish_state_soon_alive;
+                        fish->colour = target_peice->emit[ trigger_id ];
+                        
+                        if( target_peice->config != k_cell_type_stub )
+                        {
+                           struct cell_description *desc = &cell_descriptions[ target_peice->config ];
+                           v2i_copy( desc->start, fish->dir );
+                           fish->flow_reversed = 1;
+
+                           world.num_fishes ++;
+                           alive_count ++;
+                        }
+                     }
+                     else
+                        vg_warn( "Max marbles exceeded\n" );
                                                }
                                                else
                                                {
@@ -2084,14 +2132,19 @@ static void vg_update(void)
                                                struct cell *cell_ptr = pcell( fish->pos );
                                                
                                                if( cell_ptr->config != k_cell_type_stub )
-                                               {
-                                                       struct cell_description *desc = &cell_descriptions[ cell_ptr->config ];
-                                                       
-                                                       v2i_copy( desc->start, fish->dir );
-                                                       fish->flow_reversed = 1;
-                                                       
-                                                       world.num_fishes ++;
-                                                       alive_count ++;
+                  {
+                     if( world.num_fishes < vg_list_size(world.fishes))
+                     {
+                        struct cell_description *desc = &cell_descriptions[ cell_ptr->config ];
+                        
+                        v2i_copy( desc->start, fish->dir );
+                        fish->flow_reversed = 1;
+                        
+                        world.num_fishes ++;
+                        alive_count ++;
+                     }
+                     else
+                        vg_warn( "Max marbles exceeded\n" );
                                                }
                                        }
                                }
@@ -3191,7 +3244,61 @@ void vg_ui(void)
       gui_text( (ui_px [2]){ vg_window_x / 2, 28 }, world.pCmpLevel->description, 1, k_text_align_center );
    }
 
-       if( world.st.state == k_game_state_settings )
+   if( world.st.state == k_game_state_update )
+   {
+      gui_group_id( 34 );
+
+      ui_global_ctx.cursor[2] = 458;
+      ui_global_ctx.cursor[3] = 316;
+      ui_global_ctx.cursor[0] = vg_window_x / 2 - 229;
+      ui_global_ctx.cursor[1] = vg_window_y / 2 - 158;
+
+      gui_new_node();
+      {
+         gui_capture_mouse( 200 );
+         gui_fill_rect( ui_global_ctx.cursor, 0xE8303030 );
+         
+         ui_px title_pos[2];
+         title_pos[0] = ui_global_ctx.cursor[0] + 229;
+         title_pos[1] = ui_global_ctx.cursor[1] + 16;
+
+         gui_text( title_pos, "Update 1.5", 2, k_text_align_center );
+
+         gui_text( (ui_px [2]){ ui_global_ctx.cursor[0] + 16, title_pos[1] + 45 },
+            "Welcome to the first update to marble computing!"
+            "\n"
+            "New features have been added:\n"
+            "\n"
+            "  - Settings menu\n"
+            "  - Map skins\n"
+            "  - More levels and a new block type\n"
+            "  - Scores for each level\n"
+            "  - Zooming and panning (mousewheel)\n"
+            "\n"
+            "There is much more in the works, such as a\n"
+            "soundtrack, and the rest of the levels for the\n"
+            "3 bit computer!\n"
+            "\n"
+            "Thank you everyone for enjoying my game :)\n",
+            1, k_text_align_left
+         );
+
+         ui_global_ctx.cursor[2] = 100;
+         ui_global_ctx.cursor[3] = 30;
+         ui_global_ctx.cursor[0] += 229 - 50;
+         ui_global_ctx.cursor[1] += 316 - 30 - 16;
+
+         if( gui_button( 1 ) )
+         {
+            world.st.state = k_game_state_main;
+         }
+         gui_text( (ui_px [2]){ ui_global_ctx.cursor[0] + 50,
+            ui_global_ctx.cursor[1] + 4 }, "OK", 1, k_text_align_center );
+         gui_end();
+      }
+      gui_end();
+   }
+   else if( world.st.state == k_game_state_settings )
        {
                gui_group_id( 35 );
 
@@ -3249,7 +3356,7 @@ void vg_ui(void)
                                        if( colour_set_id > 0 )
                                                colour_set_id --;
                                }
-                               gui_text( ui_global_ctx.cursor, "<", 1, 0 );
+                               gui_text( ui_global_ctx.cursor, "<", 2, 0 );
                                gui_end_right();
                                
                                ui_global_ctx.cursor[2] = 150;
@@ -3270,7 +3377,7 @@ void vg_ui(void)
                                        if( colour_set_id < vg_list_size( colour_sets )-1 )
                                                colour_set_id ++;
                                }
-                               gui_text( ui_global_ctx.cursor, ">", 1, 0 );
+                               gui_text( ui_global_ctx.cursor, ">", 2, 0 );
                                gui_end_down();
                        }
                        gui_end_down();
@@ -3290,7 +3397,7 @@ void vg_ui(void)
                                        if( world_theme_id > 0 )
                                                world_theme_id --;
                                }
-                               gui_text( ui_global_ctx.cursor, "<", 1, 0 );
+                               gui_text( ui_global_ctx.cursor, "<", 2, 0 );
                                gui_end_right();
                                
                                ui_global_ctx.cursor[2] = 150;
@@ -3310,7 +3417,7 @@ void vg_ui(void)
                                        if( world_theme_id < vg_list_size( world_themes )-1 )
                                                world_theme_id ++;
                                }
-                               gui_text( ui_global_ctx.cursor, ">", 1, 0 );
+                               gui_text( ui_global_ctx.cursor, ">", 2, 0 );
                                gui_end_down();
                        }
                        gui_end_down();
@@ -3434,7 +3541,6 @@ static int console_credits( int argc, char const *argv[] )
        vg_info( "  miniaudio    MIT0         miniaud.io\n" );
        vg_info( "  QOI          MIT          phoboslab.org\n" );
        vg_info( "  STB library  MIT          nothings.org\n" );
-       vg_info( "  Ubuntu Regular            ubuntu.com\n" );
        return 0;
 }
 

diff --git a/fishladder_resources.h b/fishladder_resources.h
index a5e3bd6aba281878989f6c0b92209de4bf3e4d8f..ad4c6f3995615b644915ebe23002ef0f1c9db42e 100644 (file)
--- a/fishladder_resources.h
+++ b/fishladder_resources.h
@@ -9,7 +9,6 @@ vg_tex2d tex_tiles_min  =  { .path = "textures/tile_minimal.qoi" };
 vg_tex2d tex_tiles_lab  =  { .path = "textures/tile_lab.qoi" };
 
 vg_tex2d tex_ball_noise =  { .path = "textures/bnoise.qoi" };
-vg_tex2d tex_monofur   =  { .path = "textures/ascii.qoi", .flags = VG_TEXTURE_NO_MIP };
 vg_tex2d tex_unkown            =  { .path = "textures/unkown.qoi" };
 vg_tex2d tex_buttons           =  { .path = "textures/buttons.qoi" };
 vg_tex2d tex_sprites           =  { .path = "textures/autocombine.qoi" };
@@ -21,7 +20,6 @@ vg_tex2d *texture_list[] = {
    &tex_tiles_min, 
    &tex_tiles_lab, 
    &tex_ball_noise, 
-   &tex_monofur, 
    &tex_unkown, 
    &tex_buttons, 
    &tex_sprites 
@@ -613,6 +611,7 @@ static struct cmp_level cmp_levels_tutorials[] =
    {
       26, "cmp_p7", "PRINCIPLE 7", "Emitters",
       ._unlock = 27,
+      ._linked = 13,
       .is_tutorial = 1
    }
 };
@@ -635,8 +634,13 @@ static struct cmp_level cmp_levels_basic[] =
        },
        {
       5, "cmp_b03", "RESTRUCTURE", "",
-               ._unlock = 8
+               ._unlock = 8,
+      ._linked = 31
        },
+   {
+      31, "cmp_121", "1-2-1", "",
+      ._unlock = 8
+   },
        {
       7, "cmp_b05", "PATTERNS 1", "",
                ._unlock = 15,
@@ -675,7 +679,7 @@ static struct cmp_level cmp_levels_basic[] =
        },
        {
       20, "cmp_xor", "QUALIFICATION PROJECT", "",
-               ._unlock = 25,
+               ._unlock = 26,
                .achievement = "GRADUATE"
        },
    {
@@ -688,10 +692,15 @@ static struct cmp_level cmp_levels_basic[] =
    },
    {
       29, "cmp_routing2", "ROUTING PROBLEM 2", "Spaghetti!",
-      ._linked = 30
+      ._linked = 30,
+      ._unlock = 32
+   },
+   {
+      30, "cmp_exact5", "EXACTLY 5", "",
+      ._unlock = 32
    },
    {
-      30, "cmp_exact5", "EXACTLY 5", ""
+      32, "cmp_3and2", "THREE AND FOUR", ""
    }
 };
 
@@ -780,6 +789,7 @@ static struct cmp_level cmp_levels_computer[] =
 static struct career_level_pack 
 {
        struct cmp_level *pack;
+   const char *title;
        int count;
 
        v3f primary_colour;
@@ -790,6 +800,7 @@ career_packs[] =
 {
        {
                .pack = cmp_levels_tutorials,
+      .title = "",
                .count = vg_list_size( cmp_levels_tutorials ),
                .primary_colour = { 0.204f, 0.345f, 0.553f },
                .origin = { -5, -2 },
@@ -797,6 +808,7 @@ career_packs[] =
        },
        {
                .pack = cmp_levels_basic,
+      .title = "\x8C\x8D"" Core",
                .count = vg_list_size( cmp_levels_basic ),
                .primary_colour = { 0.304f, 0.245f, 0.553f },
                .origin = { -3, -2 },
@@ -804,6 +816,7 @@ career_packs[] =
        },
        {
                .pack = cmp_levels_grad,
+      .title = "\x8C\x8E"" Challenge",
                .count = vg_list_size( cmp_levels_grad ),
                .primary_colour = { 0.553f, 0.345f, 0.204f },
                .origin = { -5, 6 },
@@ -811,6 +824,7 @@ career_packs[] =
        },
        {
                .pack = cmp_levels_computer,
+      .title = "\x8C\x8F"" 3 Bit computer\n\n (preview)",
                .count = vg_list_size( cmp_levels_computer ),
                .primary_colour = { 0.75f, 0.23f, 0.39f },
                .origin = { -5, 8 },

diff --git a/fonts/vg_font.png b/fonts/vg_font.png
index 892a6dd421322a70a9a4627b25b0cd24db968d3a..937ce3350ae016a909d9add976c277635164c5d6 100644 (file)
Binary files a/fonts/vg_font.png and b/fonts/vg_font.png differ

diff --git a/maps/cmp_121.map b/maps/cmp_121.map
new file mode 100644 (file)
index 0000000..050de96
--- /dev/null
+++ b/maps/cmp_121.map
@@ -0,0 +1,11 @@
+###############;
+###-###-###-###;c,cc,c
+##           ##;
+##           ##;
+##           ##;
+##           ##;
+##           ##;
+##           ##;
+##           ##;
+#######+#######;cccc
+###############;

diff --git a/maps/cmp_3and2.map b/maps/cmp_3and2.map
new file mode 100644 (file)
index 0000000..8ba3afd
--- /dev/null
+++ b/maps/cmp_3and2.map
@@ -0,0 +1,11 @@
+##############;
+##############;
+##          ##;
+########### ##;
+###-###-### ##;bbb,bbbb
+##   #   ## ##;
+##   #   ## ##;
+##   #   ## ##;
+##   #   ## ##;
+###*###*###+##;bb,bb,a
+##############;

diff --git a/textures/ascii.png b/textures/ascii.png
deleted file mode 100644 (file)
index 78884ae..0000000
Binary files a/textures/ascii.png and /dev/null differ

diff --git a/textures/ubuntu.png b/textures/ubuntu.png
deleted file mode 100644 (file)
index bf15bff..0000000
Binary files a/textures/ubuntu.png and /dev/null differ

diff --git a/vg/vg_pxfont.h b/vg/vg_pxfont.h
index a67a48d30c50dca46162c289176e421f6fa776ad..3086e5a3c4366d59226e99053efc7af8d151c267 100644 (file)
--- a/vg/vg_pxfont.h
+++ b/vg/vg_pxfont.h
@@ -101,14 +101,14 @@
 0x3000000,0,0,0,0,0,0,0,
 0x1800000,0x6000000,0x600000,0,0x6000180,0x1800600,0,0,
 0x800000,0x6000000,0x600000,0,0x6000180,0x1800600,0x6000000,0,
-0x1c0,0x60003c0,0x6003c0,0x1e003c0,0x6000000,0x600,0x60007e0,0x3c007e0,
-0x3e0,0x7c007e0,0x3e007e0,0x3e007e0,0x6000380,0x38006e0,0x6000ff0,0x7e00ff0,
-0x60,0x7e00600,0x7e00660,0x3000660,0x7c00180,0x18007c0,0x6000db0,0x7e00e70,
-0x3e0,0x6600600,0x66006e0,0x3000660,0x7e00180,0x1800780,0x6000db0,0x6600c30,
-0x660,0x6600600,0x66007c0,0x3000660,0x6600180,0x18007c0,0x6000c30,0x6600c30,
-0x660,0x6600600,0x6600700,0x3e007e0,0x6600180,0x18006c0,0x6000c30,0x6600e70,
-0x7e0,0x7e007e0,0x7e003e0,0x3c003e0,0x6600180,0x1800660,0x7c00c30,0x6600ff0,
-0x3e0,0x7c003c0,0x3e001c0,0x3000060,0x6600180,0x1800660,0x3c00c30,0x66007e0,
+0x1c0,0x60003c0,0x6003c0,0x1e003c0,0x6000000,0x600,0x60007e0,0x3c003c0,
+0x3e0,0x7c007e0,0x3e007e0,0x3e007e0,0x6000380,0x38006e0,0x6000ff0,0x7e007e0,
+0x60,0x7e00600,0x7e00660,0x3000660,0x7c00180,0x18007c0,0x6000db0,0x7e00660,
+0x3e0,0x6600600,0x66006e0,0x3000660,0x7e00180,0x1800780,0x6000db0,0x6600660,
+0x660,0x6600600,0x66007c0,0x3000660,0x6600180,0x18007c0,0x6000c30,0x6600660,
+0x660,0x6600600,0x6600700,0x3e007e0,0x6600180,0x18006c0,0x6000c30,0x6600660,
+0x7e0,0x7e007e0,0x7e003e0,0x3c003e0,0x6600180,0x1800660,0x7c00c30,0x66007e0,
+0x3e0,0x7c003c0,0x3e001c0,0x3000060,0x6600180,0x1800660,0x3c00c30,0x66003c0,
 0,0,0,0x70007e0,0,0x3800000,0,0,
 0,0,0,0x60003c0,0,0x3000000,0,0,
 0,0,0,0,0,0,0,0,
@@ -116,7 +116,7 @@
 0,0,0,0,0,0,0,0,
 0,0,0,0,0,0xc0,0x300,0,
 0,0,0,0,0,0x1c0,0x1800380,0,
-0,0,0,0,0,0x180,0x1800180,0x1ce0,
+0,0,0x3000000,0,0,0x180,0x1800180,0x1ce0,
 0x3c003c0,0x1c001c0,0x3000660,0xc300c30,0xc300660,0x7e00180,0x1800180,0x3ff0,
 0x7e007e0,0x3c003c0,0x3000660,0xc300c30,0xe700660,0x7e00380,0x18001c0,0x7303ff0,
 0x6600660,0x3000300,0x3c00660,0x6600c30,0x7e00660,0xe00700,0x18000e0,0xfb03ff0,
@@ -130,18 +130,18 @@
 0,0,0,0,0,0,0,0,
 0,0x100,0x800100,0x800000,0,0,0,0,
 0,0x100,0x800100,0x800000,0,0,0,0,
-0,0,0,0,0x2000040,0,0,0,
-0,0x100,0x800100,0x800000,0x4000020,0,0,0,
-0,0x100,0x800100,0x800000,0x8000010,0,0,0,
-0,0,0,0,0x8000010,0,0,0,
-0,0x100,0x800100,0x800000,0x8000010,0,0,0,
-0x1b66db6,0x6d800100,0x800100,0x800000,0x68000016,0x1800180,0,0,
-0,0,0,0,0x8000010,0,0,0,
-0x1000000,0x800100,0x8001b6,0x6d806db6,0x8000010,0x1000080,0,0,
-0x1000000,0x800100,0x800000,0,0x8000010,0x1000080,0,0,
-0,0,0,0,0x8000010,0,0,0,
-0x1000000,0x800100,0x800000,0,0x4000020,0x1000080,0,0,
-0x1000000,0x800100,0x800000,0,0x2000040,0x1000080,0,0,
+0,0,0,0,0x2000040,0,0x1ff81ff8,0x1ff81ff8,
+0,0x100,0x800100,0x800000,0x4000020,0,0x1c381e78,0x1c381c38,
+0,0x100,0x800100,0x800000,0x8000010,0,0x18181c78,0x18181818,
+0,0,0,0,0x8000010,0,0x19981c78,0x1b981f98,
+0,0x100,0x800100,0x800000,0x8000010,0,0x13081e78,0x1f981f98,
+0x1b66db6,0x6d800100,0x800100,0x800000,0x68000016,0x1800180,0x12081e78,0x1f181e18,
+0,0,0,0,0x8000010,0,0x10481e78,0x1e381e18,
+0x1000000,0x800100,0x8001b6,0x6d806db6,0x8000010,0x1000080,0x10c81e78,0x1c781f98,
+0x1000000,0x800100,0x800000,0,0x8000010,0x1000080,0x19981e78,0x18f81f98,
+0,0,0,0,0x8000010,0,0x18181c38,0x18181818,
+0x1000000,0x800100,0x800000,0,0x4000020,0x1000080,0x1c381c38,0x18181c38,
+0x1000000,0x800100,0x800000,0,0x2000040,0x1000080,0x1ff81ff8,0x1ff81ff8,
 0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,