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

Fix Celadon University spriteset issue

Browse source 
Thanks to erosunica for the help!

Contains some Citrine City groundwork as well.
This commit is contained in:
May Evans 2023-03-29 21:25:43 +01:00
parent fffcf9a393
commit 9cf8a3fcc7
11 changed files with 269 additions and 282 deletions
Download patch file Download diff file Expand all files Collapse all files

2
data/maps/hide_show_data.asm
View file

@ -15,6 +15,7 @@ MapHSPointers:
dw NoHS
dw SaffronCityHS
dw NoHS
dw NoHS
dw Route1HS
dw Route2HS
dw NoHS
@ -246,7 +247,6 @@ MapHSPointers:
dw NoHS
dw NoHS
dw NoHS
dw NoHS
dw BillsGardenHS
dw NoHS
dw NoHS

10
data/maps/map_header_banks.asm
View file

@ -12,7 +12,8 @@ MapHeaderBanks::
db BANK(CinnabarIsland_h)
db BANK(IndigoPlateau_h)
db BANK(SaffronCity_h)
db $01 ; UNUSED_MAP_0B
db $01 ; TODO BANK(CitrineCity_h)
db BANK(CeladonUniversityOutside_h)
db BANK(Route1_h)
db BANK(Route2_h)
db BANK(Route3_h)
@ -242,10 +243,9 @@ MapHeaderBanks::
db $11 ; UNUSED_MAP_EE
db BANK(TradeCenter_h)
db BANK(Colosseum_h)
db BANK(CeladonUniversityOutside_h) ; $11 UNUSED_MAP_F1
db BANK(CeladonUniversityInside_h) ; $11 UNUSED_MAP_F2
db BANK(CeladonUniversityPokecenter_h) ; UNUSED_MAP_F3
db BANK(BillsGarden_h) ; UNUSED_MAP_F4, $11
db BANK(CeladonUniversityInside_h) ; $11 UNUSED_MAP_F1
db BANK(CeladonUniversityPokecenter_h) ; UNUSED_MAP_F2
db BANK(BillsGarden_h) ; UNUSED_MAP_F3, $11
db BANK(LoreleisRoom_h)
db BANK(BrunosRoom_h)
db BANK(AgathasRoom_h)

10
data/maps/map_header_pointers.asm
View file

@ -12,7 +12,8 @@ MapHeaderPointers::
dw CinnabarIsland_h
dw IndigoPlateau_h
dw SaffronCity_h
dw SaffronCity_h ; UNUSED_MAP_0B
dw SaffronCity_h ; TODO CitrineCity_h
dw CeladonUniversityOutside_h
dw Route1_h
dw Route2_h
dw Route3_h
@ -242,10 +243,9 @@ MapHeaderPointers::
dw SilphCo2F_h ; UNUSED_MAP_EE
dw TradeCenter_h
dw Colosseum_h
dw CeladonUniversityOutside_h ; UNUSED_MAP_F1
dw CeladonUniversityInside_h ; UNUSED_MAP_F2
dw CeladonUniversityPokecenter_h ; UNUSED_MAP_F3
dw BillsGarden_h ; UNUSED_MAP_F4, used to use SilphCo2F_h
dw CeladonUniversityInside_h ; UNUSED_MAP_F1
dw CeladonUniversityPokecenter_h ; UNUSED_MAP_F2
dw BillsGarden_h ; UNUSED_MAP_F3, used to use SilphCo2F_h
dw LoreleisRoom_h
dw BrunosRoom_h
dw AgathasRoom_h

1
data/maps/names.asm
View file

@ -10,6 +10,7 @@ CinnabarIslandName: db "CINNABAR ISLAND@"
IndigoPlateauName: db "INDIGO PLATEAU@"
SaffronCityName: db "SAFFRON CITY@"
CitrineCityName: db "CITRINE CITY@"
CeladonUniversityName: db "CELADON UNIVERSITY@"
Route1Name: db "ROUTE 1@"
Route2Name: db "ROUTE 2@"
Route3Name: db "ROUTE 3@"

9
data/maps/objects/CeladonUniversityOutside.asm
View file

@ -12,9 +12,8 @@ CeladonUniversityOutside_Object:
object_event 22, 26, SPRITE_SUPER_NERD, WALK, LEFT, 2 ; trainer
object_event 9, 6, SPRITE_GAMBLER, WALK, DOWN, 3 ; trainer
object_event 25, 20, SPRITE_SUPER_NERD, WALK, DOWN, 4 ; trainer
object_event 4, 27, SPRITE_ROCKER, WALK, LEFT, 5
object_event 33, 16, SPRITE_BEAUTY, WALK, DOWN, 6
object_event 7, 22, SPRITE_SEEL, WALK, RIGHT, 7
object_event 34, 25, SPRITE_SEEL, WALK, LEFT, 7
object_event 4, 27, SPRITE_FISHER, WALK, LEFT, 5 ; Original SPRITE_ROCKER replaced. Reason: maximum of 10 sprites per set
object_event 33, 16, SPRITE_GIRL, WALK, DOWN, 6 ; Original SPRITE_BEAUTY replaced. Reason: same as above
object_event 7, 22, SPRITE_SEEL, WALK, RIGHT, 7 ; Static sprite. Reason: same as above and used the slot 11
object_event 34, 25, SPRITE_SEEL, WALK, LEFT, 7 ; Static sprite. Reason: same as above
def_warps_to CELADON_UNIVERSITY_OUTSIDE

10
data/maps/songs.asm
View file

@ -11,7 +11,8 @@ MapSongBanks::
db MUSIC_CINNABAR, BANK(Music_Cinnabar) ; CINNABAR_ISLAND
db MUSIC_INDIGO_PLATEAU, BANK(Music_IndigoPlateau) ; INDIGO_PLATEAU
db MUSIC_CITIES1, BANK(Music_Cities1) ; SAFFRON_CITY
db MUSIC_CITIES1, BANK(Music_Cities1) ; UNUSED_MAP_0B
db MUSIC_CITIES1, BANK(Music_Cities1) ; CITRINE_CITY
db MUSIC_CELADON, BANK(Music_Celadon) ; CELADON_UNIVERSITY_OUTSIDE
db MUSIC_ROUTES1, BANK(Music_Routes1) ; ROUTE_1
db MUSIC_ROUTES1, BANK(Music_Routes1) ; ROUTE_2
db MUSIC_ROUTES3, BANK(Music_Routes3) ; ROUTE_3
@ -241,10 +242,9 @@ MapSongBanks::
db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; UNUSED_MAP_EE
db MUSIC_CELADON, BANK(Music_Celadon) ; TRADE_CENTER
db MUSIC_CELADON, BANK(Music_Celadon) ; COLOSSEUM
db MUSIC_CELADON, BANK(Music_Celadon) ; UNUSED_MAP_F1 / Celadon University Outside
db MUSIC_OAKS_LAB, BANK(Music_OaksLab) ; UNUSED_MAP_F2 / Celadon University Outside
db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; UNUSED_MAP_F3 / Celadon University Pokecenter
db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; UNUSED_MAP_F4
db MUSIC_OAKS_LAB, BANK(Music_OaksLab) ; UNUSED_MAP_F1 / Celadon University Outside
db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; UNUSED_MAP_F2 / Celadon University Pokecenter
db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; UNUSED_MAP_F3
db MUSIC_GYM, BANK(Music_Gym) ; LORELEIS_ROOM
db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ; BRUNOS_ROOM
db MUSIC_POKEMON_TOWER, BANK(Music_PokemonTower) ; AGATHAS_ROOM

27
data/maps/sprite_sets.asm
View file

@ -11,7 +11,8 @@ MapSpriteSets:
db $01 ; CINNABAR_ISLAND
db $06 ; INDIGO_PLATEAU
db $07 ; SAFFRON_CITY
db $0B ; unused map ID - now CeladonU
db $01 ; CITRINE_CITY
db $05 ; CELADON_UNIVERSITY_OUTSIDE
db $01 ; ROUTE_1
db $f1 ; ROUTE_2
db $02 ; ROUTE_3
@ -60,7 +61,6 @@ SplitMapSpriteSets:
db NORTH_SOUTH, 2, $07, $04 ; $fa
db EAST_WEST, 17, $05, $07 ; $fb
db EAST_WEST, 3, $07, $03 ; $fc
db NORTH_SOUTH, 0, $05, $0B ; Celadon University
SpriteSets:
@ -130,15 +130,15 @@ DEF SPRITE_SET_LENGTH EQU 9 + 2
; sprite set $05 - Celadon City
table_width 1
db SPRITE_LITTLE_GIRL
db SPRITE_LITTLE_BOY
db SPRITE_COOLTRAINER_F ; Original: SPRITE_LITTLE_BOY
db SPRITE_GIRL
db SPRITE_FISHER
db SPRITE_MIDDLE_AGED_MAN
db SPRITE_GAMBLER ; Original: SPRITE_MIDDLE_AGED_MAN
db SPRITE_GRAMPS
db SPRITE_MONSTER
db SPRITE_GUARD
db SPRITE_SUPER_NERD ; Original: SPRITE_GUARD
db SPRITE_ROCKET
db SPRITE_POKE_BALL
db SPRITE_SEEL ; Original: SPRITE_POKE_BALL (static sprite)
db SPRITE_SNORLAX
assert_table_length SPRITE_SET_LENGTH
@ -216,18 +216,3 @@ DEF SPRITE_SET_LENGTH EQU 9 + 2
db SPRITE_POKE_BALL
db SPRITE_FOSSIL
assert_table_length SPRITE_SET_LENGTH
; sprite set $0b
table_width 1
db SPRITE_LITTLE_GIRL
db SPRITE_LITTLE_BOY
db SPRITE_COOLTRAINER_F
db SPRITE_SUPER_NERD
db SPRITE_MIDDLE_AGED_MAN
db SPRITE_GAMBLER
db SPRITE_SEEL
db SPRITE_GUARD
db SPRITE_ROCKET
db SPRITE_POKE_BALL
db SPRITE_SNORLAX
assert_table_length SPRITE_SET_LENGTH

3
data/maps/town_map_entries.asm
View file

@ -18,7 +18,8 @@ ExternalMapEntries:
external_map 2, 15, CinnabarIslandName
external_map 0, 2, IndigoPlateauName
external_map 10, 5, SaffronCityName
external_map 7, 10, CitrineCityName
external_map 7, 10, CitrineCityName
external_map 7, 4, CeladonUniversityName
external_map 2, 10, Route1Name
external_map 2, 6, Route2Name
external_map 4, 3, Route3Name

1
data/maps/town_map_order.asm
View file

@ -26,6 +26,7 @@ TownMapOrder:
db ROUTE_8
db ROUTE_7
db CELADON_CITY
; db CELADON_UNIVERSITY_OUTSIDE ; erosunica: uncomment this line to add it to the Town Map
db SAFFRON_CITY
db ROUTE_11
db ROUTE_12