diff --git a/LivingDexSS.gmx/datafiles/Icons/Regular/GRIMMSNARL-GIGANTAMAX.png b/LivingDexSS.gmx/datafiles/Icons/Regular/GRIMMSNARL-GIGANTAMAX.png index e074328..d04c100 100644 Binary files a/LivingDexSS.gmx/datafiles/Icons/Regular/GRIMMSNARL-GIGANTAMAX.png and b/LivingDexSS.gmx/datafiles/Icons/Regular/GRIMMSNARL-GIGANTAMAX.png differ diff --git a/LivingDexSS.gmx/objects/obj_global.object.gmx b/LivingDexSS.gmx/objects/obj_global.object.gmx index daffc56..d1768e1 100644 --- a/LivingDexSS.gmx/objects/obj_global.object.gmx +++ b/LivingDexSS.gmx/objects/obj_global.object.gmx @@ -418,30 +418,11 @@ else if (mouse_wheel_down()) 1 /// DRAW +/// Display Info + var color = get_color3(global.selected[dex.own], false); draw_set_color(color); -/// DRAW HOVER INFO -/*var len = global.box_len/8; -var hal = len/2; -var mid = room_width*0.75; - -draw_set_font(global.font) -draw_set_halign(fa_middle) -draw_text_transformed(mid, room_height*0.1, scr_zeros(global.selected[dex.dexno]), len, len, 0); -draw_text_transformed(mid, room_height*0.5, global.selected[dex.pokemon], len, len, 0); - -draw_set_color(c_white); - -if (global.selected[dex.type2] != "") -{ - draw_sprite_ext(spr_type, scr_typeget(global.selected[dex.type1]), mid-(30*hal)-hal, room_height*0.6, hal, hal, image_angle, image_blend, image_alpha); - draw_sprite_ext(spr_type, scr_typeget(global.selected[dex.type2]), mid+hal, room_height*0.6, hal, hal, image_angle, image_blend, image_alpha); -} -else -{ -}*/ - draw_text_hud(global.selected[dex.dexno], 2, -2, color); draw_pokemon_hud(global.selected[dex.sprite]); draw_text_hud(global.selected[dex.pokemon], 2, 1, color); @@ -449,6 +430,8 @@ draw_text_hud(global.selected[dex.form], 1.5, 3, color); draw_type_hud(global.selected[dex.type1], global.selected[dex.type2], 4.5); +// Debug + draw_guidelines(false); diff --git a/LivingDexSS.gmx/scripts/draw_text_hud.gml b/LivingDexSS.gmx/scripts/draw_text_hud.gml index bd1a90e..54529ed 100644 --- a/LivingDexSS.gmx/scripts/draw_text_hud.gml +++ b/LivingDexSS.gmx/scripts/draw_text_hud.gml @@ -48,6 +48,11 @@ draw_set_font(global.font); draw_set_halign(fa_middle); draw_set_color(col); -draw_text_transformed(mid_x, mid_y+start+len, str, sca, sca, 0); +var final_y = mid_y + start + len; + +if (final_y < view_yview[0]) + final_y = view_yview[0]; + +draw_text_transformed(mid_x, final_y, str, sca, sca, 0); draw_set_color(c_white); diff --git a/LivingDexSS.gmx/scripts/make_sprite.gml b/LivingDexSS.gmx/scripts/make_sprite.gml index 7522430..f313097 100644 --- a/LivingDexSS.gmx/scripts/make_sprite.gml +++ b/LivingDexSS.gmx/scripts/make_sprite.gml @@ -12,9 +12,9 @@ if (form != "") show_debug_message(str); } -sprtemp = sprite_add("Icons\Regular\"+string(str)+".png",0,true,false,19,14); +sprtemp = sprite_add("Icons\Regular\"+string(str)+".png",0,false,false,19,14); -if (sprite_get_width(sprtemp) > 40 || sprite_get_height(sprtemp) > 30) +if (sprite_get_width(sprtemp) > 40 || sprite_get_height(sprtemp) > 30 || sprite_get_height(sprtemp) == 29) sprite_set_offset(sprtemp, sprite_get_width(sprtemp)/2, sprite_get_height(sprtemp)/2); return sprtemp;