From 447da806153d2c56d15a8775ab43511202b269bc Mon Sep 17 00:00:00 2001 From: Rangi Date: Thu, 27 Feb 2020 14:33:30 -0500 Subject: [PATCH 1/3] Identify remaining gfx/unknown files --- Makefile | 13 +- engine/gfx/crystal_layouts.asm | 6 +- engine/menus/main_menu.asm | 4 +- engine/pokemon/stats_screen.asm | 5 +- gfx/font.asm | 11 +- .../17eb7e.png => font/postal_mark.png} | Bin gfx/font/space.png | Bin 0 -> 71 bytes gfx/frames/space.png | Bin 113 -> 0 bytes gfx/mobile/card.png | Bin 0 -> 335 bytes gfx/mobile/card_2.png | Bin 0 -> 306 bytes gfx/mobile/card_folder.png | Bin 0 -> 567 bytes gfx/mobile/card_large_sprite.png | Bin 0 -> 137 bytes gfx/mobile/card_list.png | Bin 0 -> 235 bytes gfx/mobile/card_sprite.png | Bin 0 -> 103 bytes gfx/mobile/chris_silhouette.png | Bin 0 -> 250 bytes .../11601a.png => mobile/dialing.png} | Bin .../106514.png => mobile/dialing_frame.png} | Bin .../17ae3d.tilemap => mobile/dialpad.attrmap} | Bin gfx/mobile/dialpad.png | Bin 0 -> 631 bytes .../17acd5.tilemap => mobile/dialpad.tilemap} | Bin gfx/mobile/dialpad_cursor.png | Bin 0 -> 135 bytes gfx/mobile/down_arrow.png | Bin 77 -> 82 bytes .../08940b.png => mobile/ez_chat_cursor.png} | Bin gfx/mobile/kris_silhouette.png | Bin 0 -> 264 bytes gfx/mobile/mobile_adapter.png | Bin 1517 -> 0 bytes gfx/mobile/mobile_adapters.pal | 8 + .../1091c7.png => mobile/mobile_cable_1.png} | Bin .../1092c7.png => mobile/mobile_cable_2.png} | Bin .../mobile_center.attrmap} | Bin .../mobile_center.tilemap} | Bin .../049c0c.png => mobile/mobile_menu.png} | Bin gfx/mobile/mobile_password.pal | 39 +++ .../16c903.pal => mobile/mobile_splash.pal} | 0 .../mobile_splash_check.png} | Bin .../mobile_trade.2bpp.lz.aad8592b} | Bin .../mobile_trade.attrmap} | Bin .../mobile_trade.attrmap.lz.ea4f2cbe} | Bin .../108da7.png => mobile/mobile_trade.png} | Bin .../mobile_trade.tilemap} | Bin .../mobile_trade.tilemap.lz.12882d37} | Bin gfx/mobile/mobile_trade_bg.pal | 39 +++ gfx/mobile/mobile_trade_lights.pal | 19 ++ .../mobile_trade_lights.png} | Bin gfx/mobile/mobile_trade_ob1.pal | 39 +++ gfx/mobile/mobile_trade_ob2.pal | 39 +++ .../mobile_trade_sprites.2bpp.lz.eef1e11d} | Bin .../mobile_trade_sprites.png} | Bin .../password.attrmap} | Bin .../password_bottom.tilemap} | Bin .../password_shift.tilemap} | Bin .../password_top.tilemap} | Bin gfx/mobile/phone_tiles.png | Bin 245 -> 235 bytes .../pichu_border.attrmap} | 0 .../171848.png => mobile/pichu_border.png} | Bin .../pichu_border.tilemap} | 0 gfx/mobile/pichu_border_bg.pal | 4 + gfx/mobile/pichu_border_ob.pal | 39 +++ gfx/mobile/pokemon_news.pal | 39 +++ gfx/{pokedex => mobile}/select_start.png | Bin .../stadium2_n64.attrmap} | Bin .../stadium2_n64.png} | Bin .../stadium2_n64.tilemap} | 0 .../stadium2_n64_corrupt.tilemap} | 0 gfx/mobile/unused_mobile_pulses.pal | 11 + gfx/mobile/up_arrow.png | Bin 77 -> 82 bytes .../egg/unused_front.2bpp.lz.a5b6cbfa} | Bin .../egg/unused_front.png} | Bin .../49757.pal => trade/mobile_border.pal} | 0 gfx/unknown/17afa5.png | Bin 896 -> 0 bytes home/pokemon.asm | 2 +- main.asm | 4 +- mobile/fixed_words.asm | 12 +- mobile/mobile_12.asm | 4 +- mobile/mobile_22.asm | 38 +-- mobile/mobile_22_2.asm | 18 +- mobile/mobile_40.asm | 32 +-- mobile/mobile_41.asm | 8 +- mobile/mobile_42.asm | 248 +++--------------- mobile/mobile_45_2.asm | 48 +--- mobile/mobile_45_sprite_engine.asm | 42 +-- mobile/mobile_5b.asm | 20 +- mobile/mobile_5c.asm | 124 ++++----- mobile/mobile_5e.asm | 62 +++-- mobile/mobile_5f.asm | 49 +--- mobile/mobile_menu.asm | 4 +- 85 files changed, 534 insertions(+), 496 deletions(-) rename gfx/{unknown/17eb7e.png => font/postal_mark.png} (100%) create mode 100644 gfx/font/space.png delete mode 100644 gfx/frames/space.png create mode 100644 gfx/mobile/card.png create mode 100644 gfx/mobile/card_2.png create mode 100644 gfx/mobile/card_folder.png create mode 100644 gfx/mobile/card_large_sprite.png create mode 100644 gfx/mobile/card_list.png create mode 100644 gfx/mobile/card_sprite.png create mode 100644 gfx/mobile/chris_silhouette.png rename gfx/{unknown/11601a.png => mobile/dialing.png} (100%) rename gfx/{unknown/106514.png => mobile/dialing_frame.png} (100%) rename gfx/{unknown/17ae3d.tilemap => mobile/dialpad.attrmap} (100%) create mode 100644 gfx/mobile/dialpad.png rename gfx/{unknown/17acd5.tilemap => mobile/dialpad.tilemap} (100%) create mode 100644 gfx/mobile/dialpad_cursor.png rename gfx/{unknown/08940b.png => mobile/ez_chat_cursor.png} (100%) create mode 100644 gfx/mobile/kris_silhouette.png delete mode 100644 gfx/mobile/mobile_adapter.png create mode 100644 gfx/mobile/mobile_adapters.pal rename gfx/{unknown/1091c7.png => mobile/mobile_cable_1.png} (100%) rename gfx/{unknown/1092c7.png => mobile/mobile_cable_2.png} (100%) rename gfx/{unknown/172955.attrmap => mobile/mobile_center.attrmap} (100%) rename gfx/{unknown/172685.tilemap => mobile/mobile_center.tilemap} (100%) rename gfx/{unknown/049c0c.png => mobile/mobile_menu.png} (100%) create mode 100644 gfx/mobile/mobile_password.pal rename gfx/{unknown/16c903.pal => mobile/mobile_splash.pal} (100%) rename gfx/{unknown/16cca3.png => mobile/mobile_splash_check.png} (100%) rename gfx/{unknown/108da7.2bpp.lz.aad8592b => mobile/mobile_trade.2bpp.lz.aad8592b} (100%) rename gfx/{unknown/1090a7.tilemap => mobile/mobile_trade.attrmap} (100%) rename gfx/{unknown/1090a7.tilemap.lz.ea4f2cbe => mobile/mobile_trade.attrmap.lz.ea4f2cbe} (100%) rename gfx/{unknown/108da7.png => mobile/mobile_trade.png} (100%) rename gfx/{unknown/108fe7.tilemap => mobile/mobile_trade.tilemap} (100%) rename gfx/{unknown/108fe7.tilemap.lz.12882d37 => mobile/mobile_trade.tilemap.lz.12882d37} (100%) create mode 100644 gfx/mobile/mobile_trade_bg.pal create mode 100644 gfx/mobile/mobile_trade_lights.pal rename gfx/{unknown/1032a2.png => mobile/mobile_trade_lights.png} (100%) create mode 100644 gfx/mobile/mobile_trade_ob1.pal create mode 100644 gfx/mobile/mobile_trade_ob2.pal rename gfx/{unknown/108d27.2bpp.lz.eef1e11d => mobile/mobile_trade_sprites.2bpp.lz.eef1e11d} (100%) rename gfx/{unknown/108d27.png => mobile/mobile_trade_sprites.png} (100%) rename gfx/{unknown/1727ed.attrmap => mobile/password.attrmap} (100%) rename gfx/{unknown/17251d.tilemap => mobile/password_bottom.tilemap} (100%) rename gfx/{unknown/1725f9.tilemap => mobile/password_shift.tilemap} (100%) rename gfx/{unknown/172491.tilemap => mobile/password_top.tilemap} (100%) rename gfx/{unknown/1174d6.attrmap => mobile/pichu_border.attrmap} (100%) rename gfx/{unknown/171848.png => mobile/pichu_border.png} (100%) rename gfx/{unknown/117356.tilemap => mobile/pichu_border.tilemap} (100%) create mode 100644 gfx/mobile/pichu_border_bg.pal create mode 100644 gfx/mobile/pichu_border_ob.pal create mode 100644 gfx/mobile/pokemon_news.pal rename gfx/{pokedex => mobile}/select_start.png (100%) rename gfx/{unknown/173517.attrmap => mobile/stadium2_n64.attrmap} (100%) rename gfx/{trade/game_boy_n64.png => mobile/stadium2_n64.png} (100%) rename gfx/{unknown/1733af.tilemap => mobile/stadium2_n64.tilemap} (100%) rename gfx/{unknown/1733af_corrupt.tilemap => mobile/stadium2_n64_corrupt.tilemap} (100%) create mode 100644 gfx/mobile/unused_mobile_pulses.pal rename gfx/{unknown/unknown_egg.2bpp.lz.a5b6cbfa => pokemon/egg/unused_front.2bpp.lz.a5b6cbfa} (100%) rename gfx/{unknown/unknown_egg.png => pokemon/egg/unused_front.png} (100%) rename gfx/{unknown/49757.pal => trade/mobile_border.pal} (100%) delete mode 100644 gfx/unknown/17afa5.png diff --git a/Makefile b/Makefile index 28b064fe2..2bd491529 100644 --- a/Makefile +++ b/Makefile @@ -157,6 +157,8 @@ gfx/pokemon/%/back.2bpp: rgbgfx += -h gfx/trainers/%.2bpp: rgbgfx += -h +gfx/pokemon/egg/unused_front.2bpp: rgbgfx += -h + gfx/new_game/shrink1.2bpp: rgbgfx += -h gfx/new_game/shrink2.2bpp: rgbgfx += -h @@ -181,7 +183,6 @@ gfx/title/old_fg.2bpp: tools/gfx += --interleave --png=$< gfx/title/logo.2bpp: rgbgfx += -x 4 gfx/trade/ball.2bpp: tools/gfx += --remove-whitespace -gfx/trade/game_boy_n64.2bpp: tools/gfx += --trim-whitespace gfx/slots/slots_1.2bpp: tools/gfx += --trim-whitespace gfx/slots/slots_2.2bpp: tools/gfx += --interleave --png=$< @@ -226,13 +227,17 @@ gfx/font/unused_bold_font.1bpp: tools/gfx += --trim-whitespace gfx/sgb/sgb_border.2bpp: tools/gfx += --trim-whitespace gfx/mobile/ascii_font.2bpp: tools/gfx += --trim-whitespace +gfx/mobile/dialpad.2bpp: tools/gfx += --trim-whitespace +gfx/mobile/dialpad_cursor.2bpp: tools/gfx += --trim-whitespace gfx/mobile/electro_ball.2bpp: tools/gfx += --trim-whitespace gfx/mobile/electro_ball_nonmatching.2bpp: tools/gfx += --remove-duplicates --remove-xflip -gfx/mobile/mobile_adapter.2bpp: tools/gfx += --trim-whitespace gfx/mobile/mobile_splash.2bpp: tools/gfx += --remove-duplicates --remove-xflip +gfx/mobile/card.2bpp: tools/gfx += --trim-whitespace +gfx/mobile/card_2.2bpp: tools/gfx += --trim-whitespace +gfx/mobile/card_folder.2bpp: tools/gfx += --trim-whitespace +gfx/mobile/phone_tiles.2bpp: tools/gfx += --remove-whitespace gfx/mobile/pichu_animated.2bpp: tools/gfx += --trim-whitespace - -gfx/unknown/unknown_egg.2bpp: rgbgfx += -h +gfx/mobile/stadium2_n64.2bpp: tools/gfx += --trim-whitespace ### Catch-all graphics rules diff --git a/engine/gfx/crystal_layouts.asm b/engine/gfx/crystal_layouts.asm index 4f424d7fc..a9b4e3ee8 100644 --- a/engine/gfx/crystal_layouts.asm +++ b/engine/gfx/crystal_layouts.asm @@ -222,7 +222,7 @@ MG_Mobile_Layout02: RGB 31, 31, 31 Function49742: - ld hl, .Palette_49757 + ld hl, .MobileBorderPalettes ld de, wBGPals1 ld bc, 8 palettes ld a, BANK(wBGPals1) @@ -230,8 +230,8 @@ Function49742: farcall ApplyPals ret -.Palette_49757: -INCLUDE "gfx/unknown/49757.pal" +.MobileBorderPalettes: +INCLUDE "gfx/trade/mobile_border.pal" _InitMG_Mobile_LinkTradePalMap: hlcoord 0, 0, wAttrmap diff --git a/engine/menus/main_menu.asm b/engine/menus/main_menu.asm index f02da0ce7..214028bce 100644 --- a/engine/menus/main_menu.asm +++ b/engine/menus/main_menu.asm @@ -1,5 +1,5 @@ -GFX_49c0c: -INCBIN "gfx/unknown/049c0c.2bpp" +MobileMenuGFX: +INCBIN "gfx/mobile/mobile_menu.2bpp" MainMenu: xor a diff --git a/engine/pokemon/stats_screen.asm b/engine/pokemon/stats_screen.asm index 3719f3ade..cb066317d 100644 --- a/engine/pokemon/stats_screen.asm +++ b/engine/pokemon/stats_screen.asm @@ -942,9 +942,8 @@ StatsScreen_LoadTextboxSpaceGFX: pop hl ret -Unreferenced_4e32a: -; A blank space tile? - ds 16 +Unreferenced_StatsScreenSpaceGFX: +INCBIN "gfx/font/space.2bpp" EggStatsScreen: xor a diff --git a/gfx/font.asm b/gfx/font.asm index e83fc4d17..e32060db7 100644 --- a/gfx/font.asm +++ b/gfx/font.asm @@ -18,8 +18,6 @@ INCBIN "gfx/frames/7.1bpp" INCBIN "gfx/frames/8.1bpp" INCBIN "gfx/frames/9.1bpp" -; Various misc graphics here. - StatsScreenPageTilesGFX: INCBIN "gfx/stats/stats_tiles.2bpp" @@ -35,22 +33,23 @@ INCBIN "gfx/battle/expbar.2bpp" TownMapGFX: INCBIN "gfx/pokegear/town_map.2bpp.lz" -UnusedWeekdayKanjiGFX: ; unused kanji +UnusedWeekdayKanjiGFX: INCBIN "gfx/font/unused_weekday_kanji.2bpp" PokegearPhoneIconGFX: INCBIN "gfx/font/phone_icon.2bpp" -UnusedBoldFontGFX: ; unused bold letters + unown chars +UnusedBoldFontGFX: INCBIN "gfx/font/unused_bold_font.1bpp" TextboxSpaceGFX: -INCBIN "gfx/frames/space.1bpp" +; StatsScreen_LoadTextboxSpaceGFX reads 2bpp; LoadFrame reads first half as 1bpp +INCBIN "gfx/font/space.2bpp" FontsExtra_SolidBlackGFX: INCBIN "gfx/font/black.1bpp" -UnusedUpArrowGFX: ; unused up arrow + whitespace +UnusedUpArrowGFX: INCBIN "gfx/font/unused_up_arrow.1bpp" MobilePhoneTilesGFX: diff --git a/gfx/unknown/17eb7e.png b/gfx/font/postal_mark.png similarity index 100% rename from gfx/unknown/17eb7e.png rename to gfx/font/postal_mark.png diff --git a/gfx/font/space.png b/gfx/font/space.png new file mode 100644 index 0000000000000000000000000000000000000000..3233c135eef064b25509a4d998b5b91b87f6ab9b GIT binary patch literal 71 zcmeAS@N?(olHy`uVBq!ia0vp^93adDBp6m-`S}e<@p-y9hE&{2{_%f4qcju4{s{h$ TmlgGXfK+(8`njxgN@xNAHMtWS literal 0 HcmV?d00001 diff --git a/gfx/frames/space.png b/gfx/frames/space.png deleted file mode 100644 index 577318724c7f7a5e30a88eeb4b01d7d332a00906..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 113 zcmeAS@N?(olHy`uVBq!ia0vp^96&6LML4-UF}y8C5z=MCpbDd_X|i@=N6=( zsVNwq_mUjFrT!tggZ%j4y)ed%0q{?v5lcSSC13Z^|%bQ~F1ne;Y*0RyOD^>`rj{OM?NXwaCXV_Y7%a!o)0p-81zDmfa))Bx?sa`Y9s zm5RPEy7KK!c%)3Frv6ky4wbDNhi zg`JjIY-VQR4oAvKnFf9QyEFg(yP%Z!RPZ9mp%DBt$f=}iHK;s43{d5V>>y=Zz;iFZ z8bdjT9Jr?jNstvkm?V^KrHZt-Q?_Ndy( zwPM@&&vFQol{vxh%wTVxm?)*TLU$9BeU%}&27^)rZyp(%>aZ0Hv;$yj<(9m;_T=Zs zY*XKUdxb!X+Bw&sj|hT>f^q%DBA^iqF|({ec`a^s76?~NQF$+JHb=O3%_-ZNA1~m$ zYfstETqy)naLxkZ5%-{-o#VYdF`%+G$Tc9K9eth?D{2b{gQGN~0gF)eRw9?zr3SZWyCIGGMoJ*Y>*;yOZ|D-Q#h|2CW(7E;LFpOT+Ur_C3 z`jA9-*jhsnECU{j=S{!*!5!NncnG2=;9?lwF71JTz#kIr-(5s4kY)e?002ovPDHLk FV1mLv2=)K~ literal 0 HcmV?d00001 diff --git a/gfx/mobile/card_large_sprite.png b/gfx/mobile/card_large_sprite.png new file mode 100644 index 0000000000000000000000000000000000000000..4d6beae4719d5ad0626ae83134f68f9affc2475f GIT binary patch literal 137 zcmeAS@N?(olHy`uVBq!ia0vp^3P3Et1SA+FZd<7UsQ^zG$B>F!$v^m6dE_MyESUF@ zp(814Lb}D0jVrnvvm0#=GfF%bh~e_k-r&n%6t*^ME7KabMY1Of7?~^Enwu098gy8b jV;T(iwKX}~GM|xTunp5n`g?7&7|0G!S3j3^P6F!x#tY|4lD4mUWmEm z;^Z{vQ1TJY0RIDzybHL>-%e4r_HNt7HfhR=uWbJR?oZ|j+;lRiDN)B)bWvxUk`V(_ zk_Mj-``><+MnP=`s|LPVQ$)CSvAy}proViFQFC-ck5z+geBj=iLOz@GQe{*B+fM(L zGSU2^^Ak_kGQpkBB8Ep2Pse{yay9PW&QkZ6F<1HSg9{7n{8kh@Maw6ieW1PN(BeI3 jr~P)bE^LYIn)jP=)`!opt^99Z1Np+!)z4*}Q$iB}LJwQy literal 0 HcmV?d00001 diff --git a/gfx/mobile/card_sprite.png b/gfx/mobile/card_sprite.png new file mode 100644 index 0000000000000000000000000000000000000000..c343465a595263ea7b2cc9dba4c6a4840f621fa9 GIT binary patch literal 103 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx;Bp3=bcE|uJJx>?MkcwN$KloXA!kwKDOX?XI z7#PPy9lXku!r198>vKln+R=dZX&pKdhH*>`D>}6cHqGO`0W!hU)z4*}Q$iB}okAO! literal 0 HcmV?d00001 diff --git a/gfx/mobile/chris_silhouette.png b/gfx/mobile/chris_silhouette.png new file mode 100644 index 0000000000000000000000000000000000000000..2952da07659b8546f85ee9bcd52bfd4a7501717d GIT binary patch literal 250 zcmV3@7?!K1Y`t3@V=W^tJ2k>Lr4RNiPp{8 zbr-0EKukOrR-P-zO1n$a4sb_n`zlCt7;G%*q3Pdy2py7R`z7HIX=Gk;JRh))Uf5swHMO zbsrs2evGGEz*$ni26&gECkVW)9w@*?5bS|3JVD^R5Iy+!J)l`<3H&7F1aLQU34+!} zAa(#K=?R58j?)G(NH#LI4oN7;K;RYh=YF5W@gQy!?!$LMGgXxeUBDggi+1-fRdrKAx*_*- zv{smQ6x_xQ0hmW?1-yT%$<`6`QdLQz6-6^0>~ut27%GN^d{n4EqX9S*gAgfle9zTi z^8JSbbQ>tMSZN8y1Yi^>0!!s2EEZfZObSc~#+c4*zE)U8bxJ5J!Ddu^%YpHnGuv8> zswYpEp=C(`Xi?aOQ831#;5vsPhslTGr?!WjnZv>^OPT{SSF!$v>oj{kK1Sed^c$ zlKTuBISehjHBII{l)Aj?CC~O5X?p29P9B+XuAo`a#o$24Y=uW*883?3vR5~}+SkTZ j`iGr~>By?k|Nog80+bw7xN0BW1li!}>gTe~DWM4f$d@ug literal 0 HcmV?d00001 diff --git a/gfx/mobile/down_arrow.png b/gfx/mobile/down_arrow.png index 9eaaadd2dc1ad5b065857e61c348637029af1aa8..33803e197e7b1358a8fecfbe55c49ad2d05b0ffc 100644 GIT binary patch delta 64 zcmeYbnjmh?!NdRrtFQe02BaiCT^vIyZYBTtKmQ?vF-PqK_J#J}6u$hoXDEs0{Qjh_ Q(if!I)78&qol`;+0Pm?75dZ)H delta 59 zcmWIYogi+;!o&ascf>4vfs}}+i(^Q|t>hh2=RP#de%Nkzc>iAp8B>-&FLEYzfYf=q L`njxgN@xNAET$Bv diff --git a/gfx/unknown/08940b.png b/gfx/mobile/ez_chat_cursor.png similarity index 100% rename from gfx/unknown/08940b.png rename to gfx/mobile/ez_chat_cursor.png diff --git a/gfx/mobile/kris_silhouette.png b/gfx/mobile/kris_silhouette.png new file mode 100644 index 0000000000000000000000000000000000000000..77ff319ed8628f60c4724892c7c2be76f744ff5e GIT binary patch literal 264 zcmV+j0r&oiP)0 z!41P83%L52w9;Ukf;k~fJCgu2)%TV9Ow;{8jLZANaYYcS;h`Fu6B?=$uxS* zLSU$j04h(SV|t=xlJY&_qzRK=dnl;{aV@mO1aJv(fqbt;Gp|Jx0^ZoT!u1NqqtyMB zc7@ncneZf;%vcHx$}WnIP8(bKosAnWBM_K=1|lbXDch}WP*!IqlMH1H^7xLUa`;1k z%hR+L0j=@g(+Lk*R>XC~pgbvemK7elSV>4UyBbaO2H7#qV5y|@rp7;drBz;0pHDRa O00001Gg7F0+q0(}1i2QK>n;Uxl? zCIZYiQBu*RS6T@C_QqDDfPuh%1bF!}b?m*s+pGVUIe?bBELyS>#;2zV;IffQrA`~F zLP0XChX65&X?D#we~cxUmmi%dPf|u{c9cR{(o&#gBEZbOndF3>O5VS%qJk+yPTt>9 z;1`8%8HVFay!YRK!wWM+8S-Q zTTx)*tK}gHbT3E4^ntat^_B$u;t^>RMEwf?Nhg9_u{H8LU%63Jp4!6lF;!m=WOw9nc+R}yH-y09@4dP9s*A@nlh4c0}4n-haL z5Xnbc0wXdBLMj5tesr=M2t)wS2V%bGMi3+mq9O8iHvm}Rb~6fiVID0dt@H!2e%CCu zsfxLZg;DeawoE=Fs;#g?#h(X}gb?V;bn@(}VljXZBh9c~t{aT)Q(ij@J}4Fml$8+R z;cTNA0L36_ymBVU7`cJDZA!qF!@9wwbx8^b*(7w$2{ zl_10mOa#D9V#v2W@S=Ez9R?TzF+VsX5?loEH#zouj2Sj>*nxlS`Hp`+z^I#i8+~ah zy&BuG6o(C|r{QU-M9u>ToJa1YrLu;5%wexq^t%poSBRVkZsM6^Dee^0y_&@wM{ih+ z9f(5=JVk|l#h&ykUd>?*{jqc6SVQ+uImjL6*I9b1I)=j>c1l0#B=4Qlb?GEzAdT}o zYOgfzG?=IA8_v@cpXnQx5*&j~oXT>q+G%y*x8u48oi%t;V#COiu?O9~il=42u0UFE zOqPsblk~~}U^8|E0Dk1;&gKds09v3liJvKc`V5h0D@Os?_xSVWyJVCc?6Bt%A0mJy z0M_vSdDlr4d@M|OQ@vAzfr*a^tFT(s2fh#l0H3xJnDEcaMEEI*7FcQ4IbH?_1~q5@D$Hguu$gGs#|00s~q?_u_ufb5nz={M*!8TumL8* z^DkGcbjlq{-E{$=A0$`n@y3H*)h+iZEqs^H7jn6Lezq{rP3Nizl*=u*%BV}}>gvM6 zVqq@7u(~*}!BvOkDsH>o?v>l?>pcO?<`;7S+5ma%$PK7Yq9Wwhh%T4!t8R6Pw8(lHKbasF{Te}4=C zP_SZV2L2PasR;movRZmObr1^^9vkiF7OGG)Y+)(&tQ5H9mB~WT;7`2 z#i*_6Fp_Vl;dFpdF>zK5Wg)Fr45!!61sr~!NF12s3VzJEKp+wh#HDXAN#M+;#uegX z6bEGDOcL)?;Iqhq$Tah`3LgaA58z9!MOPm#7Ou!kN#BJc0Osaq=eA9A=BV372IN0 zR&lnN53)SX!ossTnZH%maHyNR%QG`IGkZRsEy68*vNHU@goJke`uDf89sf>sFiW*_ zVtuwG=)%F|KhF>OZM!&^^QxKZB(I&Pv%PhDSbVKopFR(ZeH`>h?aD7#iCkd^`N>RX zckln`P}Z68!e6WT>I%7zi<(mxGZ%&YOI}v&k^3sGseIxTUDJcSGwM?_CP!WNSyTUh j*Wo#A;nuUu9+ki2o@#iqx`nM*6XXj|S3j3^P66)6 literal 245 zcmVlM>b`|QO0qQq0MtdJ@f-jqCw`!4z;@2F-(|n)^wYgc2IA%Nx zvdPyQS8*1nF7bll+UYMCG;-gqmnGyWIUFJmdKI;Vst0QTM(00000 delta 59 zcmWIYogi+;!o&ascf>4vfs}}+i(^Q|t>hok=Rdg4d&p#cc=c5Vc~+J`0?SWs0;%(K L^>bP0l+XkK8-^3a diff --git a/gfx/unknown/unknown_egg.2bpp.lz.a5b6cbfa b/gfx/pokemon/egg/unused_front.2bpp.lz.a5b6cbfa similarity index 100% rename from gfx/unknown/unknown_egg.2bpp.lz.a5b6cbfa rename to gfx/pokemon/egg/unused_front.2bpp.lz.a5b6cbfa diff --git a/gfx/unknown/unknown_egg.png b/gfx/pokemon/egg/unused_front.png similarity index 100% rename from gfx/unknown/unknown_egg.png rename to gfx/pokemon/egg/unused_front.png diff --git a/gfx/unknown/49757.pal b/gfx/trade/mobile_border.pal similarity index 100% rename from gfx/unknown/49757.pal rename to gfx/trade/mobile_border.pal diff --git a/gfx/unknown/17afa5.png b/gfx/unknown/17afa5.png deleted file mode 100644 index fc6459040befca6e8a4db3b9f078c80c6879d380..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 896 zcmV-`1AqL9P)k+VCcE>=_x+gnCIhI45aND3AqGVN zE19$!3qddC5{}9x4GsW`u;3M4^eROLFQqI(#^YJ(5g6ZLA5&noJO_TRYEUk^r{#(Z zaeNLv?2c9`S{(oI+XPVjq4lfNHDJN3xFb?LGC+GK#f4dL`0Y)1PVvJ4jy)`6^y4vu z6-iEMmljQadM+j=CiTOkIk4S1ub{*dA6z6-Q0gwyPHECRDbnKVNeU@fg}@dKnGYsdHl~yD`Xux0X$s z&EOU;A6J$QC}zs*SyEkxxF;}7M%WOzo`YOiKYN#g!=pJcrJ$-nZ%VLVIB&c@PJFZID+8%sB=nXu;)`!k3f z4t5T7nosRcv)Qq4{EbtcSmCBM5{Mryc$fgE9KLn&!-4_N?A`Ac0Z71Flt2D{IRVX1 zr^5we#YdxvfvE2bv6F&5OTOBZ@)g7K~2S%I%1eO6!n7?=#YUMxGCUq4jgo;FM&IEV8XvUWB Date: Fri, 28 Feb 2020 11:17:58 -0500 Subject: [PATCH 2/3] =?UTF-8?q?Document=20a=20bug=20where=20Teleport=20can?= =?UTF-8?q?not=20fail=20for=20wild=20Pok=C3=A9mon?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/bugs_and_glitches.md | 20 ++++++++++++++++++++ engine/battle/move_effects/teleport.asm | 6 ++---- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/docs/bugs_and_glitches.md b/docs/bugs_and_glitches.md index 8fdcf1ffb..abb1e524f 100644 --- a/docs/bugs_and_glitches.md +++ b/docs/bugs_and_glitches.md @@ -30,6 +30,7 @@ Some fixes are mentioned as breaking compatibility with link battles. This can b - [A Disabled but PP Up–enhanced move may not trigger Struggle](#a-disabled-but-pp-upenhanced-move-may-not-trigger-struggle) - [A Pokémon that fainted from Pursuit will have its old status condition when revived](#a-pokémon-that-fainted-from-pursuit-will-have-its-old-status-condition-when-revived) - [Lock-On and Mind Reader don't always bypass Fly and Dig](#lock-on-and-mind-reader-dont-always-bypass-fly-and-dig) +- [Wild Pokémon can always Teleport regardless of level difference](#wild-pokémon-can-always-teleport-regardless-of-level-difference) - [Beat Up can desynchronize link battles](#beat-up-can-desynchronize-link-battles) - [Beat Up works incorrectly with only one Pokémon in the party](#beat-up-works-incorrectly-with-only-one-pokémon-in-the-party) - [Beat Up may fail to raise Substitute](#beat-up-may-fail-to-raise-substitute) @@ -693,6 +694,25 @@ This bug affects Attract, Curse, Foresight, Mean Look, Mimic, Nightmare, Spider ``` +## Wild Pokémon can always Teleport regardless of level difference + +**Fix:** Edit `BattleCommand_Teleport` in [engine/battle/move_effects/teleport.asm](https://github.com/pret/pokecrystal/blob/master/engine/battle/move_effects/teleport.asm): + +```diff + .loop_enemy + call BattleRandom + cp c + jr nc, .loop_enemy + srl b + srl b + cp b +- ; This should be jr c, .failed +- ; As written, it makes enemy use of Teleport always succeed if able +- jr nc, .run_away ++ jr c, .failed +``` + + ## Beat Up can desynchronize link battles *Fixing this bug will break compatibility with standard Pokémon Crystal for link battles.* diff --git a/engine/battle/move_effects/teleport.asm b/engine/battle/move_effects/teleport.asm index 1a6aeed41..ba470798a 100644 --- a/engine/battle/move_effects/teleport.asm +++ b/engine/battle/move_effects/teleport.asm @@ -66,10 +66,8 @@ BattleCommand_Teleport: srl b srl b cp b - ; This does the wrong thing. What was - ; probably intended was jr c, .failed - ; The way this is made makes enemy use - ; of Teleport always succeed if able + ; This should be jr c, .failed + ; As written, it makes enemy use of Teleport always succeed if able jr nc, .run_away .run_away call UpdateBattleMonInParty From 1d4c1aeef4b18738aae3966846429dae80da731c Mon Sep 17 00:00:00 2001 From: Rangi Date: Fri, 28 Feb 2020 11:51:42 -0500 Subject: [PATCH 3/3] 'and BANK' -> 'aka BANK' --- engine/battle_anims/anim_commands.asm | 2 +- engine/events/battle_tower/battle_tower.asm | 4 ++-- engine/rtc/rtc.asm | 2 +- mobile/mobile_46.asm | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/engine/battle_anims/anim_commands.asm b/engine/battle_anims/anim_commands.asm index 09cfbcec0..113e9df37 100644 --- a/engine/battle_anims/anim_commands.asm +++ b/engine/battle_anims/anim_commands.asm @@ -152,7 +152,7 @@ BattleAnimRestoreHuds: ldh a, [rSVBK] push af - ld a, BANK(wCurBattleMon) ; aka BANK(wTempMon) and BANK(wPartyMon1) and several others + ld a, BANK(wCurBattleMon) ; aka BANK(wTempMon), BANK(wPartyMon1), and several others ldh [rSVBK], a ld hl, UpdateBattleHuds diff --git a/engine/events/battle_tower/battle_tower.asm b/engine/events/battle_tower/battle_tower.asm index a851c76f8..3e3bbb57f 100644 --- a/engine/events/battle_tower/battle_tower.asm +++ b/engine/events/battle_tower/battle_tower.asm @@ -17,7 +17,7 @@ Function1700c4: call Function17042c - ld a, BANK(s5_be45) ; aka BANK(s5_be46) and BANK(s5_aa41) and BANK(s5_aa5d) + ld a, BANK(s5_be45) ; aka BANK(s5_be46), BANK(s5_aa41), and BANK(s5_aa5d) call GetSRAMBank ld a, 1 ld [s5_be45], a @@ -1212,7 +1212,7 @@ CheckMobileEventIndex: ; BattleTowerAction $0b something to do with GS Ball Function1708c8: ; BattleTowerAction $0c call UpdateTime - ld a, BANK(s5_aa8b) ; aka BANK(s5_aa8c) and BANK(s5_aa5d) and BANK(s5_aa48) and BANK(s5_aa47) + ld a, BANK(s5_aa8b) ; aka BANK(s5_aa8c), BANK(s5_aa5d), BANK(s5_aa48), and BANK(s5_aa47) call GetSRAMBank ld a, [wCurDay] ld [s5_aa8b], a diff --git a/engine/rtc/rtc.asm b/engine/rtc/rtc.asm index 00098c0e5..e3007ee4e 100644 --- a/engine/rtc/rtc.asm +++ b/engine/rtc/rtc.asm @@ -136,7 +136,7 @@ Function140ae: .time_overflow farcall ClearDailyTimers farcall Function170923 - ld a, BANK(s5_aa8c) ; and BANK(s5_b2fa) + ld a, BANK(s5_aa8c) ; aka BANK(s5_b2fa) call GetSRAMBank ld a, [s5_aa8c] inc a diff --git a/mobile/mobile_46.asm b/mobile/mobile_46.asm index 6e925d025..283f3b020 100644 --- a/mobile/mobile_46.asm +++ b/mobile/mobile_46.asm @@ -183,7 +183,7 @@ Function118180: ld a, [wcd38] and a ret z - ld a, BANK(s5_a89c) ; and BANK(s5_a8b2) + ld a, BANK(s5_a89c) ; aka BANK(s5_a8b2) call GetSRAMBank ld hl, wcd69 ld de, s5_a89c