thorn/jep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/jep-hack.git synced 2025-11-05 21:30:57 +13:00
Code Issues Actions Packages Projects Releases Wiki Activity

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
parent e27b9c6200 1c9dafa527
commit 2b2a5617b8
23 changed files with 174 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
constants/map_constants.asm
View file

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

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.

10
engine/battle/effect_commands.asm
View file

@ -6121,7 +6121,13 @@ BattleCommand_DoubleUndergroundDamage:
call GetBattleVar
bit SUBSTATUS_UNDERGROUND, a
ret z
jr DoubleDamage
BattleCommand_DoubleUnderwaterDamage:
; doubleunderwaterdamage
ld a, BATTLE_VARS_SUBSTATUS4_OPP
call GetBattleVar
bit SUBSTATUS_UNDERWATER, a
; fallthrough
DoubleDamage:
@ -6136,6 +6142,10 @@ DoubleDamage:
ld [hl], a
.quit
ret
BattleCommand_Unused3C:
BattleCommand_Unused5D: ; Just stuffing these here for now because I'm unsure of if I can just axe them from the effect command pointers?? Probably can but :V
ret
INCLUDE "engine/battle/move_effects/mimic.asm"

4
engine/events/overworld.asm
View file

@ -2115,7 +2115,7 @@ WaterSportFunction:
.FailWaterSport:
ld hl, CantWaterSportText
call MenuTextBoxBackup
call MenuTextboxBackup
ld a, $80
ret
@ -2176,7 +2176,7 @@ CanWaterSportText:
AskWaterSportScript:
opentext
copybytetovar wPlayerStandingTile
copybytetovar wPlayerTile
ifequal COLL_DIVE_UP, .up
writetext AskWaterSportDownText
jump .continue

16
engine/tilesets/tileset_anims.asm
View file

@ -78,7 +78,7 @@ TilesetForestAnim:
TilesetJohtoAnim:
dw vTiles2 tile $14, AnimateWaterTile
dw NULL, WaitTileAnimation
dw vTiles2 tile $5b, AnimateDeepWaterTile
dw NULL, WaitTileAnimation
dw NULL, AnimateWaterPalette
dw NULL, WaitTileAnimation
@ -237,7 +237,6 @@ TilesetTowerAnim:
dw NULL, DoneTileAnimation
TilesetNihon1Anim:
TilesetNihonBirdonAnim:
TilesetNihonFontAnim:
TilesetNihonHighTechAnim:
TilesetNihonOldAnim:
@ -255,6 +254,19 @@ TilesetNihonWhiteCityAnim:
dw NULL, WaitTileAnimation
dw NULL, StandingTileFrame8
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:
dw NULL, WaitTileAnimation

37
engine/tilesets/tileset_palettes.asm
View file

@ -78,6 +78,11 @@ LoadSpecialMapPalette:
scf
ret
.underwater
call LoadUnderwaterPalette
scf
ret
.do_nothing
and a
ret
@ -228,6 +233,38 @@ LoadDesertPalette:
ret
INCLUDE "gfx/tilesets/desert.pal"
LoadUnderwaterPalette:
ld a, [wTimeOfDay]
and $7
cp NITE_F
jr z, .nite
cp DAY_F
jr z, .day
scf
;morn
ld a, BANK(wBGPals1)
ld de, wBGPals1
ld hl, UnderwaterMornPalette
ld bc, 8 palettes
jp FarCopyWRAM
ret
.day
ld a, BANK(wBGPals1)
ld de, wBGPals1
ld hl, UnderwaterDayPalette
ld bc, 8 palettes
jp FarCopyWRAM
ret
.nite
ld a, BANK(wBGPals1)
ld de, wBGPals1
ld hl, UnderwaterNitePalette
ld bc, 8 palettes
jp FarCopyWRAM
ret
INCLUDE "gfx/tilesets/underwater.pal"
LoadSpecialMapObjectPalette:

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

30
gfx/tilesets/underwater.pal Normal file
View file

@ -0,0 +1,30 @@
UnderwaterMornPalette:
RGB 31,31,07, 19,18,23, 13,10,13, 03,07,10 ; gray
RGB 31,31,07, 25,16,16, 22,06,14, 03,07,10 ; red
RGB 19,18,23, 09,18,12, 05,11,05, 03,07,10 ; green
RGB 31,31,07, 13,17,31, 05,10,27, 03,07,10 ; water (just blue)
RGB 31,31,07, 12,24,11, 18,13,05, 03,07,10 ; yellow
RGB 31,31,07, 19,17,12, 14,08,11, 03,07,10 ; brown
RGB 31,31,07, 15,31,31, 05,17,31, 03,07,10 ; roof
RGB 31,31,16, 31,31,16, 14,09,00, 00,00,00 ; text
UnderwaterDayPalette:
RGB 18,28,27, 19,18,23, 13,10,13, 03,07,10 ; gray
RGB 18,28,27, 25,16,16, 22,06,14, 03,07,10 ; red
RGB 19,18,23, 09,18,12, 05,11,05, 03,07,10 ; green
RGB 18,28,27, 13,17,31, 05,10,27, 03,07,10 ; water (just blue)
RGB 18,28,27, 12,24,11, 18,13,05, 03,07,10 ; yellow
RGB 18,28,27, 19,17,12, 14,08,11, 03,07,10 ; brown
RGB 18,28,27, 15,31,31, 05,17,31, 03,07,10 ; roof
RGB 31,31,16, 31,31,16, 14,09,00, 00,00,00 ; text
UnderwaterNitePalette:
RGB 12,14,22, 10,10,13, 03,07,10, 00,00,00 ; gray
RGB 12,14,22, 14,06,14, 03,07,10, 00,00,00 ; red
RGB 10,10,13, 05,11,05, 03,07,10, 00,00,00 ; green
RGB 12,14,22, 05,10,22, 03,07,10, 00,00,00 ; water (just blue)
RGB 12,14,22, 13,13,05, 03,07,10, 00,00,00 ; yellow
RGB 12,14,22, 14,08,11, 03,07,10, 00,00,00 ; brown
RGB 12,14,22, 10,12,15, 03,07,10, 00,00,00 ; roof
RGB 31,31,16, 31,31,16, 14,09,00, 00,00,00 ; text

BIN
gfx/tilesets/underwater.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 2.4 KiB

4
maps/DebugRoom.asm
View file

@ -8,12 +8,12 @@ DebugRoom_MapScripts:
DebugPokemon1Script:
opentext
getmonname STRING_BUFFER_3, MACHAMP
getmonname STRING_BUFFER_3, AZUMARILL
writetext ReceivedDebugPokemonText
playsound SFX_CAUGHT_MON
waitsfx
promptbutton
givepoke MACHAMP, 65, TM_ROCK_SMASH
givepoke AZUMARILL, 4, HM_WATER_SPORT
closetext
end

5
maps/SunglowCity.asm
View file

@ -5,11 +5,16 @@ SunglowCity_MapScripts:
def_callbacks
callback MAPCALLBACK_NEWMAP, .Flypoint
callback MAPCALLBACK_NEWMAP, .DiveMap
.Flypoint:
setflag ENGINE_FLYPOINT_SUNGLOW_CITY
return
.DiveMap:
divemap SUNGLOW_WELL
return
SunglowCity_MapEvents:
db 0, 0 ; filler

9
maps/SunglowWell.ablk Normal file
View file

@ -0,0 +1,9 @@

        



18
maps/SunglowWell.asm Normal file
View file

@ -0,0 +1,18 @@
object_const_def
SunglowWell_MapScripts:
def_scene_scripts
def_callbacks
SunglowWell_MapEvents:
db 0, 0 ; filler
def_warp_events
def_coord_events
def_bg_events
def_object_events