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
This commit is contained in:
Llinos Evans 2023-12-11 13:16:38 +00:00
parent 2b2c95e52b
commit 5eb44b1794
16 changed files with 29 additions and 1 deletions

View file

@ -55,6 +55,7 @@ DEF SHOW EQU $15
const HS_ROUTE_25_ITEM ; 29 X const HS_ROUTE_25_ITEM ; 29 X
const HS_CACTUS ; 2A const HS_CACTUS ; 2A
const HS_BRUNSWICK_ZAPDOS_G_1 ; 2B const HS_BRUNSWICK_ZAPDOS_G_1 ; 2B
const HS_BRUNSWICK_TRAIL_ITEM1
const HS_DAISY_SITTING ; 2C const HS_DAISY_SITTING ; 2C
const HS_DAISY_WALKING ; 2D const HS_DAISY_WALKING ; 2D
const HS_TOWN_MAP ; 2E const HS_TOWN_MAP ; 2E
@ -251,5 +252,9 @@ DEF SHOW EQU $15
const HS_GLADE_GZAP_1 ; EE const HS_GLADE_GZAP_1 ; EE
const HS_GLADE_GZAP_2 ; EF const HS_GLADE_GZAP_2 ; EF
const HS_GLADE_GZAP_3 ; F0 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 const HS_CINNABAR_VOLCANO_FLOORS_ITEM ; F1
DEF NUM_HS_OBJECTS EQU const_value ; F2 - FE all go unused. DEF NUM_HS_OBJECTS EQU const_value ; F2 - FE all go unused.

View file

@ -64,4 +64,5 @@ HiddenItemCoords:
hidden_item MT_MOON_CRATER, 32, 45 ; Old Amber hidden_item MT_MOON_CRATER, 32, 45 ; Old Amber
hidden_item DAYCARE, 4, 1 ; Daycare PC hidden_item DAYCARE, 4, 1 ; Daycare PC
hidden_item MT_MOON_SQUARE, 5, 5 ; Moon Stone hidden_item MT_MOON_SQUARE, 5, 5 ; Moon Stone
hidden_item BRUNSWICK_TRAIL, 23, 11 ; Solar Beam TM below Cactus
db -1 ; end db -1 ; end

View file

@ -90,6 +90,7 @@ HiddenObjectMaps:
db MT_MOON_CRATER db MT_MOON_CRATER
db DAYCARE db DAYCARE
db MT_MOON_SQUARE db MT_MOON_SQUARE
db BRUNSWICK_TRAIL
db -1 ; end db -1 ; end
HiddenObjectPointers: HiddenObjectPointers:
@ -185,6 +186,7 @@ HiddenObjectPointers:
dw MtMoonCraterHiddenObjects dw MtMoonCraterHiddenObjects
dw DaycareHiddenItems dw DaycareHiddenItems
dw MtMoonSquareHiddenItems dw MtMoonSquareHiddenItems
dw BrunswickTrailHiddenItems
MACRO hidden_object MACRO hidden_object
db \2 ; y coord db \2 ; y coord
@ -667,3 +669,7 @@ DaycareHiddenItems:
MtMoonSquareHiddenItems: MtMoonSquareHiddenItems:
hidden_object 5, 5, MOON_STONE, HiddenItems hidden_object 5, 5, MOON_STONE, HiddenItems
db -1 db -1
BrunswickTrailHiddenItems:
hidden_object 23, 11, TM_SOLARBEAM, HiddenItems
db -1

View file

@ -330,6 +330,7 @@ Route25HS:
BrunswickTrailHS: BrunswickTrailHS:
db BRUNSWICK_TRAIL, $01, SHOW ; HS_CACTUS db BRUNSWICK_TRAIL, $01, SHOW ; HS_CACTUS
db BRUNSWICK_TRAIL, $06, SHOW ; HS_BRUNSWICK_ZAPDOS_G_1 db BRUNSWICK_TRAIL, $06, SHOW ; HS_BRUNSWICK_ZAPDOS_G_1
db BRUNSWICK_TRAIL, $09, SHOW ; HS_BRUNSWICK_TRAIL_ITEM1
BluesHouseHS: BluesHouseHS:
db BLUES_HOUSE, $01, SHOW ; HS_DAISY_SITTING db BLUES_HOUSE, $01, SHOW ; HS_DAISY_SITTING
db BLUES_HOUSE, $02, HIDE ; HS_DAISY_WALKING 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, $01, HIDE ; HS_GLADE_GZAP_1
db BRUNSWICK_GLADE, $02, HIDE ; HS_GLADE_GZAP_2 db BRUNSWICK_GLADE, $02, HIDE ; HS_GLADE_GZAP_2
db BRUNSWICK_GLADE, $03, HIDE ; HS_GLADE_GZAP_3 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: CinnabarVolcanoFloorsHS:
db CINNABAR_VOLCANO_FLOORS, $05, SHOW db CINNABAR_VOLCANO_FLOORS, $05, SHOW
assert_table_length NUM_HS_OBJECTS assert_table_length NUM_HS_OBJECTS

View file

@ -8,11 +8,15 @@ BrunswickGlade_Object:
warp_event 9, 0, BRUNSWICK_GROTTO, 2 warp_event 9, 0, BRUNSWICK_GROTTO, 2
def_bg_events def_bg_events
bg_event 14, 24, 4 bg_event 14, 24, 8 ; Sign
def_object_events def_object_events
object_event 32, 25, SPRITE_BIRD, STAY, DOWN, 1 object_event 32, 25, SPRITE_BIRD, STAY, DOWN, 1
object_event 20, 18, SPRITE_BIRD, STAY, RIGHT, 2 object_event 20, 18, SPRITE_BIRD, STAY, RIGHT, 2
object_event 9, 3, SPRITE_BIRD, STAY, UP, 3 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 def_warps_to BRUNSWICK_GLADE

View file

@ -16,5 +16,7 @@ BrunswickTrail_Object:
object_event 54, 9, SPRITE_BIRD, STAY, UP, 6 ; person, GZap 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, 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_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 def_warps_to BRUNSWICK_TRAIL

View file

@ -6,6 +6,10 @@ BrunswickGlade_TextPointers:
dw GZapRun2 dw GZapRun2
dw GZapRun3 dw GZapRun3
dw BrunswickGladeSign1 dw BrunswickGladeSign1
dw PickUpItemText
dw PickUpItemText
dw PickUpItemText
dw PickUpItemText
GZapRun1: GZapRun1:
text_far _BirdBattleText text_far _BirdBattleText

View file

@ -21,6 +21,7 @@ BrunswickTrail_TextPointers:
dw GZapFound dw GZapFound
dw Lover1 dw Lover1
dw Lover2 dw Lover2
dw PickUpItemText
BrunswickTrailTrainerHeaders: BrunswickTrailTrainerHeaders:
def_trainers def_trainers

0
tools/consts.py Executable file → Normal file
View file

0
tools/free_space.awk Executable file → Normal file
View file

0
tools/palfix.py Executable file → Normal file
View file

0
tools/pic.py Executable file → Normal file
View file

0
tools/rgb555.py Executable file → Normal file
View file

0
tools/sym_comments.py Executable file → Normal file
View file

0
tools/toc.py Executable file → Normal file
View file

0
tools/unique.py Executable file → Normal file
View file