Skip to content

Commit

Permalink
Add dashplus logo
Browse files Browse the repository at this point in the history
  • Loading branch information
yujiyokoo committed Feb 16, 2023
1 parent 676eaa9 commit ad0109c
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 4 deletions.
Binary file added res/backgrounds/main_logo_dashplus.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions res/resources.res
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Binary file modified res/sprites/wombat0.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified res/sprites/wombat1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions src/game.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 4 additions & 2 deletions src/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

0 comments on commit ad0109c

Please sign in to comment.