From 5eb44b1794b7111a78bbb8c21b4fda16dac98553 Mon Sep 17 00:00:00 2001 From: Llinos Evans <36418502+PlagueVonKarma@users.noreply.github.com> Date: Mon, 11 Dec 2023 13:16:38 +0000 Subject: [PATCH] brunswick items In the glade and trail could possibly move some to the grotto itself; I wasn't sure what to put there I realised that I don't have polishedmap on this laptop so you'll want to move the items elsewhere --- constants/hide_show_constants.asm | 5 +++++ data/events/hidden_item_coords.asm | 1 + data/events/hidden_objects.asm | 6 ++++++ data/maps/hide_show_data.asm | 5 +++++ data/maps/objects/BrunswickGlade.asm | 6 +++++- data/maps/objects/BrunswickTrail.asm | 2 ++ scripts/BrunswickGlade.asm | 4 ++++ scripts/BrunswickTrail.asm | 1 + tools/consts.py | 0 tools/free_space.awk | 0 tools/palfix.py | 0 tools/pic.py | 0 tools/rgb555.py | 0 tools/sym_comments.py | 0 tools/toc.py | 0 tools/unique.py | 0 16 files changed, 29 insertions(+), 1 deletion(-) mode change 100755 => 100644 tools/consts.py mode change 100755 => 100644 tools/free_space.awk mode change 100755 => 100644 tools/palfix.py mode change 100755 => 100644 tools/pic.py mode change 100755 => 100644 tools/rgb555.py mode change 100755 => 100644 tools/sym_comments.py mode change 100755 => 100644 tools/toc.py mode change 100755 => 100644 tools/unique.py diff --git a/constants/hide_show_constants.asm b/constants/hide_show_constants.asm index 54467918..8fd7f807 100644 --- a/constants/hide_show_constants.asm +++ b/constants/hide_show_constants.asm @@ -55,6 +55,7 @@ DEF SHOW EQU $15 const HS_ROUTE_25_ITEM ; 29 X const HS_CACTUS ; 2A const HS_BRUNSWICK_ZAPDOS_G_1 ; 2B + const HS_BRUNSWICK_TRAIL_ITEM1 const HS_DAISY_SITTING ; 2C const HS_DAISY_WALKING ; 2D const HS_TOWN_MAP ; 2E @@ -251,5 +252,9 @@ DEF SHOW EQU $15 const HS_GLADE_GZAP_1 ; EE const HS_GLADE_GZAP_2 ; EF const HS_GLADE_GZAP_3 ; F0 + const HS_GLADE_ITEM1 + const HS_GLADE_ITEM2 + const HS_GLADE_ITEM3 + const HS_GLADE_ITEM4 const HS_CINNABAR_VOLCANO_FLOORS_ITEM ; F1 DEF NUM_HS_OBJECTS EQU const_value ; F2 - FE all go unused. diff --git a/data/events/hidden_item_coords.asm b/data/events/hidden_item_coords.asm index d9bc77ea..1c3c8853 100644 --- a/data/events/hidden_item_coords.asm +++ b/data/events/hidden_item_coords.asm @@ -64,4 +64,5 @@ HiddenItemCoords: hidden_item MT_MOON_CRATER, 32, 45 ; Old Amber hidden_item DAYCARE, 4, 1 ; Daycare PC hidden_item MT_MOON_SQUARE, 5, 5 ; Moon Stone + hidden_item BRUNSWICK_TRAIL, 23, 11 ; Solar Beam TM below Cactus db -1 ; end diff --git a/data/events/hidden_objects.asm b/data/events/hidden_objects.asm index bc6fdb26..264188f9 100644 --- a/data/events/hidden_objects.asm +++ b/data/events/hidden_objects.asm @@ -90,6 +90,7 @@ HiddenObjectMaps: db MT_MOON_CRATER db DAYCARE db MT_MOON_SQUARE + db BRUNSWICK_TRAIL db -1 ; end HiddenObjectPointers: @@ -185,6 +186,7 @@ HiddenObjectPointers: dw MtMoonCraterHiddenObjects dw DaycareHiddenItems dw MtMoonSquareHiddenItems + dw BrunswickTrailHiddenItems MACRO hidden_object db \2 ; y coord @@ -667,3 +669,7 @@ DaycareHiddenItems: MtMoonSquareHiddenItems: hidden_object 5, 5, MOON_STONE, HiddenItems db -1 + +BrunswickTrailHiddenItems: + hidden_object 23, 11, TM_SOLARBEAM, HiddenItems + db -1 diff --git a/data/maps/hide_show_data.asm b/data/maps/hide_show_data.asm index 42140dbe..704d898e 100644 --- a/data/maps/hide_show_data.asm +++ b/data/maps/hide_show_data.asm @@ -330,6 +330,7 @@ Route25HS: BrunswickTrailHS: db BRUNSWICK_TRAIL, $01, SHOW ; HS_CACTUS db BRUNSWICK_TRAIL, $06, SHOW ; HS_BRUNSWICK_ZAPDOS_G_1 + db BRUNSWICK_TRAIL, $09, SHOW ; HS_BRUNSWICK_TRAIL_ITEM1 BluesHouseHS: db BLUES_HOUSE, $01, SHOW ; HS_DAISY_SITTING db BLUES_HOUSE, $02, HIDE ; HS_DAISY_WALKING @@ -591,6 +592,10 @@ BrunswickGladeHS: db BRUNSWICK_GLADE, $01, HIDE ; HS_GLADE_GZAP_1 db BRUNSWICK_GLADE, $02, HIDE ; HS_GLADE_GZAP_2 db BRUNSWICK_GLADE, $03, HIDE ; HS_GLADE_GZAP_3 + db BRUNSWICK_GLADE, $04, HIDE ; HS_GLADE_ITEM1 + db BRUNSWICK_GLADE, $05, HIDE ; HS_GLADE_ITEM2 + db BRUNSWICK_GLADE, $06, HIDE ; HS_GLADE_ITEM3 + db BRUNSWICK_GLADE, $07, HIDE ; HS_GLADE_ITEM4 CinnabarVolcanoFloorsHS: db CINNABAR_VOLCANO_FLOORS, $05, SHOW assert_table_length NUM_HS_OBJECTS diff --git a/data/maps/objects/BrunswickGlade.asm b/data/maps/objects/BrunswickGlade.asm index 9889a35c..ad43777d 100644 --- a/data/maps/objects/BrunswickGlade.asm +++ b/data/maps/objects/BrunswickGlade.asm @@ -8,11 +8,15 @@ BrunswickGlade_Object: warp_event 9, 0, BRUNSWICK_GROTTO, 2 def_bg_events - bg_event 14, 24, 4 + bg_event 14, 24, 8 ; Sign def_object_events object_event 32, 25, SPRITE_BIRD, STAY, DOWN, 1 object_event 20, 18, SPRITE_BIRD, STAY, RIGHT, 2 object_event 9, 3, SPRITE_BIRD, STAY, UP, 3 + object_event 6, 15, SPRITE_POKE_BALL, STAY, NONE, 4, TM_THUNDER ; itemball1 + object_event 6, 15, SPRITE_POKE_BALL, STAY, NONE, 5, LEAF_STONE ; itemball2 + object_event 6, 15, SPRITE_POKE_BALL, STAY, NONE, 6, REVIVE ; itemball3 + object_event 6, 15, SPRITE_POKE_BALL, STAY, NONE, 7, HYPER_POTION ; itemball4 def_warps_to BRUNSWICK_GLADE \ No newline at end of file diff --git a/data/maps/objects/BrunswickTrail.asm b/data/maps/objects/BrunswickTrail.asm index 9e0fe377..9191f525 100644 --- a/data/maps/objects/BrunswickTrail.asm +++ b/data/maps/objects/BrunswickTrail.asm @@ -16,5 +16,7 @@ BrunswickTrail_Object: object_event 54, 9, SPRITE_BIRD, STAY, UP, 6 ; person, GZap object_event 6, 16, SPRITE_COOLTRAINER_F, STAY, LEFT, 7 ; person, Lover1 object_event 6, 15, SPRITE_BRUNETTE_GIRL, STAY, LEFT, 8 ; person, Lover2 + object_event 6, 15, SPRITE_POKE_BALL, STAY, NONE, 9, ULTRA_BALL ; itemball1 + def_warps_to BRUNSWICK_TRAIL diff --git a/scripts/BrunswickGlade.asm b/scripts/BrunswickGlade.asm index 9900defc..aa64323c 100644 --- a/scripts/BrunswickGlade.asm +++ b/scripts/BrunswickGlade.asm @@ -6,6 +6,10 @@ BrunswickGlade_TextPointers: dw GZapRun2 dw GZapRun3 dw BrunswickGladeSign1 + dw PickUpItemText + dw PickUpItemText + dw PickUpItemText + dw PickUpItemText GZapRun1: text_far _BirdBattleText diff --git a/scripts/BrunswickTrail.asm b/scripts/BrunswickTrail.asm index 8b182408..34b4c6e4 100644 --- a/scripts/BrunswickTrail.asm +++ b/scripts/BrunswickTrail.asm @@ -21,6 +21,7 @@ BrunswickTrail_TextPointers: dw GZapFound dw Lover1 dw Lover2 + dw PickUpItemText BrunswickTrailTrainerHeaders: def_trainers diff --git a/tools/consts.py b/tools/consts.py old mode 100755 new mode 100644 diff --git a/tools/free_space.awk b/tools/free_space.awk old mode 100755 new mode 100644 diff --git a/tools/palfix.py b/tools/palfix.py old mode 100755 new mode 100644 diff --git a/tools/pic.py b/tools/pic.py old mode 100755 new mode 100644 diff --git a/tools/rgb555.py b/tools/rgb555.py old mode 100755 new mode 100644 diff --git a/tools/sym_comments.py b/tools/sym_comments.py old mode 100755 new mode 100644 diff --git a/tools/toc.py b/tools/toc.py old mode 100755 new mode 100644 diff --git a/tools/unique.py b/tools/unique.py old mode 100755 new mode 100644