From ecc6be8c14de03d663d001ad306957bf1aa9b853 Mon Sep 17 00:00:00 2001 From: Unagii Date: Sun, 8 Sep 2024 13:21:05 -0500 Subject: [PATCH] Ramen Delivery cont. Implemented Fisherman who wants ramen. Not finished. --- constants/map_constants.asm | 1 + data/maps/attributes.asm | 1 + data/maps/blocks.asm | 5 +- data/maps/maps.asm | 1 + data/maps/scripts.asm | 1 + data/tilesets/house_attributes.bin | Bin 400 -> 560 bytes data/tilesets/house_collision.asm | 12 +++- data/tilesets/house_metatiles.bin | Bin 400 -> 560 bytes maps/KagaFishingShop.ablk | 1 + maps/KagaFishingShop.asm | 92 +++++++++++++++++++++++++++++ maps/KagaTown.asm | 1 + maps/RamenShop.asm | 3 + 12 files changed, 116 insertions(+), 2 deletions(-) create mode 100644 maps/KagaFishingShop.ablk create mode 100644 maps/KagaFishingShop.asm diff --git a/constants/map_constants.asm b/constants/map_constants.asm index 7b4e7b85fe7..29f17539ce1 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -510,6 +510,7 @@ ENDM map_const MT_KAGA, 32, 24 ; 6 map_const KAGA_POND, 18, 24 ; 7 map_const RAMEN_SHOP, 8, 6 ; 8 + map_const KAGA_FISHING_SHOP, 5, 6 ; 9 endgroup DEF NUM_MAP_GROUPS EQU const_value ; 27 diff --git a/data/maps/attributes.asm b/data/maps/attributes.asm index 45c4359f729..d843f6754c2 100644 --- a/data/maps/attributes.asm +++ b/data/maps/attributes.asm @@ -402,6 +402,7 @@ ENDM connection south, MtKaga, MT_KAGA, -8 map_attributes RamenShop, RAMEN_SHOP, $00, 0 + map_attributes KagaFishingShop, KAGA_FISHING_SHOP, $00, 0 map_attributes Route23, ROUTE_23, $0f, 0 map_attributes SproutTower1F, SPROUT_TOWER_1F, $00, 0 map_attributes SproutTower2F, SPROUT_TOWER_2F, $00, 0 diff --git a/data/maps/blocks.asm b/data/maps/blocks.asm index 5f02c3f43c9..c2eea9e1508 100644 --- a/data/maps/blocks.asm +++ b/data/maps/blocks.asm @@ -1074,4 +1074,7 @@ KagaPond_Blocks: INCBIN "maps/KagaPond.ablk" RamenShop_Blocks: - INCBIN "maps/RamenShop.ablk" \ No newline at end of file + INCBIN "maps/RamenShop.ablk" + +KagaFishingShop_Blocks: + INCBIN "maps/KagaFishingShop.ablk" \ No newline at end of file diff --git a/data/maps/maps.asm b/data/maps/maps.asm index de1f030dc26..73adb7b874e 100644 --- a/data/maps/maps.asm +++ b/data/maps/maps.asm @@ -549,4 +549,5 @@ MapGroup_Kagawa: map MtKaga, TILESET_KAGAWA, TOWN, LANDMARK_ROUTE_30, MUSIC_ROUTE_30, FALSE, PALETTE_AUTO, FISHGROUP_SHORE, KELPGROUP_KRABBY map KagaPond, TILESET_KAGAWA, TOWN, LANDMARK_ROUTE_30, MUSIC_ROUTE_30, FALSE, PALETTE_AUTO, FISHGROUP_SHORE, KELPGROUP_KRABBY map RamenShop, TILESET_HOUSE, INDOOR, LANDMARK_ROUTE_30, MUSIC_DANCING_HALL, FALSE, PALETTE_DAY, FISHGROUP_SHORE, KELPGROUP_KRABBY + map KagaFishingShop, TILESET_HOUSE, INDOOR, LANDMARK_ROUTE_30, MUSIC_DANCING_HALL, FALSE, PALETTE_DAY, FISHGROUP_SHORE, KELPGROUP_KRABBY assert_table_length NUM_KAGAWA_MAPS \ No newline at end of file diff --git a/data/maps/scripts.asm b/data/maps/scripts.asm index 6aff74f09d9..e834cb381d9 100644 --- a/data/maps/scripts.asm +++ b/data/maps/scripts.asm @@ -492,5 +492,6 @@ INCLUDE "maps/KagaTown.asm" INCLUDE "maps/MtKaga.asm" INCLUDE "maps/KagaPond.asm" INCLUDE "maps/RamenShop.asm" +INCLUDE "maps/KagaFishingShop.asm" ENDSECTION diff --git a/data/tilesets/house_attributes.bin b/data/tilesets/house_attributes.bin index cc85287d5c77fecabccb04d8f8791f720c3f779f..fbf4e8ab045b5ec355bdc60a60944fca746ea0c5 100644 GIT binary patch literal 560 zcma)3TMED+46Ba9P&~zccK;KOXoFq1;R3O*v=vpoqXaZVGB93Qj`^#r0jqvrrw_Z{ zS8FMgPd#S5aVWXV_b~^%cbxt78v4|Vv<61-oxkj6VBP;7axu<1B~W#6L^CtziLje@ K!Yr#F+;;)|ixaB= delta 7 OcmdnMGJ$!+1V#V~`~ryp diff --git a/data/tilesets/house_collision.asm b/data/tilesets/house_collision.asm index 09516033097..ac1828b6768 100644 --- a/data/tilesets/house_collision.asm +++ b/data/tilesets/house_collision.asm @@ -15,7 +15,7 @@ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0e tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0f tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 10 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 11 + tilecoll COUNTER, FLOOR, FLOOR, FLOOR ; 11 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 12 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 13 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 14 @@ -23,3 +23,13 @@ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 16 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 17 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 18 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 19 + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 1a + tilecoll WALL, WALL, FLOOR, FLOOR ; 1b + tilecoll WALL, COUNTER, FLOOR, FLOOR ; 1c + tilecoll WALL, WALL, FLOOR, FLOOR ; 1d + tilecoll WALL, FLOOR, WALL, FLOOR ; 1e + tilecoll FLOOR, WALL, FLOOR, WALL ; 1f + tilecoll WALL, WALL, FLOOR, WALL ; 20 + tilecoll WALL, WALL, WALL, WALL ; 21 + tilecoll WALL, WALL, FLOOR, FLOOR ; 22 diff --git a/data/tilesets/house_metatiles.bin b/data/tilesets/house_metatiles.bin index af54f5b40106f929e9bad64fea1e16d3e3437e4d..e6b34fa6275483d6206065ba9102b1a57e797162 100644 GIT binary patch delta 169 zcmbQhyn$uI1jc$s9DoG~M1X(+3Si3A)Ya8l_4V~_tgNg+V(RMpmO!p0kZTR%b8#~= za&R&-N=Y*^N=RagK#b$zWn`3*Wn?r{v@|j{GPbjaKsk9ic?Jd*F9rq^6OdLA006ou B4ln=! delta 7 OcmdnMGJ$!+1V#V~`~ryp diff --git a/maps/KagaFishingShop.ablk b/maps/KagaFishingShop.ablk new file mode 100644 index 00000000000..56dcf4bef23 --- /dev/null +++ b/maps/KagaFishingShop.ablk @@ -0,0 +1 @@ +" !! \ No newline at end of file diff --git a/maps/KagaFishingShop.asm b/maps/KagaFishingShop.asm new file mode 100644 index 00000000000..313c815ad33 --- /dev/null +++ b/maps/KagaFishingShop.asm @@ -0,0 +1,92 @@ + object_const_def + + +KagaFishingShop_MapScripts: + def_scene_scripts + + def_callbacks + +KagaFishingShopClerkScript: + opentext + checkitem MYSTIC_WATER + iftrue .RamenScript + writetext KagaFSCShopText + waitbutton + closetext + end + +.RamenScript: + writetext KagaFSCHungryText + waitbutton + writetext KagaFSCHasRamenText + waitbutton + yesorno + iffalse .No + sjump .Yes +.Yes: + writetext KagaFSCYesRamenText + waitbutton + takeitem MYSTIC_WATER + writetext KagaFSCTookRamenText + waitbutton + givemoney YOUR_MONEY, 250 + writetext KagaFSCTipText + end +.No: + writetext KagaFSCNoRamenText + waitbutton + closetext + end + +KagaFSCShopText: + text "Wanna buy" + line "some tackle?" + done + +KagaFSCHungryText: + text "Gee, I'm" + line "starving..." + cont "How long will" + cont "this delivery" + cont "take?" + done + +KagaFSCHasRamenText: + text "Are you the" + line "one with my" + cont "RAMEN?" + done + +KagaFSCYesRamenText: + text "You're way" + line "faster than" + cont "the usual guy!" + done + +KagaFSCNoRamenText: + text "Aww man..." + done + +KagaFSCTookRamenText: + text "Thanks!" + line "Here's a Tip." + done + +KagaFSCTipText: + text "You got ¥250!" + done + +KagaFishingShop_MapEvents: + db 0, 0 ; filler + + def_warp_events + warp_event 4, 11, KAGA_TOWN, 1 + warp_event 5, 11, KAGA_TOWN, 1 + + def_coord_events + + def_bg_events + + def_object_events + object_event 1, 1, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, KagaFishingShopClerkScript, -1 + diff --git a/maps/KagaTown.asm b/maps/KagaTown.asm index 6e27ac533e6..12df7f55ae0 100644 --- a/maps/KagaTown.asm +++ b/maps/KagaTown.asm @@ -10,6 +10,7 @@ KagaTown_MapEvents: db 0, 0 ; filler def_warp_events + warp_event 23, 27, KAGA_FISHING_SHOP, 1 def_coord_events diff --git a/maps/RamenShop.asm b/maps/RamenShop.asm index 36b41c8fb91..40341cf51e3 100644 --- a/maps/RamenShop.asm +++ b/maps/RamenShop.asm @@ -18,6 +18,9 @@ RamenShopDeliveryScript: writetext ChoDeliveryAcceptedText promptbutton verbosegiveitem MYSTIC_WATER + waitbutton + closetext + end .No: writetext ChoDeliveryDeniedText waitbutton