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

Merge branch 'master' of https://github.com/plaguevonkarma/kep-hack

Browse source
This commit is contained in:
emaskyesmogon 2022-09-27 10:37:03 -06:00
commit e02394e8d2
28 changed files with 484 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

2
data/maps/headers/CeladonUniversityPokecenter.asm Normal file
View file

@ -0,0 +1,2 @@
map_header CeladonUniversityPokecenter, CELADON_UNIVERSITY_POKECENTER, POKECENTER, 0
end_map_header

2
data/maps/map_header_banks.asm
View file

@ -244,7 +244,7 @@ MapHeaderBanks::
db BANK(Colosseum_h)
db BANK(CeladonUniversityOutside_h) ; $11 UNUSED_MAP_F1
db BANK(CeladonUniversityInside_h) ; $11 UNUSED_MAP_F2
db $11 ; UNUSED_MAP_F3
db BANK(CeladonUniversityPokecenter_h) ; UNUSED_MAP_F3
db $11 ; UNUSED_MAP_F4
db BANK(LoreleisRoom_h)
db BANK(BrunosRoom_h)

2
data/maps/map_header_pointers.asm
View file

@ -244,7 +244,7 @@ MapHeaderPointers::
dw Colosseum_h
dw CeladonUniversityOutside_h ; UNUSED_MAP_F1
dw CeladonUniversityInside_h ; UNUSED_MAP_F2
dw SilphCo2F_h ; UNUSED_MAP_F3
dw CeladonUniversityPokecenter_h ; UNUSED_MAP_F3
dw SilphCo2F_h ; UNUSED_MAP_F4
dw LoreleisRoom_h
dw BrunosRoom_h

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

@ -3,12 +3,18 @@ CeladonUniversityOutside_Object:
def_warp_events
warp_event 20, 13, CELADON_UNIVERSITY_INSIDE, 1
warp_event 15, 25, CELADON_UNIVERSITY_POKECENTER, 1
def_bg_events
def_object_events
object_event 19, 30, SPRITE_COOLTRAINER_F, STAY, RIGHT, 1, OPP_JR_TRAINER_F, 3
object_event 22, 26, SPRITE_SUPER_NERD, STAY, LEFT, 2, OPP_SUPER_NERD, 6
object_event 9, 6, SPRITE_BALDING_GUY, STAY, DOWN, 3, OPP_ENGINEER, 1
object_event 19, 30, SPRITE_COOLTRAINER_F, WALK, RIGHT, 1, OPP_JR_TRAINER_F, 4
object_event 22, 26, SPRITE_SUPER_NERD, WALK, LEFT, 2, OPP_SUPER_NERD, 6
object_event 9, 6, SPRITE_GAMBLER, WALK, DOWN, 3, OPP_ENGINEER, 1
object_event 25, 20, SPRITE_SUPER_NERD, WALK, DOWN, 4, OPP_SUPER_NERD, 7
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
def_warps_to CELADON_UNIVERSITY_OUTSIDE

16
data/maps/objects/CeladonUniversityPokecenter.asm Normal file
View file

@ -0,0 +1,16 @@
CeladonUniversityPokecenter_Object:
db $0 ; border block
def_warp_events
warp_event 3, 7, CELADON_UNIVERSITY_OUTSIDE, 2
warp_event 4, 7, CELADON_UNIVERSITY_OUTSIDE, 2
def_bg_events
def_object_events
object_event 3, 1, SPRITE_NURSE, STAY, DOWN, 1 ; person
object_event 8, 3, SPRITE_SCIENTIST, STAY, LEFT_RIGHT, 2 ; person
object_event 10, 5, SPRITE_MIDDLE_AGED_MAN, WALK, ANY_DIR, 3 ; spamton
object_event 11, 2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 4 ; person
def_warps_to CELADON_UNIVERSITY_POKECENTER

1
data/maps/objects/RockTunnelPokecenter.asm
View file

@ -12,5 +12,6 @@ RockTunnelPokecenter_Object:
object_event 7, 3, SPRITE_GENTLEMAN, WALK, LEFT_RIGHT, 2 ; person
object_event 2, 5, SPRITE_FISHER, STAY, NONE, 3 ; person
object_event 11, 2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 4 ; person
object_event 9, 6, SPRITE_MIDDLE_AGED_MAN, STAY, DOWN, 5 ; spamton
def_warps_to ROCK_TUNNEL_POKECENTER

2
data/maps/songs.asm
View file

@ -243,7 +243,7 @@ MapSongBanks::
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_SILPH_CO, BANK(Music_SilphCo) ; UNUSED_MAP_F3
db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; UNUSED_MAP_F3 / Celadon University Pokecenter
db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; UNUSED_MAP_F4
db MUSIC_GYM, BANK(Music_Gym) ; LORELEIS_ROOM
db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ; BRUNOS_ROOM

10
data/maps/sprite_sets.asm
View file

@ -93,7 +93,7 @@ DEF SPRITE_SET_LENGTH EQU 9 + 2
db SPRITE_COOLTRAINER_F
db SPRITE_COOLTRAINER_M
db SPRITE_POKE_BALL
db SPRITE_UNUSED_GAMBLER_ASLEEP_2
db SPRITE_FAKE_TREE ; fake tree, used to be unused sleeping gambler
assert_table_length SPRITE_SET_LENGTH
; sprite set $03
@ -108,7 +108,7 @@ DEF SPRITE_SET_LENGTH EQU 9 + 2
db SPRITE_COOLTRAINER_M
db SPRITE_GUARD
db SPRITE_POKE_BALL
db SPRITE_UNUSED_GAMBLER_ASLEEP_2
db SPRITE_FAKE_TREE ; fake tree, used to be unused sleeping gambler
assert_table_length SPRITE_SET_LENGTH
; sprite set $04
@ -123,7 +123,7 @@ DEF SPRITE_SET_LENGTH EQU 9 + 2
db SPRITE_COOLTRAINER_F
db SPRITE_COOLTRAINER_M
db SPRITE_POKE_BALL
db SPRITE_UNUSED_GAMBLER_ASLEEP_2
db SPRITE_FAKE_TREE ; fake tree, used to be unused sleeping gambler
assert_table_length SPRITE_SET_LENGTH
; sprite set $05
@ -153,7 +153,7 @@ DEF SPRITE_SET_LENGTH EQU 9 + 2
db SPRITE_GUARD
db SPRITE_GAMBLER
db SPRITE_POKE_BALL
db SPRITE_UNUSED_GAMBLER_ASLEEP_2
db SPRITE_FAKE_TREE ; fake tree, used to be unused sleeping gambler
assert_table_length SPRITE_SET_LENGTH
; sprite set $07
@ -168,7 +168,7 @@ DEF SPRITE_SET_LENGTH EQU 9 + 2
db SPRITE_COOLTRAINER_M
db SPRITE_MONSTER
db SPRITE_POKE_BALL
db SPRITE_UNUSED_GAMBLER_ASLEEP_2
db SPRITE_FAKE_TREE ; fake tree, used to be unused sleeping gambler
assert_table_length SPRITE_SET_LENGTH
; sprite set $08

11
data/pokemon/base_stats/gyaoon.asm
View file

@ -1,6 +1,6 @@
db DEX_GYAOON ; pokedex id
db 101, 130, 105, 35, 70
db 101, 110, 100, 30, 95
; hp atk def spd spc
db ROCK, ROCK ; type
@ -15,10 +15,11 @@
; tm/hm learnset
tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \
DOUBLE_EDGE, HYPER_BEAM, SUBMISSION, COUNTER, SEISMIC_TOSS, \
RAGE, DRAGON_RAGE, EARTHQUAKE, FISSURE, DIG, \
MIMIC, DOUBLE_TEAM, BIDE, FIRE_BLAST, SKULL_BASH, \
REST, ROCK_SLIDE, SUBSTITUTE, STRENGTH
DOUBLE_EDGE, ICE_BEAM, BLIZZARD, HYPER_BEAM, SUBMISSION, \
COUNTER, SEISMIC_TOSS, RAGE, DRAGON_RAGE, THUNDERBOLT, \
THUNDER, EARTHQUAKE, FISSURE, DIG, MIMIC, \
DOUBLE_TEAM, BIDE, FIRE_BLAST, SKULL_BASH, REST, \
ROCK_SLIDE, SUBSTITUTE, SURF, STRENGTH
; end
db BANK(GyaoonPicFront)

2
data/sprites/sprites.asm
View file

@ -56,7 +56,7 @@ SpriteSheetPointerTable:
overworld_sprite FisherSprite, 12 ; SPRITE_FISHER
overworld_sprite KogaSprite, 12 ; SPRITE_KOGA
overworld_sprite GuardSprite, 12 ; SPRITE_GUARD
overworld_sprite GuardSprite, 12 ; SPRITE_UNUSED_GUARD
overworld_sprite TreeSprite, 4 ; SPRITE_FAKE_TREE - used to be unused guard, now fake tree
overworld_sprite MomSprite, 12 ; SPRITE_MOM
overworld_sprite BaldingGuySprite, 12 ; SPRITE_BALDING_GUY
overworld_sprite LittleBoySprite, 12 ; SPRITE_LITTLE_BOY

10
data/trainers/parties.asm
View file

@ -168,7 +168,7 @@ JrTrainerFData:
db 16, RATTATA, PIKACHU, 0
db 16, PIDGEY, PIDGEY, PIDGEY, 0
; Unused - used in celadon university
db 22, BULBASAUR, 0
db 22, BULBASAUR, CHARMANDER, SQUIRTLE, 0
; Route 9
db 18, ODDISH, BELLSPROUT, ODDISH, BELLSPROUT, 0
db 23, MEOWTH, 0
@ -222,8 +222,8 @@ SuperNerdData:
db 22, GRIMER, MUK, GRIMER, 0
db 26, KOFFING, 0
; Unused
db 22, KOFFING, MAGNEMITE, WEEZING, 0 ; - used in celadon university
db 20, MAGNEMITE, MAGNEMITE, KOFFING, MAGNEMITE, 0
db 30, PORYGON, 0 ; - used in celadon university
db 25, MAGNETITE, ELECTRODE, KABUTO, OMANYTE, 0 ; - used in celadon university
db 24, MAGNEMITE, VOLTORB, 0
; Cinnabar Gym
db 36, VULPIX, VULPIX, NINETALES, 0
@ -303,7 +303,7 @@ BurglarData:
EngineerData:
; Unused - used in celadon university
db 21, VOLTORB, MAGNEMITE, 0
db 36, GOLEM, 0
; Route 11
db 21, MAGNEMITE, 0
db 18, MAGNEMITE, MAGNEMITE, MAGNETON, 0
@ -372,7 +372,7 @@ GamblerData:
db 18, GROWLITHE, VULPIX, 0
; Route 8
db 22, POLIWAG, POLIWAG, POLIWHIRL, 0
; Unused - used in celadon university
; Unused - may be used in celadon university
db 22, ONIX, GEODUDE, GRAVELER, 0
; Route 8
db 24, GROWLITHE, VULPIX, 0