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

Mt Moon Rocket has Raticate again, Arbok in Game Corner

Browse source 
Minor upgrades in accordance with the recent KEP playtest.

The Mt. Moon Rocket with the Raticate is arguably one of the most iconic NPC trainers in Pokemon history and under no circumstances should it be cut. No matter what Yellow tells you.

Added a nice Arbok NPC to the Game Corner to make more use of the new overworld sprites I did. It's basically a guard for the attendant to its left - need some safety in casinos, y'know? Especially pachinko parlours...

I put the Arbok text in `text_2.asm` since it'll likely be used by other maps down the line. Or not, but it's good for architecture.
This commit is contained in:
Llinos Evans 2023-06-05 13:00:20 +01:00
parent 3f2a065992
commit 14c92ac855
4 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -21,5 +21,6 @@ GameCorner_Object:
object_event 14, 11, SPRITE_CLERK, STAY, LEFT, 9 ; person object_event 14, 11, SPRITE_CLERK, STAY, LEFT, 9 ; person
object_event 17, 13, SPRITE_GENTLEMAN, STAY, RIGHT, 10 ; person object_event 17, 13, SPRITE_GENTLEMAN, STAY, RIGHT, 10 ; person
object_event 9, 5, SPRITE_ROCKET, STAY, UP, 11, OPP_ROCKET, 7 object_event 9, 5, SPRITE_ROCKET, STAY, UP, 11, OPP_ROCKET, 7
object_event 6, 6, SPRITE_ARBOK, STAY, DOWN, 14 ; Arbok attendant
def_warps_to GAME_CORNER def_warps_to GAME_CORNER

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

@ -15,7 +15,7 @@ MtMoonB2F_Object:
object_event 9, 3, SPRITE_JESSIE, STAY, LEFT, 2 object_event 9, 3, SPRITE_JESSIE, STAY, LEFT, 2
object_event 15, 22, SPRITE_ROCKET, STAY, DOWN, 3, OPP_ROCKET, 2 object_event 15, 22, SPRITE_ROCKET, STAY, DOWN, 3, OPP_ROCKET, 2
object_event 11, 16, SPRITE_ROCKET, STAY, DOWN, 4, OPP_ROCKET, 3 object_event 11, 16, SPRITE_ROCKET, STAY, DOWN, 4, OPP_ROCKET, 3
object_event 29, 17, SPRITE_ROCKET, STAY, LEFT, 5, OPP_ROCKET, 1 object_event 29, 17, SPRITE_ROCKET, STAY, LEFT, 5, OPP_ROCKET, 4 ; Raticate Boss
object_event 9, 4, SPRITE_JAMES, STAY, LEFT, 6 object_event 9, 4, SPRITE_JAMES, STAY, LEFT, 6
object_event 12, 6, SPRITE_FOSSIL, STAY, NONE, 7 ; person object_event 12, 6, SPRITE_FOSSIL, STAY, NONE, 7 ; person
object_event 13, 6, SPRITE_FOSSIL, STAY, NONE, 8 ; person object_event 13, 6, SPRITE_FOSSIL, STAY, NONE, 8 ; person

4
data/text/text_2.asm
View file

@ -1846,3 +1846,7 @@ _MeltanIncrement::
text "<PLAYER> found" text "<PLAYER> found"
line "10 MELTAN CANDY!" line "10 MELTAN CANDY!"
prompt prompt
_GameCornerArbok:: ; Putting here to be potentially farcalled somewhere else.
text "ARBOK: Chaaarbok!"
done

9
scripts/GameCorner.asm
View file

@ -130,6 +130,7 @@ GameCorner_TextPointers:
dw CeladonGameCornerText11 dw CeladonGameCornerText11
dw CeladonGameCornerText12 dw CeladonGameCornerText12
dw CeladonGameCornerText13 dw CeladonGameCornerText13
dw GameCornerArbok
CeladonGameCornerText1: CeladonGameCornerText1:
text_far _CeladonGameCornerText1 text_far _CeladonGameCornerText1
@ -525,3 +526,11 @@ Has9990Coins:
ld a, $90 ld a, $90
ldh [hCoins + 1], a ldh [hCoins + 1], a
jp HasEnoughCoins jp HasEnoughCoins
GameCornerArbok:
text_far _GameCornerArbok
text_asm
ld a, ARBOK
call PlayCry
call WaitForSoundToFinish
jp TextScriptEnd