thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2025-09-17 02:40:50 +12:00
Code Issues Actions Packages Projects Releases Wiki Activity

New sprites just dropped

Browse source 
A selection of Game Corner sprites retooled to be overworld Pokemon. I also placed Voltorb, Diglett, and Magikarp.
This commit is contained in:
Llinos Evans 2023-04-28 19:11:49 +01:00
parent 583847ae2c
commit 83f6200c74
21 changed files with 56 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
constants/hide_show_constants.asm
View file

@ -35,6 +35,8 @@ DEF SHOW EQU $15
const HS_SAFFRON_CITY_E ; 17
const HS_SAFFRON_CITY_F ; 18
const HS_SAFFRON_CITY_UP_GRADE ; 19
const HS_CACTUS ; 1A was ROUTE_2_ITEM_2
const HS_BRUNSWICK_ZAPDOS_G ; 1B was ROUTE_4_ITEM
const HS_CELESTE_ARTICUNO_G ; 1C was unused HS_ROUTE_9_ITEM
const HS_ROUTE_12_SNORLAX ; 1D
const HS_CELESTE_ZAPDOS_G ; 1E X was unused HS_ROUTE_12_ITEM_1
@ -223,8 +225,6 @@ DEF SHOW EQU $15
const HS_VICTORY_ROAD_1F_ITEM_1 ; D4 X
const HS_VICTORY_ROAD_1F_ITEM_2 ; D5 X
const HS_CHAMPIONS_ROOM_OAK ; D6
const HS_CACTUS ; 1A was ROUTE_2_ITEM_2
const HS_ZAPDOSG ; 1B was ROUTE_4_ITEM
const HS_SEAFOAM_ISLANDS_1F_BOULDER_1 ; D7
const HS_SEAFOAM_ISLANDS_1F_BOULDER_2 ; D8
const HS_SEAFOAM_ISLANDS_B1F_BOULDER_1 ; D9

11
constants/sprite_constants.asm
View file

@ -75,6 +75,12 @@
const SPRITE_JAMES ; $46
const SPRITE_CAT
const SPRITE_SMALL_BIRD
const SPRITE_ARBOK
const SPRITE_KOFFING
const SPRITE_DIGLETT
const SPRITE_VOLTORB
const SPRITE_GENGAR
const SPRITE_MAGIKARP
DEF FIRST_STILL_SPRITE EQU const_value
const SPRITE_POKE_BALL ; $47
const SPRITE_FOSSIL ; $48
@ -86,6 +92,7 @@ DEF FIRST_STILL_SPRITE EQU const_value
const SPRITE_FAKE_TREE ; $4e was SPRITE_UNUSED_OLD_AMBER
const SPRITE_OLD_AMBER ; $4f
const SPRITE_UNUSED_GAMBLER_ASLEEP_1 ; $50
const SPRITE_UNUSED_GAMBLER_ASLEEP_2 ; $51
const SPRITE_POLIWAG ; $51 UNUSED_GAMBLER_ASLEEP_2
const SPRITE_GAMBLER_ASLEEP ; $52
DEF NUM_SPRITES EQU const_value - 1
DEF NUM_SPRITES EQU const_value - 1
;there are pidgey, and rattata sprites that I can't find discernible use for yet.

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

@ -14,6 +14,6 @@ CeladonUniversityOutside_Object:
object_event 25, 20, SPRITE_SUPER_NERD, WALK, DOWN, 4 ; trainer
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
object_event 7, 22, SPRITE_MAGIKARP, WALK, RIGHT, 7 ; Static sprite. Reason: same as above and used the slot 11
object_event 34, 25, SPRITE_MAGIKARP, WALK, LEFT, 7 ; Static sprite. Reason: same as above
def_warps_to CELADON_UNIVERSITY_OUTSIDE

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

@ -10,5 +10,6 @@ DiglettsCaveRoute2_Object:
def_object_events
object_event 3, 3, SPRITE_FISHING_GURU, STAY, NONE, 1 ; person
object_event 2, 3, SPRITE_DIGLETT, STAY, NONE, 2
def_warps_to DIGLETTS_CAVE_ROUTE_2

16
data/maps/objects/PowerPlant.asm
View file

@ -9,14 +9,14 @@ PowerPlant_Object:
def_bg_events
def_object_events
object_event 9, 20, SPRITE_POKE_BALL, STAY, NONE, 1, VOLTORB, 40 | OW_POKEMON
object_event 32, 18, SPRITE_POKE_BALL, STAY, NONE, 2, VOLTORB, 40 | OW_POKEMON
object_event 21, 25, SPRITE_POKE_BALL, STAY, NONE, 3, VOLTORB, 40 | OW_POKEMON
object_event 25, 18, SPRITE_POKE_BALL, STAY, NONE, 4, ELECTRODE, 43 | OW_POKEMON
object_event 23, 34, SPRITE_POKE_BALL, STAY, NONE, 5, VOLTORB, 40 | OW_POKEMON
object_event 26, 28, SPRITE_POKE_BALL, STAY, NONE, 6, VOLTORB, 40 | OW_POKEMON
object_event 21, 14, SPRITE_POKE_BALL, STAY, NONE, 7, ELECTRODE, 43 | OW_POKEMON
object_event 37, 32, SPRITE_POKE_BALL, STAY, NONE, 8, VOLTORB, 40 | OW_POKEMON
object_event 9, 20, SPRITE_VOLTORB, STAY, UP, 1, VOLTORB, 40 | OW_POKEMON
object_event 32, 18, SPRITE_VOLTORB, STAY, UP, 2, VOLTORB, 40 | OW_POKEMON
object_event 21, 25, SPRITE_VOLTORB, STAY, UP, 3, VOLTORB, 40 | OW_POKEMON
object_event 25, 18, SPRITE_VOLTORB, STAY, UP, 4, ELECTRODE, 43 | OW_POKEMON
object_event 23, 34, SPRITE_VOLTORB, STAY, UP, 5, VOLTORB, 40 | OW_POKEMON
object_event 26, 28, SPRITE_VOLTORB, STAY, UP, 6, VOLTORB, 40 | OW_POKEMON
object_event 21, 14, SPRITE_VOLTORB, STAY, UP, 7, ELECTRODE, 43 | OW_POKEMON
object_event 37, 32, SPRITE_VOLTORB, STAY, UP, 8, VOLTORB, 40 | OW_POKEMON
object_event 4, 9, SPRITE_BIRD, STAY, UP, 9, ZAPDOS, 50 | OW_POKEMON
object_event 7, 25, SPRITE_POKE_BALL, STAY, NONE, 10, CARBOS
object_event 28, 3, SPRITE_POKE_BALL, STAY, NONE, 11, HP_UP

2
data/maps/sprite_sets.asm
View file

@ -131,7 +131,7 @@ SpriteSets:
db SPRITE_MONSTER
db SPRITE_SUPER_NERD ; Original: SPRITE_GUARD
db SPRITE_ROCKET
db SPRITE_SEEL ; Original: SPRITE_POKE_BALL (static sprite)
db SPRITE_MAGIKARP ; Original: SPRITE_POKE_BALL (static sprite)
db SPRITE_SNORLAX
; SPRITESET_INDIGO

10
data/sprites/sprites.asm
View file

@ -80,6 +80,12 @@ SpriteSheetPointerTable:
overworld_sprite JamesSprite, 12 ; SPRITE_JAMES
overworld_sprite CatSprite, 12 ; SPRITE_CAT
overworld_sprite SmallBirdSprite, 12 ; SPRITE_SMALL_BIRD
overworld_sprite ArbokSprite, 12 ; SPRITE_ARBOK
overworld_sprite KoffingSprite, 12 ; SPRITE_KOFFING
overworld_sprite DiglettSprite, 12 ; SPRITE_DIGLETT
overworld_sprite VoltorbSprite, 12 ; SPRITE_VOLTORB
overworld_sprite GengarSprite, 12 ; SPRITE_GENGAR
overworld_sprite MagikarpSprite, 12 ; SPRITE_MAGIKARP
overworld_sprite PokeBallSprite, 4 ; SPRITE_POKE_BALL
overworld_sprite FossilSprite, 4 ; SPRITE_FOSSIL
overworld_sprite BoulderSprite, 4 ; SPRITE_BOULDER
@ -87,9 +93,9 @@ SpriteSheetPointerTable:
overworld_sprite PokedexSprite, 4 ; SPRITE_POKEDEX
overworld_sprite ClipboardSprite, 4 ; SPRITE_CLIPBOARD
overworld_sprite SnorlaxSprite, 4 ; SPRITE_SNORLAX
overworld_sprite FakeTreeSprite, 4 ; was SPRITE_UNUSED_OLD_AMBER
overworld_sprite FakeTreeSprite, 4 ; SPRITE_FAKE_TREE, 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
overworld_sprite PoliwagSprite, 4 ; was SPRITE_UNUSED_GAMBLER_ASLEEP_2
overworld_sprite GamblerAsleepSprite, 4 ; SPRITE_GAMBLER_ASLEEP
assert_table_length NUM_SPRITES

7
gfx/sprites.asm
View file

@ -90,3 +90,10 @@ JessieSprite:: INCBIN "gfx/sprites/jessie.2bpp"
JamesSprite:: INCBIN "gfx/sprites/james.2bpp"
SmallBirdSprite:: INCBIN "gfx/sprites/smallbird.2bpp"
FakeTreeSprite:: INCBIN "gfx/sprites/fake_tree.2bpp"
ArbokSprite:: INCBIN "gfx/sprites/arbok.2bpp"
KoffingSprite:: INCBIN "gfx/sprites/koffing.2bpp"
DiglettSprite:: INCBIN "gfx/sprites/diglett.2bpp"
VoltorbSprite:: INCBIN "gfx/sprites/voltorb.2bpp"
GengarSprite:: INCBIN "gfx/sprites/gengar.2bpp"
MagikarpSprite:: INCBIN "gfx/sprites/magikarp.2bpp"
PoliwagSprite:: INCBIN "gfx/sprites/poliwag.2bpp"

BIN
gfx/sprites/arbok.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 511 B

BIN
gfx/sprites/clefairy2.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 237 B

BIN
gfx/sprites/diglett.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 353 B

BIN
gfx/sprites/gengar.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 377 B

BIN
gfx/sprites/koffing.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 436 B

BIN
gfx/sprites/magikarp.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 363 B

BIN
gfx/sprites/pidgey.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 256 B

BIN
gfx/sprites/poliwag.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 266 B

BIN
gfx/sprites/rattata.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 250 B

BIN
gfx/sprites/voltorb.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 356 B

10
scan_includes.exe.stackdump
View file

@ -1,15 +1,15 @@
Exception: STATUS_ACCESS_VIOLATION at rip=00100401246
rax=FFFFFFF7FFF97031 rbx=0000000000000794 rcx=0000000800000010
rdx=0000000000000000 rsi=0000000800058944 rdi=0000000000000000
rax=FFFFFFF7FFF970C1 rbx=0000000000001024 rcx=0000000800000010
rdx=0000000000000000 rsi=0000000800058C39 rdi=0000000000000000
r8 =00000000FFFFC7C4 r9 =0000000000000000 r10=0000000100000000
r11=0000000100401282 r12=0000000800068FD0 r13=0000000100403148
r11=0000000100401282 r12=0000000800068F40 r13=0000000100403148
r14=0000000000000000 r15=0000000000000001
rbp=0000000100403156 rsp=00000000FFFFCA60
program=C:\cygwin64\home\chipp\kep-hack\tools\scan_includes.exe, pid 3411, thread main
program=C:\cygwin64\home\chipp\kep-hack\tools\scan_includes.exe, pid 923, thread main
cs=0033 ds=002B es=002B fs=0053 gs=002B ss=002B
Stack trace:
Frame Function Args
00100403156 00100401246 (00800058944, 00000000022, 00100403166, 000FFFFCB90)
00100403156 00100401246 (00800058C39, 00000000022, 00100403166, 000FFFFCB90)
00100403156 00100401409 (00000000000, 00100000001, 00180227860, 00100407000)
00100403178 00100401C87 (00000000020, 00000000000, 00180049B11, 00180048A70)
000FFFFCD30 00180049B7D (00000000000, 00000000000, 00000000000, 00000000000)

9
scripts/DiglettsCaveRoute2.asm
View file

@ -5,7 +5,16 @@ DiglettsCaveRoute2_Script:
DiglettsCaveRoute2_TextPointers:
dw DiglettsCaveRoute2Text1
dw DiglettsCaveRoute2Diglett
DiglettsCaveRoute2Text1:
text_far _DiglettsCaveRoute2Text1
text_end
DiglettsCaveRoute2Diglett:
text_far _DiglettsCaveRoute2Diglett
text_asm
ld a, DIGLETT
call PlayCry
call WaitForSoundToFinish
jp TextScriptEnd

4
text/DiglettsCaveRoute2.asm
View file

@ -7,3 +7,7 @@ _DiglettsCaveRoute2Text1::
line "FLASH could light"
cont "it up..."
done
_DiglettsCaveRoute2Diglett::
text "Digda!"
done