From 061ac38e8c08c61bf6f8ca2b1600912fbd332671 Mon Sep 17 00:00:00 2001 From: SoupPotato Date: Fri, 6 Sep 2024 18:25:37 +0100 Subject: [PATCH] Restored the Gen1 Vermillion Gym Trash Puzzle --- data/tilesets/game_corner_collision.asm | 4 +- data/tilesets/game_corner_metatiles.bin | Bin 1024 -> 1024 bytes gfx/tilesets/game_corner.png | Bin 3599 -> 1651 bytes gfx/tilesets/game_corner_palette_map.asm | 10 +- maps/VermilionGym.asm | 274 ++++++++++++++++++++--- maps/VermilionGym.blk | 2 +- ram/wram.asm | 5 +- 7 files changed, 254 insertions(+), 41 deletions(-) diff --git a/data/tilesets/game_corner_collision.asm b/data/tilesets/game_corner_collision.asm index b86357493..595ce5499 100644 --- a/data/tilesets/game_corner_collision.asm +++ b/data/tilesets/game_corner_collision.asm @@ -24,7 +24,7 @@ tilecoll COUNTER, FLOOR, COUNTER, COUNTER ; 17 tilecoll FLOOR, FLOOR, COUNTER, COUNTER ; 18 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 19 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1a + tilecoll WALL, WALL, FLOOR, FLOOR ; 1a tilecoll FLOOR, COUNTER, COUNTER, COUNTER ; 1b tilecoll WALL, WALL, FLOOR, COUNTER ; 1c tilecoll FLOOR, WALL, FLOOR, WALL ; 1d @@ -48,7 +48,7 @@ tilecoll WALL, WALL, FLOOR, WALL ; 2f tilecoll WALL, WALL, WALL, FLOOR ; 30 tilecoll COUNTER, FLOOR, COUNTER, COUNTER ; 31 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 32 + tilecoll WALL, WALL, FLOOR, FLOOR ; 32 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 33 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 34 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 35 diff --git a/data/tilesets/game_corner_metatiles.bin b/data/tilesets/game_corner_metatiles.bin index bb6f3f6502290c8286c9e703a7d5d96042b6871b..6d7310266e58d8d9e8319af068817386d419a48d 100644 GIT binary patch delta 50 zcmV-20L}k^2!IH%paBrJx3;&&$HvD25CISo5)l%!umNxZ5KT?0t6N*Rxkg90xmH)m I$&(=i(D_0Xi~s-t delta 37 fcmZqRXyDkefKh+}4Q$@PSim^hkoo*%2WCM4b^Zp# diff --git a/gfx/tilesets/game_corner.png b/gfx/tilesets/game_corner.png index 21557f7c915bf6a5aa54a47ba0e13ac481fe7eeb..e505c5f7f4d267735e9e37a720d4023c7d1b05a0 100644 GIT binary patch delta 1647 zcmV-#29WuW9PCD0pNtF;08>bP#cyWOHveu!%30&}=x3KLTuECa+K#X^%u->Wd|7 z6y}1MLXkI1H)6~($Cg>>42u-b&U0^DD2440*iN`jx&55)d4HbobAAEiZP~{k52&r2 zu_k;+DgM{RfU#+^>?6egB8%D>i|+mLR?{>gjg%thY~;WUSD-X-o(@;^ktS=iJ2b=C z0>yU2b4vw$hY9IIfRH9s2?1DDfL2?RfW7262X6d6#n?Sfp}RH-C?`HuVQRWj1L%YX zP+tsqi#B2G34h>*T>}VjbsWIn_&p9VrbFN-$`%L-oPYYwZ3u^>2Ij{YDkvQ!q#**N zF%Hn-JIk95>35@+Af;yz07#1fTUY^#0qn-?`Ab0n72u;pfZkdGO1VPr_}B+QNl^iA zWip^Ce0OP5Qfjp!Ae{r6u`3FNbmG-$rWPdW;sBN=p??67olo$MrXV1|)P{g9%9t(s zvRX$?!EOK+HZX}0C3K?CYVlHP@k+#`2Xi_DAc{m_))2mK1jq_2YZ^~v3%-&ZXhxe@)4`}CjxUM zpN~KEE`J9q203uhoB&>fYj>`m9g$1`=6(*Gob_#k2QNT7#xPT)ER=e~>5=hKI|7H_ z18Ar806Z{0Dnnq}u4~kM7?Vw{t!7^@z(GoT;6X-rS-$2wv*AZ{uE*4}$$W_es#)XR z(2hP}MYJ@dX{Hu1A5j9Qw^P~)(xDP$|izGz_c33Q3g|5)27-asT06Tf^ipZTj`bts$AP4-J z#bEPSTnGx7X5p89aBuJ22frG^A7TtMQQLr)W^fY%mP7Nz?GiE|oOS~Ub;|^#Km68K7RLA?wkQ%n14*9Ulz$BXZdAxi zhx(~y6@XU90JJ)EjV;WuG3&YtSgeOS(l|}*TVlYbD|iXm->v#Er`?{C<^!I(`0#^* z`MDKt;%G*l1W>z(SB$5Vyo5Gx?_X{rHrrH_V?ca9ge^3HN3okYn=8~p#}#7pVeDKS zkdlFT7J&pnHULhOx_<=pXMf7 zWIyfJ(<_84I8Z?~Z8abj5{3V%3b_5|oW0ta1myL}=GO{Ip5P=Ja3M0X20#UpSDYuP zL*$O90GdLjBDe}$iDJxJ6GL2q-|coLD!ZNnRxqcPI8xG#E8rXuFKG8U)=`KJ!4<^g zT)}HeR`6@9B%L2-S=c)T7}Jj6YY2#~ms1r+2~JvasMz6fiI>U7K#3@-L##dMU_>Gr tMxx}F@beQ7^OQ8>K_Y-(R!@0se*+xCi*)KgdME$@002ovPDHLkV1hEl@Z|si literal 3599 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 diff --git a/gfx/tilesets/game_corner_palette_map.asm b/gfx/tilesets/game_corner_palette_map.asm index 152154900..969d73f9b 100644 --- a/gfx/tilesets/game_corner_palette_map.asm +++ b/gfx/tilesets/game_corner_palette_map.asm @@ -19,10 +19,8 @@ tilepal 1, YELLOW, RED, YELLOW, RED, GREEN, GREEN, BROWN, ROOF tilepal 1, ROOF, GRAY, GRAY, GRAY, GRAY, RED, ROOF, ROOF tilepal 1, YELLOW, RED, YELLOW, RED, WATER, WATER, RED, RED - tilepal 1, RED, RED, RED, RED, GREEN, GRAY, RED, RED - tilepal 1, RED, RED, YELLOW, YELLOW, WATER, WATER, BROWN, BROWN + tilepal 1, RED, RED, BROWN, BROWN, GREEN, GRAY, RED, RED + tilepal 1, RED, RED, YELLOW, YELLOW, WATER, WATER, GRAY, GRAY tilepal 1, BROWN, BROWN, RED, RED, GREEN, ROOF, RED, RED - tilepal 1, RED, RED, YELLOW, YELLOW, ROOF, ROOF, RED, RED - tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, ROOF, RED, RED - tilepal 1, RED, GRAY, GRAY, GRAY, GRAY, GRAY, RED, RED - tilepal 1, GRAY, GRAY, GRAY, WATER, ROOF, ROOF, WATER, WATER + tilepal 1, RED, RED, YELLOW, YELLOW, ROOF, ROOF, GRAY, GRAY + tilepal 1, BROWN, BROWN \ No newline at end of file diff --git a/maps/VermilionGym.asm b/maps/VermilionGym.asm index 68ae33a86..b8bf7575c 100644 --- a/maps/VermilionGym.asm +++ b/maps/VermilionGym.asm @@ -9,6 +9,189 @@ VermilionGym_MapScripts: def_scene_scripts def_callbacks + callback MAPCALLBACK_OBJECTS, .VermilionGymDoorsScript + callback MAPCALLBACK_TILES, .VermilionGymDoorsCallback + +.VermilionGymDoorsScript: + checkevent EVENT_VERMILION_GYM_SWITCH_2 + iftrue .done + checkevent EVENT_VERMILION_GYM_SWITCH_1 + iffalse .resample +.resample + callasm SampleVermilionGymTrashCans +.done + endcallback + +.VermilionGymDoorsCallback: + checkevent EVENT_VERMILION_GYM_SWITCH_2 + iftrue .NoDoors + endcallback + +.NoDoors: + changeblock 4, 4, $01 ; floor + endcallback + +VermilionGymTrashCanScript: + checkevent EVENT_VERMILION_GYM_SWITCH_2 + iftrue .trash_can + callasm CheckVermilionGymTrashCan + iftrue .open_lock + checkevent EVENT_VERMILION_GYM_SWITCH_1 + iftrue .reset_switches +.trash_can + opentext + writetext VermilionGymTrashCanText + waitbutton + closetext + end + +.open_lock + opentext + checkevent EVENT_VERMILION_GYM_SWITCH_1 + iftrue .second_switch + writetext VermilionGymFoundSwitchText + promptbutton + writetext VermilionGymFoundFirstSwitchText + setevent EVENT_VERMILION_GYM_SWITCH_1 + playsound SFX_PUSH_BUTTON + waitsfx + pause 16 + closetext + end + +.second_switch + writetext VermilionGymFoundSecondSwitchText + waitbutton + playsound SFX_ENTER_DOOR + waitsfx + pause 16 + setevent EVENT_VERMILION_GYM_SWITCH_2 + changeblock 4, 4, $01 ; floor + reloadmappart + closetext + end + +.reset_switches + opentext + writetext VermilionGymTrashCanText + promptbutton + writetext VermilionGymResetSwitchesText + playsound SFX_WRONG + waitsfx + pause 16 + closetext + callasm SampleVermilionGymTrashCans + clearevent EVENT_VERMILION_GYM_SWITCH_1 + end + +SampleVermilionGymTrashCans: + ldh a, [rSVBK] + push af + ld a, BANK(wVermilionGymTrashCan1) + ldh [rSVBK], a +.loop + call Random + ld e, a + swap e + and $f + jr z, .loop + dec a + ld [wVermilionGymTrashCan1], a + call .GetSecondTrashCan + ld [wVermilionGymTrashCan2], a + pop af + ldh [rSVBK], a + ret + +.GetSecondTrashCan: + ld hl, .AdjacencyTable + add a + add a + ld c, a + ld a, e + and %11 + add c + ld c, a + ld b, 0 + add hl, bc + ld a, [hl] + ret + +.AdjacencyTable: + ; left, right, up, down + db 1, 1, 5, 5 ; 0 ( 1, 7) + db 0, 2, 6, 6 ; 1 ( 3, 7) + db 1, 3, 7, 7 ; 2 ( 5, 7) + db 2, 4, 8, 8 ; 3 ( 7, 7) + db 3, 3, 9, 9 ; 4 ( 9, 7) + db 6, 6, 0, 10 ; 5 ( 1, 9) + db 5, 7, 1, 11 ; 6 ( 3, 9) + db 6, 8, 2, 12 ; 7 ( 5, 9) + db 7, 9, 3, 13 ; 8 ( 7, 9) + db 8, 8, 4, 14 ; 9 ( 9, 9) + db 11, 11, 5, 5 ; 10 ( 1,11) + db 10, 12, 6, 6 ; 11 ( 3,11) + db 11, 13, 7, 7 ; 12 ( 5,11) + db 12, 14, 8, 8 ; 13 ( 7,11) + db 13, 13, 9, 9 ; 14 ( 9,11) + +CheckVermilionGymTrashCan: + ldh a, [rSVBK] + push af + ld a, BANK(wVermilionGymTrashCan1) + ldh [rSVBK], a + ld de, EVENT_VERMILION_GYM_SWITCH_1 + ld b, CHECK_FLAG + call EventFlagAction + ld a, c + and a + jr z, .first + ld a, [wVermilionGymTrashCan2] + call .CheckTrashCan + ld a, TRUE + jr z, .done + dec a ; FALSE +.done + ld [wScriptVar], a + pop af + ldh [rSVBK], a + ret + +.first: + ld a, [wVermilionGymTrashCan1] + call .CheckTrashCan + jr z, .yes + ld a, [wVermilionGymTrashCan2] + call .CheckTrashCan + ld a, FALSE + jr nz, .done + ld a, [wVermilionGymTrashCan1] + ld [wVermilionGymTrashCan2], a +.yes + ld a, TRUE + jr .done + +.CheckTrashCan: + ld c, a + call GetFacingTileCoord + call .ConvertCoordsToTrashCan + cp c + ret + +.ConvertCoordsToTrashCan: + ld a, d + sub 5 + srl a + ld d, a + ld a, e + sub 11 + srl a + ld e, a + add a + add a + add e + add d + ret VermilionGymSurgeScript: faceplayer @@ -197,11 +380,12 @@ GuitaristVincentBeatenText: done GuitaristVincentAfterBattleText: - text "If the GYM's traps" - line "were working, you" + text "The GYM's traps" + line "are SURGE's test…" - para "would have been" - line "toast…" + para "If you can't solve" + line "them, then your" + cont "toast…" done JugglerHortonSeenText: @@ -236,13 +420,14 @@ VermilionGymGuideText: para "traps set all over" line "the GYM." - para "But--he-heh--the" - line "traps aren't" - cont "active right now." + para "Why lucky, you may" + line "ask? Because you" - para "You'll have no" - line "problem getting to" - cont "LT.SURGE." + para "can train yourself" + line "better that way!" + + para "Make up your mind" + line "and take on SURGE!" done VermilionGymGuideWinText: @@ -254,8 +439,34 @@ VermilionGymGuideWinText: done VermilionGymTrashCanText: - text "Nope! Nothing here" - line "but trash." + text "Nope, there's " + line "only trash here." + done + +VermilionGymFoundSwitchText: + text "Hey!" + + para "There's a switch" + line "under the trash!" + cont "Turn it on!" + done + +VermilionGymFoundFirstSwitchText: + text "The 1st electric" + line "lock opened!" + done + +VermilionGymFoundSecondSwitchText: + text "The 2nd electric" + line "lock opened!" + + para "The motorized door" + line "opened!" + done + +VermilionGymResetSwitchesText: + text "Hey! The electric" + line "locks were reset!" done VermilionGym_MapEvents: @@ -268,27 +479,28 @@ VermilionGym_MapEvents: def_coord_events def_bg_events - bg_event 1, 7, BGEVENT_READ, VermilionGymTrashCan - bg_event 3, 7, BGEVENT_READ, VermilionGymTrashCan - bg_event 5, 7, BGEVENT_READ, VermilionGymTrashCan - bg_event 7, 7, BGEVENT_READ, VermilionGymTrashCan - bg_event 9, 7, BGEVENT_READ, VermilionGymTrashCan - bg_event 1, 9, BGEVENT_READ, VermilionGymTrashCan - bg_event 3, 9, BGEVENT_READ, VermilionGymTrashCan - bg_event 5, 9, BGEVENT_READ, VermilionGymTrashCan - bg_event 7, 9, BGEVENT_READ, VermilionGymTrashCan - bg_event 9, 9, BGEVENT_READ, VermilionGymTrashCan - bg_event 1, 11, BGEVENT_READ, VermilionGymTrashCan - bg_event 3, 11, BGEVENT_READ, VermilionGymTrashCan - bg_event 5, 11, BGEVENT_READ, VermilionGymTrashCan - bg_event 7, 11, BGEVENT_READ, VermilionGymTrashCan - bg_event 9, 11, BGEVENT_READ, VermilionGymTrashCan - bg_event 3, 15, BGEVENT_READ, VermilionGymStatue - bg_event 6, 15, BGEVENT_READ, VermilionGymStatue + bg_event 1, 7, BGEVENT_READ, VermilionGymTrashCanScript + bg_event 3, 7, BGEVENT_READ, VermilionGymTrashCanScript + bg_event 5, 7, BGEVENT_READ, VermilionGymTrashCanScript + bg_event 7, 7, BGEVENT_READ, VermilionGymTrashCanScript + bg_event 9, 7, BGEVENT_READ, VermilionGymTrashCanScript + bg_event 1, 9, BGEVENT_READ, VermilionGymTrashCanScript + bg_event 3, 9, BGEVENT_READ, VermilionGymTrashCanScript + bg_event 5, 9, BGEVENT_READ, VermilionGymTrashCanScript + bg_event 7, 9, BGEVENT_READ, VermilionGymTrashCanScript + bg_event 9, 9, BGEVENT_READ, VermilionGymTrashCanScript + bg_event 1, 11, BGEVENT_READ, VermilionGymTrashCanScript + bg_event 3, 11, BGEVENT_READ, VermilionGymTrashCanScript + bg_event 5, 11, BGEVENT_READ, VermilionGymTrashCanScript + bg_event 7, 11, BGEVENT_READ, VermilionGymTrashCanScript + bg_event 9, 11, BGEVENT_READ, VermilionGymTrashCanScript + bg_event 6, 1, BGEVENT_READ, VermilionGymTrashCan + bg_event 3, 14, BGEVENT_READ, VermilionGymStatue + bg_event 6, 14, BGEVENT_READ, VermilionGymStatue def_object_events - object_event 5, 2, SPRITE_SURGE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, VermilionGymSurgeScript, -1 + object_event 5, 1, SPRITE_SURGE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, VermilionGymSurgeScript, -1 object_event 8, 8, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerGentlemanGregory, -1 object_event 4, 7, SPRITE_ROCKER, SPRITEMOVEDATA_STANDING_DOWN, 3, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerGuitaristVincent, -1 object_event 0, 10, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerJugglerHorton, -1 - object_event 7, 15, SPRITE_GYM_GUIDE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 1, VermilionGymGuideScript, -1 + object_event 7, 14, SPRITE_GYM_GUIDE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 1, VermilionGymGuideScript, -1 diff --git a/maps/VermilionGym.blk b/maps/VermilionGym.blk index 70311ffce..7ace47b0f 100644 --- a/maps/VermilionGym.blk +++ b/maps/VermilionGym.blk @@ -1 +1 @@ -"&&&$#% ! !  \ No newline at end of file +"&&2$#% ! !  \ No newline at end of file diff --git a/ram/wram.asm b/ram/wram.asm index 7897aaa10..15d24bae7 100644 --- a/ram/wram.asm +++ b/ram/wram.asm @@ -3360,7 +3360,10 @@ wSwarmLandmark:: db wLastMapYCoord:: db ; current y coordinate relative to top-left corner of the previous map wLastMapXCoord:: db ; current x coordinate relative to top-left corner of previous map - ds 11 + ds 9 + +wVermilionGymTrashCan1:: db +wVermilionGymTrashCan2:: db wFossilStepCount:: ds 1