From fe33ec1040bd42493b68dbe256a0193f0ed771c9 Mon Sep 17 00:00:00 2001 From: MementoMartha Date: Thu, 29 Sep 2022 17:00:48 +0100 Subject: [PATCH] Electivire & Magmortar! --- constants/pokedex_constants.asm | 10 ++++++++ constants/pokemon_constants.asm | 12 +++++----- data/pokemon/base_stats.asm | 2 ++ data/pokemon/base_stats/electivire.asm | 27 +++++++++++++++++++++ data/pokemon/base_stats/magmortar.asm | 26 +++++++++++++++++++++ data/pokemon/cries.asm | 4 ++-- data/pokemon/dex_entries.asm | 16 +++++++++++++ data/pokemon/dex_order.asm | 2 ++ data/pokemon/evos_moves.asm | 31 +++++++++++++++++++++++-- data/pokemon/menu_icons.asm | 2 ++ data/pokemon/names.asm | 2 ++ data/pokemon/palettes.asm | 2 ++ data/sgb/sgb_palettes.asm | 8 +++---- data/trainers/parties.asm | 6 ++--- engine/debug/debug_party.asm | 14 +++++------ gfx/pics.asm | 18 ++++++++------ gfx/pokemon/back/electivireb.png | Bin 0 -> 576 bytes gfx/pokemon/back/magmortarb.png | Bin 0 -> 613 bytes gfx/pokemon/front/electivire.png | Bin 0 -> 893 bytes gfx/pokemon/front/magmortar.png | Bin 0 -> 1005 bytes gfx/slots/slots_1.png | Bin 469 -> 478 bytes gfx/slots/slots_2.png | Bin 314 -> 379 bytes 22 files changed, 151 insertions(+), 31 deletions(-) create mode 100644 data/pokemon/base_stats/electivire.asm create mode 100644 data/pokemon/base_stats/magmortar.asm create mode 100644 gfx/pokemon/back/electivireb.png create mode 100644 gfx/pokemon/back/magmortarb.png create mode 100644 gfx/pokemon/front/electivire.png create mode 100644 gfx/pokemon/front/magmortar.png diff --git a/constants/pokedex_constants.asm b/constants/pokedex_constants.asm index 4c82a74c..67b8ba56 100644 --- a/constants/pokedex_constants.asm +++ b/constants/pokedex_constants.asm @@ -55,6 +55,7 @@ const DEX_GLOOM ; 44 const DEX_VILEPLUME ; 45 const DEX_BELLOSSOM + ; const DEX_PARA const DEX_PARAS ; 46 const DEX_PARASECT ; 47 const DEX_VENONAT ; 48 @@ -68,6 +69,7 @@ const DEX_KONYA const DEX_MEOWTH ; 52 const DEX_PERSIAN ; 53 + ; const DEX_PERRSERKER const DEX_PSYDUCK ; 54 const DEX_WEIRDUCK const DEX_GOLDUCK ; 55 @@ -106,15 +108,19 @@ const DEX_MAGNEMITE ; 81 const DEX_MAGNETITE const DEX_MAGNETON ; 82 + ; const DEX_MAGNEZONE const DEX_BARUNDA const DEX_FARFETCHD ; 83 const DEX_MADAAMU + ; const DEX_SIRFETCHD const DEX_BLASTYKE const DEX_BLASTOISE + ; const DEX_HINAAZU const DEX_DODUO ; 84 const DEX_DODRIO ; 85 const DEX_SEEL ; 86 const DEX_DEWGONG ; 87 + ; const DEX_BETOBEBII const DEX_GRIMER ; 88 const DEX_MUK ; 89 const DEX_SHELLDER ; 90 @@ -173,6 +179,7 @@ const DEX_STARMIE ; 121 const DEX_JAGG const DEX_MR_MIME ; 122 + ; const DEX_MR_RIME const DEX_SCYTHER ; 123 const DEX_SCIZOR const DEX_KLEAVOR @@ -181,7 +188,9 @@ const DEX_JYNX ; 124 const DEX_BUU const DEX_ELECTABUZZ ; 125 + const DEX_ELECTIVIRE const DEX_MAGMAR ; 126 + const DEX_MAGMORTAR const DEX_TRAMPEL ; const DEX_TAUROS ; 128 const DEX_MAGIKARP ; 129 @@ -200,6 +209,7 @@ const DEX_SYLVEON const DEX_PORYGON ; 137 const DEX_PORYGON2 + ; const DEX_PORYGONZ const DEX_OMANYTE ; 138 const DEX_OMASTAR ; 139 const DEX_KABUTO ; 140 diff --git a/constants/pokemon_constants.asm b/constants/pokemon_constants.asm index e9f08dcd..c9101521 100644 --- a/constants/pokemon_constants.asm +++ b/constants/pokemon_constants.asm @@ -220,12 +220,12 @@ const KINGDRA ; $D3 const POLITOED ; $D4 const SLOWKING ; $D5 - ; const PARA ; $D6 - ; const HINAAZU ; $D7 - ; const BETOBEBII ; $D8 - ; const MAGNEZONE ; $D9 - ; const ELECTIVIRE ; $DA - ; const MAGMORTAR ; $DB + const ELECTIVIRE ; $D6 + const MAGMORTAR ; $D7 + ; const PARA ; $D8 + ; const HINAAZU ; $D9 + ; const BETOBEBII ; $DA + ; const MAGNEZONE ; $DB ; const PORYGONZ ; $DC ; const PERRSERKER ; $DD ; const SIRFETCHD ; $DE diff --git a/data/pokemon/base_stats.asm b/data/pokemon/base_stats.asm index 07b6e058..7afae4d6 100644 --- a/data/pokemon/base_stats.asm +++ b/data/pokemon/base_stats.asm @@ -177,7 +177,9 @@ INCLUDE "data/pokemon/base_stats/purakkusu.asm" INCLUDE "data/pokemon/base_stats/jynx.asm" INCLUDE "data/pokemon/base_stats/buu.asm" INCLUDE "data/pokemon/base_stats/electabuzz.asm" +INCLUDE "data/pokemon/base_stats/electivire.asm" INCLUDE "data/pokemon/base_stats/magmar.asm" +INCLUDE "data/pokemon/base_stats/magmortar.asm" INCLUDE "data/pokemon/base_stats/trampel.asm" INCLUDE "data/pokemon/base_stats/tauros.asm" INCLUDE "data/pokemon/base_stats/magikarp.asm" diff --git a/data/pokemon/base_stats/electivire.asm b/data/pokemon/base_stats/electivire.asm new file mode 100644 index 00000000..91e10602 --- /dev/null +++ b/data/pokemon/base_stats/electivire.asm @@ -0,0 +1,27 @@ + db DEX_ELECTIVIRE ; pokedex id + + db 75, 123, 67, 95, 85 + ; hp atk def spd spc + + db ELECTRIC, ELECTRIC ; type + db 30 ; catch rate + db 199 ; base exp + + INCBIN "gfx/pokemon/front/electivire.pic", 0, 1 ; sprite dimensions + dw ElectivirePicFront, ElectivirePicBack + + db QUICK_ATTACK, LEER, NO_MOVE, NO_MOVE ; level 1 learnset + db GROWTH_MEDIUM_FAST ; growth rate + + ; tm/hm learnset + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, HYPER_BEAM, SUBMISSION, COUNTER, SEISMIC_TOSS, \ + RAGE, THUNDERBOLT, THUNDER, EARTHQUAKE, FISSURE, \ + PSYCHIC_M, TELEPORT, MIMIC, DOUBLE_TEAM, REFLECT, \ + BIDE, METRONOME, SWIFT, SKULL_BASH, REST, \ + THUNDER_WAVE, PSYWAVE, ROCK_SLIDE, SUBSTITUTE, STRENGTH, \ + FLASH + ; end + + db BANK(ElectivirePicFront) + assert BANK(ElectivirePicFront) == BANK(ElectivirePicBack) diff --git a/data/pokemon/base_stats/magmortar.asm b/data/pokemon/base_stats/magmortar.asm new file mode 100644 index 00000000..95b8f7cb --- /dev/null +++ b/data/pokemon/base_stats/magmortar.asm @@ -0,0 +1,26 @@ + db DEX_MAGMORTAR ; pokedex id + + db 75, 95, 67, 83, 125 + ; hp atk def spd spc + + db FIRE, FIRE ; type + db 30 ; catch rate + db 199 ; base exp + + INCBIN "gfx/pokemon/front/magmortar.pic", 0, 1 ; sprite dimensions + dw MagmortarPicFront, MagmortarPicBack + + db EMBER, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset + db GROWTH_MEDIUM_FAST ; growth rate + + ; tm/hm learnset + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, HYPER_BEAM, SUBMISSION, COUNTER, SEISMIC_TOSS, \ + RAGE, THUNDERBOLT, THUNDER, EARTHQUAKE, FISSURE, \ + PSYCHIC_M, TELEPORT, MIMIC, DOUBLE_TEAM, BIDE, \ + METRONOME, FIRE_BLAST, SKULL_BASH, REST, PSYWAVE, \ + ROCK_SLIDE, SUBSTITUTE, STRENGTH + ; end + + db BANK(MagmortarPicFront) + assert BANK(MagmortarPicFront) == BANK(MagmortarPicBack) diff --git a/data/pokemon/cries.asm b/data/pokemon/cries.asm index c26adfc6..f365a2d6 100644 --- a/data/pokemon/cries.asm +++ b/data/pokemon/cries.asm @@ -219,12 +219,12 @@ CryData:: mon_cry SFX_CRY_00, $00, $00 ; Kingdra mon_cry SFX_CRY_00, $00, $00 ; Politoed mon_cry SFX_CRY_00, $00, $00 ; Slowking + mon_cry SFX_CRY_00, $00, $00 ; Electivire + mon_cry SFX_CRY_00, $00, $00 ; Magmortar ; mon_cry SFX_CRY_1E, $79, $40 ; Para ; mon_cry SFX_CRY_00, $00, $00 ; Hinaazu ; mon_cry SFX_CRY_05, $FF, $40 ; Betobebii ; mon_cry SFX_CRY_00, $00, $00 ; Magnezone - ; mon_cry SFX_CRY_00, $00, $00 ; Electivire - ; mon_cry SFX_CRY_00, $00, $00 ; Magmortar ; mon_cry SFX_CRY_00, $00, $00 ; Porygon-Z ; mon_cry SFX_CRY_00, $00, $00 ; Perrserker ; mon_cry SFX_CRY_00, $00, $00 ; Sirfetch'd diff --git a/data/pokemon/dex_entries.asm b/data/pokemon/dex_entries.asm index 229cf15e..92835948 100644 --- a/data/pokemon/dex_entries.asm +++ b/data/pokemon/dex_entries.asm @@ -213,6 +213,8 @@ PokedexEntryPointers: dw KingdraDexEntry dw PolitoedDexEntry dw SlowkingDexEntry + dw ElectivireDexEntry + dw MagmortarDexEntry assert_table_length NUM_POKEMON_INDEXES ; string: species name @@ -1696,4 +1698,18 @@ SlowkingDexEntry: dw 1750 text_far _SlowkingDexEntry text_end + +ElectivireDexEntry: + db "THUNDER@" + db 5,11 + dw 3060 + text_far _ElectivireDexEntry + text_end + +MagmortarDexEntry: + db "BLAST@" + db 5,3 + dw 1500 + text_far _MagmortarDexEntry + text_end \ No newline at end of file diff --git a/data/pokemon/dex_order.asm b/data/pokemon/dex_order.asm index bf04c73f..3d741cec 100644 --- a/data/pokemon/dex_order.asm +++ b/data/pokemon/dex_order.asm @@ -213,4 +213,6 @@ PokedexOrder: db DEX_KINGDRA db DEX_POLITOED db DEX_SLOWKING + db DEX_ELECTIVIRE + db DEX_MAGMORTAR assert_table_length NUM_POKEMON_INDEXES diff --git a/data/pokemon/evos_moves.asm b/data/pokemon/evos_moves.asm index 1b564638..b4e3b0f8 100644 --- a/data/pokemon/evos_moves.asm +++ b/data/pokemon/evos_moves.asm @@ -216,6 +216,8 @@ EvosMovesPointerTable: dw KingdraEvosMoves dw PolitoedEvosMoves dw SlowkingEvosMoves + dw ElectivireEvosMoves + dw MagmortarEvosMoves assert_table_length NUM_POKEMON_INDEXES RhydonEvosMoves: @@ -820,7 +822,7 @@ BarundaEvosMoves: MagmarEvosMoves: ; Evolutions - ;db EV_ITEM, FIRE_STONE, 1, MAGMORTAR + db EV_ITEM, FIRE_STONE, 1, MAGMORTAR db 0 ; Learnset db 36, LEER @@ -844,7 +846,7 @@ BuuEvosMoves: ElectabuzzEvosMoves: ; Evolutions - ;db EV_ITEM, THUNDER_STONE, 1, ELECTIVIRE + db EV_ITEM, THUNDER_STONE, 1, ELECTIVIRE db 0 ; Learnset db 34, THUNDERSHOCK @@ -2740,3 +2742,28 @@ SlowkingEvosMoves: db 44, AMNESIA db 55, PSYCHIC_M db 0 + +ElectivireEvosMoves: +; Evolutions + db 0 +; Learnset + db 34, THUNDERSHOCK + db 37, SCREECH + db 42, THUNDERPUNCH + db 49, LIGHT_SCREEN + db 54, THUNDER + db 58, LOW_KICK + db 0 + +MagmortarEvosMoves: +; Evolutions + db 0 +; Learnset + db 36, LEER + db 39, CONFUSE_RAY + db 43, FIRE_PUNCH + db 48, SMOKESCREEN + db 52, SMOG + db 55, FLAMETHROWER + db 0 + \ No newline at end of file diff --git a/data/pokemon/menu_icons.asm b/data/pokemon/menu_icons.asm index f5d9aae1..159ae322 100644 --- a/data/pokemon/menu_icons.asm +++ b/data/pokemon/menu_icons.asm @@ -177,7 +177,9 @@ MonPartyData: nybble ICON_MON ; Jynx nybble ICON_MON ; Buu nybble ICON_MON ; Electabuzz + nybble ICON_MON ; Electivire nybble ICON_MON ; Magmar + nybble ICON_MON ; Magmortar nybble ICON_MON ; Trampel nybble ICON_QUADRUPED ; Tauros nybble ICON_WATER ; Magikarp diff --git a/data/pokemon/names.asm b/data/pokemon/names.asm index d609271f..7a352ca0 100644 --- a/data/pokemon/names.asm +++ b/data/pokemon/names.asm @@ -213,5 +213,7 @@ MonsterNames:: db "KINGDRA@@@" db "POLITOED@@" db "SLOWKING@@" + db "ELECTIVIRE" + db "MAGMORTAR@" assert_table_length NUM_POKEMON_INDEXES diff --git a/data/pokemon/palettes.asm b/data/pokemon/palettes.asm index 2d97e37a..75ac3ba6 100644 --- a/data/pokemon/palettes.asm +++ b/data/pokemon/palettes.asm @@ -178,7 +178,9 @@ MonsterPalettes: db PAL_REDBAR ; JYNX db PAL_BLUEMON ; BUU db PAL_YELLOWMON ; ELECTABUZZ + db PAL_YELLOWMON ; ELECTIVIRE db PAL_REDMON ; MAGMAR + db PAL_REDMON ; MAGMORTAR db PAL_GREYMON ; TRAMPEL db PAL_BROWNMON ; TAUROS db PAL_REDMON ; MAGIKARP diff --git a/data/sgb/sgb_palettes.asm b/data/sgb/sgb_palettes.asm index 601ca613..0748f0f6 100644 --- a/data/sgb/sgb_palettes.asm +++ b/data/sgb/sgb_palettes.asm @@ -27,10 +27,10 @@ SuperPalettes: RGB 31,31,31, 31,15,18, 31,00,06, 03,03,03 ; PAL_PINKMON RGB 31,31,31, 31,31,00, 28,14,00, 03,03,03 ; PAL_YELLOWMON RGB 31,31,31, 18,18,19, 10,10,10, 03,03,03 ; PAL_GREYMON - RGB 31,31,31, 21,12,15, 21,14,00, 03,03,03 ; PAL_SLOTS1 - RGB 31,31,31, 31,31,00, 09,05,30, 03,03,03 ; PAL_SLOTS2 - RGB 31,31,31, 03,31,09, 09,05,30, 03,03,03 ; PAL_SLOTS3 - RGB 31,31,31, 20,08,15, 09,05,30, 03,03,03 ; PAL_SLOTS4 + RGB 31,31,31, 25,01,31, 31,00,00, 03,03,03 ; PAL_SLOTS1 + RGB 31,31,31, 31,04,19, 31,31,00, 03,03,03 ; PAL_SLOTS2 + RGB 31,31,31, 08,31,00, 31,31,00, 03,03,03 ; PAL_SLOTS3 + RGB 31,31,31, 00,31,31, 31,31,00, 03,03,03 ; PAL_SLOTS4 RGB 31,31,31, 03,03,03, 03,03,03, 03,03,03 ; PAL_BLACK RGB 31,31,31, 31,31,00, 00,31,00, 03,03,03 ; PAL_GREENBAR RGB 31,31,31, 31,31,00, 31,18,00, 03,03,03 ; PAL_YELLOWBAR diff --git a/data/trainers/parties.asm b/data/trainers/parties.asm index ffcd490f..3521ca74 100644 --- a/data/trainers/parties.asm +++ b/data/trainers/parties.asm @@ -653,7 +653,7 @@ MistyData: LtSurgeData: db $FF, 22, VOLTORB, 21, GAOTORA, 22, MAGNEMITE, 23, ELECTABUZZ, 24, GOROCHU, 0 ; post-game rematch team (currently unused) - ; db $FF, 66, ELECTABUZZ, 67, GOROTORA, 67, ELECTRODE, 66, JOLTEON, 67, GOROCHU, 70, ZAPDOS, 0 + ; db $FF, 66, ELECTRODE, 67, GOROTORA, 67, ELECTIVIRE, 66, JOLTEON, 67, GOROCHU, 70, ZAPDOS, 0 ErikaData: db $FF, 28, WEEPINBELL, 28, GLOOM, 29, CACTUS, 28, PARASECT, 31, TANGROWTH, 0 @@ -666,9 +666,9 @@ KogaData: ; db $FF, 66, TENTACRUEL, 67, MUK, 67, WEEZING, 66, VENOMOTH, 67, TSUBOMITTO, 70, CROBAT, 0 BlaineData: - db $FF, 45, MAGMAR, 44, NINETALES, 45, RAPIDASH, 44, FLAREON, 47, ARCANINE, 0 + db $FF, 45, RAPIDASH, 44, NINETALES, 45, ARCANINE, 44, FLAREON, 47, MAGMORTAR, 0 ; post-game rematch team (currently unused) - ; db $FF, 66, MAGMAR, 67, NINETALES, 67, RAPIDASH, 66, FLAREON, 67, ARCANINE, 70, MOLTRES, 0 + ; db $FF, 66, NINETALES, 67, ARCANINE, 67, RAPIDASH, 66, FLAREON, 67, MAGMORTAR, 70, MOLTRES, 0 SabrinaData: db $FF, 39, JYNX, 40, MR_MIME, 39, SLOWKING, 40, HYPNO, 43, ALAKAZAM, 0 diff --git a/engine/debug/debug_party.asm b/engine/debug/debug_party.asm index 1d74a562..ecf1d89b 100644 --- a/engine/debug/debug_party.asm +++ b/engine/debug/debug_party.asm @@ -21,17 +21,17 @@ SetIshiharaTeam: jr .loop IshiharaTeam: - db CROBAT, 90 + db KINGDRA, 90 IF DEF(_DEBUG) - db BLISSEY, 5 + db ANIMON, 50 ELSE - db BLISSEY, 20 + db ANIMON, 20 ENDC - db HITMONTOP, 56 - db TSUBOMITTO, 56 - db STEELIX, 57 + db MAGMORTAR, 56 + db ELECTIVIRE, 56 + db PORYGON2, 57 IF DEF(_DEBUG) - db KADABRA, 16 ; to test trade evos @ celadon uni - PvK + db POLIWHIRL, 16 ; to test trade evos @ celadon uni - PvK ENDC db -1 ; end diff --git a/gfx/pics.asm b/gfx/pics.asm index dbb1db82..7efb6992 100644 --- a/gfx/pics.asm +++ b/gfx/pics.asm @@ -464,9 +464,9 @@ RhyperiorPicBack:: INCBIN "gfx/pokemon/back/rhyperiorb.pic" KleavorPicFront:: INCBIN "gfx/pokemon/front/kleavor.pic" KleavorPicBack:: INCBIN "gfx/pokemon/back/kleavorb.pic" -FossilKabutopsPic:: INCBIN "gfx/pokemon/front/fossilkabutops.pic" -FossilAerodactylPic:: INCBIN "gfx/pokemon/front/fossilaerodactyl.pic" -GhostPic:: INCBIN "gfx/battle/ghost.pic" +FossilKabutopsPic:: INCBIN "gfx/pokemon/front/fossilkabutops.pic" +FossilAerodactylPic:: INCBIN "gfx/pokemon/front/fossilaerodactyl.pic" +GhostPic:: INCBIN "gfx/battle/ghost.pic" SECTION "Pics 9", ROMX @@ -494,11 +494,15 @@ AnimonPicFront:: INCBIN "gfx/pokemon/front/animon.pic" AnimonPicBack:: INCBIN "gfx/pokemon/back/animonb.pic" BellossomPicFront:: INCBIN "gfx/pokemon/front/bellossom.pic" BellossomPicBack:: INCBIN "gfx/pokemon/back/bellossomb.pic" -Porygon2PicFront:: INCBIN "gfx/pokemon/front/porygon2.pic" -Porygon2PicBack:: INCBIN "gfx/pokemon/back/porygon2b.pic" -KingdraPicFront:: INCBIN "gfx/pokemon/front/kingdra.pic" -KingdraPicBack:: INCBIN "gfx/pokemon/back/kingdrab.pic" +Porygon2PicFront:: INCBIN "gfx/pokemon/front/porygon2.pic" +Porygon2PicBack:: INCBIN "gfx/pokemon/back/porygon2b.pic" +KingdraPicFront:: INCBIN "gfx/pokemon/front/kingdra.pic" +KingdraPicBack:: INCBIN "gfx/pokemon/back/kingdrab.pic" PolitoedPicFront:: INCBIN "gfx/pokemon/front/politoed.pic" PolitoedPicBack:: INCBIN "gfx/pokemon/back/politoedb.pic" SlowkingPicFront:: INCBIN "gfx/pokemon/front/slowking.pic" SlowkingPicBack:: INCBIN "gfx/pokemon/back/slowkingb.pic" +ElectivirePicFront:: INCBIN "gfx/pokemon/front/electivire.pic" +ElectivirePicBack:: INCBIN "gfx/pokemon/back/electivireb.pic" +MagmortarPicFront:: INCBIN "gfx/pokemon/front/magmortar.pic" +MagmortarPicBack:: INCBIN "gfx/pokemon/back/magmortarb.pic" diff --git a/gfx/pokemon/back/electivireb.png b/gfx/pokemon/back/electivireb.png new file mode 100644 index 0000000000000000000000000000000000000000..a4addeac048ff6ee5fb37ecdcba9f1d6ba346da8 GIT binary patch literal 576 zcmeAS@N?(olHy`uVBq!ia0vp^3Lwk`Bp75C+I9jdmUKs7M+SzC{oH>NSwWJ?9znhg z3{`3j3=J&|48MRv4KElNN(~qoUL`OvSj}Ky5HFasE6@fg!Ib3f?!v%q+)~s54nJ@ErkR#;MwT(m+A>5>H=O_Gg^3d@4MFS@zvPA;$b7zYxari^^vKIjSYD5hW>! zC8<`)MX5lF!N|bKNY}tp*T^!&(8S8v%*xP6+rYrez#x6Q!g3T1x%nxXX_Z(s7(z6t zGc~mVHAJOGc&7RKGH3zW91N_CLJZ7679$WcFiJ6iybNS9cri-D*+GmNP&L4SViHEE z2dV=B4w#FvQbJn+kNvBWkp5CXX@DupHKcweD(jrr=Ovr zH|*^7x{f?7UXsxvsu?NSce~t@Q!?mAamwi{va_~lt5geV$ZCX~N%-Enx2>v;L+6$T zhYE}EtmhrY8Jf&nxtkgr!kGLGg}$gB=WgV7nI|aH?6twgl6mh#iH+*I!OlnYoR6D! h9J{D*@&B*9-KD#0_Qp#l-2(cB!PC{xWt~$(69BNzn{@yH literal 0 HcmV?d00001 diff --git a/gfx/pokemon/back/magmortarb.png b/gfx/pokemon/back/magmortarb.png new file mode 100644 index 0000000000000000000000000000000000000000..be4ec631493bf39c49477565f20af99256ec4149 GIT binary patch literal 613 zcmeAS@N?(olHy`uVBq!ia0vp^3Lwk`Bp75C+I9jdmUKs7M+SzC{oH>NSwWJ?9znhg z3{`3j3=J&|48MRv4KElNN(~qoUL`OvSj}Ky5HFasE6@fg!Ib3f?!v%q+)~s54nJ@ErkR#;MwT(m+A>5>H=O_Gg^3e5!)l! zC8<`)MX5lF!N|bKNY}tp*T^!&(8S8v%*w=E+rYrez@RptF$G0KZhlH;S|t_@W)Kal zTsP$aHAJOGc&7RKGH3zW91N_CLJZ7679$WcFiJ6iybNS9cri-D*+GmNP&L4SViHEE z2dV=B4%;PLwrFS7c`T)~~h%aTrhkgW*&YxFa%tZjyWNNQS=*{j7Z zZ*Qs8YZyLFn=`#4+5bpv%Dl+S3yyGWO=Z2XsgtA1=lPu#kt{d%1Qd%)?zUO6kN?lf zt{yc9#o9t=ww{asX8c_L_v4h6x^p%dvRes$U|nLWZd0T5XR)S@-o|6!JMTCx`jp+- zBa?Wp?}h#0NS%G|oWRD45bDP46hOx7_4S6Fo+k-*%fF5lweBoc6VW5Hf|~E0P;8s zJR*x382FBWFymBhK53vJdx@v7EBiA}S$-YaPY3_I0fiXzi~K?u&o3&U1>~rfxJHzu zB$lLFB^RXvDF!10BO_e{OI;(&5JOWd6B8>Vb8Q0yD+2@X2$35o8glbfGSez?Yp`Nn zlLFKbl^Wrh=IhI#1!QwDurdlUFauePK*+!-#Q^d$kj3D|C=F)^F={~700W9i7@;1h z4g@@a7^DYG%Ljco0doI(x;TbtoDaQhn}5qeg8jq)M(1Gt2~JC{a0jZN3VF(XBlJ*! zSjK^%*(-w1>8-qSe!|jV1CNP|7GJlve)e?P zZ_jHlD}PESJyh8B$3ySKCd>1jb0ocm?>tFln=|9iUh52LkxThS->>IYo)_l-A|IQ( zx9)Y@o+FMWd&|?j?ifjR)wVNL>_WRCD>XK&7maoW)izvMM;8@qx^@|NxO*|a(dr#{bZMXC%DWdL0 zOZ)?@mCYko#Iq)qKA!T6v3;uH1C^LhOsgs%3f~JhzxB^DOmO~3G4Ir~GbY_PzMYhJ z#QN3g=h}kqS8n_0E>-?@<>J3ffkzbgPMou>@Amsk$3tcNS%G|oWRD45bDP46hOx7_4S6Fo+k-*%fF5lweBoc6VW5Hf|~E0P;8s zJR*x382FBWFymBhK53vJdx@v7EBiA}Sw0n>z%2W2pb%qzkzWYo`9sBK_iWnd5%Z)Js|AvZrIGp!Q026d*U zHlT*6)CkWsUtb0-Ae)1Ml~IU+8OUM;LIy@D29TG5ECw$|X*fHGQ3I+57*I^Y2=zd9 zAm9PSAU$AOKIpp%P*tv{i(`n!dE3i-^DjGyFnn;o+!5q@<8MJ*o+wYQ_=;Vj6W@e% zYPEWlO{!j5(9Y9wl;;n#hiAJ^@2j{~+&z=>xsB^iG-lyk>zFa&0)t0$Ta5ht4X1Cpn``&?F zJa&(IPP|zAHH251sb)&cJVrOEvmMuDwu*fUp5V6g83XT*%d^b63|fnt%@-U>$==5h zka+Ri`tk>xrk_2UlHOC3ds+`U&%vbbqfly>*KkdmrxH{Kf4+ z{yDuHtItlazxXnTdxzVzb?sjt@^7(zzj)W0+dMtHkGw5sHxgf68T+>ViPi6Qb0SY? z>{NHs*}3KZR2h~Xe>{X_`^}$ToSU>z|48;e$dwF@nCY4BL!C8)-CoZdW3x4g0of50(w)0VVr_GkmZ(UwB>$Q%o zb_ogWf6RAE?qtRG8Im7aW;(aDPPK?=F;IJc?8>PXcf$?WPANM5@#rq@l~3&W9V8c+ zHni}FBx?L$=~{Tmd{WF=ss4_wEtQqJE(fj%{*CdqYbi)`^XF=m6Tk4EQF7n$*qb5A QnV{6@>FVdQ&MBb@03WG+umAu6 literal 0 HcmV?d00001 diff --git a/gfx/slots/slots_1.png b/gfx/slots/slots_1.png index ea4cf0bddd2f0d2ccc9f9263fa8c892950509996..cee209f5488602abf31cf441338b9898ed74176a 100644 GIT binary patch delta 452 zcmV;#0XzQH1KtCWB!8tzL_t(|+I^9+Yui8+#$Rm&;RqNH+Ks`)Xv`P_u1Tg0MacSu z>3@(6`5T0bAh@NQlJ!a`sOLaQRxQrp#Y@)A9SsqNtbxmWrzvUG4<3hfzx&?%?kG>H z%DfX;pNzQ$=#YS`@-HCvF)?OEbSS{-Q?a8c)oG9x!@kxRt$(n+^uo=;v$nHk;4;xg zU(I^j%z797S#Pc;56`PfaI@Mh(iWWozZjr5z`@N*ptQAFP<{#MLOF+2%Q{zLFKs$o zYw7$HD0cch13T!s(nX+TKpB)rBr30f_bKX#9CFJAd|3k5YfgT<_sEv4KY8*Uh<`YU zsIyDdX6Wc%0Dp0~%agD0;tZh&vUc<$1^yBMA3q=*OnE!S;Gc!kLF9*s ze;c3DmN8n@_b))Kv^#m?qXr~vdu=VZbATR9m9!bMXQXr{&q1R#(b0VkM0t{lTTuM` z9PNM0hc!U zI=1LopmqL>7k{E{FhCC!nTCld%<^SFO)0=%?CAsaI*hinf{^lKZwQ>VcgA4@Kt$VY zOa^2!81#X&#ui$WvJVV1jV#-6iz5AO@Him904UA^z)sZ-Rx9^k?`dizM(xG?kO466 zR^tJXs?)9sB6e-?VU?2lWPt!M_{vyT2*5I|U>jk89W=q<(uDz*{d4I;EefXV@+pJ> lJe=v&vO)na*DWQ(fNw~QwPKyZd6NJD002ovPDHLkV1k*o&LIE* diff --git a/gfx/slots/slots_2.png b/gfx/slots/slots_2.png index ee8c688e4cdf951a76b6c1d54a7453fd2dc070cc..b4bdf8a8bf0ea20259507ca43ff9a7089eb7fb7c 100644 GIT binary patch delta 352 zcmV-m0iXW50{a4xB!5ClL_t(|+AWSTOT$1IhF^P#Ab|{;U(iJyY%#bMPSD9Eh2+Gg zlYgXi6d}LC1|dXn7N<%KwM95^>ThtmTpT(aeBPZNeDK`+@w|K>lM#hPa9|P#ZA$Gq zU?HJKhz!(liiAi(?{<$}3kPIhl)$MLIEJzd9D)aNAOHbdv44{R5yn<=1NU<&+@6Ce zIAd6Mfd~E>E3}t~iSJp8v(&JEXtN+hBcgOEh7xTSB}>613|sJKOtIJ7g#Cd+9b-M% z7QW|WuY0000n6-4$j z(7&R16*@gSgfs}RORHKMT)bl`aQcIdgVhQ=ZJZuI>j3WsfD@$BeOfvM?H6d;W49YE z0L8cfAK7mX32)1BaCC=?|iu0l<(`(b6);)ZGY;7vT1|lr}gD6p={Ig z@`}(@aOuf&x0gi?$cQt@@kjaSslQ3U`1002ovPDHLkV1m!Zg}nd(