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

reversions

Browse source
This commit is contained in:
Llinos Evans 2025-07-25 17:55:22 +01:00
parent 4738656c3d
commit c1b0ec142d
9 changed files with 40 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
data/collision/collision_permissions.asm
View file

@ -43,8 +43,8 @@ TileCollisionTable::
db WALL_TILE ; COLL_BUOY
db WATER_TILE ; COLL_CUT_28
db WATER_TILE ; COLL_WATER
db WATERTILE | TALK ; COLL_DIVE_DOWN (unused)
db LANDTILE | TALK ; COLL_DIVE_UP (unused)
db WATER_TILE | TALK ; COLL_DIVE_DOWN (unused)
db LAND_TILE | TALK ; COLL_DIVE_UP (unused)
db WATER_TILE | TALK ; COLL_WHIRLPOOL_2C
db WATER_TILE ; 2d
db WATER_TILE ; 2e

3
data/tilesets/nihon_birdon_collision.asm
View file

@ -34,7 +34,8 @@
tilecoll WALL, WALL, DOOR, WALL ; 21
tilecoll WALL, WALL, WALL, WALL ; 22
tilecoll WALL, WALL, WALL, WALL ; 23
tilecoll WALL, WALL, WALL, DIVE_DOWN ; 24
; tilecoll WALL, WALL, WALL, DIVE_DOWN ; 24
tilecoll WALL, WALL, WALL, WALL ; Placeholder for above
tilecoll WALL, WALL, WALL, WALL ; 25
tilecoll WALL, DOOR, FLOOR, FLOOR ; 26
tilecoll WALL, WALL, FLOOR, FLOOR ; 27

6
data/tilesets/underwater_collision.asm
View file

@ -2,11 +2,13 @@
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 DIVE_UP, DIVE_UP, DIVE_UP, DIVE_UP ; 04
tilecoll WALL, WALL, WALL, WALL ; Placeholder for above
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 FLOOR, FLOOR, FLOOR, DIVE_UP ; 08
tilecoll WALL, WALL, WALL, WALL ; Placeholder for above
tilecoll WALL, WALL, WALL, WALL ; 09
tilecoll WALL, WALL, WALL, WALL ; 0a
tilecoll WALL, WALL, WALL, WALL ; 0b

2
data/wild/flee_mons.asm
View file

@ -19,7 +19,7 @@ SometimesFleeMons:
dw PHANPY
dw TEDDIURSA
dw DIGLETT
dw WIGLETT
; dw WIGLETT
dw SQUEAMATA
dw DUNSPARCE
dw DUDUNSPARCE

26
engine/battle/effect_commands.asm
View file

@ -1263,6 +1263,11 @@ INCLUDE "data/battle/critical_hit_chances.asm"
INCLUDE "engine/battle/move_effects/triple_kick.asm"
GetNextTypeMatchupsByte:
ld a, BANK(TypeMatchups)
call GetFarByte
ret
BattleCommand_Stab:
; STAB = Same Type Attack Bonus
ld a, BATTLE_VARS_MOVE_ANIM
@ -1347,7 +1352,9 @@ BattleCommand_Stab:
ld hl, TypeMatchups
.TypesLoop:
ld a, [hli]
; ld a, [hli]
call GetNextTypeMatchupsByte
inc hl
cp -1
jr z, .end
@ -1365,7 +1372,8 @@ BattleCommand_Stab:
.SkipForesightCheck:
cp b
jr nz, .SkipType
ld a, [hl]
; ld a, [hl]
call GetNextTypeMatchupsByte
cp d
jr z, .GotMatchup
cp e
@ -1470,7 +1478,9 @@ CheckTypeMatchup:
ld [wTypeMatchup], a
ld hl, TypeMatchups
.TypesLoop:
ld a, [hli]
; ld a, [hli]
call GetNextTypeMatchupsByte
inc hl
cp -1
jr z, .End
cp -2
@ -1484,7 +1494,9 @@ CheckTypeMatchup:
.Next:
cp d
jr nz, .Nope
ld a, [hli]
; ld a, [hli]
call GetNextTypeMatchupsByte
inc hl
cp b
jr z, .Yup
cp c
@ -1502,7 +1514,9 @@ CheckTypeMatchup:
ldh [hDividend + 0], a
ldh [hMultiplicand + 0], a
ldh [hMultiplicand + 1], a
ld a, [hli]
; ld a, [hli]
call GetNextTypeMatchupsByte
inc hl
ldh [hMultiplicand + 2], a
ld a, [wTypeMatchup]
ldh [hMultiplier], a
@ -1544,7 +1558,7 @@ BattleCommand_ResetTypeMatchup:
INCLUDE "engine/battle/ai/switch.asm"
INCLUDE "data/types/type_matchups.asm"
;INCLUDE "data/types/type_matchups.asm"
BattleCommand_DamageVariation:
; Modify the damage spread between 85% and 100%.

11
gfx/tilesets.asm
View file

@ -623,17 +623,6 @@ INCLUDE "data/tilesets/lushcave_collision.asm"
TilesetLushCaveAttr::
INCBIN "data/tilesets/lushcave_attributes.bin"
TilesetPlayersRoomGFX::
INCBIN "gfx/tilesets/players_room.2bpp.lz"
TilesetPlayersRoomMeta::
INCBIN "data/tilesets/players_room_metatiles.bin"
TilesetPlayersRoomColl::
INCLUDE "data/tilesets/players_room_collision.asm"
; there should be space here, lavender crypt's set is just big
SECTION "Tileset Data 16", ROMX
; This tileset is very big and detailed.
TilesetLavenderCryptAttr::

5
maps/DebugRoom.asm
View file

@ -13,7 +13,7 @@ DebugPokemon1Script:
playsound SFX_CAUGHT_MON
waitsfx
promptbutton
givepoke KLEAVOR, 15, HM_WATER_SPORT
givepoke KLEAVOR, 15
closetext
end
@ -211,7 +211,8 @@ DebugItemScript:
giveitem HELIX_FOSSIL, 2
giveitem OLD_AMBER, 2
giveitem COIN_CASE
giveitem HM_STRONG_ARM
; giveitem HM_STRONG_ARM
; giveitem HM_WATER_SPORT
givecoins 2500
closetext
end

8
maps/SunglowCity.asm
View file

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

8
maps/SunglowWell.asm
View file

@ -4,11 +4,11 @@ SunglowWell_MapScripts:
def_scene_scripts
def_callbacks
callback MAPCALLBACK_NEWMAP, .DiveMap
; callback MAPCALLBACK_NEWMAP, .DiveMap
.DiveMap:
divemap SUNGLOW_CITY, 0, 0
endcallback
;.DiveMap:
; divemap SUNGLOW_CITY, 0, 0
; endcallback
SunglowWell_MapEvents:
db 0, 0 ; filler