From c939b46740d90aff9a9bf634b50127102a2eed3b Mon Sep 17 00:00:00 2001 From: Martha Schilling Date: Fri, 9 Jun 2023 14:58:59 +0100 Subject: [PATCH] Custom palette for Game Corner, slight early game rebalance I did these a few days ago and forgot to push the commit lol - Gives the Game Corner and the prize building a new palette - Makes encounter levels a bit more consistent in the early game, as well as spreading out species a bit more evenly --- constants/palette_constants.asm | 1 + data/sgb/sgb_palettes.asm | 1 + data/wild/maps/MtMoon1F.asm | 6 +++--- data/wild/maps/MtMoonB1F.asm | 8 ++++---- data/wild/maps/MtMoonB2F.asm | 4 ++-- data/wild/maps/Route1.asm | 10 +++++----- data/wild/maps/Route2.asm | 12 ++++++------ data/wild/maps/Route24.asm | 12 ++++++------ data/wild/maps/Route25.asm | 16 ++++++++-------- data/wild/maps/Route3.asm | 14 +++++++------- data/wild/maps/Route4.asm | 17 ++++++++--------- data/wild/maps/ViridianForest.asm | 12 ++++++------ engine/gfx/palettes.asm | 19 +++++++++++++------ gfx/sprites/arbok.png | Bin 426 -> 557 bytes 14 files changed, 70 insertions(+), 62 deletions(-) diff --git a/constants/palette_constants.asm b/constants/palette_constants.asm index c012a9b7..6aa99f77 100644 --- a/constants/palette_constants.asm +++ b/constants/palette_constants.asm @@ -76,4 +76,5 @@ DEF SET_PAL_DEFAULT EQU $ff const PAL_GARNET ; $28 const PAL_BRUNSWICK ; $29 const PAL_VOLCANO ; $2A + const PAL_CASINO ; $2B DEF NUM_SGB_PALS EQU const_value diff --git a/data/sgb/sgb_palettes.asm b/data/sgb/sgb_palettes.asm index a067bb6d..e7fd5317 100644 --- a/data/sgb/sgb_palettes.asm +++ b/data/sgb/sgb_palettes.asm @@ -44,4 +44,5 @@ SuperPalettes: RGB 31,31,31, 31,06,08, 18,04,06, 03,03,03 ; PAL_GARNET RGB 31,31,31, 01,20,03, 11,23,31, 03,03,03 ; PAL_BRUNSWICK RGB 31,31,31, 30,10,02, 28,00,00, 03,03,03 ; PAL_VOLCANO + RGB 31,31,31, 28,13,30, 25,05,10, 03,03,03 ; PAL_CASINO assert_table_length NUM_SGB_PALS diff --git a/data/wild/maps/MtMoon1F.asm b/data/wild/maps/MtMoon1F.asm index 403094db..ba5dfa50 100644 --- a/data/wild/maps/MtMoon1F.asm +++ b/data/wild/maps/MtMoon1F.asm @@ -5,10 +5,10 @@ MtMoon1FWildMons: db 9, BITTYBAT db 8, GEODUDE db 6, BITTYBAT - db 10, SANDSHREW - db 10, GEODUDE + db 9, SANDSHREW + db 9, GEODUDE db 8, PARAS - db 11, BITTYBAT + db 10, BITTYBAT db 8, CLEFAIRY end_grass_wildmons diff --git a/data/wild/maps/MtMoonB1F.asm b/data/wild/maps/MtMoonB1F.asm index 9bf56d53..f8b661cb 100644 --- a/data/wild/maps/MtMoonB1F.asm +++ b/data/wild/maps/MtMoonB1F.asm @@ -1,15 +1,15 @@ MtMoonB1FWildMons: def_grass_wildmons 10 ; encounter rate db 8, BITTYBAT - db 7, BITTYBAT + db 9, BITTYBAT db 7, GEODUDE db 8, GEODUDE db 9, GEODUDE - db 10, PARAS + db 9, PARAS db 10, BITTYBAT - db 11, SANDSHREW - db 9, CLEFAIRY db 9, SANDSHREW + db 9, CLEFAIRY + db 10, SANDSHREW end_grass_wildmons def_water_wildmons 0 ; encounter rate diff --git a/data/wild/maps/MtMoonB2F.asm b/data/wild/maps/MtMoonB2F.asm index 39a751ff..72df01e0 100644 --- a/data/wild/maps/MtMoonB2F.asm +++ b/data/wild/maps/MtMoonB2F.asm @@ -6,9 +6,9 @@ MtMoonB2FWildMons: db 10, GEODUDE db 11, ZUBAT db 10, PARAS - db 12, PARAS + db 11, PARAS db 10, CLEFAIRY - db 12, SANDSHREW + db 11, SANDSHREW db 12, ZUBAT end_grass_wildmons diff --git a/data/wild/maps/Route1.asm b/data/wild/maps/Route1.asm index 36050078..260f1616 100644 --- a/data/wild/maps/Route1.asm +++ b/data/wild/maps/Route1.asm @@ -1,15 +1,15 @@ Route1WildMons: def_grass_wildmons 25 ; encounter rate - db 4, PIDGEY - db 3, RATTATA - db 3, RATTATA + db 2, PIDGEY + db 2, RATTATA db 3, RATTATA + db 3, PIDGEY db 2, KONYA db 3, KONYA db 3, PIDGEY db 4, RATTATA - db 6, PIDGEY - db 7, PIDGEY + db 4, PIDGEY + db 5, PIDGEY end_grass_wildmons def_water_wildmons 0 ; encounter rate diff --git a/data/wild/maps/Route2.asm b/data/wild/maps/Route2.asm index 6a7b65a8..c9a0214f 100644 --- a/data/wild/maps/Route2.asm +++ b/data/wild/maps/Route2.asm @@ -1,15 +1,15 @@ Route2WildMons: def_grass_wildmons 25 ; encounter rate db 4, RATTATA - db 5, PIDGEY + db 3, PIDGEY + db 4, PIDGEY + db 4, WEEDLE + db 3, KONYA db 4, CATERPIE db 4, WEEDLE + db 4, CATERPIE + db 4, KONYA db 5, KONYA - db 4, NIDORAN_F - db 3, KONYA - db 4, NIDORAN_M - db 5, KOKANA - db 6, KOKANA end_grass_wildmons def_water_wildmons 0 ; encounter rate diff --git a/data/wild/maps/Route24.asm b/data/wild/maps/Route24.asm index 370f0835..628937a9 100644 --- a/data/wild/maps/Route24.asm +++ b/data/wild/maps/Route24.asm @@ -1,15 +1,15 @@ Route24WildMons: def_grass_wildmons 25 ; encounter rate - db 13, BEEDRILL - db 12, ODDISH + db 13, ODDISH + db 13, BELLSPROUT db 12, PIDGEY - db 12, ODDISH - db 13, VENONAT - db 10, ABRA + db 14, ODDISH db 14, BELLSPROUT + db 10, ABRA db 13, PIDGEY + db 14, PIDGEY db 12, ABRA - db 16, PIDGEOTTO + db 16, BUTTERFREE end_grass_wildmons def_water_wildmons 0 ; encounter rate diff --git a/data/wild/maps/Route25.asm b/data/wild/maps/Route25.asm index e9112c7e..6b9f10c3 100644 --- a/data/wild/maps/Route25.asm +++ b/data/wild/maps/Route25.asm @@ -1,15 +1,15 @@ Route25WildMons: def_grass_wildmons 15 ; encounter rate - db 14, BEEDRILL - db 13, ODDISH - db 13, PIDGEY - db 12, ODDISH - db 13, VENONAT - db 12, ABRA db 14, BELLSPROUT + db 13, PIDGEY + db 12, VENONAT + db 14, ODDISH + db 14, ODDISH db 10, ABRA - db 10, VENONAT - db 15, PIDGEOTTO + db 13, VENONAT + db 14, PIDGEY + db 12, ABRA + db 16, BEEDRILL end_grass_wildmons def_water_wildmons 0 ; encounter rate diff --git a/data/wild/maps/Route3.asm b/data/wild/maps/Route3.asm index f0cb3324..f9c74bb8 100644 --- a/data/wild/maps/Route3.asm +++ b/data/wild/maps/Route3.asm @@ -1,14 +1,14 @@ Route3WildMons: def_grass_wildmons 20 ; encounter rate - db 6, PIDGEY - db 5, SPEAROW db 7, PIDGEY - db 6, SPEAROW - db 7, MANKEY - db 8, RATTATA - db 8, SANDSHREW - db 3, JIGGLYPUFF + db 7, RATTATA + db 7, SPEAROW + db 8, PIDGEY + db 7, NIDORAN_M + db 7, NIDORAN_F + db 8, SPEAROW db 5, JIGGLYPUFF + db 6, JIGGLYPUFF db 7, JIGGLYPUFF end_grass_wildmons diff --git a/data/wild/maps/Route4.asm b/data/wild/maps/Route4.asm index a66fd3da..285cc288 100644 --- a/data/wild/maps/Route4.asm +++ b/data/wild/maps/Route4.asm @@ -1,16 +1,15 @@ Route4WildMons: def_grass_wildmons 20 ; encounter rate - db 10, RATTATA - db 10, PIDGEY - db 8, KONYA - db 10, EKANS - db 8, SPEAROW + db 11, RATTATA + db 11, PIDGEY + db 11, MANKEY + db 12, RATTATA db 10, EKANS + db 11, EKANS + db 11, MIKON db 12, MIKON - db 12, MANKEY - db 12, MIKON - db 8, MANKEY - + db 8, JIGGLYPUFF + db 10, JIGGLYPUFF end_grass_wildmons def_water_wildmons 0 ; encounter rate diff --git a/data/wild/maps/ViridianForest.asm b/data/wild/maps/ViridianForest.asm index 80673919..3bf56da9 100644 --- a/data/wild/maps/ViridianForest.asm +++ b/data/wild/maps/ViridianForest.asm @@ -1,13 +1,13 @@ ViridianForestWildMons: def_grass_wildmons 8 ; encounter rate + db 4, CATERPIE + db 4, WEEDLE + db 4, PIDGEY db 5, CATERPIE + db 5, KOKANA db 5, WEEDLE - db 6, CATERPIE - db 5, PIDGEY - db 6, KOKANA - db 6, WEEDLE - db 8, KAKUNA - db 8, METAPOD + db 7, KAKUNA + db 7, METAPOD db 4, PIKACHU ; FIXME: Add considerations for STARTER4/Pikachu so it isn't rendered redundant. db 9, PIDGEOTTO end_grass_wildmons diff --git a/engine/gfx/palettes.asm b/engine/gfx/palettes.asm index 072bba76..48fa073a 100644 --- a/engine/gfx/palettes.asm +++ b/engine/gfx/palettes.asm @@ -155,6 +155,10 @@ SetPal_Overworld: jr z, .powerPlant cp SILPH_GAUNTLET_3F jr z, .ship + cp GAME_CORNER + jr z, .pachinko + cp GAME_CORNER_PRIZE_ROOM + jr z, .pachinko cp CELESTE_HILL jr z, .celeste cp CERULEAN_CAVE_2F @@ -203,12 +207,6 @@ SetPal_Overworld: .caveDefault ld a, PAL_CAVE - 1 jr .town -.celeste - ld a, PAL_CELESTE - 1 - jr .town -.ship - ld a, PAL_VERMILION - 1 - jr .town .forest ld a, [wCurMap] cp SILPH_GAUNTLET_1F + 1 @@ -225,6 +223,15 @@ SetPal_Overworld: .powerPlant ld a, PAL_YELLOWMON - 1 jr .town +.celeste + ld a, PAL_CELESTE - 1 + jr .town +.ship + ld a, PAL_VERMILION - 1 + jr .town +.pachinko + ld a, PAL_CASINO - 1 + jr .town .faraway ld a, PAL_ROUTE - 1 jr .town diff --git a/gfx/sprites/arbok.png b/gfx/sprites/arbok.png index a6e8aeb50a72a5ec593c7e8ee72d6127890c0d2c..726f91faeaa4c216850276310caeeab83237cedb 100644 GIT binary patch literal 557 zcmeAS@N?(olHy`uVBq!ia0vp^0zhoQ1SA;BTlQ)JDVB6cUq=Rpjs4tz5?O(Kg=CK) zUj~LMH3o);76yi2K%s^g3=E|P3=FRl7#OT(FffQ0%-I!a1C(G&@^*J&U^Z?k>HzXM z3p^r=85sDEfH31!Z9ZwBAbW|YuPgg=Ha31<#wFfLKoJJU{35>)#`BBHX8}2?C9V-A zDTyViR>?)FK#IZ0z{ptFzzm2&3{9;Jjjap}v<(b^WT3(P$0!FGguNJBU#Oss~8X^KmHgfm5shmk5Yk!bQ=v0Xn&WM-=WE$1j z-IqOv4*K(&YG-PkpFpPY_j;hP(}P1f^91TjqMYJUm54@Ep{z!EpCpSORHMA^`eGrd#&wm& zjfmLQK#_Bwg?~JN@1v=OQfqad5zLp59!STEf1n3XwBSOpD`qBrOAp2v^LFaJFQifr zGV&dmZ)!Ell7P-6TF0000