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

Sepia Museum

Browse source 
It's an art museum where you can get your legendary beasts sculpted for now, though I haven't added the functionality. There's a world where it could be for any Pokemon but that implies we make individualised icons...
This commit is contained in:
Llinos Evans 2024-07-26 01:49:14 +01:00
parent 662aea5857
commit 675e112bee
16 changed files with 117 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
constants/map_constants.asm
View file

@ -644,6 +644,7 @@ ENDM
map_const OLD_CITY_FAMILY_HOUSE, 4, 4 ; 6
map_const SEPIA_SCHOOL, 4, 8 ; 7
map_const OLD_CITY_GYM, 6, 10 ; 8
map_const OLD_CITY_MUSEUM, 8, 3 ; 9
endgroup
newgroup BLUE_FOREST ; 37

1
data/maps/attributes.asm
View file

@ -833,6 +833,7 @@ ENDM
map_attributes OldCityFamilyHouse, OLD_CITY_FAMILY_HOUSE, $00, 0
map_attributes SepiaSchool, SEPIA_SCHOOL, $00, 0
map_attributes OldCityGym, OLD_CITY_GYM, $00, 0
map_attributes OldCityMuseum, OLD_CITY_MUSEUM, $00, 0
map_attributes BlueForest, BLUE_FOREST, $00, 0 ; this is on its own for now. add connections later.

3
data/maps/blocks.asm
View file

@ -1243,3 +1243,6 @@ Route66WhiteCityGate_Blocks:
OldCityGym_Blocks:
INCBIN "maps/OldCityGym.ablk"
OldCityMuseum_Blocks:
INCBIN "maps/OldCityMuseum.ablk"

1
data/maps/maps.asm
View file

@ -704,6 +704,7 @@ MapGroup_OldCity:
map OldCityFamilyHouse, TILESET_TRADITIONAL_HOUSE, INDOOR, LANDMARK_OLD_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_NONE
map SepiaSchool, TILESET_LAB, INDOOR, LANDMARK_OLD_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_NONE
map OldCityGym, TILESET_TOWER, INDOOR, LANDMARK_OLD_CITY, MUSIC_GYM, FALSE, PALETTE_DAY, FISHGROUP_NONE
map OldCityMuseum, TILESET_TOWER, INDOOR, LANDMARK_OLD_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_NONE
assert_table_length NUM_OLD_CITY_MAPS
MapGroup_BlueForest:

1
data/maps/scripts.asm
View file

@ -590,6 +590,7 @@ INCLUDE "maps/Route66WhiteCityGate.asm"
SECTION "Map Scripts 30", ROMX
INCLUDE "maps/OldCityGym.asm"
INCLUDE "maps/OldCityMuseum.asm"
SECTION "Map Scripts 31", ROMX ; spillover
INCLUDE "maps/TanobyRuins.asm"

BIN
data/tilesets/nihon_old_attributes.bin
View file

Binary file not shown.

3
data/tilesets/nihon_old_collision.asm
View file

@ -60,6 +60,7 @@
tilecoll WALL, WALL, WALL, WALL ; 3b
tilecoll WALL, WALL, WALL, WALL ; 3c
tilecoll WALL, DOOR, FLOOR, FLOOR ; 3d
tilecoll DOOR, WALL, WALL, WALL ; 3e
tilecoll DOOR, WALL, FLOOR, WALL ; 3e
tilecoll WALL, WALL, WALL, WALL ; 3f
tilecoll WALL, WALL, FLOOR, WALL ; 40
tilecoll HEADBUTT_TREE, FLOOR, FLOOR, FLOOR ; 41

BIN
data/tilesets/nihon_old_metatiles.bin
View file

Binary file not shown.

BIN
data/tilesets/tower_attributes.bin
View file

Binary file not shown.

8
data/tilesets/tower_collision.asm
View file

@ -78,3 +78,11 @@
tilecoll WALL, FLOOR, FLOOR, FLOOR ; 4d
tilecoll WALL, WALL, FLOOR, WALL ; 4e
tilecoll WALL, WALL, WALL, FLOOR ; 4f
tilecoll FLOOR, FLOOR, WALL, WALL ; 50
tilecoll FLOOR, FLOOR, WALL, FLOOR ; 51
tilecoll WALL, FLOOR, FLOOR, FLOOR ; 52
tilecoll WALL, WALL, FLOOR, FLOOR ; 53
tilecoll WALL, WALL, FLOOR, FLOOR ; 54
tilecoll WALL, WALL, FLOOR, FLOOR ; 55
tilecoll WALL, WALL, FLOOR, FLOOR ; 56
tilecoll WALL, WALL, FLOOR, FLOOR ; 57

2
data/tilesets/tower_metatiles.bin
View file

@ -1,4 +1,4 @@
 @ !!A1A1!!!!!!@ A1A1
A1A1A1A1A1A1A1A1A1A1!!!!!!!!A1A1!!!! -.=><>MN./>?,NO()89*+:;()89*+:;MN]^NO^_A1A1@ !!A1A1!!@ !!!!^^^^"#23&'67"#23&'67PQPQPQPQPQPQPQPQ$$$$  "#23!!67"#!!2367%545%545%545%545 ^^  
GHWX
GHWXFV GW PQPQRSRSBCHZ[!XL\67IBCY!Z[L\67JKZ[L\67JKZ[L\67DETU!!!!PPPPPPPPFV   GW 0123!!4501!!2345EFUV!!55EF!!UV55IJYZ!!55IJ!!YZ55KL[\!!55KL!![\556789!!5567!!8955!!^^!!^^!!!!!!!!!!!!!!!!
GHWXFV GW PQPQRSRSBCHZ[!XL\67IBCY!Z[L\67JKZ[L\67JKZ[L\67DETU!!!!PPPPPPPPFV   GW 0123!!4501!!2345EFUV!!55EF!!UV55IJYZ!!55IJ!!YZ55KL[\!!55KL!![\556789!!5567!!8955!!^^!!^^!!!!!!!!!!!!!!!! !!!$%:;!#%'NO^_<=]]>?MM55]]<=MM>?55]]]]MMMM]]!!MM]]MM!!

BIN
gfx/tilesets/tower.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.1 KiB

After

Width:  |  Height:  |  Size: 4.3 KiB

BIN
maps/OldCity.ablk
View file

Binary file not shown.

8
maps/OldCity.asm
View file

@ -88,9 +88,7 @@ OldCityMuseumSignScript:
jumptext OldCityMuseumSignText
OldCityMuseumSignText:
text "XX"
line "Comment to be"
cont "written."
text "SEPIA ART MUSEUM"
done
OldCityFruitTree:
@ -202,8 +200,8 @@ OldCity_MapEvents:
warp_event 3, 26, OLD_MART, 1 ; Mart
warp_event 27, 12, OLD_CITY_GYM, 1 ; gym right
warp_event 26, 12, OLD_CITY_GYM, 1 ; gym left
warp_event 5, 12, DEBUG_ROOM, 1 ; Museum(?) right
warp_event 4, 12, DEBUG_ROOM, 1 ; Museum(?) left
warp_event 5, 12, OLD_CITY_MUSEUM, 1 ; Museum(?) right
warp_event 4, 12, OLD_CITY_MUSEUM, 1 ; Museum(?) left
warp_event 12, 16, DEBUG_ROOM, 1 ; Pokemon Pagoda right
warp_event 11, 16, DEBUG_ROOM, 1 ; Pokemon Pagoda left
warp_event 3, 31, HONEY_GRANDMAS_HOUSE, 1

1
maps/OldCityMuseum.ablk Normal file
View file

@ -0,0 +1 @@
VWVWVWVW RPQPQPQ &

95
maps/OldCityMuseum.asm Normal file
View file

@ -0,0 +1,95 @@
; This seems to have been Mr. Pokemon's house in SW97. The egg is on the far right.
; Here, we've changed it to an art museum, a la RSE's. Only here, the sculptor will construct statues of legendary Pokemon.
; Technically, we could make it the player's, but the problem is, it implies we'd have icons for all 466+ Pokemon in our dex, which is very unfeasible.
; So let's make him do statues of the Legendary Beasts!
; He should have connections with Mr. Pokemon.
; Include an item maniac?
object_const_def
OldCityMuseum_MapScripts:
def_scene_scripts
def_callbacks
; Will eventually be complete.
OldCityInteriorMuseumSign:
jumptext OldCityMuseumInteriorSignText
OldCityMuseumInteriorSignText:
text "NOW LOOKING FOR"
line "DONATIONS"
cont " - CURATOR"
done
; These exhibits will only appear when he's inspired.
OldCityMuseumExhibit1:
jumptext OldCityMuseumExhibit1Text
OldCityMuseumExhibit2:
jumptext OldCityMuseumExhibit2Text
OldCityMuseumExhibit3:
jumptext OldCityMuseumExhibit3Text
OldCityMuseumExhibit1Text:
text "SUICUNE"
line "Comment to be"
cont "written."
done
OldCityMuseumExhibit2Text:
text "ENTEI"
line "Comment to be"
cont "written."
done
OldCityMuseumExhibit3Text:
text "RAIKOU"
line "Comment to be"
cont "written."
done
OldCityMuseumCuratorScript:
opentext
writetext OldCityMuseumCuratorText
waitbutton
closetext
end
OldCityMuseumCuratorText:
text "Hello! I am a"
line "local sculptor!"
para "I wish to fill"
line "this museum with"
cont "statues of legen-"
cont "dary #MON!"
para "If you have a"
line "subject, please"
cont "allow me a look!"
done
OldCityMuseum_MapEvents:
db 0, 0 ; filler
def_warp_events
warp_event 3, 5, OLD_CITY, 7
warp_event 2, 5, OLD_CITY, 8
def_coord_events
def_bg_events
bg_event 2, 2, BGEVENT_READ, OldCityInteriorMuseumSign
bg_event 5, 3, BGEVENT_READ, OldCityMuseumExhibit1
bg_event 9, 3, BGEVENT_READ, OldCityMuseumExhibit2
bg_event 13, 3, BGEVENT_READ, OldCityMuseumExhibit3
def_object_events
object_event 6, 4, SPRITE_FISHER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_PURPLE, OBJECTTYPE_SCRIPT, 0, OldCityMuseumCuratorScript, -1
object_event 5, 3, SPRITE_SUICUNE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, OldCityMuseumExhibit1, -1
object_event 9, 3, SPRITE_ENTEI, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, OldCityMuseumExhibit2, -1
object_event 13, 3, SPRITE_RAIKOU, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, OldCityMuseumExhibit3Text, -1