From 038970363fb9c14ca758283471cf3ee1d6abd5cd Mon Sep 17 00:00:00 2001 From: Llinos Evans <36418502+PlagueVonKarma@users.noreply.github.com> Date: Wed, 1 Nov 2023 20:31:28 +0000 Subject: [PATCH 1/2] Kurt instamakes balls now --- README.md | 1 + maps/DebugRoom.ablk | 2 +- maps/DebugRoom.asm | 1 + maps/KurtsHouse.asm | 25 ++++++++++++++----------- 4 files changed, 17 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 1c116b8..263c8cc 100644 --- a/README.md +++ b/README.md @@ -27,6 +27,7 @@ The Fairy-type does exist. ## QoL Changes - A Trader NPC is available in a new Lake of Rage town area, allowing you to access trade evolutions natively. +- Kurt now makes Apricorn Balls instantly. He's had his coffee and is listening to his favourite music. - Instant text is now an option! - Clock reset procedure is now like vanilla GS, requiring just Down + B. - Tilesets now handle up to 255 titles (from 192), allowing for slightly nicer maps. diff --git a/maps/DebugRoom.ablk b/maps/DebugRoom.ablk index db8ca54..6df1b12 100644 --- a/maps/DebugRoom.ablk +++ b/maps/DebugRoom.ablk @@ -1,4 +1,4 @@ - ! ! !WWE + ! ! !WWE R  ! ERETvUXYG~IJ diff --git a/maps/DebugRoom.asm b/maps/DebugRoom.asm index c9bb505..c7f5d36 100644 --- a/maps/DebugRoom.asm +++ b/maps/DebugRoom.asm @@ -101,6 +101,7 @@ DebugRoom_MapEvents: warp_event 5, 35, VIRIDIAN_FOREST, 1 ; southwest warp warp_event 19, 34, VIRIDIAN_FOREST, 1 ; southern warp warp_event 33, 33, VIRIDIAN_FOREST, 1 ; southeast warp + warp_event 5, 3, AZALEA_TOWN, 1 def_coord_events diff --git a/maps/KurtsHouse.asm b/maps/KurtsHouse.asm index 5579a41..64a404b 100644 --- a/maps/KurtsHouse.asm +++ b/maps/KurtsHouse.asm @@ -72,8 +72,8 @@ Kurt1: iffalse .NoRoomForBall setevent EVENT_KURT_GAVE_YOU_LURE_BALL .GotLureBall: - checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 - iftrue .WaitForApricorns + ;checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 + ;iftrue .WaitForApricorns checkevent EVENT_GAVE_KURT_RED_APRICORN iftrue .GiveLevelBall checkevent EVENT_GAVE_KURT_BLU_APRICORN @@ -167,11 +167,17 @@ Kurt1: .GaveKurtApricorns: setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 - setflag ENGINE_KURT_MAKING_BALLS -.WaitForApricorns: - writetext KurtsHouseKurtItWillTakeADayText + ;setflag ENGINE_KURT_MAKING_BALLS +;.WaitForApricorns: + writetext KurtsHouseKurtGetStartedText waitbutton closetext + special FadeBlackQuickly + special ReloadSpritesNoPalettes + playsound SFX_WARP_TO + waitsfx + pause 35 + sjump Kurt1 end .Cancel: @@ -528,12 +534,9 @@ KurtsHouseKurtAskYouHaveAnApricornText: line "into a BALL." done -KurtsHouseKurtItWillTakeADayText: - text "KURT: It'll take a" - line "day to make you a" - - para "BALL. Come back" - line "for it later." +KurtsHouseKurtGetStartedText: + text "Kurt: I'll get" + line "started right now!" done KurtsHouseKurtThatsALetdownText: From a91b7fd2a11f9bf5e3b0744cae700c69d6cb1ffe Mon Sep 17 00:00:00 2001 From: Llinos Evans <36418502+PlagueVonKarma@users.noreply.github.com> Date: Wed, 1 Nov 2023 21:23:39 +0000 Subject: [PATCH 2/2] Rock Smash, but good Adds new rock smash wild data categories. Somehow, the functionality for this existed in-game, they just...didn't use it. --- constants/pokemon_data_constants.asm | 7 +++++- data/wild/treemon_maps.asm | 15 ++++++++---- data/wild/treemons.asm | 34 ++++++++++++++++++++++++++-- 3 files changed, 49 insertions(+), 7 deletions(-) diff --git a/constants/pokemon_data_constants.asm b/constants/pokemon_data_constants.asm index 0cd88a6..52edaee 100644 --- a/constants/pokemon_data_constants.asm +++ b/constants/pokemon_data_constants.asm @@ -185,7 +185,12 @@ DEF NUM_ROAMMON_MAPS EQU 16 ; RoamMaps table size (see data/wild/roammon_maps.as const TREEMON_SET_KANTO const TREEMON_SET_LAKE const TREEMON_SET_FOREST - const TREEMON_SET_ROCK + const TREEMON_SET_ROCK_BEACH + const TREEMON_SET_ROCK_DARK_CAVE + const TREEMON_SET_ROCK_TOWER + const TREEMON_SET_ROCK_ICE + const TREEMON_SET_ROCK_SQUARE + const TREEMON_SET_ROCK_WELL DEF NUM_TREEMON_SETS EQU const_value ; treemon scores diff --git a/data/wild/treemon_maps.asm b/data/wild/treemon_maps.asm index 2fbb93c..130e28f 100644 --- a/data/wild/treemon_maps.asm +++ b/data/wild/treemon_maps.asm @@ -41,8 +41,15 @@ TreeMonMaps: db -1 RockMonMaps: - treemon_map CIANWOOD_CITY, TREEMON_SET_ROCK - treemon_map ROUTE_40, TREEMON_SET_ROCK - treemon_map DARK_CAVE_VIOLET_ENTRANCE, TREEMON_SET_ROCK - treemon_map SLOWPOKE_WELL_B1F, TREEMON_SET_ROCK + treemon_map CIANWOOD_CITY, TREEMON_SET_ROCK_BEACH + treemon_map ROUTE_40, TREEMON_SET_ROCK_BEACH + treemon_map DARK_CAVE_VIOLET_ENTRANCE, TREEMON_SET_ROCK_DARK_CAVE + treemon_map SLOWPOKE_WELL_B1F, TREEMON_SET_ROCK_WELL + treemon_map ICE_PATH_1F, TREEMON_SET_ROCK_ICE + treemon_map ICE_PATH_B1F, TREEMON_SET_ROCK_ICE + treemon_map ICE_PATH_B2F_MAHOGANY_SIDE, TREEMON_SET_ROCK_ICE + treemon_map ICE_PATH_B2F_BLACKTHORN_SIDE, TREEMON_SET_ROCK_ICE + treemon_map ICE_PATH_B3F, TREEMON_SET_ROCK_ICE + treemon_map MOUNT_MOON_SQUARE, TREEMON_SET_ROCK_SQUARE + treemon_map BURNED_TOWER_1F, TREEMON_SET_ROCK_TOWER db -1 diff --git a/data/wild/treemons.asm b/data/wild/treemons.asm index 50faa8c..45081c9 100644 --- a/data/wild/treemons.asm +++ b/data/wild/treemons.asm @@ -8,7 +8,12 @@ TreeMons: dw TreeMonSet_Kanto dw TreeMonSet_Lake dw TreeMonSet_Forest - dw TreeMonSet_Rock + dw TreeMonSet_Rock_Beach + dw TreeMonSet_Rock_Dark_Cave + dw TreeMonSet_Rock_Tower + dw TreeMonSet_Rock_Ice + dw TreeMonSet_Rock_Square + dw TreeMonSet_Rock_Well assert_table_length NUM_TREEMON_SETS dw TreeMonSet_City ; unused @@ -125,7 +130,32 @@ TreeMonSet_Forest: dbbw 5, 10, KAKUNA db -1 -TreeMonSet_Rock: +TreeMonSet_Rock_Beach: dbbw 90, 15, KRABBY dbbw 10, 15, SHUCKLE db -1 + +TreeMonSet_Rock_Dark_Cave: + dbbw 90, 15, GEODUDE + dbbw 10, 15, DUNSPARCE + db -1 + +TreeMonSet_Rock_Tower: + dbbw 90, 15, GEODUDE + dbbw 10, 15, SLUGMA + db -1 + +TreeMonSet_Rock_Ice: + dbbw 90, 15, GEODUDE + dbbw 10, 15, SWINUB + db -1 + +TreeMonSet_Rock_Square: + dbbw 90, 15, GEODUDE + dbbw 10, 15, SHUCKLE + db -1 + +TreeMonSet_Rock_Well: + dbbw 90, 15, KRABBY + dbbw 10, 15, SHELLDER + db -1