From 447da806153d2c56d15a8775ab43511202b269bc Mon Sep 17 00:00:00 2001 From: Rangi Date: Thu, 27 Feb 2020 14:33:30 -0500 Subject: 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 +- gfx/font/postal_mark.png | Bin 0 -> 78 bytes 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 gfx/mobile/dialing.png | Bin 0 -> 262 bytes gfx/mobile/dialing_frame.png | Bin 0 -> 149 bytes gfx/mobile/dialpad.attrmap | Bin 0 -> 360 bytes gfx/mobile/dialpad.png | Bin 0 -> 631 bytes gfx/mobile/dialpad.tilemap | Bin 0 -> 360 bytes gfx/mobile/dialpad_cursor.png | Bin 0 -> 135 bytes gfx/mobile/down_arrow.png | Bin 77 -> 82 bytes gfx/mobile/ez_chat_cursor.png | Bin 0 -> 78 bytes gfx/mobile/kris_silhouette.png | Bin 0 -> 264 bytes gfx/mobile/mobile_adapter.png | Bin 1517 -> 0 bytes gfx/mobile/mobile_adapters.pal | 8 + gfx/mobile/mobile_cable_1.png | Bin 0 -> 181 bytes gfx/mobile/mobile_cable_2.png | Bin 0 -> 196 bytes gfx/mobile/mobile_center.attrmap | Bin 0 -> 360 bytes gfx/mobile/mobile_center.tilemap | Bin 0 -> 360 bytes gfx/mobile/mobile_menu.png | Bin 0 -> 177 bytes gfx/mobile/mobile_password.pal | 39 ++++ gfx/mobile/mobile_splash.pal | 39 ++++ gfx/mobile/mobile_splash_check.png | Bin 0 -> 453 bytes gfx/mobile/mobile_trade.2bpp.lz.aad8592b | Bin 0 -> 576 bytes gfx/mobile/mobile_trade.attrmap | Bin 0 -> 1024 bytes gfx/mobile/mobile_trade.attrmap.lz.ea4f2cbe | Bin 0 -> 80 bytes gfx/mobile/mobile_trade.png | Bin 0 -> 648 bytes gfx/mobile/mobile_trade.tilemap | Bin 0 -> 1024 bytes gfx/mobile/mobile_trade.tilemap.lz.12882d37 | Bin 0 -> 192 bytes gfx/mobile/mobile_trade_bg.pal | 39 ++++ gfx/mobile/mobile_trade_lights.pal | 19 ++ gfx/mobile/mobile_trade_lights.png | Bin 0 -> 94 bytes gfx/mobile/mobile_trade_ob1.pal | 39 ++++ gfx/mobile/mobile_trade_ob2.pal | 39 ++++ gfx/mobile/mobile_trade_sprites.2bpp.lz.eef1e11d | Bin 0 -> 128 bytes gfx/mobile/mobile_trade_sprites.png | Bin 0 -> 205 bytes gfx/mobile/password.attrmap | Bin 0 -> 360 bytes gfx/mobile/password_bottom.tilemap | Bin 0 -> 220 bytes gfx/mobile/password_shift.tilemap | Bin 0 -> 140 bytes gfx/mobile/password_top.tilemap | Bin 0 -> 140 bytes gfx/mobile/phone_tiles.png | Bin 245 -> 235 bytes gfx/mobile/pichu_border.attrmap | 1 + gfx/mobile/pichu_border.png | Bin 0 -> 266 bytes gfx/mobile/pichu_border.tilemap | 1 + gfx/mobile/pichu_border_bg.pal | 4 + gfx/mobile/pichu_border_ob.pal | 39 ++++ gfx/mobile/pokemon_news.pal | 39 ++++ gfx/mobile/select_start.png | Bin 0 -> 130 bytes gfx/mobile/stadium2_n64.attrmap | Bin 0 -> 360 bytes gfx/mobile/stadium2_n64.png | Bin 0 -> 787 bytes gfx/mobile/stadium2_n64.tilemap | 13 ++ gfx/mobile/stadium2_n64_corrupt.tilemap | 15 ++ gfx/mobile/unused_mobile_pulses.pal | 11 + gfx/mobile/up_arrow.png | Bin 77 -> 82 bytes gfx/pokedex/select_start.png | Bin 130 -> 0 bytes gfx/pokemon/egg/unused_front.2bpp.lz.a5b6cbfa | Bin 0 -> 146 bytes gfx/pokemon/egg/unused_front.png | Bin 0 -> 219 bytes gfx/trade/game_boy_n64.png | Bin 787 -> 0 bytes gfx/trade/mobile_border.pal | 39 ++++ gfx/unknown/049c0c.png | Bin 177 -> 0 bytes gfx/unknown/08940b.png | Bin 78 -> 0 bytes gfx/unknown/1032a2.png | Bin 94 -> 0 bytes gfx/unknown/106514.png | Bin 149 -> 0 bytes gfx/unknown/108d27.2bpp.lz.eef1e11d | Bin 128 -> 0 bytes gfx/unknown/108d27.png | Bin 205 -> 0 bytes gfx/unknown/108da7.2bpp.lz.aad8592b | Bin 576 -> 0 bytes gfx/unknown/108da7.png | Bin 648 -> 0 bytes gfx/unknown/108fe7.tilemap | Bin 1024 -> 0 bytes gfx/unknown/108fe7.tilemap.lz.12882d37 | Bin 192 -> 0 bytes gfx/unknown/1090a7.tilemap | Bin 1024 -> 0 bytes gfx/unknown/1090a7.tilemap.lz.ea4f2cbe | Bin 80 -> 0 bytes gfx/unknown/1091c7.png | Bin 181 -> 0 bytes gfx/unknown/1092c7.png | Bin 196 -> 0 bytes gfx/unknown/11601a.png | Bin 262 -> 0 bytes gfx/unknown/117356.tilemap | 1 - gfx/unknown/1174d6.attrmap | 1 - gfx/unknown/16c903.pal | 39 ---- gfx/unknown/16cca3.png | Bin 453 -> 0 bytes gfx/unknown/171848.png | Bin 266 -> 0 bytes gfx/unknown/172491.tilemap | Bin 140 -> 0 bytes gfx/unknown/17251d.tilemap | Bin 220 -> 0 bytes gfx/unknown/1725f9.tilemap | Bin 140 -> 0 bytes gfx/unknown/172685.tilemap | Bin 360 -> 0 bytes gfx/unknown/1727ed.attrmap | Bin 360 -> 0 bytes gfx/unknown/172955.attrmap | Bin 360 -> 0 bytes gfx/unknown/1733af.tilemap | 13 -- gfx/unknown/1733af_corrupt.tilemap | 15 -- gfx/unknown/173517.attrmap | Bin 360 -> 0 bytes gfx/unknown/17acd5.tilemap | Bin 360 -> 0 bytes gfx/unknown/17ae3d.tilemap | Bin 360 -> 0 bytes gfx/unknown/17afa5.png | Bin 896 -> 0 bytes gfx/unknown/17eb7e.png | Bin 78 -> 0 bytes gfx/unknown/49757.pal | 39 ---- gfx/unknown/unknown_egg.2bpp.lz.a5b6cbfa | Bin 146 -> 0 bytes gfx/unknown/unknown_egg.png | Bin 219 -> 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 | 34 +-- mobile/mobile_41.asm | 8 +- mobile/mobile_42.asm | 266 +++++------------------ mobile/mobile_45_2.asm | 52 +---- mobile/mobile_45_sprite_engine.asm | 42 ++-- mobile/mobile_5b.asm | 20 +- mobile/mobile_5c.asm | 126 +++++------ mobile/mobile_5e.asm | 62 ++++-- mobile/mobile_5f.asm | 49 +---- mobile/mobile_menu.asm | 4 +- 122 files changed, 655 insertions(+), 617 deletions(-) create mode 100644 gfx/font/postal_mark.png 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 create mode 100644 gfx/mobile/dialing.png create mode 100644 gfx/mobile/dialing_frame.png create mode 100644 gfx/mobile/dialpad.attrmap create mode 100644 gfx/mobile/dialpad.png create mode 100644 gfx/mobile/dialpad.tilemap create mode 100644 gfx/mobile/dialpad_cursor.png create mode 100644 gfx/mobile/ez_chat_cursor.png create mode 100644 gfx/mobile/kris_silhouette.png delete mode 100644 gfx/mobile/mobile_adapter.png create mode 100644 gfx/mobile/mobile_adapters.pal create mode 100644 gfx/mobile/mobile_cable_1.png create mode 100644 gfx/mobile/mobile_cable_2.png create mode 100644 gfx/mobile/mobile_center.attrmap create mode 100644 gfx/mobile/mobile_center.tilemap create mode 100644 gfx/mobile/mobile_menu.png create mode 100644 gfx/mobile/mobile_password.pal create mode 100644 gfx/mobile/mobile_splash.pal create mode 100644 gfx/mobile/mobile_splash_check.png create mode 100644 gfx/mobile/mobile_trade.2bpp.lz.aad8592b create mode 100644 gfx/mobile/mobile_trade.attrmap create mode 100644 gfx/mobile/mobile_trade.attrmap.lz.ea4f2cbe create mode 100644 gfx/mobile/mobile_trade.png create mode 100644 gfx/mobile/mobile_trade.tilemap create mode 100644 gfx/mobile/mobile_trade.tilemap.lz.12882d37 create mode 100644 gfx/mobile/mobile_trade_bg.pal create mode 100644 gfx/mobile/mobile_trade_lights.pal create mode 100644 gfx/mobile/mobile_trade_lights.png create mode 100644 gfx/mobile/mobile_trade_ob1.pal create mode 100644 gfx/mobile/mobile_trade_ob2.pal create mode 100644 gfx/mobile/mobile_trade_sprites.2bpp.lz.eef1e11d create mode 100644 gfx/mobile/mobile_trade_sprites.png create mode 100644 gfx/mobile/password.attrmap create mode 100644 gfx/mobile/password_bottom.tilemap create mode 100644 gfx/mobile/password_shift.tilemap create mode 100644 gfx/mobile/password_top.tilemap create mode 100644 gfx/mobile/pichu_border.attrmap create mode 100644 gfx/mobile/pichu_border.png create mode 100644 gfx/mobile/pichu_border.tilemap 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 create mode 100644 gfx/mobile/select_start.png create mode 100644 gfx/mobile/stadium2_n64.attrmap create mode 100644 gfx/mobile/stadium2_n64.png create mode 100644 gfx/mobile/stadium2_n64.tilemap create mode 100644 gfx/mobile/stadium2_n64_corrupt.tilemap create mode 100644 gfx/mobile/unused_mobile_pulses.pal delete mode 100644 gfx/pokedex/select_start.png create mode 100644 gfx/pokemon/egg/unused_front.2bpp.lz.a5b6cbfa create mode 100644 gfx/pokemon/egg/unused_front.png delete mode 100644 gfx/trade/game_boy_n64.png create mode 100644 gfx/trade/mobile_border.pal delete mode 100644 gfx/unknown/049c0c.png delete mode 100644 gfx/unknown/08940b.png delete mode 100644 gfx/unknown/1032a2.png delete mode 100644 gfx/unknown/106514.png delete mode 100644 gfx/unknown/108d27.2bpp.lz.eef1e11d delete mode 100644 gfx/unknown/108d27.png delete mode 100644 gfx/unknown/108da7.2bpp.lz.aad8592b delete mode 100644 gfx/unknown/108da7.png delete mode 100644 gfx/unknown/108fe7.tilemap delete mode 100644 gfx/unknown/108fe7.tilemap.lz.12882d37 delete mode 100644 gfx/unknown/1090a7.tilemap delete mode 100644 gfx/unknown/1090a7.tilemap.lz.ea4f2cbe delete mode 100644 gfx/unknown/1091c7.png delete mode 100644 gfx/unknown/1092c7.png delete mode 100644 gfx/unknown/11601a.png delete mode 100644 gfx/unknown/117356.tilemap delete mode 100644 gfx/unknown/1174d6.attrmap delete mode 100644 gfx/unknown/16c903.pal delete mode 100644 gfx/unknown/16cca3.png delete mode 100644 gfx/unknown/171848.png delete mode 100644 gfx/unknown/172491.tilemap delete mode 100644 gfx/unknown/17251d.tilemap delete mode 100644 gfx/unknown/1725f9.tilemap delete mode 100644 gfx/unknown/172685.tilemap delete mode 100644 gfx/unknown/1727ed.attrmap delete mode 100644 gfx/unknown/172955.attrmap delete mode 100644 gfx/unknown/1733af.tilemap delete mode 100644 gfx/unknown/1733af_corrupt.tilemap delete mode 100644 gfx/unknown/173517.attrmap delete mode 100644 gfx/unknown/17acd5.tilemap delete mode 100644 gfx/unknown/17ae3d.tilemap delete mode 100644 gfx/unknown/17afa5.png delete mode 100644 gfx/unknown/17eb7e.png delete mode 100644 gfx/unknown/49757.pal delete mode 100644 gfx/unknown/unknown_egg.2bpp.lz.a5b6cbfa delete mode 100644 gfx/unknown/unknown_egg.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/font/postal_mark.png b/gfx/font/postal_mark.png new file mode 100644 index 000000000..3a4a6bd4b Binary files /dev/null and b/gfx/font/postal_mark.png differ diff --git a/gfx/font/space.png b/gfx/font/space.png new file mode 100644 index 000000000..3233c135e Binary files /dev/null and b/gfx/font/space.png differ diff --git a/gfx/frames/space.png b/gfx/frames/space.png deleted file mode 100644 index 577318724..000000000 Binary files a/gfx/frames/space.png and /dev/null differ diff --git a/gfx/mobile/card.png b/gfx/mobile/card.png new file mode 100644 index 000000000..398c1dc75 Binary files /dev/null and b/gfx/mobile/card.png differ diff --git a/gfx/mobile/card_2.png b/gfx/mobile/card_2.png new file mode 100644 index 000000000..1632e8451 Binary files /dev/null and b/gfx/mobile/card_2.png differ diff --git a/gfx/mobile/card_folder.png b/gfx/mobile/card_folder.png new file mode 100644 index 000000000..89fc453ae Binary files /dev/null and b/gfx/mobile/card_folder.png differ diff --git a/gfx/mobile/card_large_sprite.png b/gfx/mobile/card_large_sprite.png new file mode 100644 index 000000000..4d6beae47 Binary files /dev/null and b/gfx/mobile/card_large_sprite.png differ diff --git a/gfx/mobile/card_list.png b/gfx/mobile/card_list.png new file mode 100644 index 000000000..4086bff8b Binary files /dev/null and b/gfx/mobile/card_list.png differ diff --git a/gfx/mobile/card_sprite.png b/gfx/mobile/card_sprite.png new file mode 100644 index 000000000..c343465a5 Binary files /dev/null and b/gfx/mobile/card_sprite.png differ diff --git a/gfx/mobile/chris_silhouette.png b/gfx/mobile/chris_silhouette.png new file mode 100644 index 000000000..2952da076 Binary files /dev/null and b/gfx/mobile/chris_silhouette.png differ diff --git a/gfx/mobile/dialing.png b/gfx/mobile/dialing.png new file mode 100644 index 000000000..a6a7598f8 Binary files /dev/null and b/gfx/mobile/dialing.png differ diff --git a/gfx/mobile/dialing_frame.png b/gfx/mobile/dialing_frame.png new file mode 100644 index 000000000..faadc6f9c Binary files /dev/null and b/gfx/mobile/dialing_frame.png differ diff --git a/gfx/mobile/dialpad.attrmap b/gfx/mobile/dialpad.attrmap new file mode 100644 index 000000000..0aabe5c5b Binary files /dev/null and b/gfx/mobile/dialpad.attrmap differ diff --git a/gfx/mobile/dialpad.png b/gfx/mobile/dialpad.png new file mode 100644 index 000000000..1849a98d9 Binary files /dev/null and b/gfx/mobile/dialpad.png differ diff --git a/gfx/mobile/dialpad.tilemap b/gfx/mobile/dialpad.tilemap new file mode 100644 index 000000000..a7ab408ff Binary files /dev/null and b/gfx/mobile/dialpad.tilemap differ diff --git a/gfx/mobile/dialpad_cursor.png b/gfx/mobile/dialpad_cursor.png new file mode 100644 index 000000000..75b6747e8 Binary files /dev/null and b/gfx/mobile/dialpad_cursor.png differ diff --git a/gfx/mobile/down_arrow.png b/gfx/mobile/down_arrow.png index 9eaaadd2d..33803e197 100644 Binary files a/gfx/mobile/down_arrow.png and b/gfx/mobile/down_arrow.png differ diff --git a/gfx/mobile/ez_chat_cursor.png b/gfx/mobile/ez_chat_cursor.png new file mode 100644 index 000000000..108be31b9 Binary files /dev/null and b/gfx/mobile/ez_chat_cursor.png differ diff --git a/gfx/mobile/kris_silhouette.png b/gfx/mobile/kris_silhouette.png new file mode 100644 index 000000000..77ff319ed Binary files /dev/null and b/gfx/mobile/kris_silhouette.png differ diff --git a/gfx/mobile/mobile_adapter.png b/gfx/mobile/mobile_adapter.png deleted file mode 100644 index f02e3b614..000000000 Binary files a/gfx/mobile/mobile_adapter.png and /dev/null differ diff --git a/gfx/mobile/mobile_adapters.pal b/gfx/mobile/mobile_adapters.pal new file mode 100644 index 000000000..83fcd5e1c --- /dev/null +++ b/gfx/mobile/mobile_adapters.pal @@ -0,0 +1,8 @@ + RGB 18,31,15, 04,13,31, 00,00,31, 00,00,00 ; blue + RGB 18,31,15, 31,31,00, 31,15,00, 00,00,00 ; yellow + RGB 18,31,15, 09,24,00, 02,16,00, 00,00,00 ; green + RGB 18,31,15, 31,07,09, 18,00,01, 00,00,00 ; red + RGB 18,31,15, 28,05,31, 17,00,17, 00,00,00 ; purple + RGB 18,31,15, 09,09,09, 04,04,04, 00,00,00 ; black + RGB 18,31,15, 31,13,21, 27,07,12, 00,00,00 ; pink + RGB 18,31,15, 21,20,20, 14,14,31, 00,00,00 ; gray diff --git a/gfx/mobile/mobile_cable_1.png b/gfx/mobile/mobile_cable_1.png new file mode 100644 index 000000000..8def47f76 Binary files /dev/null and b/gfx/mobile/mobile_cable_1.png differ diff --git a/gfx/mobile/mobile_cable_2.png b/gfx/mobile/mobile_cable_2.png new file mode 100644 index 000000000..d48a5ee51 Binary files /dev/null and b/gfx/mobile/mobile_cable_2.png differ diff --git a/gfx/mobile/mobile_center.attrmap b/gfx/mobile/mobile_center.attrmap new file mode 100644 index 000000000..bcece9e94 Binary files /dev/null and b/gfx/mobile/mobile_center.attrmap differ diff --git a/gfx/mobile/mobile_center.tilemap b/gfx/mobile/mobile_center.tilemap new file mode 100644 index 000000000..c6ae863be Binary files /dev/null and b/gfx/mobile/mobile_center.tilemap differ diff --git a/gfx/mobile/mobile_menu.png b/gfx/mobile/mobile_menu.png new file mode 100644 index 000000000..ae6cba38d Binary files /dev/null and b/gfx/mobile/mobile_menu.png differ diff --git a/gfx/mobile/mobile_password.pal b/gfx/mobile/mobile_password.pal new file mode 100644 index 000000000..1dfb1bbc2 --- /dev/null +++ b/gfx/mobile/mobile_password.pal @@ -0,0 +1,39 @@ + RGB 0, 0, 0 + RGB 3, 0, 0 + RGB 5, 0, 0 + RGB 31, 31, 29 + + RGB 0, 2, 10 + RGB 2, 10, 21 + RGB 0, 0, 0 + RGB 10, 26, 31 + + RGB 0, 0, 0 + RGB 0, 7, 8 + RGB 31, 8, 0 + RGB 1, 17, 15 + + RGB 31, 16, 0 + RGB 31, 22, 0 + RGB 31, 27, 0 + RGB 31, 31, 0 + + RGB 31, 18, 6 + RGB 0, 3, 0 + RGB 0, 9, 0 + RGB 0, 12, 0 + + RGB 0, 16, 0 + RGB 0, 22, 0 + RGB 0, 25, 0 + RGB 0, 27, 0 + + RGB 5, 5, 16 + RGB 8, 19, 28 + RGB 0, 0, 0 + RGB 31, 31, 31 + + RGB 31, 31, 29 + RGB 21, 21, 20 + RGB 11, 11, 10 + RGB 0, 0, 0 diff --git a/gfx/mobile/mobile_splash.pal b/gfx/mobile/mobile_splash.pal new file mode 100644 index 000000000..a72635167 --- /dev/null +++ b/gfx/mobile/mobile_splash.pal @@ -0,0 +1,39 @@ + RGB 31, 31, 31 + RGB 04, 10, 20 + RGB 16, 19, 25 + RGB 25, 27, 29 + + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 31, 31, 31 + + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 31, 31, 31 + + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 31, 31, 31 + + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 31, 31, 31 + + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 31, 31, 31 + + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 31, 31, 31 + + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 31, 31, 31 diff --git a/gfx/mobile/mobile_splash_check.png b/gfx/mobile/mobile_splash_check.png new file mode 100644 index 000000000..d5ad353d8 Binary files /dev/null and b/gfx/mobile/mobile_splash_check.png differ diff --git a/gfx/mobile/mobile_trade.2bpp.lz.aad8592b b/gfx/mobile/mobile_trade.2bpp.lz.aad8592b new file mode 100644 index 000000000..4d860f055 Binary files /dev/null and b/gfx/mobile/mobile_trade.2bpp.lz.aad8592b differ diff --git a/gfx/mobile/mobile_trade.attrmap b/gfx/mobile/mobile_trade.attrmap new file mode 100644 index 000000000..6f4843dde Binary files /dev/null and b/gfx/mobile/mobile_trade.attrmap differ diff --git a/gfx/mobile/mobile_trade.attrmap.lz.ea4f2cbe b/gfx/mobile/mobile_trade.attrmap.lz.ea4f2cbe new file mode 100644 index 000000000..933762c80 Binary files /dev/null and b/gfx/mobile/mobile_trade.attrmap.lz.ea4f2cbe differ diff --git a/gfx/mobile/mobile_trade.png b/gfx/mobile/mobile_trade.png new file mode 100644 index 000000000..da41217d8 Binary files /dev/null and b/gfx/mobile/mobile_trade.png differ diff --git a/gfx/mobile/mobile_trade.tilemap b/gfx/mobile/mobile_trade.tilemap new file mode 100644 index 000000000..bb67a49f4 Binary files /dev/null and b/gfx/mobile/mobile_trade.tilemap differ diff --git a/gfx/mobile/mobile_trade.tilemap.lz.12882d37 b/gfx/mobile/mobile_trade.tilemap.lz.12882d37 new file mode 100644 index 000000000..94069f2fa Binary files /dev/null and b/gfx/mobile/mobile_trade.tilemap.lz.12882d37 differ diff --git a/gfx/mobile/mobile_trade_bg.pal b/gfx/mobile/mobile_trade_bg.pal new file mode 100644 index 000000000..d43c6e059 --- /dev/null +++ b/gfx/mobile/mobile_trade_bg.pal @@ -0,0 +1,39 @@ + RGB 18, 31, 15 + RGB 20, 20, 20 + RGB 11, 11, 11 + RGB 00, 00, 00 + + RGB 31, 15, 1 + RGB 14, 14, 31 + RGB 12, 09, 31 + RGB 00, 00, 00 + + RGB 18, 31, 15 + RGB 14, 14, 31 + RGB 12, 09, 31 + RGB 00, 00, 00 + + RGB 18, 31, 15 + RGB 20, 20, 20 + RGB 11, 11, 11 + RGB 00, 00, 00 + + RGB 18, 31, 15 + RGB 31, 07, 09 + RGB 18, 00, 01 + RGB 00, 00, 00 + + RGB 18, 31, 15 + RGB 20, 20, 20 + RGB 11, 11, 11 + RGB 00, 00, 00 + + RGB 31, 15, 1 + RGB 18, 00, 30 + RGB 09, 00, 17 + RGB 00, 00, 00 + + RGB 18, 31, 15 + RGB 18, 00, 30 + RGB 09, 00, 17 + RGB 00, 00, 00 diff --git a/gfx/mobile/mobile_trade_lights.pal b/gfx/mobile/mobile_trade_lights.pal new file mode 100644 index 000000000..43e86a231 --- /dev/null +++ b/gfx/mobile/mobile_trade_lights.pal @@ -0,0 +1,19 @@ + RGB 0, 0, 0 + RGB 31, 31, 7 + RGB 20, 31, 6 + RGB 13, 20, 16 + + RGB 0, 0, 0 + RGB 7, 11, 17 + RGB 0, 0, 0 + RGB 0, 0, 0 + + RGB 0, 0, 0 + RGB 31, 24, 4 + RGB 25, 12, 0 + RGB 31, 7, 4 + + RGB 0, 0, 0 + RGB 25, 0, 0 + RGB 0, 0, 0 + RGB 0, 0, 0 diff --git a/gfx/mobile/mobile_trade_lights.png b/gfx/mobile/mobile_trade_lights.png new file mode 100644 index 000000000..cdf1bd118 Binary files /dev/null and b/gfx/mobile/mobile_trade_lights.png differ diff --git a/gfx/mobile/mobile_trade_ob1.pal b/gfx/mobile/mobile_trade_ob1.pal new file mode 100644 index 000000000..a507d8bdf --- /dev/null +++ b/gfx/mobile/mobile_trade_ob1.pal @@ -0,0 +1,39 @@ + RGB 31, 31, 31 + RGB 31, 31, 12 + RGB 31, 13, 12 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 31, 23, 15 + RGB 31, 18, 07 + RGB 31, 15, 00 + + RGB 31, 31, 31 + RGB 20, 20, 20 + RGB 11, 11, 11 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 31, 00, 25 + RGB 31, 00, 25 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 09, 19, 31 + RGB 09, 19, 31 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 00, 00, 00 + RGB 00, 00, 00 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 00, 00, 00 + RGB 00, 00, 00 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 00, 00, 00 + RGB 00, 00, 00 + RGB 00, 00, 00 diff --git a/gfx/mobile/mobile_trade_ob2.pal b/gfx/mobile/mobile_trade_ob2.pal new file mode 100644 index 000000000..a4a1a123d --- /dev/null +++ b/gfx/mobile/mobile_trade_ob2.pal @@ -0,0 +1,39 @@ + RGB 31, 31, 31 + RGB 31, 31, 12 + RGB 31, 13, 12 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 31, 23, 15 + RGB 31, 18, 07 + RGB 31, 15, 00 + + RGB 31, 31, 31 + RGB 20, 20, 20 + RGB 11, 11, 11 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 09, 19, 31 + RGB 09, 19, 31 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 31, 00, 25 + RGB 31, 00, 25 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 00, 00, 00 + RGB 00, 00, 00 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 00, 00, 00 + RGB 00, 00, 00 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 00, 00, 00 + RGB 00, 00, 00 + RGB 00, 00, 00 diff --git a/gfx/mobile/mobile_trade_sprites.2bpp.lz.eef1e11d b/gfx/mobile/mobile_trade_sprites.2bpp.lz.eef1e11d new file mode 100644 index 000000000..b499f4abf Binary files /dev/null and b/gfx/mobile/mobile_trade_sprites.2bpp.lz.eef1e11d differ diff --git a/gfx/mobile/mobile_trade_sprites.png b/gfx/mobile/mobile_trade_sprites.png new file mode 100644 index 000000000..db774bf28 Binary files /dev/null and b/gfx/mobile/mobile_trade_sprites.png differ diff --git a/gfx/mobile/password.attrmap b/gfx/mobile/password.attrmap new file mode 100644 index 000000000..7cd3613cb Binary files /dev/null and b/gfx/mobile/password.attrmap differ diff --git a/gfx/mobile/password_bottom.tilemap b/gfx/mobile/password_bottom.tilemap new file mode 100644 index 000000000..6f449732b Binary files /dev/null and b/gfx/mobile/password_bottom.tilemap differ diff --git a/gfx/mobile/password_shift.tilemap b/gfx/mobile/password_shift.tilemap new file mode 100644 index 000000000..1963e667a Binary files /dev/null and b/gfx/mobile/password_shift.tilemap differ diff --git a/gfx/mobile/password_top.tilemap b/gfx/mobile/password_top.tilemap new file mode 100644 index 000000000..e3b77159b Binary files /dev/null and b/gfx/mobile/password_top.tilemap differ diff --git a/gfx/mobile/phone_tiles.png b/gfx/mobile/phone_tiles.png index 3aa8a68ef..b02286e5f 100644 Binary files a/gfx/mobile/phone_tiles.png and b/gfx/mobile/phone_tiles.png differ diff --git a/gfx/mobile/pichu_border.attrmap b/gfx/mobile/pichu_border.attrmap new file mode 100644 index 000000000..149adcea5 --- /dev/null +++ b/gfx/mobile/pichu_border.attrmap @@ -0,0 +1 @@ +¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯ \ No newline at end of file diff --git a/gfx/mobile/pichu_border.png b/gfx/mobile/pichu_border.png new file mode 100644 index 000000000..f0c0f64e9 Binary files /dev/null and b/gfx/mobile/pichu_border.png differ diff --git a/gfx/mobile/pichu_border.tilemap b/gfx/mobile/pichu_border.tilemap new file mode 100644 index 000000000..95d6e1f76 --- /dev/null +++ b/gfx/mobile/pichu_border.tilemap @@ -0,0 +1 @@ +ÉÉÉÉÉÉÉÉÉÉÉÉÉÉÉÉÉÉÉÉÁÁÁÁÁÁÁÁÁÁÁÁÅÆÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÆÅÁÁÁÁÁÁÁÁÁÁÁÁÃÄÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÄÃÁÁÁÁÁÁÁÁÁÁÁÁÃÄÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÄÃÁÁÁÁÁÁÁÁÁÁÁÁÃÄÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÄÃÁÁÁÁÁÁÁÁÁÁÁÁÃÄÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÄÃÁÁÁÁÁÁÁÁÁÁÁÁÃÄÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÄÃÁÁÁÁÁÁÁÁÁÁÁÁÃÄÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÄÃÁÁÁÁÁÁÁÁÁÁÁÁÃÄÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÄÃÁÁÁÁÁÁÁÁÁÁÁÁÃÄÂÂÂÂÂÂÂØÂÂØÂÂÂÂÂÄÃÁÁÁÁÁÁÁÁÁÁÁÁÇÈÊËÌÍÎÂÏÐÑÒÓÂÔÕÖ×ÈÇÁÁÁÁÁÁÁÁÁÁÁÁÉÉÉÉÉÉÉÉÉÉÉÉÉÉÉÉÉÉÉÉÁÁÁÁÁÁÁÁÁÁÁÁ \ No newline at end of file diff --git a/gfx/mobile/pichu_border_bg.pal b/gfx/mobile/pichu_border_bg.pal new file mode 100644 index 000000000..8e4d617f6 --- /dev/null +++ b/gfx/mobile/pichu_border_bg.pal @@ -0,0 +1,4 @@ + RGB 31, 30, 30 + RGB 2, 0, 0 + RGB 10, 9, 9 + RGB 15, 14, 14 diff --git a/gfx/mobile/pichu_border_ob.pal b/gfx/mobile/pichu_border_ob.pal new file mode 100644 index 000000000..70975ba17 --- /dev/null +++ b/gfx/mobile/pichu_border_ob.pal @@ -0,0 +1,39 @@ + RGB 31, 31, 31 + RGB 7, 5, 4 + RGB 31, 28, 4 + RGB 31, 5, 5 + + RGB 31, 31, 31 + RGB 7, 5, 4 + RGB 31, 23, 0 + RGB 31, 28, 4 + + RGB 31, 31, 31 + RGB 16, 19, 31 + RGB 17, 31, 31 + RGB 31, 31, 31 + + RGB 5, 5, 5 + RGB 7, 5, 4 + RGB 31, 28, 4 + RGB 19, 11, 6 + + RGB 31, 31, 31 + RGB 3, 15, 31 + RGB 4, 25, 25 + RGB 0, 7, 12 + + RGB 31, 31, 31 + RGB 0, 16, 0 + RGB 0, 16, 0 + RGB 0, 16, 0 + + RGB 4, 11, 22 + RGB 0, 16, 0 + RGB 0, 16, 0 + RGB 0, 16, 0 + + RGB 22, 11, 8 + RGB 0, 16, 0 + RGB 0, 16, 0 + RGB 0, 16, 0 diff --git a/gfx/mobile/pokemon_news.pal b/gfx/mobile/pokemon_news.pal new file mode 100644 index 000000000..940253176 --- /dev/null +++ b/gfx/mobile/pokemon_news.pal @@ -0,0 +1,39 @@ + RGB 24, 9, 8 + RGB 4, 9, 18 + RGB 18, 18, 12 + RGB 0, 0, 0 + + RGB 24, 24, 18 + RGB 18, 18, 12 + RGB 4, 9, 18 + RGB 0, 0, 0 + + RGB 31, 31, 31 + RGB 23, 11, 10 + RGB 13, 6, 5 + RGB 0, 0, 0 + + RGB 31, 31, 31 + RGB 15, 25, 5 + RGB 10, 20, 0 + RGB 0, 0, 0 + + RGB 31, 31, 31 + RGB 20, 28, 20 + RGB 10, 18, 15 + RGB 0, 0, 0 + + RGB 31, 31, 31 + RGB 22, 22, 12 + RGB 17, 12, 5 + RGB 0, 0, 0 + + RGB 5, 5, 16 + RGB 8, 19, 28 + RGB 0, 0, 0 + RGB 31, 31, 31 + + RGB 31, 31, 31 + RGB 27, 24, 0 + RGB 24, 16, 3 + RGB 0, 0, 0 diff --git a/gfx/mobile/select_start.png b/gfx/mobile/select_start.png new file mode 100644 index 000000000..efa8d4a46 Binary files /dev/null and b/gfx/mobile/select_start.png differ diff --git a/gfx/mobile/stadium2_n64.attrmap b/gfx/mobile/stadium2_n64.attrmap new file mode 100644 index 000000000..ef3adbf81 Binary files /dev/null and b/gfx/mobile/stadium2_n64.attrmap differ diff --git a/gfx/mobile/stadium2_n64.png b/gfx/mobile/stadium2_n64.png new file mode 100644 index 000000000..0e324906d Binary files /dev/null and b/gfx/mobile/stadium2_n64.png differ diff --git a/gfx/mobile/stadium2_n64.tilemap b/gfx/mobile/stadium2_n64.tilemap new file mode 100644 index 000000000..f7213ff21 --- /dev/null +++ b/gfx/mobile/stadium2_n64.tilemap @@ -0,0 +1,13 @@ + +121 ,-,./0 + +<=<7879:;$ GHG!"#ABCDEF$%$0 + +121 ,-,./0 +;<=<7879:;F$%$ GHG!"#ABCDEF$,./0 + + ,-,.79:;  7879CDEF$%$!"#ABCD ,-,./0&'()*+121 ,7879:;345643<=<7#ABCDEF>?@@?>GHG!"#A1 ,-,./0 + +121<7879:;<=<G!"#ABCDEF$%$ GHG!121 ,-,./0 + +1<=<7879:;< GHG!"#ABCDEF$%$ G \ No newline at end of file diff --git a/gfx/mobile/stadium2_n64_corrupt.tilemap b/gfx/mobile/stadium2_n64_corrupt.tilemap new file mode 100644 index 000000000..c323afa09 --- /dev/null +++ b/gfx/mobile/stadium2_n64_corrupt.tilemap @@ -0,0 +1,15 @@ + +121 ,-,./0 + +<=<7879:;$ GHG!"#ABCDEF$%$0 + +121 ,-,./0 +;<=<7879:;F$%$ GHG!"#ABCDEF$,./0 + + ,-,.79:; + + 7879CDEF$%$!"#ABCD ,-,./0&'()*+121 ,7879:;345643<=<7#ABCDEF>?@@?>GHG!"#A1 ,-,./0 + +121<7879:;<=<G!"#ABCDEF$%$ GHG!121 ,-,./0 + +1<=<7879:;< GHG!"#ABCDEF$%$ G \ No newline at end of file diff --git a/gfx/mobile/unused_mobile_pulses.pal b/gfx/mobile/unused_mobile_pulses.pal new file mode 100644 index 000000000..b51e42101 --- /dev/null +++ b/gfx/mobile/unused_mobile_pulses.pal @@ -0,0 +1,11 @@ + RGB 31, 31, 31 + RGB 00, 00, 00 + + RGB 31, 00, 25 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 00, 00, 00 + + RGB 09, 19, 31 + RGB 00, 00, 00 diff --git a/gfx/mobile/up_arrow.png b/gfx/mobile/up_arrow.png index e8b43de99..d8cfc7f3f 100644 Binary files a/gfx/mobile/up_arrow.png and b/gfx/mobile/up_arrow.png differ diff --git a/gfx/pokedex/select_start.png b/gfx/pokedex/select_start.png deleted file mode 100644 index efa8d4a46..000000000 Binary files a/gfx/pokedex/select_start.png and /dev/null differ diff --git a/gfx/pokemon/egg/unused_front.2bpp.lz.a5b6cbfa b/gfx/pokemon/egg/unused_front.2bpp.lz.a5b6cbfa new file mode 100644 index 000000000..d8de54c79 Binary files /dev/null and b/gfx/pokemon/egg/unused_front.2bpp.lz.a5b6cbfa differ diff --git a/gfx/pokemon/egg/unused_front.png b/gfx/pokemon/egg/unused_front.png new file mode 100644 index 000000000..0642c28cf Binary files /dev/null and b/gfx/pokemon/egg/unused_front.png differ diff --git a/gfx/trade/game_boy_n64.png b/gfx/trade/game_boy_n64.png deleted file mode 100644 index 0e324906d..000000000 Binary files a/gfx/trade/game_boy_n64.png and /dev/null differ diff --git a/gfx/trade/mobile_border.pal b/gfx/trade/mobile_border.pal new file mode 100644 index 000000000..93e884046 --- /dev/null +++ b/gfx/trade/mobile_border.pal @@ -0,0 +1,39 @@ + RGB 31, 31, 63 + RGB 00, 00, 00 + RGB 00, 00, 00 + RGB 00, 00, 00 + + RGB 31, 31, 63 + RGB 00, 00, 00 + RGB 00, 00, 00 + RGB 00, 00, 00 + + RGB 04, 02, 15 + RGB 21, 00, 21 + RGB 31, 00, 00 + RGB 31, 31, 31 + + RGB 04, 02, 15 + RGB 21, 00, 21 + RGB 30, 16, 26 + RGB 31, 31, 31 + + RGB 04, 02, 15 + RGB 21, 00, 21 + RGB 16, 16, 16 + RGB 31, 31, 31 + + RGB 04, 02, 15 + RGB 21, 00, 21 + RGB 31, 12, 12 + RGB 31, 31, 31 + + RGB 04, 02, 15 + RGB 21, 00, 21 + RGB 07, 08, 31 + RGB 31, 31, 31 + + RGB 04, 02, 15 + RGB 21, 00, 21 + RGB 29, 28, 09 + RGB 31, 31, 31 diff --git a/gfx/unknown/049c0c.png b/gfx/unknown/049c0c.png deleted file mode 100644 index ae6cba38d..000000000 Binary files a/gfx/unknown/049c0c.png and /dev/null differ diff --git a/gfx/unknown/08940b.png b/gfx/unknown/08940b.png deleted file mode 100644 index 108be31b9..000000000 Binary files a/gfx/unknown/08940b.png and /dev/null differ diff --git a/gfx/unknown/1032a2.png b/gfx/unknown/1032a2.png deleted file mode 100644 index cdf1bd118..000000000 Binary files a/gfx/unknown/1032a2.png and /dev/null differ diff --git a/gfx/unknown/106514.png b/gfx/unknown/106514.png deleted file mode 100644 index faadc6f9c..000000000 Binary files a/gfx/unknown/106514.png and /dev/null differ diff --git a/gfx/unknown/108d27.2bpp.lz.eef1e11d b/gfx/unknown/108d27.2bpp.lz.eef1e11d deleted file mode 100644 index b499f4abf..000000000 Binary files a/gfx/unknown/108d27.2bpp.lz.eef1e11d and /dev/null differ diff --git a/gfx/unknown/108d27.png b/gfx/unknown/108d27.png deleted file mode 100644 index db774bf28..000000000 Binary files a/gfx/unknown/108d27.png and /dev/null differ diff --git a/gfx/unknown/108da7.2bpp.lz.aad8592b b/gfx/unknown/108da7.2bpp.lz.aad8592b deleted file mode 100644 index 4d860f055..000000000 Binary files a/gfx/unknown/108da7.2bpp.lz.aad8592b and /dev/null differ diff --git a/gfx/unknown/108da7.png b/gfx/unknown/108da7.png deleted file mode 100644 index da41217d8..000000000 Binary files a/gfx/unknown/108da7.png and /dev/null differ diff --git a/gfx/unknown/108fe7.tilemap b/gfx/unknown/108fe7.tilemap deleted file mode 100644 index bb67a49f4..000000000 Binary files a/gfx/unknown/108fe7.tilemap and /dev/null differ diff --git a/gfx/unknown/108fe7.tilemap.lz.12882d37 b/gfx/unknown/108fe7.tilemap.lz.12882d37 deleted file mode 100644 index 94069f2fa..000000000 Binary files a/gfx/unknown/108fe7.tilemap.lz.12882d37 and /dev/null differ diff --git a/gfx/unknown/1090a7.tilemap b/gfx/unknown/1090a7.tilemap deleted file mode 100644 index 6f4843dde..000000000 Binary files a/gfx/unknown/1090a7.tilemap and /dev/null differ diff --git a/gfx/unknown/1090a7.tilemap.lz.ea4f2cbe b/gfx/unknown/1090a7.tilemap.lz.ea4f2cbe deleted file mode 100644 index 933762c80..000000000 Binary files a/gfx/unknown/1090a7.tilemap.lz.ea4f2cbe and /dev/null differ diff --git a/gfx/unknown/1091c7.png b/gfx/unknown/1091c7.png deleted file mode 100644 index 8def47f76..000000000 Binary files a/gfx/unknown/1091c7.png and /dev/null differ diff --git a/gfx/unknown/1092c7.png b/gfx/unknown/1092c7.png deleted file mode 100644 index d48a5ee51..000000000 Binary files a/gfx/unknown/1092c7.png and /dev/null differ diff --git a/gfx/unknown/11601a.png b/gfx/unknown/11601a.png deleted file mode 100644 index a6a7598f8..000000000 Binary files a/gfx/unknown/11601a.png and /dev/null differ diff --git a/gfx/unknown/117356.tilemap b/gfx/unknown/117356.tilemap deleted file mode 100644 index 95d6e1f76..000000000 --- a/gfx/unknown/117356.tilemap +++ /dev/null @@ -1 +0,0 @@ -ÉÉÉÉÉÉÉÉÉÉÉÉÉÉÉÉÉÉÉÉÁÁÁÁÁÁÁÁÁÁÁÁÅÆÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÆÅÁÁÁÁÁÁÁÁÁÁÁÁÃÄÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÄÃÁÁÁÁÁÁÁÁÁÁÁÁÃÄÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÄÃÁÁÁÁÁÁÁÁÁÁÁÁÃÄÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÄÃÁÁÁÁÁÁÁÁÁÁÁÁÃÄÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÄÃÁÁÁÁÁÁÁÁÁÁÁÁÃÄÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÄÃÁÁÁÁÁÁÁÁÁÁÁÁÃÄÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÄÃÁÁÁÁÁÁÁÁÁÁÁÁÃÄÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÄÃÁÁÁÁÁÁÁÁÁÁÁÁÃÄÂÂÂÂÂÂÂØÂÂØÂÂÂÂÂÄÃÁÁÁÁÁÁÁÁÁÁÁÁÇÈÊËÌÍÎÂÏÐÑÒÓÂÔÕÖ×ÈÇÁÁÁÁÁÁÁÁÁÁÁÁÉÉÉÉÉÉÉÉÉÉÉÉÉÉÉÉÉÉÉÉÁÁÁÁÁÁÁÁÁÁÁÁ \ No newline at end of file diff --git a/gfx/unknown/1174d6.attrmap b/gfx/unknown/1174d6.attrmap deleted file mode 100644 index 149adcea5..000000000 --- a/gfx/unknown/1174d6.attrmap +++ /dev/null @@ -1 +0,0 @@ -¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯ \ No newline at end of file diff --git a/gfx/unknown/16c903.pal b/gfx/unknown/16c903.pal deleted file mode 100644 index a72635167..000000000 --- a/gfx/unknown/16c903.pal +++ /dev/null @@ -1,39 +0,0 @@ - RGB 31, 31, 31 - RGB 04, 10, 20 - RGB 16, 19, 25 - RGB 25, 27, 29 - - RGB 31, 31, 31 - RGB 31, 31, 31 - RGB 31, 31, 31 - RGB 31, 31, 31 - - RGB 31, 31, 31 - RGB 31, 31, 31 - RGB 31, 31, 31 - RGB 31, 31, 31 - - RGB 31, 31, 31 - RGB 31, 31, 31 - RGB 31, 31, 31 - RGB 31, 31, 31 - - RGB 31, 31, 31 - RGB 31, 31, 31 - RGB 31, 31, 31 - RGB 31, 31, 31 - - RGB 31, 31, 31 - RGB 31, 31, 31 - RGB 31, 31, 31 - RGB 31, 31, 31 - - RGB 31, 31, 31 - RGB 31, 31, 31 - RGB 31, 31, 31 - RGB 31, 31, 31 - - RGB 31, 31, 31 - RGB 31, 31, 31 - RGB 31, 31, 31 - RGB 31, 31, 31 diff --git a/gfx/unknown/16cca3.png b/gfx/unknown/16cca3.png deleted file mode 100644 index d5ad353d8..000000000 Binary files a/gfx/unknown/16cca3.png and /dev/null differ diff --git a/gfx/unknown/171848.png b/gfx/unknown/171848.png deleted file mode 100644 index f0c0f64e9..000000000 Binary files a/gfx/unknown/171848.png and /dev/null differ diff --git a/gfx/unknown/172491.tilemap b/gfx/unknown/172491.tilemap deleted file mode 100644 index e3b77159b..000000000 Binary files a/gfx/unknown/172491.tilemap and /dev/null differ diff --git a/gfx/unknown/17251d.tilemap b/gfx/unknown/17251d.tilemap deleted file mode 100644 index 6f449732b..000000000 Binary files a/gfx/unknown/17251d.tilemap and /dev/null differ diff --git a/gfx/unknown/1725f9.tilemap b/gfx/unknown/1725f9.tilemap deleted file mode 100644 index 1963e667a..000000000 Binary files a/gfx/unknown/1725f9.tilemap and /dev/null differ diff --git a/gfx/unknown/172685.tilemap b/gfx/unknown/172685.tilemap deleted file mode 100644 index c6ae863be..000000000 Binary files a/gfx/unknown/172685.tilemap and /dev/null differ diff --git a/gfx/unknown/1727ed.attrmap b/gfx/unknown/1727ed.attrmap deleted file mode 100644 index 7cd3613cb..000000000 Binary files a/gfx/unknown/1727ed.attrmap and /dev/null differ diff --git a/gfx/unknown/172955.attrmap b/gfx/unknown/172955.attrmap deleted file mode 100644 index bcece9e94..000000000 Binary files a/gfx/unknown/172955.attrmap and /dev/null differ diff --git a/gfx/unknown/1733af.tilemap b/gfx/unknown/1733af.tilemap deleted file mode 100644 index f7213ff21..000000000 --- a/gfx/unknown/1733af.tilemap +++ /dev/null @@ -1,13 +0,0 @@ - -121 ,-,./0 - -<=<7879:;$ GHG!"#ABCDEF$%$0 - -121 ,-,./0 -;<=<7879:;F$%$ GHG!"#ABCDEF$,./0 - - ,-,.79:;  7879CDEF$%$!"#ABCD ,-,./0&'()*+121 ,7879:;345643<=<7#ABCDEF>?@@?>GHG!"#A1 ,-,./0 - -121<7879:;<=<G!"#ABCDEF$%$ GHG!121 ,-,./0 - -1<=<7879:;< GHG!"#ABCDEF$%$ G \ No newline at end of file diff --git a/gfx/unknown/1733af_corrupt.tilemap b/gfx/unknown/1733af_corrupt.tilemap deleted file mode 100644 index c323afa09..000000000 --- a/gfx/unknown/1733af_corrupt.tilemap +++ /dev/null @@ -1,15 +0,0 @@ - -121 ,-,./0 - -<=<7879:;$ GHG!"#ABCDEF$%$0 - -121 ,-,./0 -;<=<7879:;F$%$ GHG!"#ABCDEF$,./0 - - ,-,.79:; - - 7879CDEF$%$!"#ABCD ,-,./0&'()*+121 ,7879:;345643<=<7#ABCDEF>?@@?>GHG!"#A1 ,-,./0 - -121<7879:;<=<G!"#ABCDEF$%$ GHG!121 ,-,./0 - -1<=<7879:;< GHG!"#ABCDEF$%$ G \ No newline at end of file diff --git a/gfx/unknown/173517.attrmap b/gfx/unknown/173517.attrmap deleted file mode 100644 index ef3adbf81..000000000 Binary files a/gfx/unknown/173517.attrmap and /dev/null differ diff --git a/gfx/unknown/17acd5.tilemap b/gfx/unknown/17acd5.tilemap deleted file mode 100644 index a7ab408ff..000000000 Binary files a/gfx/unknown/17acd5.tilemap and /dev/null differ diff --git a/gfx/unknown/17ae3d.tilemap b/gfx/unknown/17ae3d.tilemap deleted file mode 100644 index 0aabe5c5b..000000000 Binary files a/gfx/unknown/17ae3d.tilemap and /dev/null differ diff --git a/gfx/unknown/17afa5.png b/gfx/unknown/17afa5.png deleted file mode 100644 index fc6459040..000000000 Binary files a/gfx/unknown/17afa5.png and /dev/null differ diff --git a/gfx/unknown/17eb7e.png b/gfx/unknown/17eb7e.png deleted file mode 100644 index 3a4a6bd4b..000000000 Binary files a/gfx/unknown/17eb7e.png and /dev/null differ diff --git a/gfx/unknown/49757.pal b/gfx/unknown/49757.pal deleted file mode 100644 index 93e884046..000000000 --- a/gfx/unknown/49757.pal +++ /dev/null @@ -1,39 +0,0 @@ - RGB 31, 31, 63 - RGB 00, 00, 00 - RGB 00, 00, 00 - RGB 00, 00, 00 - - RGB 31, 31, 63 - RGB 00, 00, 00 - RGB 00, 00, 00 - RGB 00, 00, 00 - - RGB 04, 02, 15 - RGB 21, 00, 21 - RGB 31, 00, 00 - RGB 31, 31, 31 - - RGB 04, 02, 15 - RGB 21, 00, 21 - RGB 30, 16, 26 - RGB 31, 31, 31 - - RGB 04, 02, 15 - RGB 21, 00, 21 - RGB 16, 16, 16 - RGB 31, 31, 31 - - RGB 04, 02, 15 - RGB 21, 00, 21 - RGB 31, 12, 12 - RGB 31, 31, 31 - - RGB 04, 02, 15 - RGB 21, 00, 21 - RGB 07, 08, 31 - RGB 31, 31, 31 - - RGB 04, 02, 15 - RGB 21, 00, 21 - RGB 29, 28, 09 - RGB 31, 31, 31 diff --git a/gfx/unknown/unknown_egg.2bpp.lz.a5b6cbfa b/gfx/unknown/unknown_egg.2bpp.lz.a5b6cbfa deleted file mode 100644 index d8de54c79..000000000 Binary files a/gfx/unknown/unknown_egg.2bpp.lz.a5b6cbfa and /dev/null differ diff --git a/gfx/unknown/unknown_egg.png b/gfx/unknown/unknown_egg.png deleted file mode 100644 index 0642c28cf..000000000 Binary files a/gfx/unknown/unknown_egg.png and /dev/null differ diff --git a/home/pokemon.asm b/home/pokemon.asm index e1d39bb9d..40b442fc0 100644 --- a/home/pokemon.asm +++ b/home/pokemon.asm @@ -267,7 +267,7 @@ GetBaseData:: jr .end .egg - ld de, UnknownEggPic + ld de, UnusedEggFrontpic ; Sprite dimensions ld b, $55 ; 5x5 diff --git a/main.asm b/main.asm index 8973bad04..8f6d542a4 100644 --- a/main.asm +++ b/main.asm @@ -262,9 +262,9 @@ INCLUDE "data/pokemon/base_stats.asm" INCLUDE "data/pokemon/names.asm" INCLUDE "data/pokemon/unused_pic_banks.asm" -UnknownEggPic:: +UnusedEggFrontpic:: ; Another egg pic. This is shifted up a few pixels. -INCBIN "gfx/unknown/unknown_egg.2bpp.lz" +INCBIN "gfx/pokemon/egg/unused_front.2bpp.lz" SECTION "Crystal Phone Text", ROMX diff --git a/mobile/fixed_words.asm b/mobile/fixed_words.asm index 6c35b1530..acbd318e8 100644 --- a/mobile/fixed_words.asm +++ b/mobile/fixed_words.asm @@ -311,11 +311,11 @@ Function11c1b9: call Function11d323 call SetPalettes call DisableLCD - ld hl, GFX_11d67e + ld hl, SelectStartGFX ld de, vTiles2 ld bc, $60 call CopyBytes - ld hl, LZ_11d6de + ld hl, EZChatSlowpokeLZ ld de, vTiles0 call Decompress call EnableLCD @@ -3236,14 +3236,14 @@ EZChat_GetCategoryWordsByKana: INCLUDE "data/pokemon/ezchat_order.asm" -GFX_11d67e: -INCBIN "gfx/pokedex/select_start.2bpp" +SelectStartGFX: +INCBIN "gfx/mobile/select_start.2bpp" -LZ_11d6de: +EZChatSlowpokeLZ: INCBIN "gfx/pokedex/slowpoke.2bpp.lz" MobileEZChatCategoryNames: -; Fixed message categories +; entries correspond to EZCHAT_* constants db "ãƒã‚±ãƒ¢ãƒ³@@" ; 00 db "タイプ@@@" ; 01 db "ã‚ã„ã•ã¤@@" ; 02 diff --git a/mobile/mobile_12.asm b/mobile/mobile_12.asm index 17f38f524..35a45c116 100644 --- a/mobile/mobile_12.asm +++ b/mobile/mobile_12.asm @@ -1006,10 +1006,10 @@ Function488b9: ret MobileUpArrowGFX: -INCBIN "gfx/mobile/up_arrow.2bpp" +INCBIN "gfx/mobile/up_arrow.1bpp" MobileDownArrowGFX: -INCBIN "gfx/mobile/down_arrow.2bpp" +INCBIN "gfx/mobile/down_arrow.1bpp" Function488d3: call Function48283 diff --git a/mobile/mobile_22.asm b/mobile/mobile_22.asm index a83803257..4efd50659 100644 --- a/mobile/mobile_22.asm +++ b/mobile/mobile_22.asm @@ -501,9 +501,9 @@ Function893e2: Function893ef: ld de, vTiles0 - ld hl, GFX_8940b + ld hl, EZChatCursorGFX ld bc, $20 - ld a, BANK(GFX_8940b) + ld a, BANK(EZChatCursorGFX) call FarCopyBytes ret @@ -514,19 +514,19 @@ Function893fe: call DelayFrame ret -GFX_8940b: -INCBIN "gfx/unknown/08940b.2bpp" +EZChatCursorGFX: +INCBIN "gfx/mobile/ez_chat_cursor.2bpp" Function8942b: ld de, vTiles0 tile $02 - ld hl, MobileAdapterGFX + $7d tiles + ld hl, CardLargeSpriteGFX ld bc, 8 tiles - ld a, BANK(MobileAdapterGFX) + ld a, BANK(CardLargeSpriteGFX) call FarCopyBytes ld de, vTiles0 tile $0a - ld hl, MobileAdapterGFX + $c6 tiles + ld hl, CardSpriteGFX ld bc, 4 tiles - ld a, BANK(MobileAdapterGFX) + ld a, BANK(CardSpriteGFX) call FarCopyBytes ret @@ -544,23 +544,23 @@ Function89448: ret Function89455: - ld hl, MobileAdapterGFX + $7d tiles + ld hl, CardLargeSpriteGFX ld de, vTiles2 tile $0c - ld bc, $49 tiles - ld a, BANK(MobileAdapterGFX) + ld bc, (8 + 65) tiles + ld a, BANK(CardLargeSpriteGFX) ; aka BANK(CardFolderGFX) call FarCopyBytes ret Function89464: - ld hl, MobileAdapterGFX + ld hl, MobileCardGFX ld de, vTiles2 ld bc, $20 tiles - ld a, BANK(MobileAdapterGFX) + ld a, BANK(MobileCardGFX) call FarCopyBytes - ld hl, MobileAdapterGFX + $66 tiles + ld hl, MobileCard2GFX ld de, vTiles2 tile $20 ld bc, $17 tiles - ld a, BANK(MobileAdapterGFX) + ld a, BANK(MobileCard2GFX) call FarCopyBytes ret @@ -1193,16 +1193,16 @@ Function897d5: ret Function89807: - ld hl, MobileAdapterGFX + $20 tiles + ld hl, ChrisSilhouetteGFX ld a, [wPlayerGender] bit PLAYERGENDER_FEMALE_F, a jr z, .asm_89814 - ld hl, MobileAdapterGFX + $43 tiles + ld hl, KrisSilhouetteGFX .asm_89814 call DisableLCD ld de, vTiles2 tile $37 - ld bc, $23 tiles - ld a, BANK(MobileAdapterGFX) + ld bc, (5 * 7) tiles + ld a, BANK(ChrisSilhouetteGFX) ; aka BANK(KrisSilhouetteGFX) call FarCopyBytes call EnableLCD call DelayFrame diff --git a/mobile/mobile_22_2.asm b/mobile/mobile_22_2.asm index 719a1fe6b..f9d071e39 100644 --- a/mobile/mobile_22_2.asm +++ b/mobile/mobile_22_2.asm @@ -569,20 +569,20 @@ Function8b677: ret Function8b690: - ld hl, GFX_17afa5 + $514 + ld hl, MobileCardListGFX ld de, vTiles2 - ld bc, $160 - ld a, BANK(GFX_17afa5) + ld bc, $16 tiles + ld a, BANK(MobileCardListGFX) call FarCopyBytes - ld hl, GFX_17afa5 + $514 + $160 - $10 + ld hl, MobileCardListGFX tile $15 ld de, vTiles2 tile $61 - ld bc, $10 - ld a, BANK(GFX_17afa5) + ld bc, 1 tiles + ld a, BANK(MobileCardListGFX) call FarCopyBytes - ld hl, GFX_17afa5 + $514 + $160 + ld hl, MobileCardListGFX tile $16 ld de, vTiles0 tile $ee - ld bc, $10 - ld a, BANK(GFX_17afa5) + ld bc, 1 tiles + ld a, BANK(MobileCardListGFX) call FarCopyBytes ret diff --git a/mobile/mobile_40.asm b/mobile/mobile_40.asm index 902b7e303..6becee7c0 100644 --- a/mobile/mobile_40.asm +++ b/mobile/mobile_40.asm @@ -6439,16 +6439,16 @@ Function102dc3: Function102dd3: call DisableLCD - ld de, GFX_1032a2 + ld de, MobileTradeLightsGFX ld hl, vTiles0 - lb bc, BANK(GFX_1032a2), 4 + lb bc, BANK(MobileTradeLightsGFX), 4 call Get2bpp farcall __LoadTradeScreenBorder call EnableLCD ret Function102dec: - ld hl, Palettes_1032e2 + ld hl, MobileTradeLightsPalettes ld de, wOBPals1 ld bc, 4 palettes ld a, $05 @@ -6890,29 +6890,11 @@ Unknown_10327a: db $00, $00, $03, $02 db $00, $00, $01, $03 -GFX_1032a2: -INCBIN "gfx/unknown/1032a2.2bpp" - -Palettes_1032e2: - RGB 0, 0, 0 - RGB 31, 31, 7 - RGB 20, 31, 6 - RGB 13, 20, 16 - - RGB 0, 0, 0 - RGB 7, 11, 17 - RGB 0, 0, 0 - RGB 0, 0, 0 - - RGB 0, 0, 0 - RGB 31, 24, 4 - RGB 25, 12, 0 - RGB 31, 7, 4 - - RGB 0, 0, 0 - RGB 25, 0, 0 - RGB 0, 0, 0 - RGB 0, 0, 0 +MobileTradeLightsGFX: +INCBIN "gfx/mobile/mobile_trade_lights.2bpp" + +MobileTradeLightsPalettes: +INCLUDE "gfx/mobile/mobile_trade_lights.pal" Function103302: call Function103309 diff --git a/mobile/mobile_41.asm b/mobile/mobile_41.asm index 66acfb5ac..fc3516c4c 100644 --- a/mobile/mobile_41.asm +++ b/mobile/mobile_41.asm @@ -1016,10 +1016,10 @@ Function106464:: ld hl, vTiles2 tile "â–²" ; $61 lb bc, BANK(FontsExtra2_UpArrowGFX), 1 call Get2bpp - ld de, GFX_106514 + ld de, MobileDialingFrameGFX ld hl, vTiles2 tile "☎" ; $62 ld c, 9 - ld b, BANK(GFX_106514) + ld b, BANK(MobileDialingFrameGFX) call Get2bpp ld de, $40b0 ld hl, vTiles2 tile $6b @@ -1103,5 +1103,5 @@ Function10650a: call Get2bpp ret -GFX_106514: -INCBIN "gfx/unknown/106514.2bpp" +MobileDialingFrameGFX: +INCBIN "gfx/mobile/dialing_frame.2bpp" diff --git a/mobile/mobile_42.asm b/mobile/mobile_42.asm index 6bae84ccf..5f4b62e5f 100644 --- a/mobile/mobile_42.asm +++ b/mobile/mobile_42.asm @@ -149,13 +149,13 @@ Function1080b7: ld a, $1 ldh [rVBK], a - ld hl, LZ_108da7 + ld hl, MobileTradeGFX ld de, vTiles2 call Decompress ld a, $0 ldh [rVBK], a - ld hl, LZ_108d27 + ld hl, MobileTradeSpritesGFX ld de, vTiles0 tile $20 call Decompress @@ -804,7 +804,7 @@ MobileTradeAnim_02: push af ld a, $5 ldh [rSVBK], a - ld hl, Palette_109107 + ld hl, MobileTradeBGPalettes ld de, wBGPals1 ld bc, 8 palettes call CopyBytes @@ -826,12 +826,12 @@ MobileTradeAnim_10: call MobileTradeAnim_ClearBGMap ld a, $1 ldh [rVBK], a - ld hl, LZ_108da7 + ld hl, MobileTradeGFX ld de, vTiles2 call Decompress ld a, $0 ldh [rVBK], a - ld hl, LZ_108d27 + ld hl, MobileTradeSpritesGFX ld de, vTiles0 tile $20 call Decompress call Function108c80 @@ -849,7 +849,7 @@ MobileTradeAnim_10: push af ld a, $5 ldh [rSVBK], a - ld hl, Palette_109107 + ld hl, MobileTradeBGPalettes ld de, wBGPals1 ld bc, 8 palettes call CopyBytes @@ -869,12 +869,12 @@ MobileTradeAnim_11: call DisableLCD ld a, $1 ldh [rVBK], a - ld hl, LZ_108da7 + ld hl, MobileTradeGFX ld de, vTiles2 call Decompress ld a, $0 ldh [rVBK], a - ld hl, LZ_108d27 + ld hl, MobileTradeSpritesGFX ld de, vTiles0 tile $20 call Decompress call Function108c80 @@ -892,7 +892,7 @@ MobileTradeAnim_11: push af ld a, $5 ldh [rSVBK], a - ld hl, Palette_109107 + ld hl, MobileTradeBGPalettes ld de, wBGPals1 ld bc, 8 palettes call CopyBytes @@ -1364,16 +1364,16 @@ MobileTradeAnim_ClearTilemap: Function108ad4: and a jr z, .asm_108adc - ld de, GFX_1092c7 + ld de, MobileCable2GFX jr .asm_108adf .asm_108adc - ld de, GFX_1091c7 + ld de, MobileCable1GFX .asm_108adf ld a, $1 ldh [rVBK], a ld hl, vTiles2 tile $4a - lb bc, BANK(GFX_1092c7), 16 + lb bc, BANK(MobileCable1GFX), 16 ; aka BANK(MobileCable2GFX) call Get2bpp_2 call DelayFrame ld a, $0 @@ -1387,23 +1387,23 @@ Function108af4: ldh [rSVBK], a ld a, [wcf65] and $1 - jr z, .copy_palette_109147 - ld hl, Palette_109187 + jr z, .copy_MobileTradeOB1Palettes + ld hl, MobileTradeOB2Palettes ld de, wOBPals1 ld bc, 8 palettes call CopyBytes - ld hl, Palette_109187 + ld hl, MobileTradeOB2Palettes ld de, wOBPals2 ld bc, 8 palettes call CopyBytes jr .done_copy -.copy_palette_109147 - ld hl, Palette_109147 +.copy_MobileTradeOB1Palettes + ld hl, MobileTradeOB1Palettes ld de, wOBPals1 ld bc, 8 palettes call CopyBytes - ld hl, Palette_109147 + ld hl, MobileTradeOB1Palettes ld de, wOBPals2 ld bc, 8 palettes call CopyBytes @@ -1615,10 +1615,10 @@ Function108c40: text_end Function108c6d: - ld hl, LZ_108fe7 + ld hl, MobileTradeTilemapLZ debgcoord 0, 0 call Decompress - ld hl, LZ_108fe7 + ld hl, MobileTradeTilemapLZ debgcoord 0, 0, vBGMap1 call Decompress ret @@ -1626,10 +1626,10 @@ Function108c6d: Function108c80: ld a, $1 ldh [rVBK], a - ld hl, LZ_1090a7 + ld hl, MobileTradeAttrmapLZ debgcoord 0, 0 call Decompress - ld hl, LZ_1090a7 + ld hl, MobileTradeAttrmapLZ debgcoord 0, 0, vBGMap1 call Decompress ld a, $0 @@ -1729,197 +1729,35 @@ LoadMobileAdapterPalette: call FarCopyWRAM ret -LZ_108d27: -INCBIN "gfx/unknown/108d27.2bpp.lz" - -LZ_108da7: -INCBIN "gfx/unknown/108da7.2bpp.lz" - -LZ_108fe7: -INCBIN "gfx/unknown/108fe7.tilemap.lz" - -LZ_1090a7: -INCBIN "gfx/unknown/1090a7.tilemap.lz" - -Palette_1090f7: -; unused - RGB 31, 31, 31 - RGB 00, 00, 00 - - RGB 31, 00, 25 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 00, 00, 00 - - RGB 09, 19, 31 - RGB 00, 00, 00 - -Palette_109107: - RGB 18, 31, 15 - RGB 20, 20, 20 - RGB 11, 11, 11 - RGB 00, 00, 00 - - RGB 31, 15, 1 - RGB 14, 14, 31 - RGB 12, 09, 31 - RGB 00, 00, 00 - - RGB 18, 31, 15 - RGB 14, 14, 31 - RGB 12, 09, 31 - RGB 00, 00, 00 - - RGB 18, 31, 15 - RGB 20, 20, 20 - RGB 11, 11, 11 - RGB 00, 00, 00 - - RGB 18, 31, 15 - RGB 31, 07, 09 - RGB 18, 00, 01 - RGB 00, 00, 00 - - RGB 18, 31, 15 - RGB 20, 20, 20 - RGB 11, 11, 11 - RGB 00, 00, 00 - - RGB 31, 15, 1 - RGB 18, 00, 30 - RGB 09, 00, 17 - RGB 00, 00, 00 - - RGB 18, 31, 15 - RGB 18, 00, 30 - RGB 09, 00, 17 - RGB 00, 00, 00 - -Palette_109147: - RGB 31, 31, 31 - RGB 31, 31, 12 - RGB 31, 13, 12 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 31, 23, 15 - RGB 31, 18, 07 - RGB 31, 15, 00 - - RGB 31, 31, 31 - RGB 20, 20, 20 - RGB 11, 11, 11 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 31, 00, 25 - RGB 31, 00, 25 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 09, 19, 31 - RGB 09, 19, 31 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 00, 00, 00 - RGB 00, 00, 00 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 00, 00, 00 - RGB 00, 00, 00 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 00, 00, 00 - RGB 00, 00, 00 - RGB 00, 00, 00 - -Palette_109187: - RGB 31, 31, 31 - RGB 31, 31, 12 - RGB 31, 13, 12 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 31, 23, 15 - RGB 31, 18, 07 - RGB 31, 15, 00 - - RGB 31, 31, 31 - RGB 20, 20, 20 - RGB 11, 11, 11 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 09, 19, 31 - RGB 09, 19, 31 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 31, 00, 25 - RGB 31, 00, 25 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 00, 00, 00 - RGB 00, 00, 00 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 00, 00, 00 - RGB 00, 00, 00 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 00, 00, 00 - RGB 00, 00, 00 - RGB 00, 00, 00 - -GFX_1091c7: -INCBIN "gfx/unknown/1091c7.2bpp" -GFX_1092c7: -INCBIN "gfx/unknown/1092c7.2bpp" +MobileTradeSpritesGFX: +INCBIN "gfx/mobile/mobile_trade_sprites.2bpp.lz" + +MobileTradeGFX: +INCBIN "gfx/mobile/mobile_trade.2bpp.lz" + +MobileTradeTilemapLZ: +INCBIN "gfx/mobile/mobile_trade.tilemap.lz" + +MobileTradeAttrmapLZ: +INCBIN "gfx/mobile/mobile_trade.attrmap.lz" + +UnusedMobilePulsePalettes: +INCLUDE "gfx/mobile/unused_mobile_pulses.pal" + +MobileTradeBGPalettes: +INCLUDE "gfx/mobile/mobile_trade_bg.pal" + +MobileTradeOB1Palettes: +INCLUDE "gfx/mobile/mobile_trade_ob1.pal" + +MobileTradeOB2Palettes: +INCLUDE "gfx/mobile/mobile_trade_ob2.pal" + +MobileCable1GFX: +INCBIN "gfx/mobile/mobile_cable_1.2bpp" + +MobileCable2GFX: +INCBIN "gfx/mobile/mobile_cable_2.2bpp" MobileAdapterPalettes: - RGB 18, 31, 15 - RGB 04, 13, 31 - RGB 00, 00, 31 - RGB 00, 00, 00 - - RGB 18, 31, 15 - RGB 31, 31, 00 - RGB 31, 15, 00 - RGB 00, 00, 00 - - RGB 18, 31, 15 - RGB 09, 24, 00 - RGB 02, 16, 00 - RGB 00, 00, 00 - - RGB 18, 31, 15 - RGB 31, 07, 09 - RGB 18, 00, 01 - RGB 00, 00, 00 - - RGB 18, 31, 15 - RGB 28, 05, 31 - RGB 17, 00, 17 - RGB 00, 00, 00 - - RGB 18, 31, 15 - RGB 09, 09, 09 - RGB 04, 04, 04 - RGB 00, 00, 00 - - RGB 18, 31, 15 - RGB 31, 13, 21 - RGB 27, 07, 12 - RGB 00, 00, 00 - - RGB 18, 31, 15 - RGB 21, 20, 20 - RGB 14, 14, 31 - RGB 00, 00, 00 +INCLUDE "gfx/mobile/mobile_adapters.pal" diff --git a/mobile/mobile_45_2.asm b/mobile/mobile_45_2.asm index 0aaa2aa41..4e227a897 100644 --- a/mobile/mobile_45_2.asm +++ b/mobile/mobile_45_2.asm @@ -1358,46 +1358,12 @@ Unknown_1172e9: db $0, $8, $0, $2 db $4, $10, $10, $6 -Palette_11730e: - RGB 31, 31, 31 - RGB 7, 5, 4 - RGB 31, 28, 4 - RGB 31, 5, 5 - RGB 31, 31, 31 - RGB 7, 5, 4 - RGB 31, 23, 0 - RGB 31, 28, 4 - RGB 31, 31, 31 - RGB 16, 19, 31 - RGB 17, 31, 31 - RGB 31, 31, 31 - RGB 5, 5, 5 - RGB 7, 5, 4 - RGB 31, 28, 4 - RGB 19, 11, 6 - RGB 31, 31, 31 - RGB 3, 15, 31 - RGB 4, 25, 25 - RGB 0, 7, 12 - RGB 31, 31, 31 - RGB 0, 16, 0 - RGB 0, 16, 0 - RGB 0, 16, 0 - RGB 4, 11, 22 - RGB 0, 16, 0 - RGB 0, 16, 0 - RGB 0, 16, 0 - RGB 22, 11, 8 - RGB 0, 16, 0 - RGB 0, 16, 0 - RGB 0, 16, 0 - -Palette_11734e: - RGB 31, 30, 30 - RGB 2, 0, 0 - RGB 10, 9, 9 - RGB 15, 14, 14 - -Unknown_117356: -INCBIN "gfx/unknown/117356.tilemap" -INCBIN "gfx/unknown/1174d6.attrmap" +PichuBorderMobileOBPalettes: +INCLUDE "gfx/mobile/pichu_border_ob.pal" + +PichuBorderMobileBGPalettes: +INCLUDE "gfx/mobile/pichu_border_bg.pal" + +PichuBorderMobileTilemapAttrmap: +INCBIN "gfx/mobile/pichu_border.tilemap" +INCBIN "gfx/mobile/pichu_border.attrmap" diff --git a/mobile/mobile_45_sprite_engine.asm b/mobile/mobile_45_sprite_engine.asm index fe9b68517..1d7cad672 100644 --- a/mobile/mobile_45_sprite_engine.asm +++ b/mobile/mobile_45_sprite_engine.asm @@ -1,7 +1,7 @@ Function115d99: - ld de, GFX_11601a + ld de, MobileDialingGFX ld hl, vTiles0 tile $60 - lb bc, BANK(GFX_11601a), 20 + lb bc, BANK(MobileDialingGFX), 20 call Get2bpp xor a ld [wc305], a @@ -307,13 +307,13 @@ Unknown_116005: dsprite 2, 0, 0, 0, $62, $01 dsprite 2, 0, 1, 0, $63, $01 -GFX_11601a:: -INCBIN "gfx/unknown/11601a.2bpp" +MobileDialingGFX:: +INCBIN "gfx/mobile/dialing.2bpp" Function11615a: xor a ld [wc30d], a - ld [$c319], a + ld [wc319], a ld [wc310], a ld [wc311], a ld [wc312], a @@ -341,7 +341,7 @@ Function11619d: ld a, [wc30d] and a ret z - ld a, [$c319] + ld a, [wc319] cp $2 jr c, .asm_1161b4 ld a, $a0 @@ -354,7 +354,7 @@ Function11619d: ret Function1161b8: - ld a, [$c319] + ld a, [wc319] ld e, a ld d, 0 ld hl, .Jumptable @@ -381,9 +381,9 @@ Function1161d5: ld a, $6 ldh [rSVBK], a - ld hl, Unknown_117356 + ld hl, PichuBorderMobileTilemapAttrmap ld de, wDecompressScratch - ld bc, $0300 + ld bc, 32 * 12 * 2 call CopyBytes di @@ -479,9 +479,9 @@ Function1161d5: ld [wMusicFadeID], a ld a, d ld [wMusicFadeID + 1], a - ld a, [$c319] + ld a, [wc319] inc a - ld [$c319], a + ld [wc319], a ret MenuHeader_11628c: @@ -492,18 +492,18 @@ MenuHeader_11628c: Function116294: farcall Function170d02 - ld a, [$c319] + ld a, [wc319] inc a - ld [$c319], a + ld [wc319], a ldh a, [rSVBK] push af ld a, $5 ldh [rSVBK], a ld hl, wBGPals1 palette 6 - ld de, $c320 + ld de, wc320 ld bc, 2 palettes call CopyBytes - ld hl, Palette_11734e + ld hl, PichuBorderMobileBGPalettes ld de, wBGPals1 palette 7 ld bc, 1 palettes call CopyBytes @@ -516,14 +516,14 @@ Function116294: Function1162cb: farcall Function170cc6 - ld a, [$c319] + ld a, [wc319] inc a - ld [$c319], a + ld [wc319], a ldh a, [rSVBK] push af ld a, $5 ldh [rSVBK], a - ld hl, Palette_11730e + ld hl, PichuBorderMobileOBPalettes ld de, wOBPals1 + 2 palettes ld bc, 6 palettes call CopyBytes @@ -654,7 +654,7 @@ Function11636e: xor a ld [wMusicFadeID + 1], a xor a - ld [$c319], a + ld [wc319], a ld [wc30d], a ret @@ -711,7 +711,7 @@ Function1163c0: .asm_116439 xor a - ld [$c319], a + ld [wc319], a ld [wc30d], a ret @@ -727,7 +727,7 @@ Function116441: xor a ld [wMusicFadeID + 1], a xor a - ld [$c319], a + ld [wc319], a ld [wc30d], a ret diff --git a/mobile/mobile_5b.asm b/mobile/mobile_5b.asm index fed24a6d4..8fb96d7d8 100644 --- a/mobile/mobile_5b.asm +++ b/mobile/mobile_5b.asm @@ -173,7 +173,7 @@ MobileSystemSplashScreen_InitGFX: .LoadPals: ld de, wBGPals1 - ld hl, UnknownMobilePalettes_16c903 + ld hl, MobileSplashScreenPalettes ld bc, 8 ld a, $5 call FarCopyWRAM @@ -211,8 +211,8 @@ INCBIN "gfx/mobile/mobile_splash.tilemap" .Attrmap: INCBIN "gfx/mobile/mobile_splash.attrmap" -UnknownMobilePalettes_16c903: -INCLUDE "gfx/unknown/16c903.pal" +MobileSplashScreenPalettes: +INCLUDE "gfx/mobile/mobile_splash.pal" Function16c943: ld a, [wd003] @@ -237,7 +237,7 @@ Function16c943: ld e, $0 ld a, $0 .asm_16c969 - ld hl, UnknownMobilePalettes_16c903 + ld hl, MobileSplashScreenPalettes call Function16cab6 call Function16cabb ld d, a @@ -260,7 +260,7 @@ Function16c943: call Function16cadc .asm_16c991 - ld hl, UnknownMobilePalettes_16c903 + ld hl, MobileSplashScreenPalettes call Function16cab6 call Function16cad8 ld d, a @@ -283,7 +283,7 @@ Function16c943: call Function16cb08 .asm_16c9b9 - ld hl, UnknownMobilePalettes_16c903 + ld hl, MobileSplashScreenPalettes call Function16cab6 call Function16cac4 ld d, a @@ -669,8 +669,8 @@ Function16cc02: Function16cc18: ld hl, vTiles1 - ld de, GFX_16cca3 - lb bc, BANK(GFX_16cca3), 46 + ld de, MobileAdapterCheckGFX + lb bc, BANK(MobileAdapterCheckGFX), 46 call Get2bpp ret @@ -754,8 +754,8 @@ Function16cc90: jr nz, .asm_16cc93 ret -GFX_16cca3: -INCBIN "gfx/unknown/16cca3.2bpp" +MobileAdapterCheckGFX: +INCBIN "gfx/mobile/mobile_splash_check.2bpp" Unknown_16cfa3: RGB 31, 31, 31 diff --git a/mobile/mobile_5c.asm b/mobile/mobile_5c.asm index e3a93f107..2e3c5001e 100644 --- a/mobile/mobile_5c.asm +++ b/mobile/mobile_5c.asm @@ -278,9 +278,9 @@ Function170cc6: Function170d02: ld a, $1 ldh [rVBK], a - ld de, GFX_171848 + ld de, PichuBorderMobileGFX ld hl, vTiles0 tile $c1 - lb bc, BANK(GFX_171848), 24 + lb bc, BANK(PichuBorderMobileGFX), 24 call Get2bpp xor a ldh [rVBK], a @@ -292,8 +292,8 @@ INCBIN "gfx/mobile/pichu_animated.2bpp.lz" ElectroBallMobileGFX: INCBIN "gfx/mobile/electro_ball.2bpp.lz" -GFX_171848: -INCBIN "gfx/unknown/171848.2bpp" +PichuBorderMobileGFX: +INCBIN "gfx/mobile/pichu_border.2bpp" Function1719c8: ldh a, [hInMenu] @@ -659,19 +659,19 @@ String_171c73: Function171c87: call DisableLCD - ld hl, GFX_171db1 + ld hl, AsciiFontGFX ld de, vTiles2 tile $00 ld bc, $6e0 call CopyBytes - ld hl, LZ_172abd + ld hl, PasswordSlowpokeLZ ld de, vTiles0 tile $00 call Decompress call EnableLCD - ld hl, Tilemap_172491 + ld hl, PasswordTopTilemap decoord 0, 0 ld bc, $168 call CopyBytes - ld hl, Attrmap_1727ed + ld hl, MobilePasswordAttrmap decoord 0, 0, wAttrmap ld bc, $168 call CopyBytes @@ -688,7 +688,7 @@ Function171ccd: push af ld a, $5 ldh [rSVBK], a - ld hl, Palette_171d71 + ld hl, MobilePasswordPalettes ld de, wBGPals1 ld bc, 8 palettes call CopyBytes @@ -711,8 +711,8 @@ Function171cf0: xor $1 ld [wcd4b], a and a - jr nz, .asm_171d16 - ld hl, Tilemap_17251d + jr nz, .shifted + ld hl, PasswordBottomTilemap decoord 0, 7 ld bc, $8c call CopyBytes @@ -720,8 +720,8 @@ Function171cf0: ld de, String_172e3f jp PlaceString -.asm_171d16 - ld hl, Tilemap_1725f9 +.shifted + ld hl, PasswordShiftTilemap decoord 0, 7 ld bc, $8c call CopyBytes @@ -731,19 +731,19 @@ Function171cf0: Function171d2b: call DisableLCD - ld hl, GFX_171db1 + ld hl, AsciiFontGFX ld de, vTiles2 tile $00 ld bc, $6e0 call CopyBytes - ld hl, LZ_172abd + ld hl, PasswordSlowpokeLZ ld de, vTiles0 tile $00 call Decompress call EnableLCD - ld hl, Tilemap_172685 + ld hl, ChooseMobileCenterTilemap decoord 0, 0 ld bc, $168 call CopyBytes - ld hl, Attrmap_172955 + ld hl, ChooseMobileCenterAttrmap decoord 0, 0, wAttrmap ld bc, $168 call CopyBytes @@ -755,57 +755,31 @@ Function171d2b: call PlaceString ret -Palette_171d71: - RGB 0, 0, 0 - RGB 3, 0, 0 - RGB 5, 0, 0 - RGB 31, 31, 29 - RGB 0, 2, 10 - RGB 2, 10, 21 - RGB 0, 0, 0 - RGB 10, 26, 31 - RGB 0, 0, 0 - RGB 0, 7, 8 - RGB 31, 8, 0 - RGB 1, 17, 15 - RGB 31, 16, 0 - RGB 31, 22, 0 - RGB 31, 27, 0 - RGB 31, 31, 0 - RGB 31, 18, 6 - RGB 0, 3, 0 - RGB 0, 9, 0 - RGB 0, 12, 0 - RGB 0, 16, 0 - RGB 0, 22, 0 - RGB 0, 25, 0 - RGB 0, 27, 0 - RGB 5, 5, 16 - RGB 8, 19, 28 - RGB 0, 0, 0 - RGB 31, 31, 31 - RGB 31, 31, 29 - RGB 21, 21, 20 - RGB 11, 11, 10 - RGB 0, 0, 0 +MobilePasswordPalettes: +INCLUDE "gfx/mobile/mobile_password.pal" -GFX_171db1: +AsciiFontGFX: INCBIN "gfx/mobile/ascii_font.2bpp" -Tilemap_172491: -INCBIN "gfx/unknown/172491.tilemap" -Tilemap_17251d: -INCBIN "gfx/unknown/17251d.tilemap" -Tilemap_1725f9: -INCBIN "gfx/unknown/1725f9.tilemap" -Tilemap_172685: -INCBIN "gfx/unknown/172685.tilemap" -Attrmap_1727ed: -INCBIN "gfx/unknown/1727ed.attrmap" -Attrmap_172955: -INCBIN "gfx/unknown/172955.attrmap" - -LZ_172abd: +PasswordTopTilemap: +INCBIN "gfx/mobile/password_top.tilemap" + +PasswordBottomTilemap: +INCBIN "gfx/mobile/password_bottom.tilemap" + +PasswordShiftTilemap: +INCBIN "gfx/mobile/password_shift.tilemap" + +ChooseMobileCenterTilemap: +INCBIN "gfx/mobile/mobile_center.tilemap" + +MobilePasswordAttrmap: +INCBIN "gfx/mobile/password.attrmap" + +ChooseMobileCenterAttrmap: +INCBIN "gfx/mobile/mobile_center.attrmap" + +PasswordSlowpokeLZ: INCBIN "gfx/pokedex/slowpoke.2bpp.lz" String_172e31: @@ -830,16 +804,16 @@ Function172e78: ld bc, $168 call ByteFill call DisableLCD - ld hl, GameBoyN64GFX + ld hl, Stadium2N64GFX ld de, vTiles2 tile $00 ld bc, $610 call CopyBytes call EnableLCD - ld hl, Tilemap_1733af + ld hl, Stadium2N64Tilemap decoord 0, 0 ld bc, $168 call CopyBytes - ld hl, Attrmap_173517 + ld hl, Stadium2N64Attrmap decoord 0, 0, wAttrmap ld bc, $168 call CopyBytes @@ -897,15 +871,17 @@ Palette_172edf: RGB 0, 0, 0 RGB 0, 0, 0 -GameBoyN64GFX: -INCBIN "gfx/trade/game_boy_n64.2bpp" +Stadium2N64GFX: +INCBIN "gfx/mobile/stadium2_n64.2bpp" -Tilemap_1733af: +Stadium2N64Tilemap: if DEF(_CRYSTAL11) -INCBIN "gfx/unknown/1733af_corrupt.tilemap" +; Crystal 1.1 corrupted this tilemap by treating $0a bytes as Unix newlines, +; and converting them to $0d $0a Windows newlines. +INCBIN "gfx/mobile/stadium2_n64_corrupt.tilemap" else -INCBIN "gfx/unknown/1733af.tilemap" +INCBIN "gfx/mobile/stadium2_n64.tilemap" endc -Attrmap_173517: -INCBIN "gfx/unknown/173517.attrmap" +Stadium2N64Attrmap: +INCBIN "gfx/mobile/stadium2_n64.attrmap" diff --git a/mobile/mobile_5e.asm b/mobile/mobile_5e.asm index a27f74d1a..fc66b0521 100644 --- a/mobile/mobile_5e.asm +++ b/mobile/mobile_5e.asm @@ -1,5 +1,23 @@ -MobileAdapterGFX:: -INCBIN "gfx/mobile/mobile_adapter.2bpp" +MobileCardGFX:: +INCBIN "gfx/mobile/card.2bpp" + +ChrisSilhouetteGFX:: +INCBIN "gfx/mobile/chris_silhouette.2bpp" + +KrisSilhouetteGFX:: +INCBIN "gfx/mobile/kris_silhouette.2bpp" + +MobileCard2GFX:: +INCBIN "gfx/mobile/card_2.2bpp" + +CardLargeSpriteGFX:: +INCBIN "gfx/mobile/card_large_sprite.2bpp" + +CardFolderGFX:: +INCBIN "gfx/mobile/card_folder.2bpp" + +CardSpriteGFX:: +INCBIN "gfx/mobile/card_sprite.2bpp" Function17a68f:: call Function17a6a8 @@ -730,21 +748,21 @@ Function17aba0: ldh [rVBK], a ld hl, vTiles5 tile $00 - ld de, GFX_17afa5 - lb bc, BANK(GFX_17afa5), $80 + ld de, DialpadGFX + lb bc, BANK(DialpadGFX), $80 ; includes first 4 tiles of DialpadCursorGFX call Get2bpp pop af ldh [rVBK], a ld hl, vTiles0 tile $00 - ld de, GFX_17afa5 + $4c0 - lb bc, BANK(GFX_17afa5), 5 + ld de, DialpadCursorGFX + lb bc, BANK(DialpadCursorGFX), 5 call Get2bpp ld hl, vTiles0 tile $05 - ld de, GFX_11601a - lb bc, BANK(GFX_11601a), 4 + ld de, MobileDialingGFX + lb bc, BANK(MobileDialingGFX), 4 call Get2bpp ret @@ -764,7 +782,7 @@ Function17abcf: ld bc, 8 palettes call CopyBytes - ld hl, GFX_17afa5 + $510 + ld hl, Palette_17b4b5 ld de, wOBPals1 palette 1 ld bc, 2 palettes call CopyBytes @@ -789,14 +807,14 @@ Function17ac0c: ret Function17ac1d: - ld hl, Tilemap_17acd5 + ld hl, DialpadTilemap decoord 0, 4 ld bc, (SCREEN_HEIGHT - 4) * SCREEN_WIDTH call CopyBytes ret Function17ac2a: - ld hl, Tilemap_17ae3d + ld hl, DialpadAttrmap decoord 0, 4, wAttrmap ld bc, (SCREEN_HEIGHT - 4) * SCREEN_WIDTH call CopyBytes @@ -905,11 +923,21 @@ Palette_17ac95: RGB 27, 31, 0 RGB 31, 31, 0 -Tilemap_17acd5: -INCBIN "gfx/unknown/17acd5.tilemap" +DialpadTilemap: +INCBIN "gfx/mobile/dialpad.tilemap" + +DialpadAttrmap: +INCBIN "gfx/mobile/dialpad.attrmap" + +DialpadGFX: +INCBIN "gfx/mobile/dialpad.2bpp" + +DialpadCursorGFX: +INCBIN "gfx/mobile/dialpad_cursor.2bpp" -Tilemap_17ae3d: -INCBIN "gfx/unknown/17ae3d.tilemap" +Palette_17b4b5: + RGB 2, 6, 10 + RGB 24, 30, 29 -GFX_17afa5:: -INCBIN "gfx/unknown/17afa5.2bpp" +MobileCardListGFX:: +INCBIN "gfx/mobile/card_list.2bpp" diff --git a/mobile/mobile_5f.asm b/mobile/mobile_5f.asm index 5df8c7a6f..0efaf047d 100644 --- a/mobile/mobile_5f.asm +++ b/mobile/mobile_5f.asm @@ -625,7 +625,7 @@ Function17d370: call CopyBytes xor a ldh [rVBK], a - ld hl, GFX_17eb7e + ld hl, PostalMarkGFX ld de, vTiles2 tile $60 ld bc, 1 tiles call CopyBytes @@ -677,7 +677,7 @@ Function17d405: push af ld a, $5 ldh [rSVBK], a - ld hl, Palette_17eff6 + ld hl, PokemonNewsPalettes ld de, wBGPals1 ld bc, 8 palettes call CopyBytes @@ -712,7 +712,7 @@ Jumptable_17d483: dw Function17e427 Function17d48d: - ld hl, Palette_17eff6 + ld hl, PokemonNewsPalettes ld de, wc608 ld bc, $40 call CopyBytes @@ -2870,9 +2870,9 @@ Function17e2a7: xor a ld [wcf66], a farcall Function118233 - ld de, GFX_17eb7e + ld de, PostalMarkGFX ld hl, vTiles2 tile $60 - lb bc, BANK(GFX_17eb7e), 1 + lb bc, BANK(PostalMarkGFX), 1 call Get2bpp ld a, [wMobileErrorCodeBuffer] and a @@ -3530,45 +3530,14 @@ Function17e6de: PokemonNewsGFX: INCBIN "gfx/mobile/pokemon_news.2bpp" -GFX_17eb7e: -INCBIN "gfx/unknown/17eb7e.2bpp" +PostalMarkGFX: +INCBIN "gfx/font/postal_mark.2bpp" PokemonNewsTileAttrmap: INCBIN "gfx/mobile/pokemon_news.bin" -Palette_17eff6: - RGB 24, 9, 8 - RGB 4, 9, 18 - RGB 18, 18, 12 - RGB 0, 0, 0 - RGB 24, 24, 18 - RGB 18, 18, 12 - RGB 4, 9, 18 - RGB 0, 0, 0 - RGB 31, 31, 31 - RGB 23, 11, 10 - RGB 13, 6, 5 - RGB 0, 0, 0 - RGB 31, 31, 31 - RGB 15, 25, 5 - RGB 10, 20, 0 - RGB 0, 0, 0 - RGB 31, 31, 31 - RGB 20, 28, 20 - RGB 10, 18, 15 - RGB 0, 0, 0 - RGB 31, 31, 31 - RGB 22, 22, 12 - RGB 17, 12, 5 - RGB 0, 0, 0 - RGB 5, 5, 16 - RGB 8, 19, 28 - RGB 0, 0, 0 - RGB 31, 31, 31 - RGB 31, 31, 31 - RGB 27, 24, 0 - RGB 24, 16, 3 - RGB 0, 0, 0 +PokemonNewsPalettes: +INCLUDE "gfx/mobile/pokemon_news.pal" RunMobileScript:: ld a, $6 diff --git a/mobile/mobile_menu.asm b/mobile/mobile_menu.asm index ec6d2b6aa..376260d4d 100644 --- a/mobile/mobile_menu.asm +++ b/mobile/mobile_menu.asm @@ -600,9 +600,9 @@ Function4a449: ret Function4a485: - ld de, GFX_49c0c + ld de, MobileMenuGFX ld hl, vTiles2 tile $00 - lb bc, BANK(GFX_49c0c), 13 + lb bc, BANK(MobileMenuGFX), 13 call Get2bpp ret -- cgit v1.2.3 From 0cce00cb73849dc761bb36b302305c55ff2d54e4 Mon Sep 17 00:00:00 2001 From: Rangi Date: Fri, 28 Feb 2020 11:17:58 -0500 Subject: =?UTF-8?q?Document=20a=20bug=20where=20Teleport=20cannot=20fail?= =?UTF-8?q?=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 -- cgit v1.2.3 From 1d4c1aeef4b18738aae3966846429dae80da731c Mon Sep 17 00:00:00 2001 From: Rangi Date: Fri, 28 Feb 2020 11:51:42 -0500 Subject: '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 -- cgit v1.2.3