thorn/jep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/jep-hack.git synced 2025-10-15 19:54:28 +13:00
Code Issues Actions Packages Projects Releases Wiki Activity

rev

Browse source
This commit is contained in:
Llinos Evans 2025-07-25 17:59:04 +01:00
parent 555a96597e
commit 8e9f9d8657
13 changed files with 3 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
constants/map_constants.asm
View file

@ -706,7 +706,6 @@ ENDM
newgroup SUNGLOW_CITY ; 40 newgroup SUNGLOW_CITY ; 40
map_const ROUTE_57, 10, 27 ; 1 map_const ROUTE_57, 10, 27 ; 1
map_const SUNGLOW_CITY, 10, 9 ; 2 map_const SUNGLOW_CITY, 10, 9 ; 2
map_const SUNGLOW_WELL, 10, 9 ; 2
endgroup endgroup
newgroup BLUE_FOREST ; 41 newgroup BLUE_FOREST ; 41

2
data/maps/attributes.asm
View file

@ -930,8 +930,6 @@ ENDM
map_attributes SunglowCity, SUNGLOW_CITY, $03, SOUTH ; this is missing a route connection map_attributes SunglowCity, SUNGLOW_CITY, $03, SOUTH ; this is missing a route connection
connection south, Route57, ROUTE_57, 0 connection south, Route57, ROUTE_57, 0
map_attributes SunglowWell, SUNGLOW_WELL, $03, SOUTH ; this is missing a route connection
map_attributes BlueForest, BLUE_FOREST, $00, 0 ; this is on its own for now. add connections later. map_attributes BlueForest, BLUE_FOREST, $00, 0 ; this is on its own for now. add connections later.

3
data/maps/blocks.asm
View file

@ -1345,9 +1345,6 @@ Route57_Blocks:
SunglowCity_Blocks: SunglowCity_Blocks:
INCBIN "maps/SunglowCity.ablk" INCBIN "maps/SunglowCity.ablk"
SunglowWell_Blocks:
INCBIN "maps/SunglowWell.ablk"
AventurineCity_Blocks: AventurineCity_Blocks:
INCBIN "maps/AventurineCity.ablk" INCBIN "maps/AventurineCity.ablk"

1
data/maps/maps.asm
View file

@ -777,7 +777,6 @@ MapGroup_SunglowCity:
table_width MAP_LENGTH, MapGroup_SunglowCity table_width MAP_LENGTH, MapGroup_SunglowCity
map Route57, TILESET_NIHON_BIRDON, ROUTE, LANDMARK_ROUTE_57, MUSIC_MOBILE_ADAPTER_MENU, FALSE, PALETTE_AUTO, FISHGROUP_SHORE map Route57, TILESET_NIHON_BIRDON, ROUTE, LANDMARK_ROUTE_57, MUSIC_MOBILE_ADAPTER_MENU, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
map SunglowCity, TILESET_NIHON_BIRDON, TOWN, LANDMARK_SUNGLOW_CITY, MUSIC_MOBILE_ADAPTER_MENU, FALSE, PALETTE_AUTO, FISHGROUP_SHORE map SunglowCity, TILESET_NIHON_BIRDON, TOWN, LANDMARK_SUNGLOW_CITY, MUSIC_MOBILE_ADAPTER_MENU, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
map SunglowWell, TILESET_UNDERWATER, ROUTE, LANDMARK_SUNGLOW_CITY, MUSIC_MOBILE_ADAPTER, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
assert_table_length NUM_SUNGLOW_CITY_MAPS assert_table_length NUM_SUNGLOW_CITY_MAPS
MapGroup_BlueForest: MapGroup_BlueForest:

BIN
data/tilesets/nihon_birdon_attributes.bin
View file

Binary file not shown.

2
data/tilesets/nihon_birdon_collision.asm
View file

@ -39,7 +39,7 @@
tilecoll WALL, WALL, WALL, WALL ; 25 tilecoll WALL, WALL, WALL, WALL ; 25
tilecoll WALL, DOOR, FLOOR, FLOOR ; 26 tilecoll WALL, DOOR, FLOOR, FLOOR ; 26
tilecoll WALL, WALL, FLOOR, FLOOR ; 27 tilecoll WALL, WALL, FLOOR, FLOOR ; 27
tilecoll WALL, FLOOR, FLOOR, FLOOR ; 28 tilecoll WALL, WALL, FLOOR, FLOOR ; 28
tilecoll WALL, WALL, FLOOR, FLOOR ; 29 tilecoll WALL, WALL, FLOOR, FLOOR ; 29
tilecoll WALL, WALL, WALL, WALL ; 2a tilecoll WALL, WALL, WALL, WALL ; 2a
tilecoll WALL, WALL, WALL, WALL ; 2b tilecoll WALL, WALL, WALL, WALL ; 2b

BIN
data/tilesets/nihon_birdon_metatiles.bin
View file

Binary file not shown.

BIN
data/tilesets/underwater_attributes.bin
View file

Binary file not shown.

BIN
data/tilesets/underwater_metatiles.bin
View file

Binary file not shown.

16
engine/tilesets/tileset_anims.asm
View file

@ -78,7 +78,7 @@ TilesetForestAnim:
TilesetJohtoAnim: TilesetJohtoAnim:
dw vTiles2 tile $14, AnimateWaterTile dw vTiles2 tile $14, AnimateWaterTile
dw vTiles2 tile $5b, AnimateDeepWaterTile dw NULL, WaitTileAnimation
dw NULL, WaitTileAnimation dw NULL, WaitTileAnimation
dw NULL, AnimateWaterPalette dw NULL, AnimateWaterPalette
dw NULL, WaitTileAnimation dw NULL, WaitTileAnimation
@ -237,6 +237,7 @@ TilesetTowerAnim:
dw NULL, DoneTileAnimation dw NULL, DoneTileAnimation
TilesetNihon1Anim: TilesetNihon1Anim:
TilesetNihonBirdonAnim:
TilesetNihonFontAnim: TilesetNihonFontAnim:
TilesetNihonHighTechAnim: TilesetNihonHighTechAnim:
TilesetNihonOldAnim: TilesetNihonOldAnim:
@ -254,19 +255,6 @@ TilesetNihonWhiteCityAnim:
dw NULL, WaitTileAnimation dw NULL, WaitTileAnimation
dw NULL, StandingTileFrame8 dw NULL, StandingTileFrame8
dw NULL, DoneTileAnimation dw NULL, DoneTileAnimation
TilesetNihonBirdonAnim:
dw vTiles2 tile $14, AnimateWaterTile
dw NULL, WaitTileAnimation
dw vTiles2 tile $60, AnimateDeepWaterTile
dw NULL, WaitTileAnimation
dw NULL, AnimateWaterPalette
dw NULL, WaitTileAnimation
dw NULL, AnimateFlowerTile
dw NULL, WaitTileAnimation
dw NULL, WaitTileAnimation
dw NULL, StandingTileFrame8
dw NULL, DoneTileAnimation
TilesetForestKantoAnim: TilesetForestKantoAnim:
dw NULL, WaitTileAnimation dw NULL, WaitTileAnimation

5
engine/tilesets/tileset_palettes.asm
View file

@ -73,11 +73,6 @@ LoadSpecialMapPalette:
scf scf
ret ret
.underwater
call LoadUnderwaterPalette
scf
ret
.do_nothing .do_nothing
and a and a
ret ret

BIN
gfx/tilesets/nihon_birdon.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.4 KiB

After

Width:  |  Height:  |  Size: 3.4 KiB

BIN
gfx/tilesets/underwater.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.4 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB