Merge branch 'master' into master

This commit is contained in:
Llinos Evans 2023-10-29 17:39:31 +00:00 committed by GitHub
commit e150889975
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
42 changed files with 107 additions and 9 deletions

View file

@ -125,12 +125,12 @@ DebugPokemon1Script:
DebugPokemon2Script:
opentext
getmonname STRING_BUFFER_3, NIDORINO
getmonname STRING_BUFFER_3, GOROCHU
writetext ReceivedDebugPokemonText
playsound SFX_CAUGHT_MON
waitsfx
promptbutton
givepoke NIDORINO, 36, POISON_STONE
givepoke GOROCHU, 35, POISON_STONE
closetext
end
@ -145,11 +145,11 @@ DebugPokemon3Script:
faceplayer
opentext
writetext DebugTextA
cry WALKING_WAKE
cry GOROCHU
pause 15
closetext
loadvar VAR_BATTLETYPE, BATTLETYPE_SUICUNE
loadwildmon WALKING_WAKE, 40
loadwildmon GOROCHU, 40
startbattle
reloadmapafterbattle
end