thorn/jep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/jep-hack.git synced 2025-11-10 23:51:03 +13:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/ZetaNull/jep-hack

Browse source
This commit is contained in:
Zeta_Null 2023-11-01 17:27:18 -04:00
parent 5e86c93aa7 a91b7fd2a1
commit 48590894b2
7 changed files with 66 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
README.md
View file

@ -27,6 +27,7 @@ The Fairy-type does exist.
## QoL Changes
- A Trader NPC is available in a new Lake of Rage town area, allowing you to access trade evolutions natively.
- Kurt now makes Apricorn Balls instantly. He's had his coffee and is listening to his favourite music.
- Instant text is now an option!
- Clock reset procedure is now like vanilla GS, requiring just Down + B.
- Tilesets now handle up to 255 titles (from 192), allowing for slightly nicer maps.

7
constants/pokemon_data_constants.asm
View file

@ -185,7 +185,12 @@ DEF NUM_ROAMMON_MAPS EQU 16 ; RoamMaps table size (see data/wild/roammon_maps.as
const TREEMON_SET_KANTO
const TREEMON_SET_LAKE
const TREEMON_SET_FOREST
const TREEMON_SET_ROCK
const TREEMON_SET_ROCK_BEACH
const TREEMON_SET_ROCK_DARK_CAVE
const TREEMON_SET_ROCK_TOWER
const TREEMON_SET_ROCK_ICE
const TREEMON_SET_ROCK_SQUARE
const TREEMON_SET_ROCK_WELL
DEF NUM_TREEMON_SETS EQU const_value
; treemon scores

15
data/wild/treemon_maps.asm
View file

@ -41,8 +41,15 @@ TreeMonMaps:
db -1
RockMonMaps:
treemon_map CIANWOOD_CITY, TREEMON_SET_ROCK
treemon_map ROUTE_40, TREEMON_SET_ROCK
treemon_map DARK_CAVE_VIOLET_ENTRANCE, TREEMON_SET_ROCK
treemon_map SLOWPOKE_WELL_B1F, TREEMON_SET_ROCK
treemon_map CIANWOOD_CITY, TREEMON_SET_ROCK_BEACH
treemon_map ROUTE_40, TREEMON_SET_ROCK_BEACH
treemon_map DARK_CAVE_VIOLET_ENTRANCE, TREEMON_SET_ROCK_DARK_CAVE
treemon_map SLOWPOKE_WELL_B1F, TREEMON_SET_ROCK_WELL
treemon_map ICE_PATH_1F, TREEMON_SET_ROCK_ICE
treemon_map ICE_PATH_B1F, TREEMON_SET_ROCK_ICE
treemon_map ICE_PATH_B2F_MAHOGANY_SIDE, TREEMON_SET_ROCK_ICE
treemon_map ICE_PATH_B2F_BLACKTHORN_SIDE, TREEMON_SET_ROCK_ICE
treemon_map ICE_PATH_B3F, TREEMON_SET_ROCK_ICE
treemon_map MOUNT_MOON_SQUARE, TREEMON_SET_ROCK_SQUARE
treemon_map BURNED_TOWER_1F, TREEMON_SET_ROCK_TOWER
db -1

34
data/wild/treemons.asm
View file

@ -8,7 +8,12 @@ TreeMons:
dw TreeMonSet_Kanto
dw TreeMonSet_Lake
dw TreeMonSet_Forest
dw TreeMonSet_Rock
dw TreeMonSet_Rock_Beach
dw TreeMonSet_Rock_Dark_Cave
dw TreeMonSet_Rock_Tower
dw TreeMonSet_Rock_Ice
dw TreeMonSet_Rock_Square
dw TreeMonSet_Rock_Well
assert_table_length NUM_TREEMON_SETS
dw TreeMonSet_City ; unused
@ -125,7 +130,32 @@ TreeMonSet_Forest:
dbbw 5, 10, KAKUNA
db -1
TreeMonSet_Rock:
TreeMonSet_Rock_Beach:
dbbw 90, 15, KRABBY
dbbw 10, 15, SHUCKLE
db -1
TreeMonSet_Rock_Dark_Cave:
dbbw 90, 15, GEODUDE
dbbw 10, 15, DUNSPARCE
db -1
TreeMonSet_Rock_Tower:
dbbw 90, 15, GEODUDE
dbbw 10, 15, SLUGMA
db -1
TreeMonSet_Rock_Ice:
dbbw 90, 15, GEODUDE
dbbw 10, 15, SWINUB
db -1
TreeMonSet_Rock_Square:
dbbw 90, 15, GEODUDE
dbbw 10, 15, SHUCKLE
db -1
TreeMonSet_Rock_Well:
dbbw 90, 15, KRABBY
dbbw 10, 15, SHELLDER
db -1

2
maps/DebugRoom.ablk
View file

@ -1,4 +1,4 @@
 ! ! !WWE
 ! ! !WWE
R
 !
ERETvUXYG~IJ

1
maps/DebugRoom.asm
View file

@ -101,6 +101,7 @@ DebugRoom_MapEvents:
warp_event 5, 35, VIRIDIAN_FOREST, 1 ; southwest warp
warp_event 19, 34, VIRIDIAN_FOREST, 1 ; southern warp
warp_event 33, 33, VIRIDIAN_FOREST, 1 ; southeast warp
warp_event 5, 3, AZALEA_TOWN, 1
def_coord_events

25
maps/KurtsHouse.asm
View file

@ -72,8 +72,8 @@ Kurt1:
iffalse .NoRoomForBall
setevent EVENT_KURT_GAVE_YOU_LURE_BALL
.GotLureBall:
checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
iftrue .WaitForApricorns
;checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
;iftrue .WaitForApricorns
checkevent EVENT_GAVE_KURT_RED_APRICORN
iftrue .GiveLevelBall
checkevent EVENT_GAVE_KURT_BLU_APRICORN
@ -167,11 +167,17 @@ Kurt1:
.GaveKurtApricorns:
setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
setflag ENGINE_KURT_MAKING_BALLS
.WaitForApricorns:
writetext KurtsHouseKurtItWillTakeADayText
;setflag ENGINE_KURT_MAKING_BALLS
;.WaitForApricorns:
writetext KurtsHouseKurtGetStartedText
waitbutton
closetext
special FadeBlackQuickly
special ReloadSpritesNoPalettes
playsound SFX_WARP_TO
waitsfx
pause 35
sjump Kurt1
end
.Cancel:
@ -528,12 +534,9 @@ KurtsHouseKurtAskYouHaveAnApricornText:
line "into a BALL."
done
KurtsHouseKurtItWillTakeADayText:
text "KURT: It'll take a"
line "day to make you a"
para "BALL. Come back"
line "for it later."
KurtsHouseKurtGetStartedText:
text "Kurt: I'll get"
line "started right now!"
done
KurtsHouseKurtThatsALetdownText: