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

Did you know?

Browse source 
Testing your code is good
This commit is contained in:
Misty 2025-10-25 16:39:21 -06:00
parent bb3fc104f8
commit 8a3a578298
5 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
data/pokemon/dex_entries/deoxys.asm
View file

@ -5,6 +5,6 @@
next "mutated space" next "mutated space"
next "virus, the crystal" next "virus, the crystal"
db "in DEOXYS' chest" page "in DEOXYS' chest"
next "is actually its" next "is actually its"
next "brain.@" next "brain.@"

10
data/trainers/parties.asm
View file

@ -336,7 +336,7 @@ Rival1Group:
dw WING_ATTACK, RETURN, TOXIC, SCREECH dw WING_ATTACK, RETURN, TOXIC, SCREECH
db 51 db 51
dw PHANDARIN dw PHANDARIN
dw SHADOW_BALL, PSYCHIC, THUNDERBOLT, SUBSTITUTE dw SHADOW_BALL, PSYCHIC_M, THUNDERBOLT, SUBSTITUTE
db 50 db 50
dw PUPITAR dw PUPITAR
dw ROCK_SLIDE, CRUNCH, THRASH, SCARY_FACE dw ROCK_SLIDE, CRUNCH, THRASH, SCARY_FACE
@ -358,7 +358,7 @@ Rival1Group:
dw WING_ATTACK, RETURN, TOXIC, SCREECH dw WING_ATTACK, RETURN, TOXIC, SCREECH
db 51 db 51
dw PHANDARIN dw PHANDARIN
dw SHADOW_BALL, PSYCHIC, THUNDERBOLT, SUBSTITUTE dw SHADOW_BALL, PSYCHIC_M, THUNDERBOLT, SUBSTITUTE
db 50 db 50
dw PUPITAR dw PUPITAR
dw ROCK_SLIDE, CRUNCH, THRASH, SCARY_FACE dw ROCK_SLIDE, CRUNCH, THRASH, SCARY_FACE
@ -380,7 +380,7 @@ Rival1Group:
dw WING_ATTACK, RETURN, TOXIC, SCREECH dw WING_ATTACK, RETURN, TOXIC, SCREECH
db 51 db 51
dw PHANDARIN dw PHANDARIN
dw SHADOW_BALL, PSYCHIC, THUNDERBOLT, SUBSTITUTE dw SHADOW_BALL, PSYCHIC_M, THUNDERBOLT, SUBSTITUTE
db 50 db 50
dw PUPITAR dw PUPITAR
dw ROCK_SLIDE, CRUNCH, THRASH, SCARY_FACE dw ROCK_SLIDE, CRUNCH, THRASH, SCARY_FACE
@ -2491,7 +2491,7 @@ GruntMGroup:
next_list_item ; GRUNTM (25) next_list_item ; GRUNTM (25)
db "GRUNT@", TRAINERTYPE_NORMAL db "GRUNT@", TRAINERTYPE_NORMAL
db 35 db 35
dw SNUBULL dw SNUBBULL
db 35 db 35
dw WEEZING dw WEEZING
db -1 ; end db -1 ; end
@ -3737,7 +3737,7 @@ SuperNerdGroup:
dw SMOKESCREEN, TWISTER, SURF, WATERFALL dw SMOKESCREEN, TWISTER, SURF, WATERFALL
db 43 db 43
dw MUK dw MUK
dw SLUDGE, SCREECH, ACID ARMOR, MINIMIZE dw SLUDGE, SCREECH, ACID_ARMOR, MINIMIZE
db 42 db 42
dw MAGNETON dw MAGNETON
dw SPARK, TRI_ATTACK, LIGHT_SCREEN, SCREECH dw SPARK, TRI_ATTACK, LIGHT_SCREEN, SCREECH

BIN
gfx/footprints/deoxys.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 69 B

3
layout.link
View file

@ -63,7 +63,6 @@ ROMX $0d
"Effect Commands" "Effect Commands"
ROMX $0e ROMX $0e
"Enemy Trainers" "Enemy Trainers"
"Enemy Trainer Parties 2"
ROMX $0f ROMX $0f
"Battle Core" "Battle Core"
ROMX $10 ROMX $10
@ -319,6 +318,8 @@ ROMX $80
"Pic Pointers" "Pic Pointers"
ROMX $81 ROMX $81
"Enemy Trainer Parties 4" "Enemy Trainer Parties 4"
ROMX $82
"Enemy Trainer Parties 2" ; moved up here, hope this doesn't break things
WRAM0 WRAM0
"Stack" "Stack"
"Audio RAM" "Audio RAM"

8
maps/DebugRoom.asm
View file

@ -13,7 +13,7 @@ DebugPokemon1Script:
playsound SFX_CAUGHT_MON playsound SFX_CAUGHT_MON
waitsfx waitsfx
promptbutton promptbutton
givepoke WEARLYCAN, 53, RARE_CANDY givepoke WEARLYCAN, 53, MASTER_BALL
closetext closetext
end end
@ -39,11 +39,11 @@ DebugPokemon3Script:
faceplayer faceplayer
opentext opentext
writetext DebugTextA writetext DebugTextA
cry NIDOQUEEN cry DEOXYS
pause 15 pause 15
closetext closetext
loadvar VAR_BATTLETYPE, BATTLETYPE_SHINY loadvar VAR_BATTLETYPE, BATTLETYPE_SHINY
loadwildmon NIDOQUEEN, 10 loadwildmon DEOXYS, 5
startbattle startbattle
reloadmapafterbattle reloadmapafterbattle
end end
@ -60,7 +60,7 @@ DebugPokemon4Script:
pause 15 pause 15
closetext closetext
loadvar VAR_BATTLETYPE, BATTLETYPE_SUICUNE loadvar VAR_BATTLETYPE, BATTLETYPE_SUICUNE
loadwildmon GOROCHU, 69 loadwildmon DEOXYS, 70
startbattle startbattle
reloadmapafterbattle reloadmapafterbattle
end end