From ad0109ca3ac309f8fa269cda47c5780fc6e0ea74 Mon Sep 17 00:00:00 2001
From: Yuji Yokoo <yujiyokoo@gmail.com>
Date: Thu, 16 Feb 2023 23:24:15 +1100
Subject: [PATCH] Add dashplus logo

---
 res/backgrounds/main_logo_dashplus.png | Bin 0 -> 1342 bytes
 res/resources.res                      |   1 +
 res/sprites/wombat0.png                | Bin 271 -> 272 bytes
 res/sprites/wombat1.png                | Bin 271 -> 273 bytes
 src/game.rb                            |   4 ++--
 src/main.c                             |   6 ++++--
 6 files changed, 7 insertions(+), 4 deletions(-)
 create mode 100755 res/backgrounds/main_logo_dashplus.png

diff --git a/res/backgrounds/main_logo_dashplus.png b/res/backgrounds/main_logo_dashplus.png
new file mode 100755
index 0000000000000000000000000000000000000000..0bb9af28db5eb81c96c07c35848e0c8e6f8a1890
GIT binary patch
literal 1342
zcmV-E1;P4>P)<h;3K|Lk000e1NJLTq00961001xu0{{R3$)QwD00001b5ch_0Itp)
z=>Px#9#BkFMF0Q*001;}kO0-v%}Pu`|NsB2p<<__tt>1thhQ#o0hQ<g000VfQchC<
z|NsC0|NsC0|9*)SRsaA5xJg7oRA_<inBA7!FbIT&F7p15+-xjh29V_JI_~M|>Z0o(
z49q8xl(zOee#d_}<ZEmVc1HK5^ND!tm~tP18$&_F-up7-%i?9^-^d42Rfp?rE*>uK
zZv#;En$BGf*ZY=02GIM7&)!VL)hmG;5J1TD0EEA~4nW6o*P4S7cUA`A`T}S{{#|Ww
ztbaQ#!QvdXcQeTVuA{pM+iBt1BzF%0SPec;;D})1cFElU!1k8AO5phSGyrKI1)%$?
z?B=BO;EVLTE2u_azODdVc?zI)Pc|u44)WNWhv>`X%!B}}+-~C+F(LpoTxx@N-b{1l
z!Ou7jPm@K#5&^8(*Xb5I)&LIEI!Mrs?I}${TQDYcvIG!)E&v3#h17;WKoVv1IPL-l
z&m%L50NiS7=b4`CfB^s<@OymRELub$P^B@-LD;v!ASTOm=v4`5;IEgp$-V%h;<yIZ
zk>lYO2>6Q<0CQsxg}~`+sz<$C0N9^|b5ia*11J&-^Unlu?Q#;)Z6&c+9}-6ckiJp?
z{ks6l4$wkQ&v^c803i@^m;t~)QGSQM%}pbIv^(+N0TuKbfTT|G4qz1%0Ne&BCB$)?
z<CX$_0s!Z527pH;{aBxMooSY;6N0OZAPdwtY<u@cFUWFrcnJXF{KdU#q=C7TGit;V
zfZ&{ky&yzV7e4`T*v$2pO}+&HLMvxh*98CoD5I*m0=SwqiNjW3I315R1+XiC^8n&k
zEB%xd?*e{rc3d|23ICv_p*4fGQUF-%Ujq=Hy7-aMQ4wX){4tucR9w=#07exB02nyV
zQUXv2cL0I_LiA4hofg0V!MrHYVo6S+1*$T9*f?tY`L|;_3}C0eE&vEO1z>XpQ`j0$
zRG5k4797(KLJqJDLH`TEb3AMv@pHE6w%WV`03{3n&=^tCbZ!99qg3P!V7yZT<H0Z;
zh4K6|;=IiE9T4()3xMBL%Si+f&oTZqehsxnEg(){NCwjYU{uWh6fgrI8vsDy6o7o|
zyGi<*T0$=$NMHwGST6ub27sE6(3~0PBR>M5z6bymw0E?bkNNyc%K><51mL)B?Zh!K
z%sPuLHz9na(qb2n%Nl^7-878beFwnHVm|kv6)&~`aOtc7#N1Z^#$^crN|XT{<52^6
zgbG*`KS+i7!b;YMo>^!e7z_Y&uK+XxAiS`Yzb;(iOSx}@P9Or%HK2qb@ffaYRLe2f
z16PS!7yyZV&O-2|&9X3nQ2`Li-r_O9S4B^d0IYU_YGt#js{sTAmjP(XzKW6ocojfT
zSP?RS1%bQ~p8&ua;=Kb1eIhQ>5jy}Pkb-z{E77s*iN`#uT-$eSd<H;l-P{6b!tFW-
z(CLJP$)H3A-~{*<ZxZIjT-Q8t-*7Y<JRU=`c|QYyU!}Ro0ANZXI_j@Z;zTFm@Oh7M
z#Ui>~oi+p@R`V}3X946aLwRff%zkuc040l-XkumQ<**~U0|2axP5ksfjscU+5LLx2
zDFw)*hjcC;xu(PqNow;{=f?U3004E}DyQ2(K)Fk0VSnxLAUU1^X!yj-g8cxOMVLZQ
zczmmTi|CQ*MFKESNfge<^85?qJ^c4f*FQ7<007P@b)}>u*#H0l07*qoM6N<$f`dX)
AA^-pY

literal 0
HcmV?d00001

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 55b01ad715dce173b389aeb6621ed1441826dd17..e7536296a0522000ac4acae0e5691a7767058ad5 100644
GIT binary patch
delta 167
zcmV;Y09gNz0+0fbaes<QL_t(IjpdTv3cw%;M!on(@BhYIX8x5l*yV%~dd@5|qF)6#
zG$CZ%IK)CTdGO}rfmakF@5&WgtbBZ^c&A)MDX4hh!+0-XcUbriM`1N;!R_l0VGEQO
zLMM~!B$Lo|{(vY+aI?^U60!qq7VtlCfm~(eS)h$DbGtyTARwgTB0W1;2c#$cF>WC$
V4Mv@VU7`R0002ovPDHLkV1iroNlO3#

delta 166
zcmV;X09pT#0*?Zaaes+PL_t(IjpdTt3IHJpM17d(|NnR?&09tb`?v!UIwzBi=uZMm
zBSP{!ODJ@MgRfMJK=cRFLW$kyg_A$rnZyxL@ZvM^9zfMBe1$8p6KBBP>zlC6&87y1
zvwYI-BhYpJfFKEQv(S1XxdAo{_yaRRF2ivKr~p=M52zW0P#;*NZwIS@^rb)Q0XHQL
UO^PPW2><{907*qoM6N<$f@V}lx&QzG

diff --git a/res/sprites/wombat1.png b/res/sprites/wombat1.png
index 22dbdee16007355ec3666227933d7df5ad7fc69c..d0d8c21381d33bafc35cd437725fa45a8fe6ecd3 100644
GIT binary patch
delta 168
zcmV;Z09XHy0+9lcaes?RL_t(IjpdR{4!|G?1zEf<y#Iw;5&0>xNtY#Q49pabNc5`!
zhbDxK8;4kECJ)|xJn)J_<XyQ!i<OTL74MXbC<PS{d>HQq><$ax;V7&|Ex3LCA#8#2
zLg-|2on#W4&L0pZ32qkJPeOKp%>w=hE|9B?JPWiDW^Na#6(NLFT%>0Q>wxs6KgJE)
W;}B4+;2Kr{0000<MNUMnLSTXo5Jdn0

delta 166
zcmV;X09pT$0*?Zaaes+PL_t(IjpdTf3IHJpggs1$-v5P{()`P4VUIfyq4Q;u5&cPE
zX+%hVX9<OFaPXCC5s3akS}3vmym0b|JCis93SN9B-UFzbg|Bc0cH#`UdwmnOx!Kgf
zaF$QneFVDB9}pw~ZWdZkBsaij0e@g7$YnUr02RQB?Ey7|5FZMQ^zC33kiPUsJ@^0+
US-U3!GXMYp07*qoM6N<$f)Y+f82|tP

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,