thorn/jep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/jep-hack.git synced 2026-02-20 06:28:38 +13:00
Code Issues Projects Releases Packages Wiki Activity Actions

revert 093bda0

Browse source
This commit is contained in:
Llinos Evans 2025-07-25 17:31:12 +01:00
parent 178cfd2f2d
commit 919250bd73
67 changed files with 94 additions and 1035 deletions
Download patch file Download diff file Expand all files Collapse all files

2
constants/battle_anim_constants.asm
View file

@ -220,8 +220,6 @@ DEF BATTLEANIM_BASE_TILE EQU 7 * 7 ; Maximum size of a pokemon picture
const ANIM_OBJ_PLAYERHEAD_2ROW
const ANIM_OBJ_COIN_HURL
const ANIM_OBJ_SHOOTING_MIST
const ANIM_OBJ_WATER_SPORT_1
const ANIM_OBJ_WATER_SPORT_2
DEF NUM_ANIM_OBJS EQU const_value
; DoBattleAnimFrame arguments (see engine/battle_anims/functions.asm)

2
constants/battle_constants.asm
View file

@ -195,7 +195,7 @@ DEF ALL_STATUS EQU (1 << PSN) | (1 << BRN) | (1 << FRZ) | (1 << PAR) | SLP_MASK
const SUBSTATUS_X_ACCURACY
const SUBSTATUS_MIST
const SUBSTATUS_FOCUS_ENERGY
const SUBSTATUS_UNDERWATER
const_skip
const SUBSTATUS_SUBSTITUTE
const SUBSTATUS_RECHARGE
const SUBSTATUS_RAGE

4
constants/collision_constants.asm
View file

@ -10,7 +10,6 @@ DEF COLL_FLOOR EQU $00
DEF COLL_01 EQU $01 ; garbage
DEF COLL_03 EQU $03 ; garbage
DEF COLL_04 EQU $04 ; garbage
DEF COLL_ROCKY_WALL EQU $06 ; added using this tutorial https://github.com/pret/pokecrystal/wiki/Rock-Climb
DEF COLL_WALL EQU $07
DEF COLL_CUT_08 EQU $08 ; unused
DEF COLL_TALL_GRASS_10 EQU $10 ; unused
@ -27,8 +26,7 @@ DEF COLL_WHIRLPOOL EQU $24
DEF COLL_BUOY EQU $27
DEF COLL_CUT_28 EQU $28 ; garbage
DEF COLL_WATER EQU $29
DEF COLL_DIVE_DOWN EQU $2a
DEF COLL_DIVE_UP EQU $2b
DEF COLL_ICE_2B EQU $2b ; unused
DEF COLL_WHIRLPOOL_2C EQU $2c ; unused
DEF COLL_WATERFALL_RIGHT EQU $30 ; unused
DEF COLL_WATERFALL_LEFT EQU $31 ; unused

6
constants/item_constants.asm
View file

@ -291,12 +291,6 @@ DEF HM01 EQU const_value
add_hm FLASH ; f8
add_hm WHIRLPOOL ; f9
add_hm WATERFALL ; fa
; nihon hms - Bounce is left out under the pretense of it being Waterfall. We are making it a field move, though.
add_hm UPROOT
add_hm WATER_SPORT
add_hm STRONG_ARM
add_hm BRIGHT_MOSS
add_hm WIND_RIDE ; ADDME: this is impossible to add until 16bit items exist. add once it's there.
DEF NUM_HMS EQU __tmhm_value__ - NUM_TMS - 1
MACRO add_mt

5
constants/menu_constants.asm
View file

@ -55,11 +55,6 @@
const MONMENUITEM_ROCKSMASH ; 12
const MONMENUITEM_MILKDRINK ; 13
const MONMENUITEM_SWEETSCENT ; 14
const MONMENUITEM_UPROOT
const MONMENUITEM_WATER_SPORT
const MONMENUITEM_STRONG_ARM
const MONMENUITEM_BRIGHT_MOSS
const MONMENUITEM_WIND_RIDE
; options
const MONMENUITEM_STATS ; 15
const MONMENUITEM_SWITCH ; 16

3
constants/move_effect_constants.asm
View file

@ -158,7 +158,4 @@
const EFFECT_FLY
const EFFECT_DEFENSE_CURL
const EFFECT_COIN_HURL
const EFFECT_SURF
const EFFECT_WHIRLPOOL
const EFFECT_BOUNCE
DEF NUM_MOVE_EFFECTS EQU const_value

1
constants/sprite_constants.asm
View file

@ -145,7 +145,6 @@
const SPRITE_BALDING_GUY
const SPRITE_GAMEBOY_GIRL
const SPRITE_OVERWORLD_PIKACHU
const SPRITE_DIVE
DEF NUM_OVERWORLD_SPRITES EQU const_value - 1
; SpriteMons indexes (see data/sprites/sprite_mons.asm)

13
constants/wram_constants.asm
View file

@ -267,13 +267,12 @@ DEF REGISTERED_POCKET EQU %11000000
DEF REGISTERED_NUMBER EQU %00111111
; wPlayerState::
DEF PLAYER_NORMAL EQU 0
DEF PLAYER_BIKE EQU 1
DEF PLAYER_SKATE EQU 2
DEF PLAYER_SURF EQU 4
DEF PLAYER_SURF_PIKA EQU 8
DEF PLAYER_RUN EQU 16
DEF PLAYER_WATER_SPORT EQU 16
DEF PLAYER_NORMAL EQU 0
DEF PLAYER_BIKE EQU 1
DEF PLAYER_SKATE EQU 2
DEF PLAYER_SURF EQU 4
DEF PLAYER_SURF_PIKA EQU 8
DEF PLAYER_RUN EQU 16
; wCelebiEvent::
DEF CELEBIEVENT_FOREST_IS_RESTLESS_F EQU 2