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

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

Browse source
This commit is contained in:
MementoMartha 2023-04-09 15:02:13 +01:00
parent eda2d0db01 7e3d48513b
commit bbec5a4256
8 changed files with 70 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
constants/event_constants.asm
View file

@ -735,6 +735,7 @@
; Safari Zone events
const_next $880
const EVENT_GOT_HM03
const EVENT_GOT_MELTAN
; Cerulean Cave events
const_next $8C0

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

@ -9,9 +9,9 @@ CeladonPokecenter_Object:
def_object_events
object_event 3, 1, SPRITE_NURSE, STAY, DOWN, 1 ; person
object_event 7, 3, SPRITE_GENTLEMAN, WALK, LEFT_RIGHT, 2 ; person
object_event 5, 4, SPRITE_GENTLEMAN, WALK, LEFT_RIGHT, 2 ; person
object_event 10, 5, SPRITE_BEAUTY, WALK, ANY_DIR, 3 ; person
object_event 11, 2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 4 ; person
object_event 7, 3, SPRITE_GAMEBOY_KID, STAY, DOWN, 5 ; Sandslash Trader
object_event 8, 3, SPRITE_GAMEBOY_KID, STAY, DOWN, 5 ; Sandslash Trader
def_warps_to CELADON_POKECENTER

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

@ -12,6 +12,6 @@ CeruleanPokecenter_Object:
object_event 10, 5, SPRITE_SUPER_NERD, WALK, ANY_DIR, 2 ; person
object_event 4, 3, SPRITE_GENTLEMAN, STAY, DOWN, 3 ; person
object_event 11, 2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 4 ; person
object_event 10, 7, SPRITE_GAMEBOY_KID, STAY, DOWN, 5 ; Ninetales Trader
object_event 9, 3, SPRITE_GAMEBOY_KID, STAY, DOWN, 5 ; Ninetales Trader
def_warps_to CERULEAN_POKECENTER

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

@ -12,6 +12,6 @@ LavenderPokecenter_Object:
object_event 5, 3, SPRITE_GENTLEMAN, STAY, NONE, 2 ; person
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 10, 7, SPRITE_GAMEBOY_KID, STAY, DOWN, 5 ; Dugtrio Trader
object_event 9, 3, SPRITE_GAMEBOY_KID, STAY, DOWN, 5 ; Dugtrio Trader
def_warps_to LAVENDER_POKECENTER

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

@ -8,8 +8,9 @@ SafariZoneEastRestHouse_Object:
def_bg_events
def_object_events
object_event 1, 3, SPRITE_SCIENTIST, WALK, UP_DOWN, 1 ; person
object_event 4, 2, SPRITE_ROCKER, STAY, NONE, 2 ; person
object_event 2, 3, SPRITE_SCIENTIST, WALK, UP_DOWN, 1 ; person
object_event 0, 2, SPRITE_ROCKER, STAY, NONE, 2 ; person
object_event 5, 2, SPRITE_SILPH_WORKER, STAY, NONE, 3 ; person
object_event 6, 2, SPRITE_SILPH_WORKER, STAY, NONE, 4 ; person
def_warps_to SAFARI_ZONE_EAST_REST_HOUSE

1
engine/debug/debug_party.asm
View file

@ -27,7 +27,6 @@ IshiharaTeam:
db PORYGON, 50
IF DEF(_DEBUG)
db NINETALES, 50
db DUGTRIO, 50
ENDC
db -1 ; end

42
scripts/SafariZoneEastRestHouse.asm
View file

@ -6,6 +6,7 @@ SafariZoneEastRestHouse_TextPointers:
dw SafariZoneRestHouse3Text1
dw SafariZoneRestHouse3Text2
dw SafariZoneRestHouse3Text3
dw SafariZoneRestHouse3Meltan
SafariZoneRestHouse3Text1:
text_far _SafariZoneRestHouse3Text1
@ -18,3 +19,44 @@ SafariZoneRestHouse3Text2:
SafariZoneRestHouse3Text3:
text_far _SafariZoneRestHouse3Text3
text_end
SafariZoneRestHouse3Meltan:
; meltan guy
text_asm
ld a, [wd72e]
bit 0, a ; got meltan?
jr z, .giveMeltan
CheckEvent EVENT_GOT_MELTAN
jr nz, .MeltanInfo
ld hl, .MeltanGuyText
call PrintText
jr .done
.giveMeltan
ld hl, .MeltanGuyText
call PrintText
lb bc, MELTAN, 5
SetEvent EVENT_GOT_MELTAN
call GivePokemon
jr nc, .done
ld a, [wSimulatedJoypadStatesEnd]
and a
call z, WaitForTextScrollButtonPress
call EnableAutoTextBoxDrawing
ld hl, .MeltanInfoWithBlackjackAndHookers
call PrintText
ld hl, wd72e
set 0, [hl]
jr .done
.MeltanInfo
ld hl, .MeltanInfoWithBlackjackAndHookers
call PrintText
.done
jp TextScriptEnd
.MeltanInfoWithBlackjackAndHookers
text_far _MeltanInfo
text_end
.MeltanGuyText
text_far _MeltanGuyText
text_end

20
text/SafariZoneEastRestHouse.asm
View file

@ -16,3 +16,23 @@ _SafariZoneRestHouse3Text3::
text "Whew! I'm tired"
line "from all the fun!"
done
_MeltanGuyText::
text "I found a lost"
line "#MON. It seems"
cont "to be looking"
cont "for its friends."
para "Could you take"
line "care of it, kid?"
prompt
_MeltanInfo::
text "My sources say it's"
line "called MELTAN."
para "It's never seen in"
line "KANTO..."
done