thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2026-02-06 15:45:24 +13:00
Code Issues Projects Releases Packages Wiki Activity Actions

Brunswick groundwork, misc. changes

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

19
data/maps/hide_show_data.asm
View file

@ -17,9 +17,9 @@ MapHSPointers:
dw NoHS
dw NoHS
dw Route1HS
dw Route2HS
dw NoHS ; Route2HS is unnecessary due to new events replacing it.
dw NoHS
dw Route4HS
dw NoHS ; Route4HS was made unnecessary from replacements
dw NoHS
dw NoHS
dw NoHS
@ -177,7 +177,7 @@ MapHSPointers:
dw NoHS
dw NoHS
dw NoHS
dw NoHS
dw BrunswickTrailHS
dw NoHS
dw NoHS
dw NoHS
@ -293,11 +293,11 @@ SaffronCityHS:
db SAFFRON_CITY, $0E, SHOW
db SAFFRON_CITY, $0F, HIDE
db SAFFRON_CITY, $1A, HIDE
Route2HS:
;db ROUTE_2, $01, SHOW - removed for the former
db ROUTE_2, $02, SHOW
Route4HS:
db ROUTE_4, $03, SHOW
;Route2HS: - made redundant.
;db ROUTE_2, $01, SHOW
;db ROUTE_2, $02, SHOW
;Route4HS:
;db ROUTE_4, $03, SHOW
Route9HS:
db ROUTE_9, $0A, SHOW
Route12HS:
@ -555,6 +555,9 @@ VictoryRoad1FHS:
db VICTORY_ROAD_1F, $04, SHOW
ChampionsRoomHS:
db CHAMPIONS_ROOM, $02, HIDE
BrunswickTrailHS:
db BRUNSWICK_TRAIL, $01, SHOW
db BRUNSWICK_TRAIL, $03, SHOW ; to test, SHOW, otherwise HIDE
SeafoamIslands1FHS:
db SEAFOAM_ISLANDS_1F, $01, SHOW
db SEAFOAM_ISLANDS_1F, $02, SHOW

3
data/maps/objects/BrunswickTrail.asm
View file

@ -7,5 +7,8 @@ BrunswickTrail_Object:
def_bg_events
def_object_events
object_event 29, 11, SPRITE_FAKE_TREE, STAY, NONE, 1, CACTUS, 60 | OW_POKEMON ; person
object_event 37, 23, SPRITE_BRUNETTE_GIRL, STAY, DOWN, 2 ; person
object_event 46, 7, SPRITE_BIRD, STAY, DOWN, 3, ZAPDOS_G, 70 | OW_POKEMON ; person
def_warps_to BRUNSWICK_TRAIL

3
data/maps/objects/CelesteHill.asm
View file

@ -2,8 +2,7 @@ CelesteHill_Object:
db $0 ; border block
def_warp_events
warp_event 13, 23, ROUTE_1, 1
warp_event 12, 23, ROUTE_1, 1
warp_event 13, 23, BRUNSWICK_TRAIL, 1
def_bg_events

15
data/maps/sprite_sets.asm
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

2
data/sprites/sprites.asm
View file

@ -87,7 +87,7 @@ SpriteSheetPointerTable:
overworld_sprite PokedexSprite, 4 ; SPRITE_POKEDEX
overworld_sprite ClipboardSprite, 4 ; SPRITE_CLIPBOARD
overworld_sprite SnorlaxSprite, 4 ; SPRITE_SNORLAX
overworld_sprite OldAmberSprite, 4 ; SPRITE_UNUSED_OLD_AMBER
overworld_sprite FakeTreeSprite, 4 ; was SPRITE_UNUSED_OLD_AMBER
overworld_sprite OldAmberSprite, 4 ; SPRITE_OLD_AMBER
overworld_sprite GamblerAsleepSprite, 4 ; SPRITE_UNUSED_GAMBLER_ASLEEP_1
overworld_sprite GamblerAsleepSprite, 4 ; SPRITE_UNUSED_GAMBLER_ASLEEP_2

2
data/tilesets/tileset_headers.asm
View file

@ -36,5 +36,5 @@ Tilesets:
tileset PreGym, $3A, $3B, -1, -1, TILEANIM_NONE
tileset Citrine, -1, -1, -1, $3F, TILEANIM_WATER_FLOWER
tileset Celeste, -1, -1, -1, $19, TILEANIM_WATER_FLOWER
tileset RocketHouse, $0A, -1, -1, -1, TILEANIM_NONE
tileset RocketHouse, $0A, -1, -1, -1, TILEANIM_NONE
assert_table_length NUM_TILESETS

2
data/tilesets/warp_tile_ids.asm
View file

@ -98,7 +98,7 @@ ENDM
warp_tiles $23
.CitrineWarpTileIDs:
warp_tiles $1B, $1C, $0B, $0C
warp_tiles $1B, $1C, $0B, $0C, $58, $59
.CelesteWarpTileIDs:
warp_tiles $5A, $5C, $3A, $30, $50, $51 ; Like Forest but a bit better

5
data/wild/grass_water.asm
View file

@ -174,7 +174,7 @@ WildDataPointers:
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw BrunswickTrailMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
@ -333,4 +333,5 @@ INCLUDE "data/wild/maps/FarawayIslandInside.asm"
INCLUDE "data/wild/maps/MtMoonCrater.asm"
INCLUDE "data/wild/maps/UnderwaterTunnel.asm"
INCLUDE "data/wild/maps/BillsGarden.asm"
INCLUDE "data/wild/maps/CelesteHill.asm"
INCLUDE "data/wild/maps/CelesteHill.asm"
INCLUDE "data/wild/maps/BrunswickTrail.asm"

28
data/wild/maps/BrunswickTrail.asm Normal file
View file

@ -0,0 +1,28 @@
; Given it's the Galarian Zapdos area, let's theme it with racing Pokemon.
; Some of these are Pokemon featured in the Big P Pokemon Race from the anime.
BrunswickTrailMons:
def_grass_wildmons 10 ; encounter rate
db 49, TOEDSCOOL
db 47, DODRIO
db 53, TOEDSCOOL
db 52, DODRIO
db 52, RAPIDASH
db 55, TAUROS
db 55, SANDSLASH
db 56, TOEDSCRUEL
db 56, TOEDSCRUEL
db 55, CACTUS
end_grass_wildmons
def_water_wildmons 10 ; encounter rate
db 52, WEIRDUCK
db 54, WEIRDUCK
db 50, GOLDUCK
db 56, STARYU
db 50, STARYU
db 52, GOLDUCK ; The fastest swimmer in Kanto, as stated in the Pokedex book.
db 54, GOLDUCK
db 50, SEADRA
db 56, SEADRA
db 50, RATICATE ; Raticate are said to be able to swim; fun Easter Egg; seen in the anime.
end_water_wildmons

8
data/wild/maps/MtMoonCrater.asm
View file

@ -2,14 +2,14 @@ MtMoonCraterMons:
def_grass_wildmons 10 ; encounter rate
db 49, DUGTRIO
db 47, VENOMOTH
db 53, CHANSEY
db 53, RAICHU
db 52, VENOMOTH
db 52, DUGTRIO
db 55, RAICHU
db 55, ESPEON
db 55, UMBREON
db 56, ESPEON
db 56, SANDY_SHOCKS
db 50, SCREAM_TAIL
db 50, SANDY_SHOCKS
db 50, CHANSEY ; I don't like this but I also don't like the Paradox Pokemon not both being 4%. Sue me.
end_grass_wildmons
def_water_wildmons 10 ; encounter rate