thorn/jep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/jep-hack.git synced 2025-12-24 19:46:49 +13:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'ZetaNull:master' into master

Browse source
This commit is contained in:
Misty 2023-10-23 11:12:13 -04:00 committed by GitHub
parent a82fdf34dd f983bc8f16
commit ee06fad63c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 15 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
data/tilesets/park_attributes.bin
View file

Binary file not shown.

2
data/tilesets/park_collision.asm
View file

@ -62,3 +62,5 @@
tilecoll WALL, WALL, WALL, WALL ; 3d tilecoll WALL, WALL, WALL, WALL ; 3d
tilecoll WALL, WALL, WALL, WALL ; 3e tilecoll WALL, WALL, WALL, WALL ; 3e
tilecoll LONG_GRASS, LONG_GRASS, LONG_GRASS, LONG_GRASS ; 3f tilecoll LONG_GRASS, LONG_GRASS, LONG_GRASS, LONG_GRASS ; 3f
tilecoll WALL, FLOOR, WALL, WARP_CARPET_DOWN ; 40
tilecoll FLOOR, WALL, WARP_CARPET_DOWN, WALL ; 41

BIN
data/tilesets/park_metatiles.bin
View file

Binary file not shown.

2
maps/FuchsiaCity.ablk
View file

@ -1,7 +1,7 @@
 
 T!  T!
ooo7}~ttttntmVUw ooo7€~ttttntmVUw
t t
6nwtttt{oowwwwwwwttt{tttn{{ 6nwtttt{oowwwwwwwttt{tttn{{

30
maps/FuchsiaCity.asm
View file

@ -68,12 +68,12 @@ FuchsiaCityPokefanMText:
done done
FuchsiaCityTeacherText: FuchsiaCityTeacherText:
text "The SAFARI ZONE is" text "I caught a"
line "closed… It's sad," line "TRAMPEL in the"
cont "SAFARI ZONE!"
para "considering it's"
line "FUCHSIA's main" para "I should show"
cont "attraction." line "it to my class!"
done done
FuchsiaCitySignText: FuchsiaCitySignText:
@ -93,12 +93,8 @@ FuchsiaGymSignText:
done done
SafariZoneOfficeSignText: SafariZoneOfficeSignText:
text "There's a notice" text "#MON PARADISE"
line "here…" line "SAFARI ZONE"
para "SAFARI ZONE OFFICE"
line "is closed until"
cont "further notice."
done done
WardensHomeSignText: WardensHomeSignText:
@ -107,12 +103,8 @@ WardensHomeSignText:
done done
SafariZoneClosedSignText: SafariZoneClosedSignText:
text "The WARDEN is" text "SAFARI GAME"
line "traveling abroad." line "#MON-U-CATCH!"
para "Therefore, the"
line "SAFARI ZONE is"
cont "closed."
done done
NoLitteringSignText: NoLitteringSignText:
@ -132,7 +124,7 @@ FuchsiaCity_MapEvents:
warp_event 11, 27, BILLS_BROTHERS_HOUSE, 1 warp_event 11, 27, BILLS_BROTHERS_HOUSE, 1
warp_event 19, 27, FUCHSIA_POKECENTER_1F, 1 warp_event 19, 27, FUCHSIA_POKECENTER_1F, 1
warp_event 27, 27, SAFARI_ZONE_WARDENS_HOME, 1 warp_event 27, 27, SAFARI_ZONE_WARDENS_HOME, 1
warp_event 18, 3, SAFARI_ZONE_FUCHSIA_GATE_BETA, 3 ; inaccessible warp_event 18, 3, SAFARI_ZONE_FUCHSIA_GATE_BETA, 3
warp_event 37, 22, ROUTE_15_FUCHSIA_GATE, 1 warp_event 37, 22, ROUTE_15_FUCHSIA_GATE, 1
warp_event 37, 23, ROUTE_15_FUCHSIA_GATE, 2 warp_event 37, 23, ROUTE_15_FUCHSIA_GATE, 2
warp_event 7, 35, ROUTE_19_FUCHSIA_GATE, 1 warp_event 7, 35, ROUTE_19_FUCHSIA_GATE, 1

2
maps/SafariZoneBeta.ablk
View file

@ -1 +1 @@
?//'#33+ @A())*,--.0112