diff --git a/Project/scripts/button_set/button_set.gml b/Project/scripts/button_set/button_set.gml index 50f4b3b..fd7cbd7 100644 --- a/Project/scripts/button_set/button_set.gml +++ b/Project/scripts/button_set/button_set.gml @@ -61,7 +61,7 @@ switch(type) text = "GALAR"; scale = global.icon_scale * 0.75; x_ = button_align_x(region.bot_left, -1.25); - y_ = button_align_y(region._100, -0.5); + y_ = button_align_y(region._100, -0.5 - 0.5); break; case but.shiny: @@ -71,7 +71,7 @@ switch(type) text = "SHINY"; scale = global.icon_scale * 0.75; x_ = button_align_x(region.bot_left, 1.25); - y_ = button_align_y(region._100, -0.5); + y_ = button_align_y(region._100, -0.5 - 0.5); break; }; diff --git a/Project/scripts/hud_draw_progress/hud_draw_progress.gml b/Project/scripts/hud_draw_progress/hud_draw_progress.gml index a3283c8..4d1e9cb 100644 --- a/Project/scripts/hud_draw_progress/hud_draw_progress.gml +++ b/Project/scripts/hud_draw_progress/hud_draw_progress.gml @@ -9,41 +9,27 @@ var h = sprite_get_height(spr_source) * global.icon_scale / 1.75; var percent = global.progress / global.progress_max * 100; draw_sprite_stretched(spr_source, src.flip, - x_s, align_y(region.bot_left, 0), + x_s, align_y(region.bot_left, 0 - 0.5), w, h); draw_sprite_stretched(spr_source, src.green, - x_s, align_y(region.bot_left, 0), + x_s, align_y(region.bot_left, 0 - 0.5), w*percent/100, h); - + + // Text - -if (!global.show_galar) - var mode = "NATIONAL"; -else - var mode = "GALAR"; - -if (global.show_shiny) - mode = string_insert(" SHINY", mode, string_length(mode)+1); - - var progress = string(global.progress)+"/"+string(global.progress_max); var percent_t = string(percent)+"%"; - var fh = sprite_get_height(spr_font); draw_set_font(global.font); - -draw_set_color(c_dkgray); -draw_set_halign(fa_right); -var sca = global.icon_scale; -draw_text_transformed(x_f-off, align_y(region.bot_left, 0.21875), progress, sca, sca, image_angle); +draw_set_valign(fa_top); draw_set_color(c_white); -draw_set_valign(fa_top); +draw_set_halign(fa_right); sca = global.icon_scale * 1.25; -draw_text_transformed(x_f, align_y(region.bot_left, -0.375), mode, sca, sca, image_angle); +draw_text_transformed(x_f, align_y(region.bot_left, -0.375 - 0.5), progress, sca, sca, image_angle); draw_set_halign(fa_left); sca = global.icon_scale * 1.75; -draw_text_transformed(x_s, align_y(region.bot_left, -0.5), percent_t, sca, sca, image_angle); \ No newline at end of file +draw_text_transformed(x_s, align_y(region.bot_left, -0.5 - 0.5), percent_t, sca, sca, image_angle); \ No newline at end of file