From 0b9a92c472685283bfa7787f6da99e33d4e3fdb2 Mon Sep 17 00:00:00 2001 From: Misty Violet Date: Mon, 23 Oct 2023 03:42:22 -0400 Subject: [PATCH 1/7] Bridge Code --- data/maps/scenes.asm | 1 + home/map.asm | 3 +++ macros/asserts.asm | 10 ++++++++++ macros/code.asm | 8 ++++++++ macros/scripts/events.asm | 9 +++++++++ maps/CeruleanCave1F.asm | 42 +++++++++++++++++++++++++++++++++++++++ ram/wram.asm | 6 +++++- 7 files changed, 78 insertions(+), 1 deletion(-) diff --git a/data/maps/scenes.asm b/data/maps/scenes.asm index 9066520..879e3bd 100644 --- a/data/maps/scenes.asm +++ b/data/maps/scenes.asm @@ -84,4 +84,5 @@ MapScenes:: scene_var MOUNT_MOON_SQUARE, wMountMoonSquareSceneID scene_var MOBILE_TRADE_ROOM, wMobileTradeRoomSceneID scene_var MOBILE_BATTLE_ROOM, wMobileBattleRoomSceneID + scene_var CERULEAN_CAVE_1F, wCeruleanCave1FSceneID db -1 ; end diff --git a/home/map.asm b/home/map.asm index 47c0db8..8a685c9 100644 --- a/home/map.asm +++ b/home/map.asm @@ -1503,6 +1503,9 @@ SaveScreen_LoadConnection:: jr nz, .row ret +GenericFinishBridge:: + ld a, 1 + ld [wOverworldDelaySkip], a GetMovementPermissions:: xor a ld [wTilePermissions], a diff --git a/macros/asserts.asm b/macros/asserts.asm index f0fa52a..c4b8df6 100644 --- a/macros/asserts.asm +++ b/macros/asserts.asm @@ -63,3 +63,13 @@ MACRO end_water_wildmons assert WATER_WILDDATA_LENGTH == @ - {CURRENT_WATER_WILDMONS_LABEL}, \ "def_water_wildmons {CURRENT_WATER_WILDMONS_MAP}: expected {d:WATER_WILDDATA_LENGTH} bytes" ENDM + +MACRO jmp + if _NARG == 1 + jp \1 + else + jp \1, \2 + shift + endc + assert warn, (\1) - @ > 127 || (\1) - @ < -129, "jp can be jr" +ENDM diff --git a/macros/code.asm b/macros/code.asm index 6856b1d..4e93302 100644 --- a/macros/code.asm +++ b/macros/code.asm @@ -94,3 +94,11 @@ if _NARG == 0 sine_table 32 endc ENDM + +MACRO changebridgeblock + ; lb de, \1 + 4, \2 + 4 + ; call GetBlockLocation + ld hl, wOverworldMapBlocks + (\2 / 2 + 3) * (\4_WIDTH + 6) + \1 / 2 + 3 + ; hard-coding the above calculation for efficiency + ld [hl], \3 +ENDM diff --git a/macros/scripts/events.asm b/macros/scripts/events.asm index 25a1395..38abf2f 100644 --- a/macros/scripts/events.asm +++ b/macros/scripts/events.asm @@ -1077,4 +1077,13 @@ MACRO checkmaplockedmons db checkmaplockedmons_command ENDM +MACRO callthisasm + ; "callasm .asm\@" causes a "File stack dump too long, got truncated" + ; error due to the long filename:linenumber trace of nested macros. + db callasm_command + dba .asm\@ + end +.asm\@ +ENDM + DEF NUM_EVENT_COMMANDS EQU const_value diff --git a/maps/CeruleanCave1F.asm b/maps/CeruleanCave1F.asm index 1b3823c..56dd1cb 100644 --- a/maps/CeruleanCave1F.asm +++ b/maps/CeruleanCave1F.asm @@ -2,6 +2,48 @@ CeruleanCave1F_MapScripts: def_scene_scripts def_callbacks +CeruleanCave1FTileScript: + checkscene + iftrue .underfoot + callasm CeruleanCave1F_OverheadBridgeAsm + endcallback + +.underfoot: + callasm CeruleanCave1F_UnderfootBridgeAsm + endcallback + +CeruleanCave1F_OverheadBridgeAsm: + changebridgeblock 20, 2, $ea, CERULEAN_CAVE_1F + changebridgeblock 22, 2, $eb, CERULEAN_CAVE_1F + changebridgeblock 20, 4, $ee, CERULEAN_CAVE_1F + changebridgeblock 22, 4, $ef, CERULEAN_CAVE_1F + changebridgeblock 20, 6, $59, CERULEAN_CAVE_1F + changebridgeblock 22, 6, $5b, CERULEAN_CAVE_1F + jmp BufferScreen + +CeruleanCave1F_UnderfootBridgeAsm: + changebridgeblock 20, 2, $e8, CERULEAN_CAVE_1F + changebridgeblock 22, 2, $e9, CERULEAN_CAVE_1F + changebridgeblock 20, 4, $ec, CERULEAN_CAVE_1F + changebridgeblock 22, 4, $ed, CERULEAN_CAVE_1F + changebridgeblock 20, 6, $55, CERULEAN_CAVE_1F + changebridgeblock 22, 6, $57, CERULEAN_CAVE_1F + jmp BufferScreen + +CeruleanCave1FBridgeOverheadTrigger: + callasm CeruleanCave1F_OverheadBridgeAsm + callthisasm + xor a + jr CeruleanCave1F_FinishBridge + +CeruleanCave1FBridgeUnderfootTrigger: + callasm CeruleanCave1F_UnderfootBridgeAsm + callthisasm + ld a, $1 +CeruleanCave1F_FinishBridge: + ld [wWalkingOnBridge], a + ld [wCeruleanCave1FSceneID], a ; setscene a + jmp GenericFinishBridge CeruleanCave1F_MapEvents: def_warp_events diff --git a/ram/wram.asm b/ram/wram.asm index 57e7f35..0ce9d35 100644 --- a/ram/wram.asm +++ b/ram/wram.asm @@ -1838,7 +1838,7 @@ wBufferMon:: party_struct wBufferMon ds 8 wMonOrItemNameBuffer:: ds NAME_LENGTH ds NAME_LENGTH - +wOverworldDelaySkip:: db SECTION UNION "Miscellaneous WRAM 1", WRAMX @@ -3120,6 +3120,7 @@ wFastShipB1FSceneID:: db wMountMoonSquareSceneID:: db wMobileTradeRoomSceneID:: db wMobileBattleRoomSceneID:: db +wCeruleanCave1FSceneID:: db ds 49 @@ -3235,6 +3236,9 @@ wdc41:: ds 1 wdc42:: ds 8 wBuenasPassword:: db wBlueCardBalance:: db + +wWalkingOnBridge:: db + wDailyRematchFlags:: ds 4 wDailyPhoneItemFlags:: ds 4 wDailyPhoneTimeOfDayFlags:: ds 4 From 1473612318c6e735b75934ba50bd97ffd0d990f7 Mon Sep 17 00:00:00 2001 From: Misty Violet Date: Mon, 23 Oct 2023 03:51:16 -0400 Subject: [PATCH 2/7] forgot the bridge coordinates whoopsie --- maps/CeruleanCave1F.asm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maps/CeruleanCave1F.asm b/maps/CeruleanCave1F.asm index 56dd1cb..2585db6 100644 --- a/maps/CeruleanCave1F.asm +++ b/maps/CeruleanCave1F.asm @@ -57,6 +57,12 @@ CeruleanCave1F_MapEvents: warp_event 5, 15, CERULEAN_CAVE_2F, 6 def_coord_events + coord_event 20, 4, 1, CeruleanCave1FBridgeOverheadTrigger + coord_event 20, 5, 1, CeruleanCave1FBridgeOverheadTrigger + coord_event 23, 4, 1, CeruleanCave1FBridgeOverheadTrigger + coord_event 23, 5, 1, CeruleanCave1FBridgeOverheadTrigger + coord_event 21, 7, 0, CeruleanCave1FBridgeUnderfootTrigger + coord_event 22, 7, 0, CeruleanCave1FBridgeUnderfootTrigger def_bg_events bg_event 10, 13, BGEVENT_ITEM + ULTRA_BALL, EVENT_CERULEAN_CAVE_1F_HIDDEN_ULTRA_BALL From e484b4950381bfa47db842ae36c20bb5c2ae0511 Mon Sep 17 00:00:00 2001 From: Llinos Evans <36418502+PlagueVonKarma@users.noreply.github.com> Date: Mon, 23 Oct 2023 14:01:48 +0100 Subject: [PATCH 3/7] Restore warps to Cerulean Cave This adds the warp to Cerulean Cave into Cerulean City, including the small walk to Route 4. I've moved the Berserk Gene to be underneath where Mewtwo stands, since its location is no longer necessary. --- maps/CeruleanCaveB1F.asm | 1 + maps/CeruleanCity.ablk | 4 ++-- maps/CeruleanCity.asm | 3 ++- maps/Route4.ablk | 4 ++-- maps/unused/BetaSproutTower7.ablk | 2 +- 5 files changed, 8 insertions(+), 6 deletions(-) diff --git a/maps/CeruleanCaveB1F.asm b/maps/CeruleanCaveB1F.asm index f49dd2c..73321fd 100644 --- a/maps/CeruleanCaveB1F.asm +++ b/maps/CeruleanCaveB1F.asm @@ -34,6 +34,7 @@ CeruleanCaveB1F_MapEvents: def_bg_events bg_event 8, 6, BGEVENT_ITEM + MAX_REVIVE, EVENT_CERULEAN_CAVE_B1F_HIDDEN_MAX_REVIVE bg_event 24, 11, BGEVENT_ITEM + ULTRA_BALL, EVENT_CERULEAN_CAVE_B1F_HIDDEN_ULTRA_BALL + bg_event 7, 13, BGEVENT_ITEM, CeruleanCityHiddenBerserkGene def_object_events object_event 7, 13, SPRITE_JYNX, SPRITEMOVEDATA_POKEMON, 0, MEWTWO, -1, -1, PAL_NPC_PURPLE, OBJECTTYPE_SCRIPT, 0, CeruleanCaveMewtwo, EVENT_CERULEAN_CAVE_MEWTWO diff --git a/maps/CeruleanCity.ablk b/maps/CeruleanCity.ablk index 9995648..d308f02 100644 --- a/maps/CeruleanCity.ablk +++ b/maps/CeruleanCity.ablk @@ -6,9 +6,9 @@ t -n1m0m+% +n1m0mWp t -tttm%Ct +tttmKt t diff --git a/maps/CeruleanCity.asm b/maps/CeruleanCity.asm index 2482d7d..44e87c5 100644 --- a/maps/CeruleanCity.asm +++ b/maps/CeruleanCity.asm @@ -283,6 +283,7 @@ CeruleanCity_MapEvents: warp_event 19, 21, CERULEAN_POKECENTER_1F, 1 warp_event 30, 23, CERULEAN_GYM, 1 warp_event 25, 29, CERULEAN_MART, 2 + warp_event 2, 11, CERULEAN_CAVE_1F, 1 def_coord_events @@ -295,7 +296,7 @@ CeruleanCity_MapEvents: bg_event 14, 29, BGEVENT_READ, CeruleanLockedDoor bg_event 20, 21, BGEVENT_READ, CeruleanCityPokecenterSign bg_event 26, 29, BGEVENT_READ, CeruleanCityMartSign - bg_event 2, 12, BGEVENT_ITEM, CeruleanCityHiddenBerserkGene + ;bg_event 2, 12, BGEVENT_ITEM, CeruleanCityHiddenBerserkGene ; To be moved to where Mewtwo will have been sitting. def_object_events object_event 15, 23, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeruleanCityCooltrainerMScript, -1 diff --git a/maps/Route4.ablk b/maps/Route4.ablk index dd1244a..4b329fc 100644 --- a/maps/Route4.ablk +++ b/maps/Route4.ablk @@ -9,14 +9,14 @@ X $WW+% Z/[Y XX -Z/a) +Z) Y XZ/C)/[ -Z/ook) +Z/oo\k) diff --git a/maps/unused/BetaSproutTower7.ablk b/maps/unused/BetaSproutTower7.ablk index 69da4e7..11adf5b 100644 --- a/maps/unused/BetaSproutTower7.ablk +++ b/maps/unused/BetaSproutTower7.ablk @@ -2,7 +2,7 @@     -      +            \ No newline at end of file From b42a806842036c08899f7cb0283562ab2f02ef0f Mon Sep 17 00:00:00 2001 From: Llinos Evans <36418502+PlagueVonKarma@users.noreply.github.com> Date: Mon, 23 Oct 2023 14:47:32 +0100 Subject: [PATCH 4/7] Pewter Museum & Viridian Forest warps Required a little tinkering because I'm vain and wanted the door to be accurate. Please understand. When doing Viridian Forest I had a bit of a moment and kept trying to use the entirely wrong building when it was staring me in the face. I am sorry. I'm getting an 8-bit error on Mewtwo's object code in Cerulean Cave B1F. Misty may need to check this, I'm just getting these locations put in the overworld. --- data/tilesets/kanto_attributes.bin | Bin 2048 -> 2064 bytes data/tilesets/kanto_collision.asm | 1 + data/tilesets/kanto_metatiles.bin | Bin 2048 -> 2064 bytes gfx/tilesets.asm | 22 +++++++------ maps/PewterCity.ablk | 2 +- maps/PewterCity.asm | 9 ++---- maps/Route2.ablk | 17 +++------- maps/Route2.asm | 17 +++++----- maps/ViridianForest.asm | 49 +++++++++++++++-------------- 9 files changed, 55 insertions(+), 62 deletions(-) diff --git a/data/tilesets/kanto_attributes.bin b/data/tilesets/kanto_attributes.bin index 387714cac92b3c441b5c82ca3cfefea1fb4dca43..13f3ab54bd9da4346951d0a90959ced2b99f91f6 100644 GIT binary patch delta 23 YcmZn=m>{r#Lx6=90$6~6m6d@304eqYDgXcg delta 6 NcmbOr&>*mY0{{mu0oecm diff --git a/data/tilesets/kanto_collision.asm b/data/tilesets/kanto_collision.asm index 275c2b0..3fd098d 100644 --- a/data/tilesets/kanto_collision.asm +++ b/data/tilesets/kanto_collision.asm @@ -126,3 +126,4 @@ tilecoll WALL, WALL, WALL, WALL ; 7d tilecoll WALL, WALL, WALL, WALL ; 7e tilecoll WALL, WALL, WALL, WALL ; 7f + tilecoll WALL, WALL, DOOR, WALL ; 80 diff --git a/data/tilesets/kanto_metatiles.bin b/data/tilesets/kanto_metatiles.bin index 41b0cfffd435a479a313984a5191fe86e76040ac..e75a8ff196b8f1adc49bf64613e4fef9f881dd9a 100644 GIT binary patch delta 23 ccmZn=m>{r#Lx9WM+sGRTxOup^q-CU}070e%eE*mY0{{mu0oecm diff --git a/gfx/tilesets.asm b/gfx/tilesets.asm index 4ae47a6..4648c0a 100644 --- a/gfx/tilesets.asm +++ b/gfx/tilesets.asm @@ -234,15 +234,6 @@ INCBIN "data/tilesets/johto_modern_metatiles.bin" TilesetJohtoModernColl:: INCLUDE "data/tilesets/johto_modern_collision.asm" -TilesetTraditionalHouseGFX:: -INCBIN "gfx/tilesets/traditional_house.2bpp.lz" - -TilesetTraditionalHouseMeta:: -INCBIN "data/tilesets/traditional_house_metatiles.bin" - -TilesetTraditionalHouseColl:: -INCLUDE "data/tilesets/traditional_house_collision.asm" - SECTION "Tileset Data 6", ROMX @@ -462,4 +453,15 @@ TilesetAerodactylWordRoomAttr:: INCBIN "data/tilesets/aerodactyl_word_room_attributes.bin" TilesetNihon1Attr:: -INCBIN "data/tilesets/nihon01_attributes.bin" \ No newline at end of file +INCBIN "data/tilesets/nihon01_attributes.bin" + +SECTION "Tileset Data 12", ROMX + +TilesetTraditionalHouseGFX:: +INCBIN "gfx/tilesets/traditional_house.2bpp.lz" + +TilesetTraditionalHouseMeta:: +INCBIN "data/tilesets/traditional_house_metatiles.bin" + +TilesetTraditionalHouseColl:: +INCLUDE "data/tilesets/traditional_house_collision.asm" \ No newline at end of file diff --git a/maps/PewterCity.ablk b/maps/PewterCity.ablk index 5e6f654..25f6972 100644 --- a/maps/PewterCity.ablk +++ b/maps/PewterCity.ablk @@ -5,7 +5,7 @@ RRRRRRRRRRRR?;tt  T!tt ,)ttuqqv7}~t -ttn,)/7}}~/B,) +ttn,)/7}€~/B,) diff --git a/maps/PewterCity.asm b/maps/PewterCity.asm index 352e7b7..021c933 100644 --- a/maps/PewterCity.asm +++ b/maps/PewterCity.asm @@ -129,12 +129,8 @@ PewterGymSignText: done PewterMuseumSignText: - text "There's a notice" - line "here…" - - para "PEWTER MUSEUM OF" - line "SCIENCE is closed" - cont "for renovations…" + text "PEWTER MUSEUM OF" + line "SCIENCE" done PewterCityMtMoonGiftShopSignText: @@ -159,6 +155,7 @@ PewterCity_MapEvents: warp_event 23, 17, PEWTER_MART, 2 warp_event 13, 25, PEWTER_POKECENTER_1F, 1 warp_event 7, 29, PEWTER_SNOOZE_SPEECH_HOUSE, 1 + warp_event 14, 7, PEWTER_MUSEUM_OF_SCIENCE_1F, 1 def_coord_events diff --git a/maps/Route2.ablk b/maps/Route2.ablk index 73d1a2d..c99fd22 100644 --- a/maps/Route2.ablk +++ b/maps/Route2.ablk @@ -3,22 +3,15 @@ >??; 11111$W% -n2ll1tt -n +mn2l1tt +mn -11111lnll +11111 ! -1nlnl - -1nnnnLL111nnnnmm2llnnnnmL/ononmm/mo +17~11112ll// -o -o -mOPl -l - -l T!n|}~ROMRR/UUUUUn +OP T! !|}~RO|~R/UUUUUn diff --git a/maps/Route2.asm b/maps/Route2.asm index 045c3c2..b39d6de 100644 --- a/maps/Route2.asm +++ b/maps/Route2.asm @@ -3,7 +3,6 @@ const ROUTE2_BUG_CATCHER2 const ROUTE2_BUG_CATCHER3 const ROUTE2_POKE_BALL1 - const ROUTE2_POKE_BALL2 const ROUTE2_POKE_BALL3 const ROUTE2_POKE_BALL4 const ROUTE2_FRUIT_TREE @@ -153,23 +152,23 @@ Route2_MapEvents: warp_event 16, 27, ROUTE_2_GATE, 1 warp_event 17, 27, ROUTE_2_GATE, 2 warp_event 12, 7, DIGLETTS_CAVE, 3 + warp_event 5, 33, VIRIDIAN_FOREST_VIRIDIAN_GATE, 1 + warp_event 3, 11, VIRIDIAN_FOREST_PEWTER_GATE, 3 + warp_event 4, 11, VIRIDIAN_FOREST_PEWTER_GATE, 4 def_coord_events def_bg_events bg_event 7, 51, BGEVENT_READ, Route2Sign bg_event 11, 9, BGEVENT_READ, Route2DiglettsCaveSign - bg_event 7, 23, BGEVENT_ITEM, Route2HiddenMaxEther - bg_event 4, 14, BGEVENT_ITEM, Route2HiddenFullHeal - bg_event 4, 27, BGEVENT_ITEM, Route2HiddenFullRestore - bg_event 11, 30, BGEVENT_ITEM, Route2HiddenRevive + bg_event 19, 32, BGEVENT_ITEM, Route2HiddenMaxEther + bg_event 8, 33, BGEVENT_ITEM, Route2HiddenRevive def_object_events object_event 10, 45, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 5, TrainerBugCatcherRob, -1 object_event 6, 4, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBugCatcherEd, -1 object_event 0, 40, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBugCatcherDoug, -1 - object_event 0, 29, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route2DireHit, EVENT_ROUTE_2_DIRE_HIT - object_event 2, 23, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route2MaxPotion, EVENT_ROUTE_2_MAX_POTION - object_event 19, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route2Carbos, EVENT_ROUTE_2_CARBOS + object_event 14, 44, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route2DireHit, EVENT_ROUTE_2_DIRE_HIT + object_event 11, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route2Carbos, EVENT_ROUTE_2_CARBOS object_event 14, 50, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route2Elixer, EVENT_ROUTE_2_ELIXER - object_event 10, 14, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route2FruitTree, -1 + object_event 2, 3, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route2FruitTree, -1 diff --git a/maps/ViridianForest.asm b/maps/ViridianForest.asm index ad2c663..41af4f8 100644 --- a/maps/ViridianForest.asm +++ b/maps/ViridianForest.asm @@ -62,7 +62,7 @@ BugCatcherDaneSeenText: text "Welcome to" line "Viridian Forest." cont "Enjoy my Bug-type" - cont "#mon." + cont "#MON!" done BugCatcherDaneBeatenText: @@ -88,11 +88,11 @@ BugCatcherDionBeatenText: done BugCatcherDionAfterBattleText: - text "Bug-type #mon" + text "Bug-type #MON" line "make all kinds of" cont "sounds." - para "For bug #mon" + para "For bug #MON" line "fans, knowing how" cont "to distinguish" cont "them is key!" @@ -100,11 +100,11 @@ BugCatcherDionAfterBattleText: BugCatcherStaceySeenText: text "Wow, that's a HUGE" - line "#mon!" + line "#MON!" para "…" line "…What kind of" - cont "trainer?!" + cont "TRAINER?!" done BugCatcherStaceyBeatenText: @@ -116,14 +116,14 @@ BugCatcherStaceyAfterBattleText: text "Has anyone ever" line "told you that from" cont "behind you look" - cont "like a Venonat?" + cont "like a VENONAT?" done BugCatcherEllisSeenText: text "There's nothing" line "more efficient and" cont "beautiful than a" - cont "Bug-type #mon." + cont "Bug-type #MON." done BugCatcherEllisBeatenText: @@ -139,20 +139,20 @@ BugCatcherEllisAfterBattleText: BugCatcherAbnerSeenText: text "Many people prefer" - line "solid bug #mon" + line "solid bug #MON" cont "over squishy bug" - cont "#mon." + cont "#MON." done BugCatcherAbnerBeatenText: text "Thanks for your" line "hard work, my" - cont "lovely #mon…" + cont "lovely #MON…" done BugCatcherAbnerAfterBattleText: text "Doesn't matter what" - line "kind of #mon--" + line "kind of #MON--" para "as long as you" line "like them, they" @@ -161,15 +161,15 @@ BugCatcherAbnerAfterBattleText: ViridianForestSignText1: text "Leaving" - line "Viridian Forest" - cont "Pewter City Ahead" + line "VIRIDIAN FOREST" + cont "PEWTER CITY ahead" done ViridianForestSignText2: text "Trainer Tips" para "Hold on to that" - line "Big Mushroom!" + line "BIG MUSHROOM!" para "Some maniacs will" line "pay lots of money" @@ -179,21 +179,22 @@ ViridianForestSignText2: ViridianForestSignText3: text "Trainer Tips" - para "Grass-type #mon" - line "are unaffected by" - - para "powder and spore" - line "moves!" + para "Weaken #MON" + line "before trying" + cont "to catch them!" + + para "When healthy," + line "they may escape!" done ViridianForestSignText4: text "For poison, use" - line "Antidote! Get it" - cont "at #mon Marts!" + line "ANTIDOTE! Get it" + cont "at #MON MARTs!" done ViridianForestSignText5: - text "Trainer Tips" + text "TRAINER TIPS" para "Poison-type #-" line "mon can't be poi-" @@ -201,9 +202,9 @@ ViridianForestSignText5: done ViridianForestSignText6: - text "Trainer Tips" + text "TRAINER TIPS" - para "Weaken #mon" + para "Weaken #MON" line "before attempting" cont "capture!" From d4437ee259faf15103b7974d5554a8926d57debb Mon Sep 17 00:00:00 2001 From: Llinos Evans <36418502+PlagueVonKarma@users.noreply.github.com> Date: Mon, 23 Oct 2023 15:36:14 +0100 Subject: [PATCH 5/7] minor tweaks viridian forest and pewter museum crash on entry, cerulean cave needs the map dimensions fixed --- data/maps/maps.asm | 2 +- maps/Route2.ablk | 10 ++++++---- maps/Route2.asm | 4 ++-- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/data/maps/maps.asm b/data/maps/maps.asm index da69788..fde6e0c 100644 --- a/data/maps/maps.asm +++ b/data/maps/maps.asm @@ -491,7 +491,7 @@ MapGroup_Viridian: map Route2NuggetHouse, TILESET_HOUSE, INDOOR, LANDMARK_ROUTE_2, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE map Route2Gate, TILESET_GATE, GATE, LANDMARK_ROUTE_2, MUSIC_ROUTE_2, FALSE, PALETTE_DAY, FISHGROUP_SHORE map VictoryRoadGate, TILESET_GATE, GATE, LANDMARK_ROUTE_26, MUSIC_INDIGO_PLATEAU, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map ViridianForest, TILESET_FOREST, CAVE, LANDMARK_VIRIDIAN_FOREST, MUSIC_UNION_CAVE, FALSE, PALETTE_AUTO, FISHGROUP_SHORE + map ViridianForest, TILESET_FOREST, CAVE, LANDMARK_VIRIDIAN_FOREST, MUSIC_ROUTE_2, FALSE, PALETTE_AUTO, FISHGROUP_SHORE ; MUSIC_ROUTE_2 is the viridian forest remix map ViridianForestViridianGate, TILESET_GATE, GATE, LANDMARK_ROUTE_2, MUSIC_ROUTE_2, FALSE, PALETTE_DAY, FISHGROUP_SHORE map ViridianForestPewterGate, TILESET_GATE, GATE, LANDMARK_ROUTE_2, MUSIC_ROUTE_2, FALSE, PALETTE_DAY, FISHGROUP_SHORE assert_table_length NUM_VIRIDIAN_MAPS diff --git a/maps/Route2.ablk b/maps/Route2.ablk index c99fd22..17d66bc 100644 --- a/maps/Route2.ablk +++ b/maps/Route2.ablk @@ -3,12 +3,14 @@ >??; 11111$W% -mn2l1tt -mn -11111 ! -17~11112ll// + +2l1tt +OPm +11111 T! + +17}~11112ll// OP T! !|}~RO|~R/UUUUUn diff --git a/maps/Route2.asm b/maps/Route2.asm index b39d6de..1115bed 100644 --- a/maps/Route2.asm +++ b/maps/Route2.asm @@ -153,8 +153,8 @@ Route2_MapEvents: warp_event 17, 27, ROUTE_2_GATE, 2 warp_event 12, 7, DIGLETTS_CAVE, 3 warp_event 5, 33, VIRIDIAN_FOREST_VIRIDIAN_GATE, 1 - warp_event 3, 11, VIRIDIAN_FOREST_PEWTER_GATE, 3 - warp_event 4, 11, VIRIDIAN_FOREST_PEWTER_GATE, 4 + warp_event 2, 11, VIRIDIAN_FOREST_PEWTER_GATE, 3 + warp_event 3, 11, VIRIDIAN_FOREST_PEWTER_GATE, 4 def_coord_events From f983bc8f163dbcf29713947c4a7f03161dbf9f3a Mon Sep 17 00:00:00 2001 From: Llinos Evans <36418502+PlagueVonKarma@users.noreply.github.com> Date: Mon, 23 Oct 2023 16:01:55 +0100 Subject: [PATCH 6/7] Prototype Safari Zone map No scripts or Safari Game yet, but this removes the details of the Safari Zone's closure and adds the map back in. Fixed the entry zone and stuff while I was at it. Fully functional. --- data/tilesets/park_attributes.bin | Bin 1024 -> 1056 bytes data/tilesets/park_collision.asm | 2 ++ data/tilesets/park_metatiles.bin | Bin 1024 -> 1056 bytes maps/FuchsiaCity.ablk | 2 +- maps/FuchsiaCity.asm | 30 +++++++++++------------------- maps/SafariZoneBeta.ablk | 2 +- 6 files changed, 15 insertions(+), 21 deletions(-) diff --git a/data/tilesets/park_attributes.bin b/data/tilesets/park_attributes.bin index 4a5b3c9cf1c9ef2ff10a7196bbab037039d7e0dd..1c2b31685336f9388a5561b8a6922db78c620025 100644 GIT binary patch delta 39 dcmZqRSirG>MS+!-i3x%k8Ch8w8BuwxtN>1P0$l(A delta 6 NcmZ3$(ZI2Q1po(10o4Ei diff --git a/data/tilesets/park_collision.asm b/data/tilesets/park_collision.asm index d24de1e..7a223a7 100644 --- a/data/tilesets/park_collision.asm +++ b/data/tilesets/park_collision.asm @@ -62,3 +62,5 @@ tilecoll WALL, WALL, WALL, WALL ; 3d tilecoll WALL, WALL, WALL, WALL ; 3e tilecoll LONG_GRASS, LONG_GRASS, LONG_GRASS, LONG_GRASS ; 3f + tilecoll WALL, FLOOR, WALL, WARP_CARPET_DOWN ; 40 + tilecoll FLOOR, WALL, WARP_CARPET_DOWN, WALL ; 41 diff --git a/data/tilesets/park_metatiles.bin b/data/tilesets/park_metatiles.bin index 0d6739bbab8bb987558d09845c9d6ded98932c83..853b8bb70d273123ae878064b04f394263ca73d5 100644 GIT binary patch delta 39 pcmZqRSirG>MS)eCk&)FIg#G Date: Mon, 23 Oct 2023 11:11:18 -0400 Subject: [PATCH 7/7] Fixing Map Sizes --- constants/map_constants.asm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/constants/map_constants.asm b/constants/map_constants.asm index e5c9b0c..30a0478 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -166,7 +166,7 @@ ENDM map_const ECRUTEAK_GYM, 5, 9 ; 7 map_const ECRUTEAK_ITEMFINDER_HOUSE, 4, 4 ; 8 map_const ECRUTEAK_CITY, 20, 18 ; 9 - map_const BELLCHIME_TRAIL, 6, 12 + map_const BELLCHIME_TRAIL, 12, 7 endgroup newgroup BLACKTHORN ; 5 @@ -211,9 +211,9 @@ ENDM map_const ROUTE_24, 10, 9 ; 15 map_const ROUTE_25, 30, 9 ; 16 map_const CERULEAN_CITY, 20, 18 ; 17 - map_const CERULEAN_CAVE_1F, 9, 15 - map_const CERULEAN_CAVE_2F, 9, 15 - map_const CERULEAN_CAVE_B1F, 9, 15 + map_const CERULEAN_CAVE_1F, 17, 12 + map_const CERULEAN_CAVE_2F, 17, 11 + map_const CERULEAN_CAVE_B1F, 17, 11 endgroup newgroup AZALEA ; 8 @@ -316,8 +316,8 @@ ENDM map_const PEWTER_POKECENTER_1F, 5, 4 ; 6 map_const PEWTER_POKECENTER_2F_BETA, 8, 4 ; 7 map_const PEWTER_SNOOZE_SPEECH_HOUSE, 4, 4 ; 8 - map_const PEWTER_MUSEUM_OF_SCIENCE_1F, 4, 10 - map_const PEWTER_MUSEUM_OF_SCIENCE_2F, 4, 7 + map_const PEWTER_MUSEUM_OF_SCIENCE_1F, 10, 4 + map_const PEWTER_MUSEUM_OF_SCIENCE_2F, 7, 4 endgroup newgroup FAST_SHIP ; 15 @@ -457,7 +457,7 @@ ENDM map_const ROUTE_2_NUGGET_HOUSE, 4, 4 ; 11 map_const ROUTE_2_GATE, 5, 4 ; 12 map_const VICTORY_ROAD_GATE, 10, 9 ; 13 - map_const VIRIDIAN_FOREST, 27, 15 + map_const VIRIDIAN_FOREST, 19, 26 map_const VIRIDIAN_FOREST_VIRIDIAN_GATE, 4, 5 map_const VIRIDIAN_FOREST_PEWTER_GATE, 4, 5 endgroup