thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2025-10-15 11:44:17 +13:00
Code Issues Actions Packages Projects Releases Wiki Activity

Expanding on Pokemon icon usage

Browse source 
This adds Pikachu, Cat, and "Small Bird" menu icons. The cat has a custom animation done by myself.

The Jigglypuff in the Pokemon Centre now uses the new sprite, nice 'n' pretty. Officer Jenny is also in Cerulean. The Pokemon from Melanie's house in Yellow have been put in Mr. Fuji's House, given the purpose of the house in RB is different. I think it ends up fitting very nicely.

Chansey has been given its proper sprite in Fuschia. Yellow didn't actually do this, as Chansey doesn't have a walk cycle, causing the stuff that exists to go unused. I wanted it, though, so I had Chansey just not walk and turn around. Oh, and it's in all the Pokemon Centres now. Yeah, that's a...lot of changed files.
This commit is contained in:
Llinos Evans 2023-04-23 21:25:45 +01:00
parent 09ad875023
commit 9b387cab7e
49 changed files with 231 additions and 77 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
README.md
View file

@ -283,6 +283,7 @@ Credits
* erosunica - Assistance with developing Celadon University & Citrine City, plus sources for various subjects.
* Chatot4444 - Assisting with gym scaling code
* ZumiIsawhat? - Restorations of beta OST
* FrenchOrange - Reconstructions of various overworld beta sprites.
* Helix Chamber, RacieBeep, loumilouminosus, Orchid, GBCRetro, & catstorm26 - Prototype Pokémon sprites
* Vortyne - Reused a bit of code from their pureRGB hack. Assisted in bug fixes.
* jojobear13 & Mateo - Move deleter & move relearner functionality from Shin Pokered, followed [this guide](https://github.com/jojobear13/shinpokered/blob/master/how%20to%20guides/how%20to%20add%20the%20move%20relearner%26deleter.txt). Tweaks were made to make it compatible with the pokered version we worked off of.

6
constants/icon_constants.asm
View file

@ -1,3 +1,4 @@
; Backported from Yellow
; party menu icons
; used in MonPartySpritePointers (see data/icon_pointers.asm)
const_def
@ -11,7 +12,10 @@
const ICON_GRASS ; $7
const ICON_SNAKE ; $8
const ICON_QUADRUPED ; $9
const ICON_PIKACHU ; $A
const ICON_SMALL_BIRD; $0B
const ICON_CAT ; 0C
DEF ICON_TRADEBUBBLE EQU $e
DEF ICON_TRADEBUBBLE EQU $0e
DEF ICONOFFSET EQU $40 ; difference between alternating icon frames' tile IDs

1
constants/sprite_constants.asm
View file

@ -74,6 +74,7 @@
const SPRITE_JESSIE ; $45
const SPRITE_JAMES ; $46
const SPRITE_CAT
const SPRITE_SMALL_BIRD
DEF FIRST_STILL_SPRITE EQU const_value
const SPRITE_POKE_BALL ; $47
const SPRITE_FOSSIL ; $48

10
data/icon_pointers.asm
View file

@ -20,7 +20,11 @@ MonPartySpritePointers:
mon_icon_header SnakeIconFrame1, 1, 1, ICON_SNAKE << 2 + 2
mon_icon_header QuadrupedIconFrame1, 0, 1, ICON_QUADRUPED << 2
mon_icon_header QuadrupedIconFrame1, 1, 1, ICON_QUADRUPED << 2 + 2
mon_icon_header PikachuSprite, 0, 4, ICON_PIKACHU << 2
mon_icon_header TradeBubbleIconGFX, 0, 4, ICON_TRADEBUBBLE << 2
mon_icon_header SmallBirdSprite, 0, 4, ICON_SMALL_BIRD << 2
mon_icon_header CatIconFrame1, 0, 1, ICON_CAT << 2
mon_icon_header CatIconFrame1, 1, 1, ICON_CAT << 2 + 2
mon_icon_header MonsterSprite, 0, 4, ICONOFFSET + ICON_MON << 2
mon_icon_header PokeBallSprite, 0, 8, ICONOFFSET + ICON_BALL << 2
mon_icon_header FairySprite, 0, 4, ICONOFFSET + ICON_FAIRY << 2
@ -34,4 +38,8 @@ MonPartySpritePointers:
mon_icon_header SnakeIconFrame2, 1, 1, ICONOFFSET + ICON_SNAKE << 2 + 2
mon_icon_header QuadrupedIconFrame2, 0, 1, ICONOFFSET + ICON_QUADRUPED << 2
mon_icon_header QuadrupedIconFrame2, 1, 1, ICONOFFSET + ICON_QUADRUPED << 2 + 2
mon_icon_header TradeBubbleIconGFX, 4, 4, ICONOFFSET + ICON_TRADEBUBBLE << 2
mon_icon_header PikachuSprite, 12, 4, ICONOFFSET + ICON_PIKACHU << 2
mon_icon_header TradeBubbleIconGFX, 4, 4, ICONOFFSET + ICON_TRADEBUBBLE << 2
mon_icon_header SmallBirdSprite, 12, 4, ICONOFFSET + ICON_SMALL_BIRD << 2
mon_icon_header CatIconFrame2, 0, 1, ICONOFFSET + ICON_CAT << 2
mon_icon_header CatIconFrame2, 1, 1, ICONOFFSET + ICON_CAT << 2 + 2

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

@ -13,5 +13,6 @@ CeladonPokecenter_Object:
object_event 10, 5, SPRITE_BEAUTY, WALK, ANY_DIR, 3 ; person
object_event 11, 2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 4 ; person
object_event 8, 3, SPRITE_GAMEBOY_KID, STAY, DOWN, 5 ; Sandslash Trader
object_event 4, 1, SPRITE_CHANSEY, STAY, DOWN, 6 ; Chansey
def_warps_to CELADON_POKECENTER

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

@ -12,6 +12,7 @@ CeladonUniversityPokecenter_Object:
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 3, 5, SPRITE_SUPER_NERD, STAY, DOWN, 4 ; person
object_event 11, 2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 4 ; person
object_event 11, 2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 5 ; person
object_event 4, 1, SPRITE_CHANSEY, STAY, DOWN, 6 ; Chansey
def_warps_to CELADON_UNIVERSITY_POKECENTER

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

@ -27,11 +27,11 @@ CeruleanCity_Object:
object_event 31, 20, SPRITE_COOLTRAINER_M, STAY, DOWN, 3 ; person
object_event 15, 18, SPRITE_SUPER_NERD, WALK, UP_DOWN, 4 ; person
object_event 9, 21, SPRITE_SUPER_NERD, WALK, LEFT_RIGHT, 5 ; person
object_event 28, 12, SPRITE_GUARD, STAY, DOWN, 6 ; person
object_event 28, 12, SPRITE_OFFICER_JENNY, STAY, DOWN, 6 ; person
object_event 29, 26, SPRITE_COOLTRAINER_F, STAY, LEFT, 7 ; person
object_event 28, 26, SPRITE_MONSTER, STAY, DOWN, 8 ; person
object_event 9, 27, SPRITE_COOLTRAINER_F, WALK, LEFT_RIGHT, 9 ; person
object_event 4, 12, SPRITE_SUPER_NERD, STAY, DOWN, 10 ; person
object_event 27, 12, SPRITE_GUARD, STAY, DOWN, 11 ; person
object_event 27, 12, SPRITE_OFFICER_JENNY, STAY, DOWN, 11 ; person
def_warps_to CERULEAN_CITY

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

@ -13,5 +13,6 @@ CeruleanPokecenter_Object:
object_event 4, 3, SPRITE_GENTLEMAN, STAY, DOWN, 3 ; person
object_event 11, 2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 4 ; person
object_event 9, 3, SPRITE_GAMEBOY_KID, STAY, DOWN, 5 ; Ninetales Trader
object_event 4, 1, SPRITE_CHANSEY, STAY, DOWN, 6 ; Chansey
def_warps_to CERULEAN_POKECENTER

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

@ -14,5 +14,6 @@ CinnabarPokecenter_Object:
object_event 11, 2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 4 ; person
object_event 9, 6, SPRITE_MIDDLE_AGED_MAN, STAY, DOWN, 5 ; spamton
object_event 8, 3, SPRITE_GAMEBOY_KID, STAY, DOWN, 6 ; Muk Trader
object_event 4, 1, SPRITE_CHANSEY, STAY, DOWN, 7 ; Chansey
def_warps_to CINNABAR_POKECENTER

2
data/maps/objects/FuchsiaCity.asm
View file

@ -33,7 +33,7 @@ FuchsiaCity_Object:
object_event 28, 17, SPRITE_GAMBLER, WALK, LEFT_RIGHT, 2 ; person
object_event 30, 14, SPRITE_FISHER, STAY, DOWN, 3 ; person
object_event 24, 8, SPRITE_YOUNGSTER, STAY, UP, 4 ; person
object_event 31, 5, SPRITE_FAIRY, WALK, ANY_DIR, 5 ; person
object_event 31, 5, SPRITE_CHANSEY, STAY, ANY_DIR, 5 ; person
object_event 25, 6, SPRITE_POKE_BALL, STAY, NONE, 6 ; person
object_event 12, 6, SPRITE_MONSTER, WALK, LEFT_RIGHT, 7 ; person
object_event 30, 12, SPRITE_MONSTER, WALK, LEFT_RIGHT, 8 ; person

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

@ -13,5 +13,6 @@ FuchsiaPokecenter_Object:
object_event 6, 5, SPRITE_COOLTRAINER_F, WALK, LEFT_RIGHT, 3 ; person
object_event 11, 2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 4 ; person
object_event 7, 3, SPRITE_GAMEBOY_KID, STAY, DOWN, 5 ; Marowak Trader
object_event 4, 1, SPRITE_CHANSEY, STAY, DOWN, 6 ; Chansey
def_warps_to FUCHSIA_POKECENTER

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

@ -15,5 +15,6 @@ IndigoPlateauLobby_Object:
object_event 0, 5, SPRITE_CLERK, STAY, RIGHT, 4 ; person
object_event 13, 6, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 5 ; person
object_event 10, 7, SPRITE_GAMEBOY_KID, STAY, DOWN, 6 ; Exeggutor Trader
object_event 8, 5, SPRITE_CHANSEY, STAY, DOWN, 7 ; Chansey
def_warps_to INDIGO_PLATEAU_LOBBY

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

@ -13,5 +13,6 @@ LavenderPokecenter_Object:
object_event 2, 6, SPRITE_LITTLE_GIRL, WALK, UP_DOWN, 3 ; person
object_event 11, 2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 4 ; person
object_event 9, 3, SPRITE_GAMEBOY_KID, STAY, DOWN, 5 ; Dugtrio Trader
object_event 4, 1, SPRITE_CHANSEY, STAY, DOWN, 6 ; Chansey
def_warps_to LAVENDER_POKECENTER

5
data/maps/objects/MrFujisHouse.asm
View file

@ -10,9 +10,10 @@ MrFujisHouse_Object:
def_object_events
object_event 3, 5, SPRITE_SUPER_NERD, STAY, NONE, 1 ; person
object_event 6, 3, SPRITE_LITTLE_GIRL, STAY, DOWN, 2 ; person
object_event 6, 4, SPRITE_MONSTER, STAY, UP, 3 ; person
object_event 1, 3, SPRITE_MONSTER, STAY, NONE, 4 ; person
object_event 6, 4, SPRITE_SANDSHREW, STAY, UP, 3 ; person
object_event 1, 3, SPRITE_BULBASAUR, STAY, NONE, 4 ; person
object_event 3, 1, SPRITE_MR_FUJI, STAY, NONE, 5 ; person
object_event 3, 3, SPRITE_POKEDEX, STAY, NONE, 6 ; person
object_event 0, 4, SPRITE_ODDISH, STAY, NONE, 7 ; person
def_warps_to MR_FUJIS_HOUSE

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

@ -14,5 +14,6 @@ MtMoonPokecenter_Object:
object_event 10, 6, SPRITE_MIDDLE_AGED_MAN, WALK, LEFT_RIGHT, 4 ; person
object_event 7, 2, SPRITE_CLIPBOARD, STAY, NONE, 5 ; person
object_event 11, 2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 6 ; person
object_event 4, 1, SPRITE_CHANSEY, STAY, DOWN, 7 ; Chansey
def_warps_to MT_MOON_POKECENTER

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

@ -10,8 +10,9 @@ PewterPokecenter_Object:
def_object_events
object_event 3, 1, SPRITE_NURSE, STAY, DOWN, 1 ; person
object_event 11, 7, SPRITE_GENTLEMAN, STAY, LEFT, 2 ; person
object_event 1, 3, SPRITE_FAIRY, STAY, DOWN, 3 ; person
object_event 1, 3, SPRITE_JIGGLYPUFF, STAY, DOWN, 3 ; person
object_event 11, 2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 4 ; person
object_event 7, 3, SPRITE_GAMEBOY_KID, STAY, DOWN, 5 ; Golem Trader
object_event 4, 1, SPRITE_CHANSEY, STAY, DOWN, 6 ; Chansey
def_warps_to PEWTER_POKECENTER

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

@ -13,5 +13,6 @@ RockTunnelPokecenter_Object:
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
object_event 4, 1, SPRITE_CHANSEY, STAY, DOWN, 6 ; Chansey
def_warps_to ROCK_TUNNEL_POKECENTER

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

@ -13,5 +13,6 @@ SaffronPokecenter_Object:
object_event 8, 3, SPRITE_GENTLEMAN, STAY, DOWN, 3 ; person
object_event 11, 2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 4 ; person
object_event 7, 3, SPRITE_GAMEBOY_KID, STAY, DOWN, 5 ; Raichu Trader
object_event 4, 1, SPRITE_CHANSEY, STAY, DOWN, 6 ; Chansey
def_warps_to SAFFRON_POKECENTER

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

@ -13,5 +13,6 @@ VermilionPokecenter_Object:
object_event 5, 4, SPRITE_SAILOR, STAY, NONE, 3 ; person
object_event 11, 2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 4 ; person
object_event 7, 3, SPRITE_GAMEBOY_KID, STAY, DOWN, 5 ; Persian Trader
object_event 4, 1, SPRITE_CHANSEY, STAY, DOWN, 6 ; Chansey
def_warps_to VERMILION_POKECENTER

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

@ -13,5 +13,6 @@ ViridianPokecenter_Object:
object_event 4, 3, SPRITE_COOLTRAINER_M, STAY, NONE, 3 ; person
object_event 11, 2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 4 ; person
object_event 7, 3, SPRITE_GAMEBOY_KID, STAY, DOWN, 5 ; Raticate Trader
object_event 4, 1, SPRITE_CHANSEY, STAY, DOWN, 6 ; Chansey
def_warps_to VIRIDIAN_POKECENTER

6
data/maps/sprite_sets.asm
View file

@ -66,6 +66,8 @@ SplitMapSpriteSets:
SpriteSets:
table_width SPRITE_SET_LENGTH, SpriteSets
; Useful note: The last entry in a spriteset doesn't move, presumably for the Old Man in Viridian.
; Unsure why Poke Balls don't use that space in other spritesets - consider experimenting.
; SPRITESET_PALLET_VIRIDIAN
db SPRITE_BLUE
db SPRITE_YOUNGSTER
@ -86,7 +88,7 @@ SpriteSets:
db SPRITE_HIKER
db SPRITE_MONSTER
db SPRITE_BLUE
db SPRITE_GUARD
db SPRITE_OFFICER_JENNY
db SPRITE_COOLTRAINER_F
db SPRITE_COOLTRAINER_M
db SPRITE_POKE_BALL
@ -186,7 +188,7 @@ SpriteSets:
; SPRITESET_FUCHSIA
db SPRITE_BIRD
db SPRITE_COOLTRAINER_M
db SPRITE_FAIRY
db SPRITE_CHANSEY
db SPRITE_FISHER
db SPRITE_GAMBLER
db SPRITE_MONSTER

34
data/pokemon/menu_icons.asm
View file

@ -9,10 +9,10 @@ MonPartyData:
nybble ICON_WATER ; Squirtle
nybble ICON_WATER ; Wartortle
nybble ICON_WATER ; Totartle
nybble ICON_FAIRY ; Pikachu
nybble ICON_FAIRY ; Raichu
nybble ICON_FAIRY ; Raichu-A
nybble ICON_FAIRY ; Gorochu
nybble ICON_PIKACHU ; Pikachu
nybble ICON_PIKACHU ; Raichu
nybble ICON_PIKACHU ; Raichu-A
nybble ICON_PIKACHU ; Gorochu
nybble ICON_QUADRUPED ; Eevee
nybble ICON_QUADRUPED ; Vaporeon
nybble ICON_QUADRUPED ; Jolteon
@ -25,14 +25,14 @@ MonPartyData:
nybble ICON_QUADRUPED ; Rattata
nybble ICON_QUADRUPED ; Raticate
nybble ICON_QUADRUPED ; Raticate-A
nybble ICON_BIRD ; Pidgey
nybble ICON_BIRD ; Pidgeotto
nybble ICON_SMALL_BIRD ; Pidgey
nybble ICON_SMALL_BIRD ; Pidgeotto
nybble ICON_BIRD ; Pidgeot
nybble ICON_MON ; Konya
nybble ICON_MON ; Meowth
nybble ICON_MON ; Persian
nybble ICON_MON ; Persian-A
nybble ICON_MON ; Perrserker
nybble ICON_CAT ; Konya
nybble ICON_CAT ; Meowth
nybble ICON_CAT ; Persian
nybble ICON_CAT ; Persian-A
nybble ICON_CAT ; Perrserker
nybble ICON_BUG ; Caterpie
nybble ICON_BUG ; Metapod
nybble ICON_BUG ; Butterfree
@ -42,7 +42,7 @@ MonPartyData:
nybble ICON_BUG ; Kokana
nybble ICON_BUG ; Kasanagi
nybble ICON_BUG ; Carapthor
nybble ICON_BIRD ; Spearow
nybble ICON_SMALL_BIRD ; Spearow
nybble ICON_BIRD ; Fearow
nybble ICON_SNAKE ; Ekans
nybble ICON_SNAKE ; Arbok
@ -118,9 +118,9 @@ MonPartyData:
nybble ICON_WATER ; Wugtrio
nybble ICON_SNAKE ; Onix
nybble ICON_SNAKE ; Steelix
nybble ICON_QUADRUPED ; Kotora
nybble ICON_QUADRUPED ; Gaotora
nybble ICON_QUADRUPED ; Gorotora
nybble ICON_CAT ; Kotora
nybble ICON_CAT ; Gaotora
nybble ICON_CAT ; Gorotora - unsure about how fitting this is but they ARE tigers, so...
nybble ICON_BALL ; Voltorb
nybble ICON_BALL ; Electrode
nybble ICON_BALL ; Electrode-H
@ -163,10 +163,10 @@ MonPartyData:
nybble ICON_MON ; Marowak
nybble ICON_MON ; Marowak-A
nybble ICON_MON ; Guardia
nybble ICON_BIRD ; Farfetch'd
nybble ICON_SMALL_BIRD ; Farfetch'd
nybble ICON_BIRD ; Madaamu
nybble ICON_BIRD ; Sirfetch'd
nybble ICON_BIRD ; Doduo
nybble ICON_BIRD ; Doduo - it's flightless, so the current sprite fits better.
nybble ICON_BIRD ; Dodrio
nybble ICON_MON ; Grimer
nybble ICON_MON ; Muk

1
data/sprites/sprites.asm
View file

@ -79,6 +79,7 @@ SpriteSheetPointerTable:
overworld_sprite JessieSprite, 12 ; SPRITE_JESSIE
overworld_sprite JamesSprite, 12 ; SPRITE_JAMES
overworld_sprite CatSprite, 12 ; SPRITE_CAT
overworld_sprite SmallBirdSprite, 12 ; SPRITE_SMALL_BIRD
overworld_sprite PokeBallSprite, 4 ; SPRITE_POKE_BALL
overworld_sprite FossilSprite, 4 ; SPRITE_FOSSIL
overworld_sprite BoulderSprite, 4 ; SPRITE_BOULDER

5
data/text/text_1.asm
View file

@ -147,3 +147,8 @@ _OaksAideNoRoomText::
text_ram wOaksAideRewardItemName
text "."
done
_NurseChanseyText::
text "CHANSEY: Chaaan"
line "sey!"
done

5
engine/debug/debug_party.asm
View file

@ -24,9 +24,10 @@ IshiharaTeam:
db EXEGGUTOR_A, 90
db RHYDON, 90
db KANGASKHAN, 90
db NIDORAN_M, 50
IF DEF(_DEBUG)
db KOKANA, 50
db FARFETCHD, 50
db MEOWTH, 50
db PIKACHU, 50
ENDC
db -1 ; end

11
engine/events/pokecenter_chansey.asm Normal file
View file

@ -0,0 +1,11 @@
PokecenterChanseyText::
ld hl, NurseChanseyText
call PrintText
ld a, CHANSEY
call PlayCry
call WaitForSoundToFinish
ret
NurseChanseyText:
text_far _NurseChanseyText
text_end

85
engine/gfx/mon_icons.asm
View file

@ -1,3 +1,4 @@
;Backported from Yellow
AnimatePartyMon_ForceSpeed1:
xor a
ld [wCurrentMenuItem], a
@ -91,7 +92,7 @@ PartyMonSpeeds:
LoadMonPartySpriteGfx:
; Load mon party sprite tile patterns into VRAM during V-blank.
ld hl, MonPartySpritePointers
ld a, $1c
ld a, $22 ; Number of pointers in the list in hex. eg. Yellow has 30, so 1E is used.
LoadAnimSpriteGfx:
; Load animated sprite tile patterns into VRAM during V-blank. hl is the address
@ -130,7 +131,7 @@ LoadMonPartySpriteGfxWithLCDDisabled:
; LCD.
call DisableLCD
ld hl, MonPartySpritePointers
ld a, $1c
ld a, $24 ; Number of pointers in the list in hex. eg. Yellow has 30, so 1E is used.
ld bc, $0
.loop
push af
@ -151,7 +152,7 @@ LoadMonPartySpriteGfxWithLCDDisabled:
inc hl
ld d, [hl]
pop hl
call FarCopyData2
call FarCopyData
pop hl
pop bc
ld a, $6
@ -170,6 +171,8 @@ WriteMonPartySpriteOAMByPartyIndex:
push de
push bc
ldh a, [hPartyMonIndex]
cp $ff
jr z, .asm_7191f
ld hl, wPartySpecies
ld e, a
ld d, 0
@ -183,6 +186,16 @@ WriteMonPartySpriteOAMByPartyIndex:
pop hl
ret
.asm_7191f
ld hl, wShadowOAM
ld de, wMonPartySpritesSavedOAM
ld bc, $60
call CopyData
pop bc
pop de
pop hl
ret
WriteMonPartySpriteOAMBySpecies:
; Write OAM blocks for the party sprite of the species in
; [wMonPartySpriteSpecies].
@ -193,43 +206,43 @@ WriteMonPartySpriteOAMBySpecies:
ld [wOAMBaseTile], a
jr WriteMonPartySpriteOAM
UnusedPartyMonSpriteFunction:
;UnusedPartyMonSpriteFunction:
; This function is unused and doesn't appear to do anything useful. It looks
; like it may have been intended to load the tile patterns and OAM data for
; the mon party sprite associated with the species in [wcf91].
; However, its calculations are off and it loads garbage data.
ld a, [wcf91]
call GetPartyMonSpriteID
push af
ld hl, vSprites tile $00
call .LoadTilePatterns
pop af
add $54
ld hl, vSprites tile $04
call .LoadTilePatterns
xor a
ld [wMonPartySpriteSpecies], a
jr WriteMonPartySpriteOAMBySpecies
; ld a, [wcf91]
; call GetPartyMonSpriteID
; push af
; ld hl, vSprites tile $00
; call .LoadTilePatterns
; pop af
; add $5A
; ld hl, vSprites tile $04
; call .LoadTilePatterns
; xor a
; ld [wMonPartySpriteSpecies], a
; jr WriteMonPartySpriteOAMBySpecies
.LoadTilePatterns
push hl
add a
ld c, a
ld b, 0
ld hl, MonPartySpritePointers
add hl, bc
add hl, bc
add hl, bc
ld a, [hli]
ld e, a
ld a, [hli]
ld d, a
ld a, [hli]
ld c, a
ld a, [hli]
ld b, a
pop hl
jp CopyVideoData
;.LoadTilePatterns
; push hl
; add a
; ld c, a
; ld b, 0
; ld hl, MonPartySpritePointers
; add hl, bc
; add hl, bc
; add hl, bc
; ld a, [hli]
; ld e, a
; ld a, [hli]
; ld d, a
; ld a, [hli]
; ld c, a
; ld a, [hli]
; ld b, a
; pop hl
; jp CopyVideoData
WriteMonPartySpriteOAM:
; Write the OAM blocks for the first animation frame into the OAM buffer and
@ -291,5 +304,7 @@ SnakeIconFrame1: INCBIN "gfx/icons/snake.2bpp", INC_FRAME_1
QuadrupedIconFrame1: INCBIN "gfx/icons/quadruped.2bpp", INC_FRAME_1
SnakeIconFrame2: INCBIN "gfx/icons/snake.2bpp", INC_FRAME_2
QuadrupedIconFrame2: INCBIN "gfx/icons/quadruped.2bpp", INC_FRAME_2
CatIconFrame1: INCBIN "gfx/icons/cat.2bpp", INC_FRAME_1
CatIconFrame2: INCBIN "gfx/icons/cat.2bpp", INC_FRAME_2
TradeBubbleIconGFX: INCBIN "gfx/trade/bubble.2bpp"

BIN
gfx/icons/cat.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 314 B

3
gfx/sprites.asm
View file

@ -87,4 +87,5 @@ ClefairySprite:: INCBIN "gfx/sprites/clefairy.2bpp"
ChanseySprite:: INCBIN "gfx/sprites/chansey.2bpp"
SurfingPikachuSprite:: INCBIN "gfx/sprites/surfing_pikachu.2bpp"
JessieSprite:: INCBIN "gfx/sprites/jessie.2bpp"
JamesSprite:: INCBIN "gfx/sprites/james.2bpp"
JamesSprite:: INCBIN "gfx/sprites/james.2bpp"
SmallBirdSprite:: INCBIN "gfx/sprites/smallbird.2bpp"

BIN
gfx/sprites/cat.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 720 B

After

Width:  |  Height:  |  Size: 923 B

BIN
gfx/sprites/daisy (1).png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 277 B

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

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 883 B

1
main.asm
View file

@ -324,6 +324,7 @@ INCLUDE "engine/overworld/field_moves.asm"
SECTION "In-Game Trade Zone", ROMX
INCLUDE "engine/events/in_game_trades.asm"
INCLUDE "engine/events/pokecenter_chansey.asm"
SECTION "Itemfinder 1", ROMX

10
scan_includes.exe.stackdump
View file

@ -1,15 +1,15 @@
Exception: STATUS_ACCESS_VIOLATION at rip=00100401246
rax=FFFFFFF7FFF8C851 rbx=00000000000003A2 rcx=0000000800000010
rdx=0000000000000000 rsi=00000008000636B3 rdi=0000000000000000
rax=FFFFFFF7FFF970C1 rbx=0000000000000209 rcx=0000000800000010
rdx=0000000000000000 rsi=0000000800058C12 rdi=0000000000000000
r8 =00000000FFFFC7C4 r9 =0000000000000000 r10=0000000100000000
r11=0000000100401282 r12=00000008000737B0 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 1047, thread main
program=C:\cygwin64\home\chipp\kep-hack\tools\scan_includes.exe, pid 2597, thread main
cs=0033 ds=002B es=002B fs=0053 gs=002B ss=002B
Stack trace:
Frame Function Args
00100403156 00100401246 (008000636B3, 00000000022, 00100403166, 000FFFFCB90)
00100403156 00100401246 (00800058C12, 00000000022, 00100403166, 000FFFFCB90)
00100403156 00100401409 (00000000000, 00100000001, 00180227860, 00100407000)
00100403178 00100401C87 (00000000020, 00000000000, 00180049B11, 00180048A70)
000FFFFCD30 00180049B7D (00000000000, 00000000000, 00000000000, 00000000000)

6
scripts/CeladonPokecenter.asm
View file

@ -8,6 +8,7 @@ CeladonPokecenter_TextPointers:
dw CeladonPokecenterText3
dw CeladonTradeNurseText
dw SandslashTrade
dw CeladonPokeCenterText4
CeladonTradeNurseText:
script_cable_club_receptionist
@ -29,3 +30,8 @@ SandslashTrade:
ld [wWhichTrade], a
predef DoInGameTradeDialogue
jp TextScriptEnd
CeladonPokeCenterText4:
text_asm
callfar PokecenterChanseyText
jp TextScriptEnd

8
scripts/CeladonUniversityPokecenter.asm
View file

@ -8,6 +8,7 @@ CeladonUniversityPokecenter_TextPointers:
dw CuboneSalesmanText
dw CeladonUniversityPokecenterText8
dw CeladonUniversityTradeNurseText
dw CeladonUniversityChansey
CeladonUniversityTradeNurseText:
script_cable_club_receptionist
@ -86,4 +87,9 @@ CuboneSalesmanText:
CeladonUniversityPokecenterText8::
text_far _CeladonUniversityPokecenterText8
text_end
text_end
CeladonUniversityChansey:
text_asm
callfar PokecenterChanseyText
jp TextScriptEnd

5
scripts/CeruleanPokecenter.asm
View file

@ -8,6 +8,7 @@ CeruleanPokecenter_TextPointers:
dw CeruleanPokecenterText3
dw CeruleanTradeNurseText
dw NinetalesTrade
dw CeruleanPokecenterText4
CeruleanTradeNurseText:
script_cable_club_receptionist
@ -30,3 +31,7 @@ NinetalesTrade:
predef DoInGameTradeDialogue
jp TextScriptEnd
CeruleanPokecenterText4:
text_asm
callfar PokecenterChanseyText
jp TextScriptEnd

6
scripts/CinnabarPokecenter.asm
View file

@ -9,6 +9,7 @@ CinnabarPokecenter_TextPointers:
dw CinnabarTradeNurseText
dw PoryZSalesmanText
dw MukTrade
dw CinnabarPokecenterText4
CinnabarHealNurseText:
script_pokecenter_nurse
@ -99,3 +100,8 @@ MukTrade:
ld [wWhichTrade], a
predef DoInGameTradeDialogue
jp TextScriptEnd
CinnabarPokecenterText4:
text_asm
callfar PokecenterChanseyText
jp TextScriptEnd

6
scripts/FuchsiaPokecenter.asm
View file

@ -8,6 +8,7 @@ FuchsiaPokecenter_TextPointers:
dw FuchsiaPokecenterText3
dw FuchsiaTradeNurseText
dw MarowakTrade
dw FuschiaPokecenterText4
FuchsiaHealNurseText:
script_pokecenter_nurse
@ -29,3 +30,8 @@ MarowakTrade:
ld [wWhichTrade], a
predef DoInGameTradeDialogue
jp TextScriptEnd
FuschiaPokecenterText4:
text_asm
callfar PokecenterChanseyText
jp TextScriptEnd

6
scripts/IndigoPlateauLobby.asm
View file

@ -21,6 +21,7 @@ IndigoPlateauLobby_TextPointers:
dw IndigoCashierText
dw IndigoTradeNurseText
dw ExeggutorTrade
dw IndigoPlateauLobbyText4
IndigoHealNurseText:
script_pokecenter_nurse
@ -45,3 +46,8 @@ ExeggutorTrade:
ld [wWhichTrade], a
predef DoInGameTradeDialogue
jp TextScriptEnd
IndigoPlateauLobbyText4:
text_asm
callfar PokecenterChanseyText
jp TextScriptEnd

5
scripts/LavenderPokecenter.asm
View file

@ -8,6 +8,7 @@ LavenderPokecenter_TextPointers:
dw LavenderPokecenterText3
dw LavenderTradeNurseText
dw DugtrioTrade
dw LavenderPokecenterText4
LavenderTradeNurseText:
script_cable_club_receptionist
@ -30,3 +31,7 @@ DugtrioTrade:
predef DoInGameTradeDialogue
jp TextScriptEnd
LavenderPokecenterText4:
text_asm
callfar PokecenterChanseyText
jp TextScriptEnd

12
scripts/MrFujisHouse.asm
View file

@ -9,6 +9,7 @@ MrFujisHouse_TextPointers:
dw LavenderHouse1Text4
dw LavenderHouse1Text5
dw LavenderHouse1Text6
dw LavenderHouse1Text7
LavenderHouse1Text1:
text_asm
@ -55,14 +56,14 @@ LavenderHouse1Text_1d8f9:
LavenderHouse1Text3:
text_far _LavenderHouse1Text3
text_asm
ld a, PSYDUCK
ld a, SANDSHREW
call PlayCry
jp TextScriptEnd
LavenderHouse1Text4:
text_far _LavenderHouse1Text4
text_asm
ld a, NIDORINO
ld a, BULBASAUR
call PlayCry
jp TextScriptEnd
@ -110,3 +111,10 @@ MrFujiAfterFluteText:
LavenderHouse1Text6:
text_far _LavenderHouse1Text6
text_end
LavenderHouse1Text7:
text_far _LavenderHouse1Text7
text_asm
ld a, ODDISH
call PlayCry
jp TextScriptEnd

6
scripts/MtMoonPokecenter.asm
View file

@ -9,6 +9,7 @@ MtMoonPokecenter_TextPointers:
dw MagikarpSalesmanText
dw MtMoonPokecenterText5
dw MtMoonTradeNurseText
dw MtMoonPokecenterText6
MtMoonHealNurseText:
script_pokecenter_nurse
@ -92,3 +93,8 @@ MtMoonPokecenterText5:
MtMoonTradeNurseText:
script_cable_club_receptionist
MtMoonPokecenterText6:
text_asm
callfar PokecenterChanseyText
jp TextScriptEnd

6
scripts/PewterPokecenter.asm
View file

@ -8,6 +8,7 @@ PewterPokecenter_TextPointers:
dw PewterJigglypuffText
dw PewterTradeNurseText
dw GolemTrade
dw PewterPokecenterText3
PewterHealNurseText:
script_pokecenter_nurse
@ -97,3 +98,8 @@ GolemTrade:
ld [wWhichTrade], a
predef DoInGameTradeDialogue
jp TextScriptEnd
PewterPokecenterText3:
text_asm
callfar PokecenterChanseyText
jp TextScriptEnd

8
scripts/RockTunnelPokecenter.asm
View file

@ -8,6 +8,7 @@ RockTunnelPokecenter_TextPointers:
dw RockTunnelPokecenterText3
dw RockTunnelTradeNurseText
dw DittoSalesmanText
dw RockTunnelPokecenterText4
RockTunnelHealNurseText:
script_pokecenter_nurse
@ -86,4 +87,9 @@ DittoSalesmanText:
.Text2
text_far _DittoSalesmanText2
text_end
text_end
RockTunnelPokecenterText4:
text_asm
callfar PokecenterChanseyText
jp TextScriptEnd

6
scripts/SaffronPokecenter.asm
View file

@ -8,6 +8,7 @@ SaffronPokecenter_TextPointers:
dw SaffronPokecenterText3
dw SaffronTradeNurseText
dw RaichuTrade
dw SaffronPokecenterText4
SaffronHealNurseText:
script_pokecenter_nurse
@ -29,3 +30,8 @@ RaichuTrade:
ld [wWhichTrade], a
predef DoInGameTradeDialogue
jp TextScriptEnd
SaffronPokecenterText4:
text_asm
callfar PokecenterChanseyText
jp TextScriptEnd

6
scripts/VermilionPokecenter.asm
View file

@ -8,6 +8,7 @@ VermilionPokecenter_TextPointers:
dw VermilionPokecenterText3
dw VermilionTradeNurseText
dw PersianTrade
dw VermillionPokeCenterText4
VermilionHealNurseText:
script_pokecenter_nurse
@ -29,3 +30,8 @@ PersianTrade:
ld [wWhichTrade], a
predef DoInGameTradeDialogue
jp TextScriptEnd
VermillionPokeCenterText4:
text_asm
callfar PokecenterChanseyText
jp TextScriptEnd

6
scripts/ViridianPokecenter.asm
View file

@ -8,6 +8,7 @@ ViridianPokecenter_TextPointers:
dw ViridianPokeCenterText3
dw ViridianTradeNurseText
dw RaticateTrade
dw ViridianPokeCenterText4
ViridianHealNurseText:
script_pokecenter_nurse
@ -29,3 +30,8 @@ RaticateTrade:
ld [wWhichTrade], a
predef DoInGameTradeDialogue
jp TextScriptEnd
ViridianPokeCenterText4:
text_asm
callfar PokecenterChanseyText
jp TextScriptEnd

9
text/MrFujisHouse.asm
View file

@ -28,11 +28,12 @@ _LavenderHouse1Text_1d8f9::
done
_LavenderHouse1Text3::
text "PSYDUCK: Gwappa!@"
text "SANDSHREW: Pikii!@"
text_end
_LavenderHouse1Text4::
text "NIDORINO: Gaoo!@"
text "BULBASAUR: Bubba!"
line "Zoar!@"
text_end
_LavenderHouse1Text_1d94c::
@ -87,3 +88,7 @@ _LavenderHouse1Text6::
para "Gone! It's been"
line "clipped out!"
done
_LavenderHouse1Text7::
text "ODDISH: Orddissh!@"
text_end