Merge branch 'PlagueVonKarma:master' into master

This commit is contained in:
Misty 2024-08-06 18:04:43 -04:00 committed by GitHub
commit 12750cfc53
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
40 changed files with 950 additions and 569 deletions

View file

@ -19,12 +19,12 @@ DebugPokemon1Script:
DebugPokemon2Script:
opentext
getmonname STRING_BUFFER_3, MACHAMP
getmonname STRING_BUFFER_3, FOLAGE
writetext ReceivedDebugPokemonText
playsound SFX_CAUGHT_MON
waitsfx
promptbutton
givepoke MACHAMP, 31, TM_ROCK_SMASH
givepoke FOLAGE, 31, RARE_CANDY
closetext
end
@ -39,11 +39,11 @@ DebugPokemon3Script:
faceplayer
opentext
writetext DebugTextA
cry LICKILORD
cry STROMEN
pause 15
closetext
loadvar VAR_BATTLETYPE, BATTLETYPE_SHINY
loadwildmon LICKILORD, 60
loadwildmon STROMEN, 60
startbattle
reloadmapafterbattle
end
@ -57,11 +57,11 @@ DebugPokemon4Script:
faceplayer
opentext
writetext DebugTextB
cry LICKILORD
cry STROMEN
pause 15
closetext
loadvar VAR_BATTLETYPE, BATTLETYPE_SAFARI
loadwildmon LICKILORD, 60
loadwildmon STROMEN, 60
startbattle
reloadmapafterbattle
end
@ -398,7 +398,7 @@ DebugRoom_MapEvents:
warp_event 27, 5, PEWTER_CITY, 2
warp_event 15, 2, GOLDENROD_CITY, 1 ; city warp
warp_event 4, 9, SUMMER_BEACH_HOUSE, 1 ; left lab/league warp
warp_event 5, 9, PALLET_TOWN, 1 ; right lab/league warp
warp_event 5, 9, ONE_ISLAND, 1 ; right lab/league warp
warp_event 35, 17, OLD_CITY, 1 ; east warp
warp_event 5, 35, LAVENDER_TOWN, 1 ; southwest warp
warp_event 19, 34, SAFARI_ZONE_FUCHSIA_GATE_BETA, 3 ; southern warp