diff --git a/res/backgrounds/main_logo_dashplus.png b/res/backgrounds/main_logo_dashplus.png new file mode 100755 index 0000000..0bb9af2 Binary files /dev/null and b/res/backgrounds/main_logo_dashplus.png differ diff --git a/res/resources.res b/res/resources.res index bc9f722..3761b96 100644 --- a/res/resources.res +++ b/res/resources.res @@ -3,6 +3,7 @@ IMAGE sky_bg "backgrounds/sky-background.png" NONE ALL IMAGE mountains_bg "backgrounds/mountains-background.png" NONE ALL IMAGE main_logo "backgrounds/main_logo.png" NONE ALL IMAGE main_logo_dash "backgrounds/main_logo_dash.png" NONE ALL +IMAGE main_logo_dashplus "backgrounds/main_logo_dashplus.png" NONE ALL IMAGE adl_bkk "backgrounds/ADL_BKK.png" NONE ALL IMAGE adl_bkk_br "backgrounds/ADL_BKK_br.png" NONE ALL IMAGE yuji "backgrounds/pixel_yuji.png" NONE ALL diff --git a/res/sprites/wombat0.png b/res/sprites/wombat0.png index 55b01ad..e753629 100644 Binary files a/res/sprites/wombat0.png and b/res/sprites/wombat0.png differ diff --git a/res/sprites/wombat1.png b/res/sprites/wombat1.png index 22dbdee..d0d8c21 100644 Binary files a/res/sprites/wombat1.png and b/res/sprites/wombat1.png differ diff --git a/src/game.rb b/src/game.rb index d1ff4ee..e540a41 100644 --- a/src/game.rb +++ b/src/game.rb @@ -447,9 +447,9 @@ def title_screen count = 0 prev = MegaMrbc.read_joypad MegaMrbc.render_start_bg - [0, 1].each do |dash| + [0, 1, 2].each do |dash_or_plus| wait_vblank(false) - MegaMrbc.render_start_logo(dash) + MegaMrbc.render_start_logo(dash_or_plus) while true do MegaMrbc.scroll_title if count / 30 >= 1 # switch every 0.5s diff --git a/src/main.c b/src/main.c index 11a7d14..a9a1dca 100644 --- a/src/main.c +++ b/src/main.c @@ -337,13 +337,15 @@ static void c_megamrbc_render_start_bg(mrb_vm *vm, mrb_value *v, int argc) { } static void c_megamrbc_render_start_logo(mrb_vm *vm, mrb_value *v, int argc) { - bool render_dash = mrbc_integer(v[1]); + bool dash_or_plus = mrbc_integer(v[1]); Image logo_image = main_logo; // use wombat palette which includes main logo palette VDP_setPalette(PAL1, wombat0.palette->data); - if(render_dash) { + if(dash_or_plus == 1) { logo_image = main_logo_dash; + } else if(dash_or_plus == 2) { + logo_image = main_logo_dashplus; } VDP_drawImageEx( BG_A, &logo_image,