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

Citrine Pokecenter, trade refactoring

Browse source 
I am tired of doing the Legendary wing event, so I'm populating Citrine City.

Some notes;
- I refactored the In-Game Trades to match their nicknames and re-distributed them.
- I swapped Fuschia's bench guy for the third unused one meant for the safe house, but I may outright restore these.
- I refactored the Pokecenter Hidden Objects to all use the same set - they're clones of each other, so this works out. This saves a TON of bytes and works fine.
- I placed the Harry trade for Kadabra/Alakazam in Citrine Pokecenter as it feels right for such a powerful Pokemon to be post-game.
This commit is contained in:
Llinos Evans 2023-04-28 00:48:09 +01:00
parent ba78014ec6
commit d5708ef12e
25 changed files with 146 additions and 78 deletions
Download patch file Download diff file Expand all files Collapse all files

3
data/events/bench_guys.asm
View file

@ -17,5 +17,6 @@ BenchGuyTextPointers:
bench_guy_text SAFFRON_POKECENTER, SPRITE_FACING_LEFT, SaffronCityPokecenterBenchGuyText
bench_guy_text MT_MOON_POKECENTER, SPRITE_FACING_LEFT, MtMoonPokecenterBenchGuyText
bench_guy_text ROCK_TUNNEL_POKECENTER, SPRITE_FACING_LEFT, RockTunnelPokecenterBenchGuyText
bench_guy_text CELADON_UNIVERSITY_POKECENTER, SPRITE_FACING_LEFT, CeladonUniversityPokecenterBenchGuyText
bench_guy_text CELADON_UNIVERSITY_POKECENTER, SPRITE_FACING_LEFT, CeladonUniversityPokecenterBenchGuyText
bench_guy_text CITRINE_POKECENTER, SPRITE_FACING_LEFT, CitrinePokecenterGuyText
db -1 ; end

63
data/events/hidden_objects.asm
View file

@ -84,6 +84,7 @@ HiddenObjectMaps:
db CERULEAN_CITY
db ROUTE_4
db CELADON_UNIVERSITY_POKECENTER
db CITRINE_POKECENTER
db -1 ; end
HiddenObjectPointers:
@ -173,6 +174,7 @@ HiddenObjectPointers:
dw CeruleanCityHiddenObjects
dw Route4HiddenObjects
dw CeladonUniversityPokecenterHiddenObjects
dw CitrinePokecenterHiddenObjects
MACRO hidden_object
db \2 ; y coord
@ -221,11 +223,6 @@ OaksLabHiddenObjects:
hidden_object 1, 1, SPRITE_FACING_UP, DisplayOakLabEmailText
db -1 ; end
ViridianPokecenterHiddenObjects:
hidden_object 0, 4, SPRITE_FACING_LEFT, PrintBenchGuyText
hidden_object 13, 3, SPRITE_FACING_UP, OpenPokemonCenterPC
db -1 ; end
ViridianMartHiddenObjects:
db -1 ; end
@ -254,12 +251,20 @@ PewterGymHiddenObjects:
PewterMartHiddenObjects:
db -1 ; end
; You don't need to re-define your hidden objects every time if they're always the same.
; Therefore, I put all the Pokecenters together. This saves a bunch of bytes.
ViridianPokecenterHiddenObjects:
PewterPokecenterHiddenObjects:
hidden_object 0, 4, SPRITE_FACING_LEFT, PrintBenchGuyText
hidden_object 13, 3, SPRITE_FACING_UP, OpenPokemonCenterPC
db -1 ; end
CeruleanPokecenterHiddenObjects:
LavenderPokecenterHiddenObjects:
VermilionPokecenterHiddenObjects:
CeladonPokecenterHiddenObjects:
FuchsiaPokecenterHiddenObjects:
CinnabarPokecenterHiddenObjects:
RockTunnelPokecenterHiddenObjects:
MtMoonPokecenterHiddenObjects:
CitrinePokecenterHiddenObjects:
CeladonUniversityPokecenterHiddenObjects:
hidden_object 0, 4, SPRITE_FACING_LEFT, PrintBenchGuyText
hidden_object 13, 3, SPRITE_FACING_UP, OpenPokemonCenterPC
db -1 ; end
@ -272,16 +277,6 @@ CeruleanGymHiddenObjects:
CeruleanMartHiddenObjects:
db -1 ; end
LavenderPokecenterHiddenObjects:
hidden_object 0, 4, SPRITE_FACING_LEFT, PrintBenchGuyText
hidden_object 13, 3, SPRITE_FACING_UP, OpenPokemonCenterPC
db -1 ; end
VermilionPokecenterHiddenObjects:
hidden_object 13, 3, SPRITE_FACING_UP, OpenPokemonCenterPC
hidden_object 0, 4, SPRITE_FACING_UP, PrintBenchGuyText
db -1 ; end
VermilionGymHiddenObjects:
hidden_object 3, 14, SPRITE_FACING_UP, GymStatues
hidden_object 6, 14, SPRITE_FACING_UP, GymStatues
@ -308,11 +303,6 @@ CeladonMansion2HiddenObjects:
hidden_object 0, 5, SPRITE_FACING_UP, OpenPokemonCenterPC
db -1 ; end
CeladonPokecenterHiddenObjects:
hidden_object 0, 4, SPRITE_FACING_LEFT, PrintBenchGuyText
hidden_object 13, 3, SPRITE_FACING_UP, OpenPokemonCenterPC
db -1 ; end
CeladonGymHiddenObjects:
hidden_object 3, 15, SPRITE_FACING_UP, GymStatues
hidden_object 6, 15, SPRITE_FACING_UP, GymStatues
@ -374,11 +364,6 @@ CeladonHotelHiddenObjects:
hidden_object 0, 4, SPRITE_FACING_LEFT, PrintBenchGuyText
db -1 ; end
FuchsiaPokecenterHiddenObjects:
hidden_object 13, 3, SPRITE_FACING_UP, OpenPokemonCenterPC
hidden_object 0, 4, SPRITE_FACING_UP, PrintBenchGuyText
db -1 ; end
FuchsiaGymHiddenObjects:
hidden_object 3, 15, SPRITE_FACING_UP, GymStatues
hidden_object 6, 15, SPRITE_FACING_UP, GymStatues
@ -395,25 +380,10 @@ CinnabarGymHiddenObjects:
hidden_object 1, 7, (TRUE << 4) | 6, PrintCinnabarQuiz
db -1 ; end
CinnabarPokecenterHiddenObjects:
hidden_object 0, 4, SPRITE_FACING_UP, PrintBenchGuyText
hidden_object 13, 3, SPRITE_FACING_UP, OpenPokemonCenterPC
db -1 ; end
SaffronGymHiddenObjects:
hidden_object 9, 15, SPRITE_FACING_UP, GymStatues
db -1 ; end
MtMoonPokecenterHiddenObjects:
hidden_object 0, 4, SPRITE_FACING_LEFT, PrintBenchGuyText
hidden_object 13, 3, SPRITE_FACING_UP, OpenPokemonCenterPC
db -1 ; end
RockTunnelPokecenterHiddenObjects:
hidden_object 0, 4, SPRITE_FACING_LEFT, PrintBenchGuyText
hidden_object 13, 3, SPRITE_FACING_UP, OpenPokemonCenterPC
db -1 ; end
ViridianForestHiddenObjects:
hidden_object 1, 18, POTION, HiddenItems
hidden_object 16, 42, ANTIDOTE, HiddenItems
@ -664,8 +634,3 @@ CeruleanCityHiddenObjects:
Route4HiddenObjects:
hidden_object 40, 3, GREAT_BALL, HiddenItems
db -1 ; end
CeladonUniversityPokecenterHiddenObjects:
hidden_object 0, 4, SPRITE_FACING_UP, PrintBenchGuyText
hidden_object 13, 3, SPRITE_FACING_UP, OpenPokemonCenterPC
db -1 ; end