Brunswick groundwork, misc. changes

The groundwork for Brunswick Trail events has been done. Wild data, Cactus event, and Zapdos-G events are set up, plus an NPC. This also makes the Fake Tree sprite available.

I made the warp at the tunnel in Brunswick goes directly to Celeste Hill and back. Warp tile made functional.

Many bugs right now:
- Cactus doesn't disappear after battling it. Also, making this work how I want it to is hard.
- Pokemon are encountered on every tile, which is likely because it's considered to be indoors. In trying to fix this, I seemed to completely screw up the maps, so this isn't being committed. Handle this with care.
- I made a spriteset specifically for Citrine, but it doesn't seem to be working for Brunswick, likely because Brunswick is an indoor map and thus isn't just taking it.

Misc. changes:
- Moved Sandy Shocks to a 4% encounter slot in Mt. Moon Crater to be equal to Scream Tail.
- Restored the proper translation for the "rotten PRESIDENT" scientist, courtesy of Dr. Lava and Nob Ogasawara.
This commit is contained in:
Llinos Evans 2023-04-27 04:08:27 +01:00
parent 7850a87e83
commit 108fb01070
19 changed files with 205 additions and 28 deletions

View file

@ -14,7 +14,7 @@ MapSpriteSets:
db SPRITESET_SAFFRON ; SAFFRON_CITY
db SPRITESET_PALLET_VIRIDIAN ; CINNABAR_ISLAND
db SPRITESET_INDIGO ; INDIGO_PLATEAU
db SPRITESET_PALLET_VIRIDIAN ; CITRINE_CITY
db SPRITESET_CITRINE ; CITRINE_CITY
db SPRITESET_PALLET_VIRIDIAN ; ROUTE_1
db SPLITSET_ROUTE_2 ; ROUTE_2
db SPRITESET_PEWTER_CERULEAN ; ROUTE_3
@ -198,4 +198,17 @@ SpriteSets:
db SPRITE_POKE_BALL
db SPRITE_FOSSIL
; SPRITESET_CITRINE
db SPRITE_BRUNETTE_GIRL
db SPRITE_BIRD
db SPRITE_SUPER_NERD ; free slot, add as needed.
db SPRITE_HIKER ; free slot, add as needed.
db SPRITE_GAMBLER ; free slot, add as needed.
db SPRITE_MONSTER ; free slot, add as needed.
db SPRITE_COOLTRAINER_F ; free slot, add as needed.
db SPRITE_COOLTRAINER_M ; free slot, add as needed.
db SPRITE_GUARD ; free slot, add as needed.
db SPRITE_POKE_BALL ; probably not free
db SPRITE_FAKE_TREE
assert_table_length NUM_SPRITE_SETS