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

Finish Lake of Rage "town"

Browse source 
Well, sort of. There's still a lot you can do with Pryce's House, it needs more things.

I want to make it so Pryce only appears when the Red Gyarados has been defeated. Maybe he can give a TM or something too.

This commit does the following;
- Fix the weird landmarking because I was a dumb stupid idiot.
- Adds all the relevant signs.
- Adds Pryce's House over where the gym was. Just a cute, quaint little place.
This commit is contained in:
Llinos Evans 2023-10-28 00:03:23 +01:00
parent c1fa88db2a
commit 56bf3ef2b0
10 changed files with 156 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
constants/map_constants.asm
View file

@ -60,9 +60,6 @@ ENDM
map_const ROUTE_42, 30, 9 ; 5
map_const ROUTE_44, 30, 9 ; 6
map_const MAHOGANY_TOWN, 10, 9 ; 7
map_const LAKE_OF_RAGE_TRADER_HOUSE, 4, 4 ; 8
map_const LAKE_OF_RAGE_POKECENTER_1F, 5, 4 ; 9
map_const LAKE_OF_RAGE_MART, 6, 4 ; 10
endgroup
newgroup DUNGEONS ; 3
@ -236,6 +233,10 @@ ENDM
map_const ROUTE_43_GATE, 5, 4 ; 4
map_const ROUTE_43, 10, 27 ; 5
map_const LAKE_OF_RAGE, 20, 18 ; 6
map_const LAKE_OF_RAGE_TRADER_HOUSE, 4, 4 ; 7
map_const LAKE_OF_RAGE_POKECENTER_1F, 5, 4 ; 8
map_const LAKE_OF_RAGE_MART, 6, 4 ; 9
map_const LAKE_OF_RAGE_PRYCES_HOUSE, 8, 5 ; 10
endgroup
newgroup VIOLET ; 10

1
data/maps/attributes.asm
View file

@ -519,6 +519,7 @@ ENDM
map_attributes AzaleaGym, AZALEA_GYM, $00, 0
map_attributes LakeOfRageHiddenPowerHouse, LAKE_OF_RAGE_HIDDEN_POWER_HOUSE, $00, 0
map_attributes LakeOfRageMagikarpHouse, LAKE_OF_RAGE_MAGIKARP_HOUSE, $00, 0
map_attributes LakeOfRagePrycesHouse, LAKE_OF_RAGE_PRYCES_HOUSE, $00, 0
map_attributes Route43MahoganyGate, ROUTE_43_MAHOGANY_GATE, $00, 0
map_attributes Route43Gate, ROUTE_43_GATE, $00, 0
map_attributes VioletMart, VIOLET_MART, $00, 0

3
data/maps/blocks.asm
View file

@ -1074,3 +1074,6 @@ CeruleanCaveB1F_Blocks:
SilentHills_Blocks:
INCBIN "maps/SilentHills.ablk"
LakeOfRagePrycesHouse_Blocks:
INCBIN "maps/LakeOfRagePrycesHouse.ablk"

7
data/maps/maps.asm
View file

@ -73,9 +73,6 @@ MapGroup_Mahogany:
map Route42, TILESET_JOHTO, ROUTE, LANDMARK_ROUTE_42, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_AUTO, FISHGROUP_LAKE
map Route44, TILESET_JOHTO, ROUTE, LANDMARK_ROUTE_44, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_AUTO, FISHGROUP_POND
map MahoganyTown, TILESET_JOHTO, TOWN, LANDMARK_MAHOGANY_TOWN, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
map LakeOfRageTraderHouse, TILESET_HOUSE, INDOOR, LANDMARK_OLIVINE_CITY, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_DAY, FISHGROUP_SHORE
map LakeOfRagePokecenter1F, TILESET_POKECENTER, INDOOR, LANDMARK_MAHOGANY_TOWN, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
map LakeOfRageMart, TILESET_MART, INDOOR, LANDMARK_MAHOGANY_TOWN, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_DAY, FISHGROUP_SHORE
assert_table_length NUM_MAHOGANY_MAPS
MapGroup_Dungeons:
@ -256,6 +253,10 @@ MapGroup_LakeOfRage:
map Route43Gate, TILESET_GATE, GATE, LANDMARK_ROUTE_43, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_DAY, FISHGROUP_SHORE
map Route43, TILESET_JOHTO, ROUTE, LANDMARK_ROUTE_43, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_AUTO, FISHGROUP_POND
map LakeOfRage, TILESET_JOHTO, TOWN, LANDMARK_LAKE_OF_RAGE, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_AUTO, FISHGROUP_GYARADOS
map LakeOfRageTraderHouse, TILESET_HOUSE, INDOOR, LANDMARK_LAKE_OF_RAGE, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_DAY, FISHGROUP_SHORE
map LakeOfRagePokecenter1F, TILESET_POKECENTER, INDOOR, LANDMARK_LAKE_OF_RAGE, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
map LakeOfRageMart, TILESET_MART, INDOOR, LANDMARK_LAKE_OF_RAGE, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_DAY, FISHGROUP_SHORE
map LakeOfRagePrycesHouse, TILESET_TRADITIONAL_HOUSE, INDOOR, LANDMARK_LAKE_OF_RAGE, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_DAY, FISHGROUP_SHORE
assert_table_length NUM_LAKE_OF_RAGE_MAPS
MapGroup_Violet:

1
data/maps/scripts.asm
View file

@ -497,3 +497,4 @@ INCLUDE "maps/SilentHills.asm"
INCLUDE "maps/LakeOfRageTraderHouse.asm"
INCLUDE "maps/LakeOfRagePokecenter1F.asm"
INCLUDE "maps/LakeOfRageMart.asm"
INCLUDE "maps/LakeOfRagePrycesHouse.asm"

2
maps/LakeOfRage.ablk
View file

@ -1 +1 @@
\^af\a\^afG^f\\f>^fTU^abfd?fdTvyY>dG\fd\X55Ya^d?f^Tvy55Y<d`f\\Ty555Y`f]\?\aX555Y\\^?Tvvy555Y^<fTvy555555Y^bd\bf^X5555555Ydf\ffTy5555555Y\b\af\fX55555Ya^d<d\daX555Yfd\\G`f^^\<G^\<bad>>e\adfa
\^,-f,"#-a\^afG&'+/f\\f>^fTU^abfd?fdTvyY>dG\fd\X55Ya^d?f^Tvy55Y<d`f\\Ty555Y`f]\?\aX555Y\\^?Tvvy555Y^<fTvy555555Y^bd\bf^X5555555Ydf\ffTy5555555Y\b\af\fX55555Ya^d<d\daX555Yfd\\G`f^^\<G^\<bad>>e\adfa

32
maps/LakeOfRage.asm
View file

@ -132,6 +132,9 @@ LakeOfRageCameramanScript:
LakeOfRageSign:
jumptext LakeOfRageSignText
LakeOfRageSign2:
jumptext LakeOfRageSignText2
MagikarpHouseSignScript:
opentext
writetext FishingGurusHouseSignText
@ -246,6 +249,12 @@ LakeOfRageLanceTeleportIntoSkyMovement:
teleport_from
step_end
LakeOfRagePokecenterSign:
jumpstd PokecenterSignScript
LakeOfRageMartSign:
jumpstd MartSignScript
LakeOfRageLanceForcedToEvolveText:
text "This lake is full"
line "of GYARADOS but"
@ -490,6 +499,14 @@ LakeOfRageSignText:
cont "GYARADOS LAKE."
done
LakeOfRageSignText2:
text "Take care when"
line "fishing!"
para "GYARADOS will"
line "attack!"
done
FishingGurusHouseSignText:
text "FISHING GURU'S"
line "HOUSE"
@ -508,6 +525,13 @@ LakeOfRageCameramanText: ; Reference to the Battle Zone
cont "rich!"
done
LakeOfRagePryceSign:
jumptext LakeOfRagePryceSignText
LakeOfRagePryceSignText:
text "PRYCE's House"
done
LakeOfRage_MapEvents:
db 0, 0 ; filler
@ -517,16 +541,20 @@ LakeOfRage_MapEvents:
warp_event 3, 9, LAKE_OF_RAGE_MART, 1
warp_event 5, 19, LAKE_OF_RAGE_POKECENTER_1F, 1
warp_event 17, 13, LAKE_OF_RAGE_TRADER_HOUSE, 1
; warp_event 10, 5, LAKE_OF_RAGE_PRE_GYM, 1 ; tbd
warp_event 10, 5, LAKE_OF_RAGE_PRYCES_HOUSE, 1
def_coord_events
def_bg_events
bg_event 19, 31, BGEVENT_READ, LakeOfRageSign
bg_event 11, 11, BGEVENT_READ, LakeOfRageSign
bg_event 33, 29, BGEVENT_READ, MagikarpHouseSignScript
bg_event 3, 31, BGEVENT_ITEM, LakeOfRageHiddenFullRestore
bg_event 9, 11, BGEVENT_ITEM, LakeOfRageHiddenRareCandy
bg_event 19, 5, BGEVENT_ITEM, LakeOfRageHiddenMaxPotion
bg_event 19, 31, BGEVENT_READ, LakeOfRageSign2
bg_event 6, 19, BGEVENT_READ, LakeOfRagePokecenterSign
bg_event 4, 9, BGEVENT_READ, LakeOfRageMartSign
bg_event 7, 5, BGEVENT_READ, LakeOfRagePryceSign
def_object_events
object_event 19, 32, SPRITE_LANCE, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LakeOfRageLanceScript, EVENT_LAKE_OF_RAGE_LANCE

1
maps/LakeOfRagePrycesHouse.ablk Normal file
View file

@ -0,0 +1 @@
--)000./000*+

110
maps/LakeOfRagePrycesHouse.asm Normal file
View file

@ -0,0 +1,110 @@
object_const_def
const LAKEOFRAGEPRYCESHOUSE_PRYCE
LakeOfRagePrycesHouse_MapScripts:
def_scene_scripts
; For some reason these crash the game. Ok.
;PrycesHouseBookshelf1:
; jumpstd DifficultBookshelfScript
;PrycesHouseBookshelf2:
; jumpstd MagazineBookshelfScript
PrycesHousePryce:
jumptext PrycesHousePryceText
PrycesHousePryceText:
text "Thank you for"
line "saving my"
cont "beloved town."
para "My middle name"
line "is WILLOW."
para "They say willow"
line "is flexible,"
cont "and not easily"
cont "broken, but..."
para "Well, my legs"
line "aren't what they"
cont "used to be."
para "As long as I"
line "have my cane,"
cont "though, I'll be"
cont "fine."
done
LakeOfRagePrycesHouseDelibirdScript:
opentext
writetext LakeOfRagePrycesHouseDelibirdText
cry DELIBIRD
waitbutton
closetext
end
LakeOfRagePrycesHouseDelibirdText:
text "Delideli!"
done
LakeOfRagePrycesHouseSwinubScript:
opentext
writetext LakeOfRagePrycesHouseSwinubText
cry SWINUB
waitbutton
closetext
end
LakeOfRagePrycesHouseSwinubText:
text "Swine! Nub!"
done
; To be used when there's a Seel overworld sprite taken from RBY
;LakeOfRagePrycesHouseSeelScript:
; opentext
; writetext LakeOfRagePrycesHouseSeelText
; cry SEEL
; waitbutton
; closetext
; end
;LakeOfRagePrycesHouseSeelText:
; text "Seel! Seel!"
; done
def_callbacks
callback MAPCALLBACK_OBJECTS, LakeOfRagePrycesHousePryce
LakeOfRagePrycesHousePryce:
checkevent EVENT_LAKE_OF_RAGE_RED_GYARADOS
iffalse .NoAppear
sjump .Appear
.Appear:
appear LAKEOFRAGEPRYCESHOUSE_PRYCE
endcallback
.NoAppear:
disappear LAKEOFRAGEPRYCESHOUSE_PRYCE
endcallback
LakeOfRagePrycesHouse_MapEvents:
db 0, 0 ; filler
def_warp_events
warp_event 3, 9, LAKE_OF_RAGE, 6
warp_event 4, 9, LAKE_OF_RAGE, 6
def_coord_events
def_bg_events
; bg_event 3, 1, BGEVENT_READ, PrycesHouseBookshelf2
; bg_event 1, 1, BGEVENT_READ, PrycesHouseBookshelf1
def_object_events
object_event 9, 6, SPRITE_PRYCE, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, PrycesHousePryce, EVENT_LAKE_OF_RAGE_RED_GYARADOS
object_event 3, 5, SPRITE_BIRD, SPRITEMOVEDATA_WANDER, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, LakeOfRagePrycesHouseDelibirdScript, -1
object_event 10, 6, SPRITE_TAUROS, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, LakeOfRagePrycesHouseSwinubScript, -1
;object_event 2, 5, SPRITE_SEEL, SPRITEMOVEDATA_WANDER, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, LakeOfRagePrycesHouseSeelScript, -1

2
maps/PlayersHouse2F.asm
View file

@ -179,7 +179,7 @@ PlayersHouse2F_MapEvents:
db 0, 0 ; filler
def_warp_events
warp_event 7, 0, LAKE_OF_RAGE, 3
warp_event 7, 0, LAKE_OF_RAGE, 1
;warp_event 7, 0, PLAYERS_HOUSE_1F, 3
def_coord_events