From c716be39dad72421e01599ba672e2ee0ec7dc9cc Mon Sep 17 00:00:00 2001 From: Llinos Evans <36418502+PlagueVonKarma@users.noreply.github.com> Date: Wed, 28 Jun 2023 01:04:09 +0100 Subject: [PATCH] Daycare Revamp (except Bulbasaur) In the name of making Pikachu/Eevee mode more accurate to Yellow, the starter trio are being made obtainable. However, I am also improving it in some respects to make it more accurate. In the anime, the Hidden Village is between Cerulean and Vermillion, so Yellow's implementation is inaccurate. It also pushes the Jynx trader out of the house, which is undesirable. Thus, Melanie has been placed in the Day Care to give more reason to go there, as well as make the Day Care look more like the one from FireRed and LeafGreen. In the name of this, a PC has been added as well, allowing for easier utility around the Day Care itself. Bulbasaur is currently allergic to hiding for some reason but we'll figure that out later. --- README.md | 1 + constants/event_constants.asm | 5 +- constants/hide_show_constants.asm | 1 + constants/map_constants.asm | 2 +- data/events/hidden_item_coords.asm | 1 + data/events/hidden_objects.asm | 6 ++ data/maps/hide_show_data.asm | 4 +- data/maps/objects/Daycare.asm | 12 ++- data/text/text_7.asm | 13 +++ gfx/blocksets/house.bst | Bin 576 -> 640 bytes gfx/tilesets.asm | 5 +- gfx/tilesets/house.png | Bin 1163 -> 2565 bytes layout.link | 2 +- maps/Daycare.blk | 2 +- scripts/Daycare.asm | 145 +++++++++++++++++++++++++++++ scripts/MrFujisHouse.asm | 6 +- text/Daycare.asm | 55 +++++++++++ text/MrFujisHouse.asm | 13 --- 18 files changed, 246 insertions(+), 27 deletions(-) diff --git a/README.md b/README.md index 6d4ad891..4914b0a2 100644 --- a/README.md +++ b/README.md @@ -101,6 +101,7 @@ Improved Areas - Diglett's Cave has a more detailed map with Onix, Wiglett, and Wugtrio also appearing! It also has its beta music! - Route 25 has been given a facelift, adding Bill's Lighthouse in place of the Sea Cottage. - The Fighting Dojo has been revamped, featuring a design reminiscent of the prototype versions; rough floors, the elder in the back, and more. Additionally, you can now get a Hitmontop as a third option. The Karate Master is also now treated somewhat more like a Gym Leader, having Gym Scaling and a Rematch system. +- The Day Care now contains a PC and Melanie from Yellow. If you pick Pikachu or Eevee and beat Misty, Melanie will give you a Bulbasaur. - Cinnabar Island is a lot bigger, with the volcano being added to it. The mansion seems different too... - Cinnabar Lab's Trade Room now features the Trader, who will evolve trade-evolving Pokemon for you! - Pokemon Tower was shortened, being less intensive and adding room for more maps. diff --git a/constants/event_constants.asm b/constants/event_constants.asm index 6c98c148..dd9b579d 100644 --- a/constants/event_constants.asm +++ b/constants/event_constants.asm @@ -3,9 +3,10 @@ ; Pallet Town events const_def const EVENT_FOLLOWED_OAK_INTO_LAB - const_skip 2 + const EVENT_GOT_BULBASAUR + const EVENT_GOT_CHARMANDER const EVENT_HALL_OF_FAME_DEX_RATING - const_skip 2 + const EVENT_GOT_SQUIRTLE const EVENT_PALLET_AFTER_GETTING_POKEBALLS const_skip 17 const EVENT_GOT_TOWN_MAP diff --git a/constants/hide_show_constants.asm b/constants/hide_show_constants.asm index 191846ba..76868df5 100644 --- a/constants/hide_show_constants.asm +++ b/constants/hide_show_constants.asm @@ -258,4 +258,5 @@ DEF SHOW EQU $15 const HS_ROCK_TUNNEL_B1F_AMBER ; F8 const HS_ROCK_TUNNEL_B1F_WING ; F9 const HS_MT_MOON_CRATER_GUARD ; FA + const HS_DAYCARE_BULBASAUR ; FB DEF NUM_HS_OBJECTS EQU const_value diff --git a/constants/map_constants.asm b/constants/map_constants.asm index 9691cc3e..ba73bc0c 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -94,7 +94,7 @@ DEF FIRST_INDOOR_MAP EQU const_value map_const VIRIDIAN_PRE_GYM, 5, 7 ; $47 - was CERULEAN_TRASHED_HOUSE_COPY map_const ROUTE_5_GATE, 4, 3 ; $48 map_const UNDERGROUND_PATH_ROUTE_5, 4, 4 ; $49 - map_const DAYCARE, 4, 4 ; $4A + map_const DAYCARE, 6, 4 ; $4A map_const ROUTE_6_GATE, 4, 3 ; $4B map_const UNDERGROUND_PATH_ROUTE_6, 4, 4 ; $4C map_const CELESTE_HILL, 11, 11 ; $4D - Was copy of above & unused diff --git a/data/events/hidden_item_coords.asm b/data/events/hidden_item_coords.asm index 54a0958e..e0472dfe 100644 --- a/data/events/hidden_item_coords.asm +++ b/data/events/hidden_item_coords.asm @@ -62,4 +62,5 @@ HiddenItemCoords: hidden_item MT_MOON_CRATER, 20, 20 ; Poison Stone hidden_item MT_MOON_CRATER, 20, 17 ; Black Augurite hidden_item MT_MOON_CRATER, 32, 45 ; Old Amber + hidden_item DAYCARE, 4, 1 ; Daycare PC db -1 ; end diff --git a/data/events/hidden_objects.asm b/data/events/hidden_objects.asm index a85c43e4..3ee95c74 100644 --- a/data/events/hidden_objects.asm +++ b/data/events/hidden_objects.asm @@ -88,6 +88,7 @@ HiddenObjectMaps: db BATTLE_TENT db VERMILION_DOCK db MT_MOON_CRATER + db DAYCARE db -1 ; end HiddenObjectPointers: @@ -181,6 +182,7 @@ HiddenObjectPointers: dw BattleTentHiddenObjects dw VermilionDockHiddenObjects dw MtMoonCraterHiddenObjects + dw DaycareHiddenItems MACRO hidden_object db \2 ; y coord @@ -655,3 +657,7 @@ MtMoonCraterHiddenObjects: hidden_object 20, 17, BLK_AUGURITE, HiddenItems hidden_object 32, 45, OLD_AMBER, HiddenItems db -1 + +DaycareHiddenItems: + hidden_object 4, 1, SPRITE_FACING_UP, OpenPokemonCenterPC + db -1 diff --git a/data/maps/hide_show_data.asm b/data/maps/hide_show_data.asm index 1b7f5d1f..08965762 100644 --- a/data/maps/hide_show_data.asm +++ b/data/maps/hide_show_data.asm @@ -78,7 +78,7 @@ MapHSPointers: dw NoHS dw NoHS dw NoHS - dw NoHS + dw DaycareHS dw NoHS dw NoHS dw CelesteHillHS @@ -349,6 +349,8 @@ CeruleanCaveHS: db CERULEAN_CAVE_1F, $01, SHOW ; HS_CERULEAN_CAVE_1F_ITEM_1 db CERULEAN_CAVE_1F, $02, SHOW ; HS_CERULEAN_CAVE_1F_ITEM_2 db CERULEAN_CAVE_1F, $03, SHOW ; HS_CERULEAN_CAVE_1F_ITEM_3 +DaycareHS: + db DAYCARE, $03, SHOW ; HS_DAYCARE_BULBASAUR CelesteHillHS: db CELESTE_HILL, $01, SHOW ; HS_MOLTRES_G PokemonTower2FHS: diff --git a/data/maps/objects/Daycare.asm b/data/maps/objects/Daycare.asm index f3ece1a9..bda5c7a4 100644 --- a/data/maps/objects/Daycare.asm +++ b/data/maps/objects/Daycare.asm @@ -2,12 +2,18 @@ Daycare_Object: db $a ; border block def_warp_events - warp_event 2, 7, LAST_MAP, 5 - warp_event 3, 7, LAST_MAP, 5 + warp_event 4, 7, LAST_MAP, 5 + warp_event 5, 7, LAST_MAP, 5 def_bg_events + bg_event 7, 4, 7 ; Daycare Book def_object_events - object_event 2, 3, SPRITE_GENTLEMAN, STAY, RIGHT, 1 ; person + object_event 2, 2, SPRITE_GENTLEMAN, STAY, RIGHT, 1 ; person + object_event 7, 5, SPRITE_GIRL, STAY, UP, 2 ; person + object_event 8, 5, SPRITE_BULBASAUR, STAY, UP, 3 ; person + object_event 10, 2, SPRITE_ODDISH, STAY, DOWN, 4 ; person + object_event 9, 4, SPRITE_SANDSHREW, STAY, LEFT, 5 ; person + object_event 7, 1, SPRITE_MONSTER, STAY, LEFT_RIGHT, 6 ; person def_warps_to DAYCARE diff --git a/data/text/text_7.asm b/data/text/text_7.asm index 31b6a150..e6f9487a 100644 --- a/data/text/text_7.asm +++ b/data/text/text_7.asm @@ -334,3 +334,16 @@ _TMNPCNoRoomText:: text "You have no" line "room for this!" done + +_OddishText:: + text "ODDISH: Orddissh!@" + text_end + +_SandshrewText:: + text "SANDSHREW: Pikii!@" + text_end + +_BulbasaurText:: + text "BULBASAUR: Bubba!" + line "Zoar!@" + text_end diff --git a/gfx/blocksets/house.bst b/gfx/blocksets/house.bst index 565a06b3abb231af47b4ce66ad3522032241bc02..7f462f80d74903668788d18beb56a1b97b6ef1e6 100644 GIT binary patch delta 72 ucmX@W(!jdGfysf1nUPUQm=O*f92poC6d4$toEaJAPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!~g&e!~vBn4jTXf37SbnK~#8N)tn1* z-L?`1qm;L3FVbG5a+^~79gQ&nNM0!~U4;Sx%zr>yPRV)s`Sa)NUkko}|Nj2;C%=CE zx^=$d<>lr5Y0T^ETlg!vih7{#qZY?Z%wXIv z)B)|*J=V^-SDz(yzP;})F(~E{SIQ3j1VUUs+flb#763yAA4zETl&xr zbaAluS=-E`xIkIR=NaD&ctr*<(z$wGWjX(9C}=Hy#*ur*YZJJ9HgJ}oXW+~px?bSi z2jgS$Xo{S45pEyN0Js$Y{Ct@ATkF~KY7%VOD7);>$_jpVJtDE`b< zU8w$?s~y&(9FftcwmPh#J^HQlF#I|j55b4-pSbV*uzAcoAgkWUUyhYs&e3B&Gt|*W z`pP+ndo?c4&B1jJ^T~5bnVh?QXKhvaouSV54}l}{c5}1da{1qzRjIPx;6xc&-E2U| zHzDcbU|$_$&iKVW-8y@LAp1> zAZN0x^$44pg<#$3vagPD5EFZh?$TjjyQ{i@Hh1N(fDhu@c~KH|{(fIy#sohL3fGMh zHs~toQk>B^YnK?Q&sX5(%^|b1+g||5w|Yg&)|;EbL0u=<0c2>-Og2%LIb-&X1sh(Q zUUfRs)~=42m&|mL?JlQ#qq?y7lrKPn!=3T}4lz<#3UoGZ^lTtSw)nX}0~s2gV@K~Q zPrU#@(Pm>s7JRqp&xWS?*|&){at4i3E_HIAHPhxp=Kq+`s?g;d|qOCyJSnpyZGDmaE___;_P3-dV9Qmq$1#BD_;CL7$ zFhUs%Zy;R|$OAe)pTVSOTrB`(;mtkcoY~GM2=Zt4S6sc^yFBFrpgU?5=eb|kuu5=M zw5x?ph=D zsBerm+PJ~S*Z8%S+^Jv2)A9QPjGT9j3NzZ%9)UcoS#o*R%k0Pt^2^*y-_`= z7qZ$>HmQ4Q`wAcaQ!qj841-JvzK;I_lrbjlX=bf{YSvrWDHhs};z%0zDP`Q^F)X1UDw(+j(CFn@o+TTg6k}=o#!M*ge!-_s)2HA`qFfeKq`WB;`Ap`IN zq)fG4n-8lCFe)Z{4E+ImjNRNT_(Ff=5A;*9h8cHfqmnvj;vUugDZdqL5C&$Gx*57; zEhr$P9DAH~1+5@o2m0Ckgmcc$4)oObIhpC4MIXe!TL;iD)C=>}UkkTc24|qFfC>@@eRuTkTz$Ba?qUH_gR29J}S!b-~WjByN}(WeL` zWnhrSt3J|p77)MKKo_|RdfmQoZVqS3_$6yG@}2b>omXnCsn_`zedR2N+@qMM{+Y2d zspouVs8hlIC=T~4+HkJS_OX|7FrOVG*w6aZkuvoxhdDD`SDB>l=Q{U=^|yTMgfni~ z=uGO_BboQ7dtgV~kA#oe+rHx?<3e7Yy8oF_Ki;mZe#{$u<9$w>lF{w_$X{>QJW6R|dKrX?KR_o!p~f?@u4mKj&%V?C2QDIy~36gLoXdp938S>y=L8 zI?uTh$6mcjyLdx$e)I8$x3sfA(%FIAoVxYTH!-e?`j9rh0(}{O#^;(D9*sU`poVn~ z*z4-sfgNHvE`UbU_$~yB9sy)QeP+J~UP;|u((j!MV0{0^1t5OwV#6!5Iyp=<>hH@kap3*GnK4Hus>)WiUL?3R*E4ZSKq?&iJg5|5>i+Tp=%@ z{islvE4)0K{^}cyVdiSAIPAs5ifOp2G=>;C)d>a>P38g bef{en6%Je+Dj@Zn00000NkvXXu0mjfI)D+l delta 1154 zcmV-|1bzF36pIOv7=Ho)0002CFEzse00dG=L_t(|+D(&RNLzOl$4?T=T9HLF=mFgIBgeOP}aRH)9V(G4~6z^Y&BW~ znGNR2mqB54jDZYHl!2>1Jv-+YTX%jB3HN^P_xC;j0CAb*5Pty_0lcfT*T;5=3Ol#_ zo@SywP->gxC}q(G;(Wt^3gs+aucOlt0659OKFL9}Ce%YEu1<%8li>*l z4oQwEL=e+WLubBenh4sfxBH;3ivh&_WjS~RoT{#vUb*;5$N8bJqVU zQN?!k!-o*^SvsGuGHC)3-QQX&pkm-(6)Pp&anf;;FbV?vVF1#iP#Rw3w@Cvu+Ww0M zkjg0}U87V?f52`_%w()%UiQi5l zD@dC3icNItL)zW?ncHWA=-$~YQ=;Ja+csr9wDZDrvVeE3=V=z3(l1K8qW~^(zvGG~ zA8}^VJZJ?NFTx!171B-kWfVMQabDbC2?JzpTZxjzkN^6Pw2rUwKhYBaalD`vSlTPy z#Dh_E7=Q3mk!w+6phZE96)a2lS^{hmIxF?T07ZI~x_YFLwdcvwGjRdFxP(q)ed84! zy}6)1H43UbYxgtI&@aI7kLdh5bbXAVXTd161B43Py=TBI1MA&0UOm*K76f4DIs?bR z!5})t_Xj`LcX|dE1&}ebwXU+X`*8#hC^U~wxqrep2T?po{Xu8);q>L92tFQp^*%a^ zKk};{#H&g{Z7?+M(^U{oryzox7aIDFf+qu#CKs@_je$(w=B1NmG*Ifnh+V0Ua~aWB>(efUpn1xBB#MGLnEW-wcxoZkLizctrY% zvYwHVOzy!0Z{*s*x~xo>q7nm9E^?ItT9sPMHSZaPZgU^hxprg2hc;&5(q`5YuFZ-2-bugfHc11zB7J%DRwA5xXnM%IofP!?La zNWcOb+^<7IQl%$T)VB25Jp+^&2nX!+gw~=pAw{J=H~){a|FEc)8*ma9PeK&*4c`~bK_;8*5^1;1AM(b{O$T}#EzPp6XyUb z." @@ -88,7 +79,3 @@ _LavenderHouse1Text6:: para "Gone! It's been" line "clipped out!" done - -_LavenderHouse1Text7:: - text "ODDISH: Orddissh!@" - text_end