thorn/jep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/jep-hack.git synced 2025-09-17 02:30:50 +12:00
Code Issues Actions Packages Projects Releases Wiki Activity

post-test fixes

Browse source 
Fixed Cianwood Gym Trainers
Fixed Mt. Mortar Suicune instacrash
This commit is contained in:
Llinos Evans 2024-12-21 22:31:56 +00:00
parent 63558a935f
commit 9c02788f7d
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
data/trainers/parties.asm
View file

@ -4200,7 +4200,7 @@ BlackbeltGroup:
db "YOSHI@", TRAINERTYPE_MOVES ; cianwood gym
db 26
dw TYROGUE
dw TACKLE, MACH_PUNCH
dw TACKLE, MACH_PUNCH, NO_MOVE, NO_MOVE
db 30
dw HITMONLEE
dw DOUBLE_KICK, MEDITATE, JUMP_KICK, FOCUS_ENERGY
@ -4226,10 +4226,10 @@ BlackbeltGroup:
db "LAO@", TRAINERTYPE_MOVES ; cianwood gym
db 26
dw TYROGUE
dw TACKLE, MACH_PUNCH
dw TACKLE, MACH_PUNCH, NO_MOVE, NO_MOVE
db 30
dw HITMONCHAN
dw COMET_PUNCH, THUNDERPUNCH, ICE_PUNCH, FIRE_PUNCH
dw UPPERCUT, THUNDERPUNCH, ICE_PUNCH, FIRE_PUNCH
db -1 ; end
next_list_item ; BLACKBELT_T (5)
@ -4866,7 +4866,7 @@ CamperGroup:
ArianaGroup: ; Ariana
next_list_item ; EXECUTIVEF (1)
db "EXECUTIVE@", TRAINERTYPE_MOVES ; Radio Tower
db "ARIANA@", TRAINERTYPE_MOVES ; Radio Tower
db 30
dw BELLEDAM
dw PURSUIT, HEAL_BELL, LOVELY_KISS, FAINT_ATTACK
@ -4885,7 +4885,7 @@ ArianaGroup: ; Ariana
db -1 ; end
next_list_item ; EXECUTIVEF (2)
db "EXECUTIVE@", TRAINERTYPE_MOVES ; Radio Tower
db "ARIANA@", TRAINERTYPE_MOVES ; Rocket HQ - severely overtuned. consider revising.
db 32
dw ARBOK
dw WRAP, POISON_STING, BITE, GLARE
@ -4898,7 +4898,7 @@ ArianaGroup: ; Ariana
; Sneasler
db 35
dw JUNGELA
dw GIGA_DRAIN, NO_MOVE, NO_MOVE, NO_MOVE ; needs sorting
dw GIGA_DRAIN, NO_MOVE, NO_MOVE, NO_MOVE ; needs sorting - also, this thing is ridiculous. disrespectfully strong.
db -1 ; end
next_list_item ; EXECUTIVEF (3)

2
maps/Route42.asm
View file

@ -15,7 +15,7 @@ Route42_MapScripts:
scene_script Route42Noop2Scene, SCENE_ROUTE42_SUICUNE
def_callbacks
callback MAPCALLBACK_OBJECTS, Route14SuicuneCallback
callback MAPCALLBACK_OBJECTS, Route42SuicuneCallback
Route42Noop1Scene:
end