thorn/jep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/jep-hack.git synced 2026-02-06 16:15:24 +13:00
Code Issues Projects Releases Packages Wiki Activity Actions

Safari Game battle type & bug fix

Browse source 
This adds the restoration of the Safari Zone from Pokemon October. There isn't a proper place for this yet, but there will be soon!

It seems to have issues with tiles, which I am assuming to either be the tilemap clearing or something relating to Zeta's custom ball palettes, since I had to add the Safari Ball. Can you get to that, @ZetaNull?

2ff835730b

also fixed the unnumbered route errors.
This commit is contained in:
Llinos Evans 2024-07-21 23:36:56 +01:00
parent 74506bd7b0
commit d3fbd1f846
13 changed files with 197 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

4
data/items/attributes.asm
View file

@ -96,8 +96,8 @@ ItemAttributes:
item_attribute 700, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_CURRENT, ITEMMENU_NOUSE
; DIRE_HIT
item_attribute 650, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_CLOSE
; ITEM_2D
item_attribute $9999, HELD_NONE, 0, NO_LIMITS, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; SAFARI_BALL, was ITEM_2D
item_attribute 0, HELD_NONE, 0, CANT_SELECT, BALL, ITEMMENU_NOUSE, ITEMMENU_CLOSE
; FRESH_WATER
item_attribute 200, HELD_NONE, 50, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
; SODA_POP

4
data/items/descriptions.asm
View file

@ -979,3 +979,7 @@ ClubFossilDesc:
HoneyPotDesc:
db "A pot for storing"
next "SWEET HONEY.@"
SafariBallDesc:
db "An ULTRA BALL"
next "painted green.@"

2
data/items/names.asm
View file

@ -44,7 +44,7 @@ ItemNames::
li "SUPER REPEL"
li "MAX REPEL"
li "DIRE HIT"
li "TERU-SAMA"
li "SAFARI BALL"
li "FRESH WATER"
li "SODA POP"
li "LEMONADE"

2
data/maps/attributes.asm
View file

@ -377,7 +377,7 @@ ENDM
map_attributes SilentHills, SILENT_HILLS, $05, EAST | WEST ; Add Prince connections later
connection west, Route49, ROUTE_49, 0
connection east, UnnumberedRoute, UNNUMBERED_ROUTE, 0
connection east, Route66, ROUTE_66, 0
map_attributes Route49, ROUTE_49, $05, EAST | WEST
connection east, SilentHills, SILENT_HILLS, $00, 0

10
data/text/battle.asm
View file

@ -1,5 +1,15 @@
BattleText:: ; used only for BANK(BattleText)
BattleText_ThrewRock:
text "<PLAYER> threw a"
line "rock."
prompt
BattleText_ThrewBait:
text "<PLAYER> threw"
line "some bait."
prompt
BattleText_PlayerPickedUpPayDayMoney:
text "<PLAYER> picked up"
line "¥@"