thorn/jep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/jep-hack.git synced 2026-02-07 08:35:23 +13:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of https://github.com/PlagueVonKarma/jep-hack

Browse source
This commit is contained in:
Llinos Evans 2024-12-30 16:31:56 +00:00
commit 2b2a5617b8
23 changed files with 174 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
data/maps/attributes.asm
View file

@ -926,6 +926,8 @@ ENDM
map_attributes SunglowCity, SUNGLOW_CITY, $03, SOUTH ; this is missing a route connection
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.

3
data/maps/blocks.asm
View file

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

1
data/maps/maps.asm
View file

@ -769,6 +769,7 @@ 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 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
MapGroup_BlueForest:

3
data/maps/scripts.asm
View file

@ -655,4 +655,5 @@ INCLUDE "maps/Route52.asm"
INCLUDE "maps/RuddyTown.asm"
INCLUDE "maps/Route57.asm"
INCLUDE "maps/SunglowCity.asm"
INCLUDE "maps/AventurineCity.asm"
INCLUDE "maps/AventurineCity.asm"
INCLUDE "maps/SunglowWell.asm"

8
data/moves/animations.asm
View file

@ -5060,12 +5060,12 @@ BattleAnim_WaterSport:
anim_2gfx ANIM_GFX_SAND, ANIM_GFX_WATER
anim_if_param_equal $0, .hit
anim_if_param_equal $2, .fail
anim_call BattleAnim_FollowPlayerHead_0
anim_call BattleAnim_TargetObj_2Row
anim_bgeffect ANIM_BG_DIG, $0, $1, $1
anim_obj ANIM_OBJ_DIVE_2, 72, 104, $0
anim_obj ANIM_OBJ_WATER_SPORT_2, 72, 104, $0
anim_sound 0, 0, SFX_BUBBLEBEAM
.loop
anim_obj ANIM_OBJ_DIVE_1, 56, 104, $0
anim_obj ANIM_OBJ_WATER_SPORT_1, 56, 104, $0
anim_wait 16
anim_loop 6, .loop
anim_wait 32
@ -5075,7 +5075,7 @@ BattleAnim_WaterSport:
anim_call BattleAnim_ShowMon_0
anim_ret
.hit
anim_bgeffect ANIM_BG_30, $0, $0, $0
anim_bgeffect ANIM_BG_SHAKE_SCREEN_X, $0, $0, $0
anim_sound 0, 1, SFX_HYDRO_PUMP
anim_obj ANIM_OBJ_HYDRO_PUMP, 124, 72, $0
anim_obj ANIM_OBJ_HYDRO_PUMP, 140, 72, $0

BIN
data/tilesets/nihon_birdon_attributes.bin
View file

Binary file not shown.

4
data/tilesets/nihon_birdon_collision.asm
View file

@ -34,11 +34,11 @@
tilecoll WALL, WALL, DOOR, WALL ; 21
tilecoll WALL, WALL, WALL, WALL ; 22
tilecoll WALL, WALL, WALL, WALL ; 23
tilecoll WALL, WALL, WALL, WALL ; 24
tilecoll WALL, WALL, WALL, DIVE_DOWN ; 24
tilecoll WALL, WALL, WALL, WALL ; 25
tilecoll WALL, DOOR, FLOOR, FLOOR ; 26
tilecoll WALL, WALL, FLOOR, FLOOR ; 27
tilecoll WALL, WALL, FLOOR, FLOOR ; 28
tilecoll WALL, FLOOR, FLOOR, FLOOR ; 28
tilecoll WALL, WALL, FLOOR, FLOOR ; 29
tilecoll WALL, WALL, WALL, WALL ; 2a
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.

32
data/tilesets/underwater_collision.asm
View file

@ -0,0 +1,32 @@
tilecoll WALL, WALL, WALL, WALL ; 00
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01
tilecoll WALL, WALL, WALL, WALL ; 02
tilecoll WALL, WALL, WALL, WALL ; 03
tilecoll DIVE_UP, DIVE_UP, DIVE_UP, DIVE_UP ; 04
tilecoll WALL, WALL, WALL, WALL ; 05
tilecoll WALL, WALL, WALL, WALL ; 06
tilecoll WALL, WALL, WALL, WALL ; 07
tilecoll FLOOR, FLOOR, FLOOR, DIVE_UP ; 08
tilecoll WALL, WALL, WALL, WALL ; 09
tilecoll WALL, WALL, WALL, WALL ; 0a
tilecoll WALL, WALL, WALL, WALL ; 0b
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0c
tilecoll WALL, WALL, WALL, WALL ; 0d
tilecoll WALL, WALL, WALL, WALL ; 0e
tilecoll WALL, WALL, WALL, WALL ; 0f
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 10
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 11
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 12
tilecoll TALL_GRASS, TALL_GRASS, TALL_GRASS, TALL_GRASS ; 13
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 14
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 15
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 16
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 17
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 18
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 19
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1a
tilecoll WALL, WALL, WALL, WALL ; 1b
tilecoll WALL, WALL, WALL, WALL ; 1c
tilecoll WALL, WALL, WALL, WALL ; 1d
tilecoll WALL, WALL, WALL, WALL ; 1e
tilecoll WALL, WALL, WALL, WALL ; 1f

BIN
data/tilesets/underwater_metatiles.bin
View file

Binary file not shown.