pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-11-16 11:27:33 -08:00
Code Issues Packages Projects Releases Wiki Activity

Rename some call/jump script commands to avoid confusion with jr/jp asm instructions

Browse Source 
Fixes #580
This commit is contained in:
Rangi 2019-03-10 16:39:31 -04:00
parent e002b536af
commit f5c9958aea
164 changed files with 840 additions and 832 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
docs/event_commands.md
View File

@ -11,16 +11,16 @@ Until this document is filled out, the [G/S Scripting Compendium](https://hax.ii
## `$01`: <code>farscall <i>script</i></code> ## `$01`: <code>farscall <i>script</i></code>
## `$02`: <code>ptcall <i>script</i></code> ## `$02`: <code>memcall <i>script</i></code>
## `$03`: <code>jump <i>script</i></code> ## `$03`: <code>sjump <i>script</i></code>
## `$04`: <code>farjump <i>script</i></code> ## `$04`: <code>farsjump <i>script</i></code>
## `$05`: <code>ptjump <i>script</i></code> ## `$05`: <code>memjump <i>script</i></code>
## `$06`: <code>ifequal <i>byte</i>, <i>script</i></code> ## `$06`: <code>ifequal <i>byte</i>, <i>script</i></code>
@ -53,7 +53,7 @@ Until this document is filled out, the [G/S Scripting Compendium](https://hax.ii
## `$0F`: <code>special <i>special_pointer</i></code> ## `$0F`: <code>special <i>special_pointer</i></code>
## `$10`: <code>ptcallasm <i>asm</i></code> ## `$10`: <code>memcallasm <i>asm</i></code>
## `$11`: <code>checkmapscene <i>map</i></code> ## `$11`: <code>checkmapscene <i>map</i></code>
@ -468,13 +468,13 @@ If <code><i>item_id</i></code> = `USE_SCRIPT_VAR`, then it uses `[wScriptVar]` i
## `$8C`: <code>deactivatefacing <i>length</i></code> ## `$8C`: <code>deactivatefacing <i>length</i></code>
## `$8D`: <code>priorityjump <i>script</i></code> ## `$8D`: <code>prioritysjump <i>script</i></code>
## `$8E`: `warpcheck` ## `$8E`: `warpcheck`
## `$8F`: <code>ptpriorityjump <i>script</i></code> ## `$8F`: <code>stopandsjump <i>script</i></code>
## `$90`: `return` ## `$90`: `return`

2
engine/events/basement_key.asm
View File

@ -29,4 +29,4 @@ _BasementKey:
.BasementKeyScript: .BasementKeyScript:
closetext closetext
farjump BasementDoorScript farsjump BasementDoorScript

2
engine/events/bug_contest/contest.asm
View File

@ -20,7 +20,7 @@ BugCatchingContestOverScript::
opentext opentext
writetext BugCatchingContestText_BeeepTimesUp writetext BugCatchingContestText_BeeepTimesUp
waitbutton waitbutton
jump BugCatchingContestReturnToGateScript sjump BugCatchingContestReturnToGateScript
BugCatchingContestOutOfBallsScript: BugCatchingContestOutOfBallsScript:
playsound SFX_ELEVATOR_END playsound SFX_ELEVATOR_END

2
engine/events/card_key.asm
View File

@ -34,4 +34,4 @@ _CardKey:
.CardKeyScript: .CardKeyScript:
closetext closetext
farjump CardKeySlotScript farsjump CardKeySlotScript

4
engine/events/fruit_trees.asm
View File

@ -10,7 +10,7 @@ FruitTreeScript::
iffalse .fruit iffalse .fruit
writetext NothingHereText writetext NothingHereText
waitbutton waitbutton
jump .end sjump .end
.fruit .fruit
writetext HeyItsFruitText writetext HeyItsFruitText
@ -22,7 +22,7 @@ FruitTreeScript::
callasm PickedFruitTree callasm PickedFruitTree
specialsound specialsound
itemnotify itemnotify
jump .end sjump .end
.packisfull .packisfull
buttonsound buttonsound

2
engine/events/misc_scripts_2.asm
View File

@ -20,7 +20,7 @@ HiddenItemScript::
callasm SetMemEvent callasm SetMemEvent
specialsound specialsound
itemnotify itemnotify
jump .finish sjump .finish
.bag_full .bag_full
buttonsound buttonsound

2
engine/events/mom_phone.asm
View File

@ -26,7 +26,7 @@ MomTriesToBuySomething::
.Script: .Script:
callasm .ASMFunction callasm .ASMFunction
farjump Script_ReceivePhoneCall farsjump Script_ReceivePhoneCall
.ASMFunction: .ASMFunction:
call MomBuysItem_DeductFunds call MomBuysItem_DeductFunds

10
engine/events/overworld.asm
View File

@ -857,7 +857,7 @@ dig_incave
reloadmappart reloadmappart
special UpdateTimePals special UpdateTimePals
writetext .Text_UsedEscapeRope writetext .Text_UsedEscapeRope
jump .UsedDigOrEscapeRopeScript sjump .UsedDigOrEscapeRopeScript
.UsedDigScript: .UsedDigScript:
reloadmappart reloadmappart
@ -1044,7 +1044,7 @@ AskStrengthScript:
callasm TryStrengthOW callasm TryStrengthOW
iffalse .AskStrength iffalse .AskStrength
ifequal $1, .DontMeetRequirements ifequal $1, .DontMeetRequirements
jump .AlreadyUsedStrength sjump .AlreadyUsedStrength
.DontMeetRequirements: .DontMeetRequirements:
jumptext UnknownText_0xcd73 jumptext UnknownText_0xcd73
@ -1540,7 +1540,7 @@ FishFunction:
Script_NotEvenANibble: Script_NotEvenANibble:
scall Script_FishCastRod scall Script_FishCastRod
writetext UnknownText_0xd0a9 writetext UnknownText_0xd0a9
jump Script_NotEvenANibble_FallThrough sjump Script_NotEvenANibble_FallThrough
Script_NotEvenANibble2: Script_NotEvenANibble2:
scall Script_FishCastRod scall Script_FishCastRod
@ -1557,7 +1557,7 @@ Script_GotABite:
callasm Fishing_CheckFacingUp callasm Fishing_CheckFacingUp
iffalse .NotFacingUp iffalse .NotFacingUp
applymovement PLAYER, .Movement_FacingUp applymovement PLAYER, .Movement_FacingUp
jump .FightTheHookedPokemon sjump .FightTheHookedPokemon
.NotFacingUp: .NotFacingUp:
applymovement PLAYER, .Movement_NotFacingUp applymovement PLAYER, .Movement_NotFacingUp
@ -1767,7 +1767,7 @@ FinishGettingOffBike:
Script_GetOffBike_Register: Script_GetOffBike_Register:
loadvar VAR_MOVEMENT, PLAYER_NORMAL loadvar VAR_MOVEMENT, PLAYER_NORMAL
jump FinishGettingOffBike sjump FinishGettingOffBike
Script_CantGetOffBike: Script_CantGetOffBike:
writetext .CantGetOffBikeText writetext .CantGetOffBikeText

2
engine/events/poisonstep.asm
View File

@ -115,7 +115,7 @@ DoPoisonStep::
end end
.whiteout .whiteout
farjump Script_OverworldWhiteout farsjump Script_OverworldWhiteout
.CheckWhitedOut: .CheckWhitedOut:
xor a xor a

2
engine/events/squirtbottle.asm
View File

@ -10,7 +10,7 @@ _Squirtbottle:
special UpdateTimePals special UpdateTimePals
callasm .CheckCanUseSquirtbottle callasm .CheckCanUseSquirtbottle
iffalse .NothingHappenedScript iffalse .NothingHappenedScript
farjump WateredWeirdTreeScript farsjump WateredWeirdTreeScript
.NothingHappenedScript: .NothingHappenedScript:
jumptext .NothingHappenedText jumptext .NothingHappenedText

2
engine/events/std_collision.asm
View File

@ -26,4 +26,4 @@ CheckFacingTileForStdScript::
INCLUDE "data/events/collision_stdscripts.asm" INCLUDE "data/events/collision_stdscripts.asm"
Script_JumpStdFromRAM: Script_JumpStdFromRAM:
jump wJumpStdScriptBuffer sjump wJumpStdScriptBuffer

42
engine/events/std_scripts.asm
View File

@ -63,40 +63,40 @@ PokecenterNurseScript:
iftrue .day iftrue .day
checktime NITE checktime NITE
iftrue .nite iftrue .nite
jump .ok sjump .ok
.morn .morn
checkevent EVENT_WELCOMED_TO_POKECOM_CENTER checkevent EVENT_WELCOMED_TO_POKECOM_CENTER
iftrue .morn_comcenter iftrue .morn_comcenter
farwritetext NurseMornText farwritetext NurseMornText
buttonsound buttonsound
jump .ok sjump .ok
.morn_comcenter .morn_comcenter
farwritetext PokeComNurseMornText farwritetext PokeComNurseMornText
buttonsound buttonsound
jump .ok sjump .ok
.day .day
checkevent EVENT_WELCOMED_TO_POKECOM_CENTER checkevent EVENT_WELCOMED_TO_POKECOM_CENTER
iftrue .day_comcenter iftrue .day_comcenter
farwritetext NurseDayText farwritetext NurseDayText
buttonsound buttonsound
jump .ok sjump .ok
.day_comcenter .day_comcenter
farwritetext PokeComNurseDayText farwritetext PokeComNurseDayText
buttonsound buttonsound
jump .ok sjump .ok
.nite .nite
checkevent EVENT_WELCOMED_TO_POKECOM_CENTER checkevent EVENT_WELCOMED_TO_POKECOM_CENTER
iftrue .nite_comcenter iftrue .nite_comcenter
farwritetext NurseNiteText farwritetext NurseNiteText
buttonsound buttonsound
jump .ok sjump .ok
.nite_comcenter .nite_comcenter
farwritetext PokeComNurseNiteText farwritetext PokeComNurseNiteText
buttonsound buttonsound
jump .ok sjump .ok
.ok .ok
; only do this once ; only do this once
@ -150,7 +150,7 @@ PokecenterNurseScript:
farwritetext NursePokerusText farwritetext NursePokerusText
waitbutton waitbutton
closetext closetext
jump .pokerus_done sjump .pokerus_done
.pokerus_comcenter .pokerus_comcenter
farwritetext PokeComNursePokerusText farwritetext PokeComNursePokerusText
@ -232,10 +232,10 @@ ElevatorButtonScript:
end end
StrengthBoulderScript: StrengthBoulderScript:
farjump AskStrengthScript farsjump AskStrengthScript
SmashRockScript: SmashRockScript:
farjump AskRockSmashScript farsjump AskRockSmashScript
PokecenterSignScript: PokecenterSignScript:
farjumptext PokecenterSignText farjumptext PokecenterSignText
@ -334,7 +334,7 @@ BugContestResultsScript:
BugContestResults_DidNotWin: BugContestResults_DidNotWin:
farwritetext ContestResults_DidNotWinText farwritetext ContestResults_DidNotWinText
buttonsound buttonsound
jump BugContestResults_FinishUp sjump BugContestResults_FinishUp
BugContestResults_ReturnAfterWinnersPrize: BugContestResults_ReturnAfterWinnersPrize:
farwritetext ContestResults_JoinUsNextTimeText farwritetext ContestResults_JoinUsNextTimeText
@ -388,7 +388,7 @@ BugContestResults_FirstPlace:
waitbutton waitbutton
verbosegiveitem SUN_STONE verbosegiveitem SUN_STONE
iffalse BugContestResults_NoRoomForSunStone iffalse BugContestResults_NoRoomForSunStone
jump BugContestResults_ReturnAfterWinnersPrize sjump BugContestResults_ReturnAfterWinnersPrize
BugContestResults_SecondPlace: BugContestResults_SecondPlace:
getitemname STRING_BUFFER_4, EVERSTONE getitemname STRING_BUFFER_4, EVERSTONE
@ -396,7 +396,7 @@ BugContestResults_SecondPlace:
waitbutton waitbutton
verbosegiveitem EVERSTONE verbosegiveitem EVERSTONE
iffalse BugContestResults_NoRoomForEverstone iffalse BugContestResults_NoRoomForEverstone
jump BugContestResults_ReturnAfterWinnersPrize sjump BugContestResults_ReturnAfterWinnersPrize
BugContestResults_ThirdPlace: BugContestResults_ThirdPlace:
getitemname STRING_BUFFER_4, GOLD_BERRY getitemname STRING_BUFFER_4, GOLD_BERRY
@ -404,31 +404,31 @@ BugContestResults_ThirdPlace:
waitbutton waitbutton
verbosegiveitem GOLD_BERRY verbosegiveitem GOLD_BERRY
iffalse BugContestResults_NoRoomForGoldBerry iffalse BugContestResults_NoRoomForGoldBerry
jump BugContestResults_ReturnAfterWinnersPrize sjump BugContestResults_ReturnAfterWinnersPrize
BugContestResults_NoRoomForSunStone: BugContestResults_NoRoomForSunStone:
farwritetext BugContestPrizeNoRoomText farwritetext BugContestPrizeNoRoomText
buttonsound buttonsound
setevent EVENT_CONTEST_OFFICER_HAS_SUN_STONE setevent EVENT_CONTEST_OFFICER_HAS_SUN_STONE
jump BugContestResults_ReturnAfterWinnersPrize sjump BugContestResults_ReturnAfterWinnersPrize
BugContestResults_NoRoomForEverstone: BugContestResults_NoRoomForEverstone:
farwritetext BugContestPrizeNoRoomText farwritetext BugContestPrizeNoRoomText
buttonsound buttonsound
setevent EVENT_CONTEST_OFFICER_HAS_EVERSTONE setevent EVENT_CONTEST_OFFICER_HAS_EVERSTONE
jump BugContestResults_ReturnAfterWinnersPrize sjump BugContestResults_ReturnAfterWinnersPrize
BugContestResults_NoRoomForGoldBerry: BugContestResults_NoRoomForGoldBerry:
farwritetext BugContestPrizeNoRoomText farwritetext BugContestPrizeNoRoomText
buttonsound buttonsound
setevent EVENT_CONTEST_OFFICER_HAS_GOLD_BERRY setevent EVENT_CONTEST_OFFICER_HAS_GOLD_BERRY
jump BugContestResults_ReturnAfterWinnersPrize sjump BugContestResults_ReturnAfterWinnersPrize
BugContestResults_NoRoomForBerry: BugContestResults_NoRoomForBerry:
farwritetext BugContestPrizeNoRoomText farwritetext BugContestPrizeNoRoomText
buttonsound buttonsound
setevent EVENT_CONTEST_OFFICER_HAS_BERRY setevent EVENT_CONTEST_OFFICER_HAS_BERRY
jump BugContestResults_DidNotWin sjump BugContestResults_DidNotWin
BugContestResults_CopyContestantsToResults: BugContestResults_CopyContestantsToResults:
checkevent EVENT_BUG_CATCHING_CONTESTANT_1A checkevent EVENT_BUG_CATCHING_CONTESTANT_1A
@ -1804,7 +1804,7 @@ CoinVendor_IntroScript:
closewindow closewindow
ifequal 1, .Buy50 ifequal 1, .Buy50
ifequal 2, .Buy500 ifequal 2, .Buy500
jump .Cancel sjump .Cancel
.Buy50: .Buy50:
checkcoins MAX_COINS - 50 checkcoins MAX_COINS - 50
@ -1817,7 +1817,7 @@ CoinVendor_IntroScript:
playsound SFX_TRANSACTION playsound SFX_TRANSACTION
farwritetext CoinVendor_Buy50CoinsText farwritetext CoinVendor_Buy50CoinsText
waitbutton waitbutton
jump .loop sjump .loop
.Buy500: .Buy500:
checkcoins MAX_COINS - 500 checkcoins MAX_COINS - 500
@ -1830,7 +1830,7 @@ CoinVendor_IntroScript:
playsound SFX_TRANSACTION playsound SFX_TRANSACTION
farwritetext CoinVendor_Buy500CoinsText farwritetext CoinVendor_Buy500CoinsText
waitbutton waitbutton
jump .loop sjump .loop
.NotEnoughMoney: .NotEnoughMoney:
farwritetext CoinVendor_NotEnoughMoneyText farwritetext CoinVendor_NotEnoughMoneyText

2
engine/events/sweet_scent.asm
View File

@ -21,7 +21,7 @@ SweetScentFromMenu:
end end
.BugCatchingContest: .BugCatchingContest:
farjump BugCatchingContestBattleScript farsjump BugCatchingContestBattleScript
SweetScentNothing: SweetScentNothing:
writetext UnknownText_0x5072b writetext UnknownText_0x5072b

4
engine/events/trainer_scripts.asm
View File

@ -4,7 +4,7 @@ TalkToTrainerScript::
iftrue AlreadyBeatenTrainerScript iftrue AlreadyBeatenTrainerScript
loadtemptrainer loadtemptrainer
encountermusic encountermusic
jump StartBattleWithMapTrainerScript sjump StartBattleWithMapTrainerScript
SeenByTrainerScript:: SeenByTrainerScript::
loadtemptrainer loadtemptrainer
@ -14,7 +14,7 @@ SeenByTrainerScript::
applymovementlasttalked wMovementBuffer applymovementlasttalked wMovementBuffer
writeobjectxy LAST_TALKED writeobjectxy LAST_TALKED
faceobject PLAYER, LAST_TALKED faceobject PLAYER, LAST_TALKED
jump StartBattleWithMapTrainerScript sjump StartBattleWithMapTrainerScript
StartBattleWithMapTrainerScript: StartBattleWithMapTrainerScript:
opentext opentext

2
engine/events/whiteout.asm
View File

@ -1,6 +1,6 @@
Script_BattleWhiteout:: Script_BattleWhiteout::
callasm BattleBGMap callasm BattleBGMap
jump Script_Whiteout sjump Script_Whiteout
Script_OverworldWhiteout:: Script_OverworldWhiteout::
refreshscreen refreshscreen

8
engine/overworld/events.asm
View File

@ -841,11 +841,11 @@ CheckMenuOW:
StartMenuScript: StartMenuScript:
callasm StartMenu callasm StartMenu
jump StartMenuCallback sjump StartMenuCallback
SelectMenuScript: SelectMenuScript:
callasm SelectMenu callasm SelectMenu
jump SelectMenuCallback sjump SelectMenuCallback
StartMenuCallback: StartMenuCallback:
SelectMenuCallback: SelectMenuCallback:
@ -855,10 +855,10 @@ SelectMenuCallback:
end end
.Script: .Script:
ptjump wQueuedScriptBank memjump wQueuedScriptBank
.Asm: .Asm:
ptcallasm wQueuedScriptBank memcallasm wQueuedScriptBank
end end
CountStep: CountStep:

42
engine/overworld/scripting.asm
View File

@ -65,10 +65,10 @@ ScriptCommandTable:
; entries correspond to macros/scripts/events.asm enumeration ; entries correspond to macros/scripts/events.asm enumeration
dw Script_scall ; 00 dw Script_scall ; 00
dw Script_farscall ; 01 dw Script_farscall ; 01
dw Script_ptcall ; 02 dw Script_memcall ; 02
dw Script_jump ; 03 dw Script_sjump ; 03
dw Script_farjump ; 04 dw Script_farsjump ; 04
dw Script_ptjump ; 05 dw Script_memjump ; 05
dw Script_ifequal ; 06 dw Script_ifequal ; 06
dw Script_ifnotequal ; 07 dw Script_ifnotequal ; 07
dw Script_iffalse ; 08 dw Script_iffalse ; 08
@ -79,7 +79,7 @@ ScriptCommandTable:
dw Script_callstd ; 0d dw Script_callstd ; 0d
dw Script_callasm ; 0e dw Script_callasm ; 0e
dw Script_special ; 0f dw Script_special ; 0f
dw Script_ptcallasm ; 10 dw Script_memcallasm ; 10
dw Script_checkmapscene ; 11 dw Script_checkmapscene ; 11
dw Script_setmapscene ; 12 dw Script_setmapscene ; 12
dw Script_checkscene ; 13 dw Script_checkscene ; 13
@ -206,9 +206,9 @@ endc
dw Script_newloadmap ; 8a dw Script_newloadmap ; 8a
dw Script_pause ; 8b dw Script_pause ; 8b
dw Script_deactivatefacing ; 8c dw Script_deactivatefacing ; 8c
dw Script_priorityjump ; 8d dw Script_prioritysjump ; 8d
dw Script_warpcheck ; 8e dw Script_warpcheck ; 8e
dw Script_ptpriorityjump ; 8f dw Script_stopandsjump ; 8f
dw Script_return ; 90 dw Script_return ; 90
dw Script_end ; 91 dw Script_end ; 91
dw Script_reloadandreturn ; 92 dw Script_reloadandreturn ; 92
@ -276,7 +276,7 @@ Script_special:
farcall Special farcall Special
ret ret
Script_ptcallasm: Script_memcallasm:
; script command 0x10 ; script command 0x10
; parameters: asm ; parameters: asm
@ -1428,7 +1428,7 @@ Script_farscall:
ld d, a ld d, a
jr ScriptCall jr ScriptCall
Script_ptcall: Script_memcall:
; script command 0x2 ; script command 0x2
; parameters: pointer ; parameters: pointer
@ -1480,7 +1480,7 @@ CallCallback::
ld [wScriptBank], a ld [wScriptBank], a
jp ScriptCall jp ScriptCall
Script_jump: Script_sjump:
; script command 0x3 ; script command 0x3
; parameters: pointer ; parameters: pointer
@ -1492,7 +1492,7 @@ Script_jump:
ld b, a ld b, a
jp ScriptJump jp ScriptJump
Script_farjump: Script_farsjump:
; script command 0x4 ; script command 0x4
; parameters: pointer ; parameters: pointer
@ -1504,7 +1504,7 @@ Script_farjump:
ld h, a ld h, a
jp ScriptJump jp ScriptJump
Script_ptjump: Script_memjump:
; script command 0x5 ; script command 0x5
; parameters: pointer ; parameters: pointer
@ -1526,7 +1526,7 @@ Script_iffalse:
ld a, [wScriptVar] ld a, [wScriptVar]
and a and a
jp nz, SkipTwoScriptBytes jp nz, SkipTwoScriptBytes
jp Script_jump jp Script_sjump
Script_iftrue: Script_iftrue:
; script command 0x9 ; script command 0x9
@ -1534,7 +1534,7 @@ Script_iftrue:
ld a, [wScriptVar] ld a, [wScriptVar]
and a and a
jp nz, Script_jump jp nz, Script_sjump
jp SkipTwoScriptBytes jp SkipTwoScriptBytes
Script_ifequal: Script_ifequal:
@ -1544,7 +1544,7 @@ Script_ifequal:
call GetScriptByte call GetScriptByte
ld hl, wScriptVar ld hl, wScriptVar
cp [hl] cp [hl]
jr z, Script_jump jr z, Script_sjump
jr SkipTwoScriptBytes jr SkipTwoScriptBytes
Script_ifnotequal: Script_ifnotequal:
@ -1554,7 +1554,7 @@ Script_ifnotequal:
call GetScriptByte call GetScriptByte
ld hl, wScriptVar ld hl, wScriptVar
cp [hl] cp [hl]
jr nz, Script_jump jr nz, Script_sjump
jr SkipTwoScriptBytes jr SkipTwoScriptBytes
Script_ifgreater: Script_ifgreater:
@ -1565,7 +1565,7 @@ Script_ifgreater:
ld b, a ld b, a
call GetScriptByte call GetScriptByte
cp b cp b
jr c, Script_jump jr c, Script_sjump
jr SkipTwoScriptBytes jr SkipTwoScriptBytes
Script_ifless: Script_ifless:
@ -1576,7 +1576,7 @@ Script_ifless:
ld b, a ld b, a
ld a, [wScriptVar] ld a, [wScriptVar]
cp b cp b
jr c, Script_jump jr c, Script_sjump
jr SkipTwoScriptBytes jr SkipTwoScriptBytes
Script_jumpstd: Script_jumpstd:
@ -1626,7 +1626,7 @@ ScriptJump:
ld [wScriptPos + 1], a ld [wScriptPos + 1], a
ret ret
Script_priorityjump: Script_prioritysjump:
; script command 0x8d ; script command 0x8d
; parameters: pointer ; parameters: pointer
@ -2697,12 +2697,12 @@ Script_deactivatefacing:
call StopScript call StopScript
ret ret
Script_ptpriorityjump: Script_stopandsjump:
; script command 0x8f ; script command 0x8f
; parameters: pointer ; parameters: pointer
call StopScript call StopScript
jp Script_jump jp Script_sjump
Script_end: Script_end:
; script command 0x91 ; script command 0x91

10
engine/phone/phone.asm
View File

@ -281,7 +281,7 @@ CheckSpecialPhoneCall::
.script .script
pause 30 pause 30
jump Script_ReceivePhoneCall sjump Script_ReceivePhoneCall
.DoSpecialPhoneCall: .DoSpecialPhoneCall:
ld a, [wSpecialPhoneCallID] ld a, [wSpecialPhoneCallID]
@ -378,7 +378,7 @@ Function90199:
ret ret
UnknownScript_0x90205: UnknownScript_0x90205:
ptcall wd002 memcall wPhoneScriptBank
return return
UnknownScript_0x90209: UnknownScript_0x90209:
@ -422,7 +422,7 @@ WrongNumber:
Script_ReceivePhoneCall: Script_ReceivePhoneCall:
refreshscreen refreshscreen
callasm RingTwice_StartCall callasm RingTwice_StartCall
ptcall wPhoneScriptPointer memcall wPhoneScriptPointer
waitbutton waitbutton
callasm HangUp callasm HangUp
closetext closetext
@ -431,7 +431,7 @@ Script_ReceivePhoneCall:
Script_SpecialBillCall:: Script_SpecialBillCall::
callasm .LoadBillScript callasm .LoadBillScript
jump Script_ReceivePhoneCall sjump Script_ReceivePhoneCall
.LoadBillScript: .LoadBillScript:
ld e, PHONE_BILL ld e, PHONE_BILL
@ -440,7 +440,7 @@ Script_SpecialBillCall::
UnknownScript_0x90261: UnknownScript_0x90261:
callasm .LoadElmScript callasm .LoadElmScript
pause 30 pause 30
jump Script_ReceivePhoneCall sjump Script_ReceivePhoneCall
.LoadElmScript: .LoadElmScript:
ld e, PHONE_ELM ld e, PHONE_ELM

12
engine/phone/scripts/alan.asm
View File

@ -13,15 +13,15 @@ AlanPhoneCalleeScript:
iftrue AlanWednesdayDay iftrue AlanWednesdayDay
.NotWednesday: .NotWednesday:
farjump UnknownScript_0xa0970 farsjump UnknownScript_0xa0970
.WantsBattle: .WantsBattle:
getlandmarkname STRING_BUFFER_5, ROUTE_36 getlandmarkname STRING_BUFFER_5, ROUTE_36
farjump UnknownScript_0xa0a73 farsjump UnknownScript_0xa0a73
.FireStone: .FireStone:
getlandmarkname STRING_BUFFER_5, ROUTE_36 getlandmarkname STRING_BUFFER_5, ROUTE_36
farjump UnknownScript_0xa0ac5 farsjump UnknownScript_0xa0ac5
AlanPhoneCallerScript: AlanPhoneCallerScript:
gettrainername STRING_BUFFER_3, SCHOOLBOY, ALAN1 gettrainername STRING_BUFFER_3, SCHOOLBOY, ALAN1
@ -44,7 +44,7 @@ AlanPhoneCallerScript:
ifequal 0, AlanHasFireStone ifequal 0, AlanHasFireStone
.Generic: .Generic:
farjump Phone_GenericCall_Male farsjump Phone_GenericCall_Male
AlanWednesdayDay: AlanWednesdayDay:
setflag ENGINE_ALAN_WEDNESDAY_AFTERNOON setflag ENGINE_ALAN_WEDNESDAY_AFTERNOON
@ -52,9 +52,9 @@ AlanWednesdayDay:
AlanWantsBattle: AlanWantsBattle:
getlandmarkname STRING_BUFFER_5, ROUTE_36 getlandmarkname STRING_BUFFER_5, ROUTE_36
setflag ENGINE_ALAN setflag ENGINE_ALAN
farjump PhoneScript_WantsToBattle_Male farsjump PhoneScript_WantsToBattle_Male
AlanHasFireStone: AlanHasFireStone:
setflag ENGINE_ALAN_HAS_FIRE_STONE setflag ENGINE_ALAN_HAS_FIRE_STONE
getlandmarkname STRING_BUFFER_5, ROUTE_36 getlandmarkname STRING_BUFFER_5, ROUTE_36
farjump PhoneScript_FoundItem_Male farsjump PhoneScript_FoundItem_Male

14
engine/phone/scripts/anthony.asm
View File

@ -13,15 +13,15 @@ AnthonyPhoneCalleeScript:
.NotFriday: .NotFriday:
checkflag ENGINE_DUNSPARCE_SWARM checkflag ENGINE_DUNSPARCE_SWARM
iftrue .AlreadySwarming iftrue .AlreadySwarming
farjump UnknownScript_0xa0950 farsjump UnknownScript_0xa0950
.WantsBattle: .WantsBattle:
getlandmarkname STRING_BUFFER_5, ROUTE_33 getlandmarkname STRING_BUFFER_5, ROUTE_33
farjump UnknownScript_0xa0a5f farsjump UnknownScript_0xa0a5f
.AlreadySwarming: .AlreadySwarming:
getlandmarkname STRING_BUFFER_5, ROUTE_33 getlandmarkname STRING_BUFFER_5, ROUTE_33
farjump UnknownScript_0xa0afa farsjump UnknownScript_0xa0afa
AnthonyPhoneCallerScript: AnthonyPhoneCallerScript:
gettrainername STRING_BUFFER_3, HIKER, ANTHONY2 gettrainername STRING_BUFFER_3, HIKER, ANTHONY2
@ -38,7 +38,7 @@ AnthonyPhoneCallerScript:
.TriesSwarm: .TriesSwarm:
farscall PhoneScript_Random5 farscall PhoneScript_Random5
ifequal 0, AnthonyTriesDunsparceSwarm ifequal 0, AnthonyTriesDunsparceSwarm
farjump Phone_GenericCall_Male farsjump Phone_GenericCall_Male
AnthonyFridayNight: AnthonyFridayNight:
setflag ENGINE_ANTHONY_FRIDAY_NIGHT setflag ENGINE_ANTHONY_FRIDAY_NIGHT
@ -46,7 +46,7 @@ AnthonyFridayNight:
AnthonyWantsBattle: AnthonyWantsBattle:
getlandmarkname STRING_BUFFER_5, ROUTE_33 getlandmarkname STRING_BUFFER_5, ROUTE_33
setflag ENGINE_ANTHONY setflag ENGINE_ANTHONY
farjump PhoneScript_WantsToBattle_Male farsjump PhoneScript_WantsToBattle_Male
AnthonyTriesDunsparceSwarm: AnthonyTriesDunsparceSwarm:
checkflag ENGINE_DUNSPARCE_SWARM checkflag ENGINE_DUNSPARCE_SWARM
@ -55,7 +55,7 @@ AnthonyTriesDunsparceSwarm:
getmonname STRING_BUFFER_4, DUNSPARCE getmonname STRING_BUFFER_4, DUNSPARCE
swarm SWARM_DUNSPARCE, DARK_CAVE_VIOLET_ENTRANCE swarm SWARM_DUNSPARCE, DARK_CAVE_VIOLET_ENTRANCE
getlandmarkname STRING_BUFFER_5, DARK_CAVE getlandmarkname STRING_BUFFER_5, DARK_CAVE
farjump UnknownScript_0xa05de farsjump UnknownScript_0xa05de
.Generic: .Generic:
farjump Phone_GenericCall_Male farsjump Phone_GenericCall_Male

16
engine/phone/scripts/arnie.asm
View File

@ -13,15 +13,15 @@ ArniePhoneCalleeScript:
.NotTuesday: .NotTuesday:
checkflag ENGINE_YANMA_SWARM checkflag ENGINE_YANMA_SWARM
iftrue .AlreadySwarming iftrue .AlreadySwarming
farjump UnknownScript_0xa0968 farsjump UnknownScript_0xa0968
.WantsBattle: .WantsBattle:
getlandmarkname STRING_BUFFER_5, ROUTE_35 getlandmarkname STRING_BUFFER_5, ROUTE_35
farjump UnknownScript_0xa0a6e farsjump UnknownScript_0xa0a6e
.AlreadySwarming: .AlreadySwarming:
getlandmarkname STRING_BUFFER_5, ROUTE_35 getlandmarkname STRING_BUFFER_5, ROUTE_35
farjump UnknownScript_0xa0aff farsjump UnknownScript_0xa0aff
ArniePhoneCallerScript: ArniePhoneCallerScript:
gettrainername STRING_BUFFER_3, BUG_CATCHER, ARNIE1 gettrainername STRING_BUFFER_3, BUG_CATCHER, ARNIE1
@ -38,7 +38,7 @@ ArniePhoneCallerScript:
ifequal 0, ArnieYanmaSwarm ifequal 0, ArnieYanmaSwarm
farscall PhoneScript_Random3 farscall PhoneScript_Random3
ifequal 0, ArnieFoundRare ifequal 0, ArnieFoundRare
farjump Phone_GenericCall_Male farsjump Phone_GenericCall_Male
ArnieTuesdayMorning: ArnieTuesdayMorning:
setflag ENGINE_ARNIE_TUESDAY_MORNING setflag ENGINE_ARNIE_TUESDAY_MORNING
@ -46,7 +46,7 @@ ArnieTuesdayMorning:
ArnieWantsBattle: ArnieWantsBattle:
getlandmarkname STRING_BUFFER_5, ROUTE_35 getlandmarkname STRING_BUFFER_5, ROUTE_35
setflag ENGINE_ARNIE setflag ENGINE_ARNIE
farjump PhoneScript_WantsToBattle_Male farsjump PhoneScript_WantsToBattle_Male
ArnieYanmaSwarm: ; start swarm ArnieYanmaSwarm: ; start swarm
checkflag ENGINE_YANMA_SWARM checkflag ENGINE_YANMA_SWARM
@ -55,10 +55,10 @@ ArnieYanmaSwarm: ; start swarm
getmonname STRING_BUFFER_4, YANMA getmonname STRING_BUFFER_4, YANMA
swarm SWARM_YANMA, ROUTE_35 swarm SWARM_YANMA, ROUTE_35
getlandmarkname STRING_BUFFER_5, ROUTE_35 getlandmarkname STRING_BUFFER_5, ROUTE_35
farjump UnknownScript_0xa05ce farsjump UnknownScript_0xa05ce
ArnieFoundRare: ArnieFoundRare:
farjump Phone_CheckIfUnseenRare_Male farsjump Phone_CheckIfUnseenRare_Male
ArnieYanmaAlreadySwarming: ArnieYanmaAlreadySwarming:
farjump Phone_GenericCall_Male farsjump Phone_GenericCall_Male

8
engine/phone/scripts/beth.asm
View File

@ -11,11 +11,11 @@ BethPhoneCalleeScript:
iftrue BethFridayAfternoon iftrue BethFridayAfternoon
.NotFriday: .NotFriday:
farjump UnknownScript_0xa0918 farsjump UnknownScript_0xa0918
.WantsBattle: .WantsBattle:
getlandmarkname STRING_BUFFER_5, ROUTE_26 getlandmarkname STRING_BUFFER_5, ROUTE_26
farjump BethBattleReminderScript farsjump BethBattleReminderScript
BethPhoneCallerScript: BethPhoneCallerScript:
gettrainername STRING_BUFFER_3, COOLTRAINERF, BETH1 gettrainername STRING_BUFFER_3, COOLTRAINERF, BETH1
@ -28,7 +28,7 @@ BethPhoneCallerScript:
ifequal 0, BethWantsBattle ifequal 0, BethWantsBattle
.Generic: .Generic:
farjump Phone_GenericCall_Female farsjump Phone_GenericCall_Female
BethFridayAfternoon: BethFridayAfternoon:
setflag ENGINE_BETH_FRIDAY_AFTERNOON setflag ENGINE_BETH_FRIDAY_AFTERNOON
@ -36,4 +36,4 @@ BethFridayAfternoon:
BethWantsBattle: BethWantsBattle:
getlandmarkname STRING_BUFFER_5, ROUTE_26 getlandmarkname STRING_BUFFER_5, ROUTE_26
setflag ENGINE_BETH setflag ENGINE_BETH
farjump PhoneScript_WantsToBattle_Female farsjump PhoneScript_WantsToBattle_Female

8
engine/phone/scripts/beverly.asm
View File

@ -3,11 +3,11 @@ BeverlyPhoneCalleeScript:
farscall PhoneScript_AnswerPhone_Female farscall PhoneScript_AnswerPhone_Female
checkflag ENGINE_BEVERLY_HAS_NUGGET checkflag ENGINE_BEVERLY_HAS_NUGGET
iftrue .HasNugget iftrue .HasNugget
farjump UnknownScript_0xa0900 farsjump UnknownScript_0xa0900
.HasNugget: .HasNugget:
getlandmarkname STRING_BUFFER_5, NATIONAL_PARK getlandmarkname STRING_BUFFER_5, NATIONAL_PARK
farjump UnknownScript_0xa0aa5 farsjump UnknownScript_0xa0aa5
BeverlyPhoneCallerScript: BeverlyPhoneCallerScript:
gettrainername STRING_BUFFER_3, POKEFANF, BEVERLY1 gettrainername STRING_BUFFER_3, POKEFANF, BEVERLY1
@ -18,9 +18,9 @@ BeverlyPhoneCallerScript:
ifequal 0, .FoundNugget ifequal 0, .FoundNugget
.HasNugget: .HasNugget:
farjump Phone_GenericCall_Female farsjump Phone_GenericCall_Female
.FoundNugget: .FoundNugget:
setflag ENGINE_BEVERLY_HAS_NUGGET setflag ENGINE_BEVERLY_HAS_NUGGET
getlandmarkname STRING_BUFFER_5, NATIONAL_PARK getlandmarkname STRING_BUFFER_5, NATIONAL_PARK
farjump PhoneScript_FoundItem_Female farsjump PhoneScript_FoundItem_Female

6
engine/phone/scripts/bill.asm
View File

@ -5,17 +5,17 @@ BillPhoneCalleeScript:
iftrue .nitegreet iftrue .nitegreet
farwritetext BillPhoneMornGreetingText farwritetext BillPhoneMornGreetingText
buttonsound buttonsound
jump .main sjump .main
.daygreet .daygreet
farwritetext BillPhoneDayGreetingText farwritetext BillPhoneDayGreetingText
buttonsound buttonsound
jump .main sjump .main
.nitegreet .nitegreet
farwritetext BillPhoneNiteGreetingText farwritetext BillPhoneNiteGreetingText
buttonsound buttonsound
jump .main sjump .main
.main .main
farwritetext BillPhoneGenericText farwritetext BillPhoneGenericText

10
engine/phone/scripts/brent.asm
View File

@ -11,11 +11,11 @@ BrentPhoneCalleeScript:
iftrue BrentMondayMorning iftrue BrentMondayMorning
.NotMonday: .NotMonday:
farjump UnknownScript_0xa0998 farsjump UnknownScript_0xa0998
.WantsBattle: .WantsBattle:
getlandmarkname STRING_BUFFER_5, ROUTE_43 getlandmarkname STRING_BUFFER_5, ROUTE_43
farjump UnknownScript_0xa0a87 farsjump UnknownScript_0xa0a87
BrentPhoneCallerScript: BrentPhoneCallerScript:
gettrainername STRING_BUFFER_3, POKEMANIAC, BRENT1 gettrainername STRING_BUFFER_3, POKEMANIAC, BRENT1
@ -30,7 +30,7 @@ BrentPhoneCallerScript:
ifequal 0, BrentWantsBattle ifequal 0, BrentWantsBattle
.Generic: .Generic:
farjump Phone_GenericCall_Male farsjump Phone_GenericCall_Male
BrentMondayMorning: BrentMondayMorning:
setflag ENGINE_BRENT_MONDAY_MORNING setflag ENGINE_BRENT_MONDAY_MORNING
@ -38,7 +38,7 @@ BrentMondayMorning:
BrentWantsBattle: BrentWantsBattle:
getlandmarkname STRING_BUFFER_5, ROUTE_43 getlandmarkname STRING_BUFFER_5, ROUTE_43
setflag ENGINE_BRENT setflag ENGINE_BRENT
farjump PhoneScript_WantsToBattle_Male farsjump PhoneScript_WantsToBattle_Male
BrentBillTrivia: BrentBillTrivia:
farjump BrentBillTriviaScript farsjump BrentBillTriviaScript

20
engine/phone/scripts/brent_gossip.asm
View File

@ -14,49 +14,49 @@ BrentBillTriviaScript:
.Father: .Father:
farwritetext UnknownText_0x662bc farwritetext UnknownText_0x662bc
buttonsound buttonsound
jump PhoneScript_HangupText_Male sjump PhoneScript_HangupText_Male
.Grandpa: .Grandpa:
farwritetext UnknownText_0x662fc farwritetext UnknownText_0x662fc
buttonsound buttonsound
jump PhoneScript_HangupText_Male sjump PhoneScript_HangupText_Male
.Goldenrod: .Goldenrod:
farwritetext UnknownText_0x66335 farwritetext UnknownText_0x66335
buttonsound buttonsound
jump PhoneScript_HangupText_Male sjump PhoneScript_HangupText_Male
.Route25: .Route25:
farwritetext UnknownText_0x66366 farwritetext UnknownText_0x66366
buttonsound buttonsound
jump PhoneScript_HangupText_Male sjump PhoneScript_HangupText_Male
.Abra: .Abra:
farwritetext UnknownText_0x663a1 farwritetext UnknownText_0x663a1
buttonsound buttonsound
jump PhoneScript_HangupText_Male sjump PhoneScript_HangupText_Male
.Sister: .Sister:
farwritetext UnknownText_0x663e6 farwritetext UnknownText_0x663e6
buttonsound buttonsound
jump PhoneScript_HangupText_Male sjump PhoneScript_HangupText_Male
.Milk: .Milk:
farwritetext UnknownText_0x66421 farwritetext UnknownText_0x66421
buttonsound buttonsound
jump PhoneScript_HangupText_Male sjump PhoneScript_HangupText_Male
.Battling: .Battling:
farwritetext UnknownText_0x6645f farwritetext UnknownText_0x6645f
buttonsound buttonsound
jump PhoneScript_HangupText_Male sjump PhoneScript_HangupText_Male
.FlowerShop: .FlowerShop:
farwritetext UnknownText_0x6649b farwritetext UnknownText_0x6649b
buttonsound buttonsound
jump PhoneScript_HangupText_Male sjump PhoneScript_HangupText_Male
.KimonoGirl: .KimonoGirl:
farwritetext UnknownText_0x664dd farwritetext UnknownText_0x664dd
buttonsound buttonsound
jump PhoneScript_HangupText_Male sjump PhoneScript_HangupText_Male

32
engine/phone/scripts/buena.asm
View File

@ -4,13 +4,13 @@ BuenaPhoneCalleeScript:
readvar VAR_HOUR readvar VAR_HOUR
ifgreater 17, BuenaPhoneScript_AfterMidnight1 ifgreater 17, BuenaPhoneScript_AfterMidnight1
scall BuenaPhoneScript_CheckTimeOfDay1 scall BuenaPhoneScript_CheckTimeOfDay1
jump BuenaPhoneScript_Random1 sjump BuenaPhoneScript_Random1
BuenaPhoneCallerScript: BuenaPhoneCallerScript:
checkflag ENGINE_ROCKETS_IN_RADIO_TOWER checkflag ENGINE_ROCKETS_IN_RADIO_TOWER
iftrue BuenaPhoneScript_Rocket iftrue BuenaPhoneScript_Rocket
scall BuenaPhoneScript_CheckTimeOfDay2 scall BuenaPhoneScript_CheckTimeOfDay2
jump BuenaPhoneScript_Random2 sjump BuenaPhoneScript_Random2
BuenaPhoneScript_CheckTimeOfDay1: BuenaPhoneScript_CheckTimeOfDay1:
checktime MORN checktime MORN
@ -69,7 +69,7 @@ BuenaPhoneScript_Random2:
checkevent EVENT_BEAT_ELITE_FOUR checkevent EVENT_BEAT_ELITE_FOUR
iftrue .PostE4 iftrue .PostE4
random 11 random 11
jump .Jumptable sjump .Jumptable
.PostE4: .PostE4:
random 14 random 14
@ -92,55 +92,55 @@ BuenaPhoneScript_Random2:
.zero .zero
writetext UnknownText_0xa0efb writetext UnknownText_0xa0efb
jump .finish sjump .finish
.one .one
writetext UnknownText_0xa0fcf writetext UnknownText_0xa0fcf
jump .finish sjump .finish
.two .two
writetext UnknownText_0xa109d writetext UnknownText_0xa109d
jump .finish sjump .finish
.three .three
writetext UnknownText_0xa1143 writetext UnknownText_0xa1143
jump .finish sjump .finish
.four .four
writetext UnknownText_0xa1244 writetext UnknownText_0xa1244
jump .finish sjump .finish
.five .five
writetext UnknownText_0xa1318 writetext UnknownText_0xa1318
jump .finish sjump .finish
.six .six
writetext UnknownText_0xa13d8 writetext UnknownText_0xa13d8
jump .finish sjump .finish
.seven .seven
writetext UnknownText_0xa1488 writetext UnknownText_0xa1488
jump .finish sjump .finish
.eight .eight
writetext UnknownText_0xa15de writetext UnknownText_0xa15de
jump .finish sjump .finish
.nine .nine
writetext UnknownText_0xa1717 writetext UnknownText_0xa1717
jump .finish sjump .finish
.ten .ten
writetext UnknownText_0xa183d writetext UnknownText_0xa183d
jump .finish sjump .finish
.eleven .eleven
writetext UnknownText_0xa19b1 writetext UnknownText_0xa19b1
jump .finish sjump .finish
.twelve .twelve
writetext UnknownText_0xa1ac0 writetext UnknownText_0xa1ac0
jump .finish sjump .finish
.thirteen .thirteen
writetext UnknownText_0xa1bed writetext UnknownText_0xa1bed

12
engine/phone/scripts/chad.asm
View File

@ -11,11 +11,11 @@ ChadPhoneCalleeScript:
iftrue ChadFridayMorning iftrue ChadFridayMorning
.NotFriday: .NotFriday:
farjump UnknownScript_0xa0980 farsjump UnknownScript_0xa0980
.WantsBattle: .WantsBattle:
getlandmarkname STRING_BUFFER_5, ROUTE_38 getlandmarkname STRING_BUFFER_5, ROUTE_38
farjump UnknownScript_0xa0a7d farsjump UnknownScript_0xa0a7d
ChadPhoneCallerScript: ChadPhoneCallerScript:
gettrainername STRING_BUFFER_3, SCHOOLBOY, CHAD1 gettrainername STRING_BUFFER_3, SCHOOLBOY, CHAD1
@ -32,7 +32,7 @@ ChadPhoneCallerScript:
.Generic: .Generic:
farscall PhoneScript_Random3 farscall PhoneScript_Random3
ifequal 0, ChadFoundRare ifequal 0, ChadFoundRare
farjump Phone_GenericCall_Male farsjump Phone_GenericCall_Male
ChadFridayMorning: ChadFridayMorning:
setflag ENGINE_CHAD_FRIDAY_MORNING setflag ENGINE_CHAD_FRIDAY_MORNING
@ -40,10 +40,10 @@ ChadFridayMorning:
ChadWantsBattle: ChadWantsBattle:
getlandmarkname STRING_BUFFER_5, ROUTE_38 getlandmarkname STRING_BUFFER_5, ROUTE_38
setflag ENGINE_CHAD setflag ENGINE_CHAD
farjump PhoneScript_WantsToBattle_Male farsjump PhoneScript_WantsToBattle_Male
ChadFoundRare: ChadFoundRare:
farjump Phone_CheckIfUnseenRare_Male farsjump Phone_CheckIfUnseenRare_Male
ChadOakGossip: ChadOakGossip:
farjump ChadOakGossipScript farsjump ChadOakGossipScript

20
engine/phone/scripts/chad_gossip.asm
View File

@ -14,49 +14,49 @@ ChadOakGossipScript:
.Blue: .Blue:
farwritetext ChadBlueGossipText farwritetext ChadBlueGossipText
buttonsound buttonsound
jump PhoneScript_HangupText_Male sjump PhoneScript_HangupText_Male
.Daisy: .Daisy:
farwritetext ChadDaisyGossipText farwritetext ChadDaisyGossipText
buttonsound buttonsound
jump PhoneScript_HangupText_Male sjump PhoneScript_HangupText_Male
.ProfElm: .ProfElm:
farwritetext ChadProfElmGossipText farwritetext ChadProfElmGossipText
buttonsound buttonsound
jump PhoneScript_HangupText_Male sjump PhoneScript_HangupText_Male
.Dream: .Dream:
farwritetext ChadDreamGossipText farwritetext ChadDreamGossipText
buttonsound buttonsound
jump PhoneScript_HangupText_Male sjump PhoneScript_HangupText_Male
.Kurt: .Kurt:
farwritetext ChadKurtGossipText farwritetext ChadKurtGossipText
buttonsound buttonsound
jump PhoneScript_HangupText_Male sjump PhoneScript_HangupText_Male
.League: .League:
farwritetext ChadLeagueGossipText farwritetext ChadLeagueGossipText
buttonsound buttonsound
jump PhoneScript_HangupText_Male sjump PhoneScript_HangupText_Male
.RadioShow: .RadioShow:
farwritetext ChadRadioShowGossipText farwritetext ChadRadioShowGossipText
buttonsound buttonsound
jump PhoneScript_HangupText_Male sjump PhoneScript_HangupText_Male
.Battling: .Battling:
farwritetext ChadBattlingGossipText farwritetext ChadBattlingGossipText
buttonsound buttonsound
jump PhoneScript_HangupText_Male sjump PhoneScript_HangupText_Male
.DaisyTea: .DaisyTea:
farwritetext ChadDaisyTeaGossipText farwritetext ChadDaisyTeaGossipText
buttonsound buttonsound
jump PhoneScript_HangupText_Male sjump PhoneScript_HangupText_Male
.Traveled: .Traveled:
farwritetext ChadTravelGossipText farwritetext ChadTravelGossipText
buttonsound buttonsound
jump PhoneScript_HangupText_Male sjump PhoneScript_HangupText_Male

14
engine/phone/scripts/dana.asm
View File

@ -13,15 +13,15 @@ DanaPhoneCalleeScript:
iftrue DanaThursdayNight iftrue DanaThursdayNight
.NotThursday: .NotThursday:
farjump UnknownScript_0xa0978 farsjump UnknownScript_0xa0978
.WantsBattle: .WantsBattle:
getlandmarkname STRING_BUFFER_5, ROUTE_38 getlandmarkname STRING_BUFFER_5, ROUTE_38
farjump UnknownScript_0xa0a78 farsjump UnknownScript_0xa0a78
.HasThunderstone: .HasThunderstone:
getlandmarkname STRING_BUFFER_5, ROUTE_38 getlandmarkname STRING_BUFFER_5, ROUTE_38
farjump UnknownScript_0xa0acd farsjump UnknownScript_0xa0acd
DanaPhoneCallerScript: DanaPhoneCallerScript:
gettrainername STRING_BUFFER_3, LASS, DANA1 gettrainername STRING_BUFFER_3, LASS, DANA1
@ -46,7 +46,7 @@ DanaPhoneCallerScript:
.Generic: .Generic:
farscall PhoneScript_Random3 farscall PhoneScript_Random3
ifequal 0, DanaFoundRare ifequal 0, DanaFoundRare
farjump Phone_GenericCall_Female farsjump Phone_GenericCall_Female
DanaThursdayNight: DanaThursdayNight:
setflag ENGINE_DANA_THURSDAY_NIGHT setflag ENGINE_DANA_THURSDAY_NIGHT
@ -54,12 +54,12 @@ DanaThursdayNight:
DanaWantsBattle: DanaWantsBattle:
getlandmarkname STRING_BUFFER_5, ROUTE_38 getlandmarkname STRING_BUFFER_5, ROUTE_38
setflag ENGINE_DANA setflag ENGINE_DANA
farjump PhoneScript_WantsToBattle_Female farsjump PhoneScript_WantsToBattle_Female
DanaFoundRare: DanaFoundRare:
farjump Phone_CheckIfUnseenRare_Female farsjump Phone_CheckIfUnseenRare_Female
DanaHasThunderstone: DanaHasThunderstone:
setflag ENGINE_DANA_HAS_THUNDERSTONE setflag ENGINE_DANA_HAS_THUNDERSTONE
getlandmarkname STRING_BUFFER_5, ROUTE_38 getlandmarkname STRING_BUFFER_5, ROUTE_38
farjump PhoneScript_FoundItem_Female farsjump PhoneScript_FoundItem_Female

12
engine/phone/scripts/derek.asm
View File

@ -13,14 +13,14 @@ DerekPhoneCalleeScript:
ifequal SATURDAY, .ContestToday ifequal SATURDAY, .ContestToday
.NoContest: .NoContest:
farjump UnknownScript_0xa0988 farsjump UnknownScript_0xa0988
.ContestToday: .ContestToday:
farjump PhoneScript_BugCatchingContest farsjump PhoneScript_BugCatchingContest
.Nugget: .Nugget:
getlandmarkname STRING_BUFFER_5, ROUTE_39 getlandmarkname STRING_BUFFER_5, ROUTE_39
farjump UnknownScript_0xa0ad5 farsjump UnknownScript_0xa0ad5
DerekPhoneCallerScript: DerekPhoneCallerScript:
gettrainername STRING_BUFFER_3, POKEFANM, DEREK1 gettrainername STRING_BUFFER_3, POKEFANM, DEREK1
@ -37,12 +37,12 @@ DerekPhoneCallerScript:
.NoContest: .NoContest:
farscall PhoneScript_Random4 farscall PhoneScript_Random4
ifequal 0, .Nugget ifequal 0, .Nugget
farjump Phone_GenericCall_Male farsjump Phone_GenericCall_Male
.ContestToday: .ContestToday:
farjump PhoneScript_BugCatchingContest farsjump PhoneScript_BugCatchingContest
.Nugget: .Nugget:
setflag ENGINE_DEREK_HAS_NUGGET setflag ENGINE_DEREK_HAS_NUGGET
getlandmarkname STRING_BUFFER_5, ROUTE_39 getlandmarkname STRING_BUFFER_5, ROUTE_39
farjump PhoneScript_FoundItem_Male farsjump PhoneScript_FoundItem_Male

8
engine/phone/scripts/erin.asm
View File

@ -11,11 +11,11 @@ ErinPhoneCalleeScript:
iftrue ErinSaturdayNight iftrue ErinSaturdayNight
.NotSaturday: .NotSaturday:
farjump ErinWorkingHardScript farsjump ErinWorkingHardScript
.WantsBattle: .WantsBattle:
getlandmarkname STRING_BUFFER_5, ROUTE_46 getlandmarkname STRING_BUFFER_5, ROUTE_46
farjump ErinComeBattleScript farsjump ErinComeBattleScript
ErinPhoneCallerScript: ErinPhoneCallerScript:
gettrainername STRING_BUFFER_3, PICNICKER, ERIN1 gettrainername STRING_BUFFER_3, PICNICKER, ERIN1
@ -29,7 +29,7 @@ ErinPhoneCallerScript:
ifequal 1, ErinWantsBattle ifequal 1, ErinWantsBattle
.GenericCall: .GenericCall:
farjump Phone_GenericCall_Female farsjump Phone_GenericCall_Female
ErinSaturdayNight: ErinSaturdayNight:
setflag ENGINE_ERIN_SATURDAY_NIGHT setflag ENGINE_ERIN_SATURDAY_NIGHT
@ -37,4 +37,4 @@ ErinSaturdayNight:
ErinWantsBattle: ErinWantsBattle:
getlandmarkname STRING_BUFFER_5, ROUTE_46 getlandmarkname STRING_BUFFER_5, ROUTE_46
setflag ENGINE_ERIN setflag ENGINE_ERIN
farjump PhoneScript_WantsToBattle_Female farsjump PhoneScript_WantsToBattle_Female

10
engine/phone/scripts/gaven.asm
View File

@ -11,11 +11,11 @@ GavenPhoneCalleeScript:
iftrue GavenThursdayMorning iftrue GavenThursdayMorning
.NotThursday: .NotThursday:
farjump UnknownScript_0xa0910 farsjump UnknownScript_0xa0910
.WantsBattle: .WantsBattle:
getlandmarkname STRING_BUFFER_5, ROUTE_26 getlandmarkname STRING_BUFFER_5, ROUTE_26
farjump UnknownScript_0xa0a37 farsjump UnknownScript_0xa0a37
GavenPhoneCallerScript: GavenPhoneCallerScript:
gettrainername STRING_BUFFER_3, COOLTRAINERM, GAVEN3 gettrainername STRING_BUFFER_3, COOLTRAINERM, GAVEN3
@ -30,7 +30,7 @@ GavenPhoneCallerScript:
.WaitingForBattle: .WaitingForBattle:
farscall PhoneScript_Random3 farscall PhoneScript_Random3
ifequal 0, GavenFoundRare ifequal 0, GavenFoundRare
farjump Phone_GenericCall_Male farsjump Phone_GenericCall_Male
GavenThursdayMorning: GavenThursdayMorning:
setflag ENGINE_GAVEN_THURSDAY_MORNING setflag ENGINE_GAVEN_THURSDAY_MORNING
@ -38,7 +38,7 @@ GavenThursdayMorning:
GavenWantsRematch: GavenWantsRematch:
getlandmarkname STRING_BUFFER_5, ROUTE_26 getlandmarkname STRING_BUFFER_5, ROUTE_26
setflag ENGINE_GAVEN setflag ENGINE_GAVEN
farjump PhoneScript_WantsToBattle_Male farsjump PhoneScript_WantsToBattle_Male
GavenFoundRare: GavenFoundRare:
farjump Phone_CheckIfUnseenRare_Male farsjump Phone_CheckIfUnseenRare_Male

6
engine/phone/scripts/generic_callee.asm
View File

@ -1245,15 +1245,15 @@ PhoneScript_MonFlavorText:
ifequal $0, .TooEnergetic ifequal $0, .TooEnergetic
farwritetext UnknownText_0x1b518b farwritetext UnknownText_0x1b518b
buttonsound buttonsound
farjump PhoneScript_HangupText_Male farsjump PhoneScript_HangupText_Male
.TooEnergetic: .TooEnergetic:
farjump .unnecessary farsjump .unnecessary
.unnecessary .unnecessary
farwritetext UnknownText_0x1b522b farwritetext UnknownText_0x1b522b
buttonsound buttonsound
farjump PhoneScript_HangupText_Male farsjump PhoneScript_HangupText_Male
GrandmaString: db "Grandma@" GrandmaString: db "Grandma@"
GrandpaString: db "Grandpa@" GrandpaString: db "Grandpa@"

54
engine/phone/scripts/generic_caller.asm
View File

@ -3,56 +3,56 @@ Phone_GenericCall_Male:
farscall PhoneScript_Random2 farscall PhoneScript_Random2
ifequal 0, .Bragging ifequal 0, .Bragging
farscall PhoneScript_Generic_Male farscall PhoneScript_Generic_Male
farjump Phone_FoundAMon_Male farsjump Phone_FoundAMon_Male
.Bragging: .Bragging:
farjump Phone_BraggingCall_Male farsjump Phone_BraggingCall_Male
Phone_GenericCall_Female: Phone_GenericCall_Female:
special RandomPhoneMon special RandomPhoneMon
farscall PhoneScript_Random2 farscall PhoneScript_Random2
ifequal 0, .Bragging ifequal 0, .Bragging
farscall PhoneScript_Generic_Female farscall PhoneScript_Generic_Female
farjump Phone_FoundAMon_Female farsjump Phone_FoundAMon_Female
.Bragging: .Bragging:
farjump Phone_BraggingCall_Female farsjump Phone_BraggingCall_Female
Phone_BraggingCall_Male: Phone_BraggingCall_Male:
farscall Phone_WhosBragging_Male farscall Phone_WhosBragging_Male
farjump Phone_FoundAMon_Male farsjump Phone_FoundAMon_Male
Phone_BraggingCall_Female: Phone_BraggingCall_Female:
farscall Phone_WhosBragging_Female farscall Phone_WhosBragging_Female
farjump Phone_FoundAMon_Female farsjump Phone_FoundAMon_Female
Phone_FoundAMon_Male: Phone_FoundAMon_Male:
special RandomPhoneWildMon special RandomPhoneWildMon
farscall PhoneScript_Random2 farscall PhoneScript_Random2
ifequal 0, .GotAway ifequal 0, .GotAway
farscall Phone_WhoDefeatedMon_Male farscall Phone_WhoDefeatedMon_Male
farjump PhoneScript_HangupText_Male farsjump PhoneScript_HangupText_Male
.GotAway: .GotAway:
farjump Phone_GotAwayCall_Male farsjump Phone_GotAwayCall_Male
Phone_FoundAMon_Female: Phone_FoundAMon_Female:
special RandomPhoneWildMon special RandomPhoneWildMon
farscall PhoneScript_Random2 farscall PhoneScript_Random2
ifequal 0, .GotAway ifequal 0, .GotAway
farscall Phone_WhoDefeatedMon_Female farscall Phone_WhoDefeatedMon_Female
farjump PhoneScript_HangupText_Female farsjump PhoneScript_HangupText_Female
.GotAway: .GotAway:
farjump Phone_GotAwayCall_Female farsjump Phone_GotAwayCall_Female
Phone_GotAwayCall_Male: Phone_GotAwayCall_Male:
farscall Phone_WhoLostAMon_Male farscall Phone_WhoLostAMon_Male
farjump PhoneScript_HangupText_Male farsjump PhoneScript_HangupText_Male
Phone_GotAwayCall_Female: Phone_GotAwayCall_Female:
farscall Phone_WhoLostAMon_Female farscall Phone_WhoLostAMon_Female
farjump PhoneScript_HangupText_Female farsjump PhoneScript_HangupText_Female
Phone_WhosBragging_Male: Phone_WhosBragging_Male:
readvar VAR_CALLERID readvar VAR_CALLERID
@ -524,11 +524,11 @@ Phone_WhoLostAMon_Female:
PhoneScript_WantsToBattle_Male: PhoneScript_WantsToBattle_Male:
farscall PhoneScript_RematchText_Male farscall PhoneScript_RematchText_Male
farjump PhoneScript_HangupText_Male farsjump PhoneScript_HangupText_Male
PhoneScript_WantsToBattle_Female: PhoneScript_WantsToBattle_Female:
farscall PhoneScript_RematchText_Female farscall PhoneScript_RematchText_Female
farjump PhoneScript_HangupText_Female farsjump PhoneScript_HangupText_Female
PhoneScript_RematchText_Male: PhoneScript_RematchText_Male:
readvar VAR_CALLERID readvar VAR_CALLERID
@ -837,18 +837,18 @@ PhoneScript_HangupText_Female:
Phone_CheckIfUnseenRare_Male: Phone_CheckIfUnseenRare_Male:
scall PhoneScriptRareWildMon scall PhoneScriptRareWildMon
iffalse .HangUp iffalse .HangUp
farjump Phone_GenericCall_Male farsjump Phone_GenericCall_Male
.HangUp: .HangUp:
farjump PhoneScript_HangupText_Male farsjump PhoneScript_HangupText_Male
Phone_CheckIfUnseenRare_Female: Phone_CheckIfUnseenRare_Female:
scall PhoneScriptRareWildMon scall PhoneScriptRareWildMon
iffalse .HangUp iffalse .HangUp
farjump Phone_GenericCall_Female farsjump Phone_GenericCall_Female
.HangUp: .HangUp:
farjump PhoneScript_HangupText_Female farsjump PhoneScript_HangupText_Female
PhoneScriptRareWildMon: PhoneScriptRareWildMon:
special RandomUnseenWildMon special RandomUnseenWildMon
@ -862,37 +862,37 @@ PhoneScript_BugCatchingContest:
.Wade: .Wade:
farwritetext WadeBugCatchingContestText farwritetext WadeBugCatchingContestText
buttonsound buttonsound
jump PhoneScript_HangupText_Male sjump PhoneScript_HangupText_Male
.Derek: .Derek:
farwritetext DerekBugCatchingContestText farwritetext DerekBugCatchingContestText
buttonsound buttonsound
jump PhoneScript_HangupText_Male sjump PhoneScript_HangupText_Male
IrwinRocketRumor: IrwinRocketRumor:
farwritetext UnknownText_0x64032 farwritetext UnknownText_0x64032
buttonsound buttonsound
jump PhoneScript_HangupText_Male sjump PhoneScript_HangupText_Male
UnknownScript_0xa05c6: UnknownScript_0xa05c6:
farwritetext UnknownText_0x177378 farwritetext UnknownText_0x177378
buttonsound buttonsound
jump PhoneScript_HangupText_Female sjump PhoneScript_HangupText_Female
UnknownScript_0xa05ce: UnknownScript_0xa05ce:
farwritetext UnknownText_0x64b5f farwritetext UnknownText_0x64b5f
buttonsound buttonsound
jump PhoneScript_HangupText_Male sjump PhoneScript_HangupText_Male
UnknownScript_0xa05d6: UnknownScript_0xa05d6:
farwritetext UnknownText_0x175dd9 farwritetext UnknownText_0x175dd9
buttonsound buttonsound
jump PhoneScript_HangupText_Male sjump PhoneScript_HangupText_Male
UnknownScript_0xa05de: UnknownScript_0xa05de:
farwritetext UnknownText_0x176c61 farwritetext UnknownText_0x176c61
buttonsound buttonsound
jump PhoneScript_HangupText_Male sjump PhoneScript_HangupText_Male
PhoneScript_FoundItem_Male: PhoneScript_FoundItem_Male:
readvar VAR_CALLERID readvar VAR_CALLERID
@ -953,9 +953,9 @@ PhoneScript_FoundItem_Female:
UnknownScript_0xa0644: UnknownScript_0xa0644:
farwritetext UnknownText_0x176feb farwritetext UnknownText_0x176feb
buttonsound buttonsound
jump PhoneScript_HangupText_Male sjump PhoneScript_HangupText_Male
KenjiCallingPhoneScript: KenjiCallingPhoneScript:
farwritetext UnknownText_0x66dc5 farwritetext UnknownText_0x66dc5
buttonsound buttonsound
jump PhoneScript_HangupText_Male sjump PhoneScript_HangupText_Male

16
engine/phone/scripts/gina.asm
View File

@ -15,18 +15,18 @@ GinaPhoneCalleeScript:
.NotSunday: .NotSunday:
checkflag ENGINE_ROCKETS_IN_RADIO_TOWER checkflag ENGINE_ROCKETS_IN_RADIO_TOWER
iftrue .Rockets iftrue .Rockets
farjump UnknownScript_0xa0960 farsjump UnknownScript_0xa0960
.Rockets: .Rockets:
farjump UnknownScript_0xa05c6 farsjump UnknownScript_0xa05c6
.WantsBattle: .WantsBattle:
getlandmarkname STRING_BUFFER_5, ROUTE_34 getlandmarkname STRING_BUFFER_5, ROUTE_34
farjump UnknownScript_0xa0a69 farsjump UnknownScript_0xa0a69
.HasLeafStone: .HasLeafStone:
getlandmarkname STRING_BUFFER_5, ROUTE_34 getlandmarkname STRING_BUFFER_5, ROUTE_34
farjump UnknownScript_0xa0abd farsjump UnknownScript_0xa0abd
GinaPhoneCallerScript: GinaPhoneCallerScript:
gettrainername STRING_BUFFER_3, PICNICKER, GINA1 gettrainername STRING_BUFFER_3, PICNICKER, GINA1
@ -53,7 +53,7 @@ GinaPhoneCallerScript:
ifequal 0, GinaWantsBattle ifequal 0, GinaWantsBattle
.Generic: .Generic:
farjump Phone_GenericCall_Female farsjump Phone_GenericCall_Female
GinaSundayDay: GinaSundayDay:
setflag ENGINE_GINA_SUNDAY_AFTERNOON setflag ENGINE_GINA_SUNDAY_AFTERNOON
@ -61,12 +61,12 @@ GinaSundayDay:
GinaWantsBattle: GinaWantsBattle:
getlandmarkname STRING_BUFFER_5, ROUTE_34 getlandmarkname STRING_BUFFER_5, ROUTE_34
setflag ENGINE_GINA setflag ENGINE_GINA
farjump PhoneScript_WantsToBattle_Female farsjump PhoneScript_WantsToBattle_Female
GinaRockets: GinaRockets:
farjump UnknownScript_0xa05c6 farsjump UnknownScript_0xa05c6
GinaHasLeafStone: GinaHasLeafStone:
setflag ENGINE_GINA_HAS_LEAF_STONE setflag ENGINE_GINA_HAS_LEAF_STONE
getlandmarkname STRING_BUFFER_5, ROUTE_34 getlandmarkname STRING_BUFFER_5, ROUTE_34
farjump PhoneScript_FoundItem_Female farsjump PhoneScript_FoundItem_Female

68
engine/phone/scripts/hangups.asm
View File

@ -1,132 +1,132 @@
JackPhoneTips: JackPhoneTips:
farwritetext UnknownText_0x1745c2 farwritetext UnknownText_0x1745c2
buttonsound buttonsound
jump PhoneScript_HangupText_Male sjump PhoneScript_HangupText_Male
UnknownScript_0xa0900: UnknownScript_0xa0900:
farwritetext UnknownText_0x17485b farwritetext UnknownText_0x17485b
buttonsound buttonsound
jump PhoneScript_HangupText_Female sjump PhoneScript_HangupText_Female
UnknownScript_0xa0908: UnknownScript_0xa0908:
farwritetext UnknownText_0x17496b farwritetext UnknownText_0x17496b
buttonsound buttonsound
jump PhoneScript_HangupText_Male sjump PhoneScript_HangupText_Male
UnknownScript_0xa0910: UnknownScript_0xa0910:
farwritetext UnknownText_0x174c29 farwritetext UnknownText_0x174c29
buttonsound buttonsound
jump PhoneScript_HangupText_Male sjump PhoneScript_HangupText_Male
UnknownScript_0xa0918: UnknownScript_0xa0918:
farwritetext UnknownText_0x174ec5 farwritetext UnknownText_0x174ec5
buttonsound buttonsound
jump PhoneScript_HangupText_Female sjump PhoneScript_HangupText_Female
UnknownScript_0xa0920: UnknownScript_0xa0920:
farwritetext UnknownText_0x17519b farwritetext UnknownText_0x17519b
buttonsound buttonsound
jump PhoneScript_HangupText_Male sjump PhoneScript_HangupText_Male
UnknownScript_0xa0928: UnknownScript_0xa0928:
farwritetext UnknownText_0x17549b farwritetext UnknownText_0x17549b
buttonsound buttonsound
jump PhoneScript_HangupText_Female sjump PhoneScript_HangupText_Female
UnknownScript_0xa0930: UnknownScript_0xa0930:
farwritetext UnknownText_0x17571d farwritetext UnknownText_0x17571d
buttonsound buttonsound
jump PhoneScript_HangupText_Male sjump PhoneScript_HangupText_Male
UnknownScript_0xa0938: UnknownScript_0xa0938:
farwritetext UnknownText_0x175abe farwritetext UnknownText_0x175abe
buttonsound buttonsound
jump PhoneScript_HangupText_Male sjump PhoneScript_HangupText_Male
UnknownScript_0xa0940: UnknownScript_0xa0940:
farwritetext UnknownText_0x175eaf farwritetext UnknownText_0x175eaf
buttonsound buttonsound
jump PhoneScript_HangupText_Male sjump PhoneScript_HangupText_Male
UnknownScript_0xa0948: UnknownScript_0xa0948:
farwritetext UnknownText_0x1768b0 farwritetext UnknownText_0x1768b0
buttonsound buttonsound
jump PhoneScript_HangupText_Female sjump PhoneScript_HangupText_Female
UnknownScript_0xa0950: UnknownScript_0xa0950:
farwritetext UnknownText_0x176d32 farwritetext UnknownText_0x176d32
buttonsound buttonsound
jump PhoneScript_HangupText_Male sjump PhoneScript_HangupText_Male
UnknownScript_0xa0958: UnknownScript_0xa0958:
farwritetext UnknownText_0x1770fb farwritetext UnknownText_0x1770fb
buttonsound buttonsound
jump PhoneScript_HangupText_Male sjump PhoneScript_HangupText_Male
UnknownScript_0xa0960: UnknownScript_0xa0960:
farwritetext UnknownText_0x177465 farwritetext UnknownText_0x177465
buttonsound buttonsound
jump PhoneScript_HangupText_Female sjump PhoneScript_HangupText_Female
UnknownScript_0xa0968: UnknownScript_0xa0968:
farwritetext UnknownText_0x64bc6 farwritetext UnknownText_0x64bc6
buttonsound buttonsound
jump PhoneScript_HangupText_Male sjump PhoneScript_HangupText_Male
UnknownScript_0xa0970: UnknownScript_0xa0970:
farwritetext UnknownText_0x64e90 farwritetext UnknownText_0x64e90
buttonsound buttonsound
jump PhoneScript_HangupText_Male sjump PhoneScript_HangupText_Male
UnknownScript_0xa0978: UnknownScript_0xa0978:
farwritetext UnknownText_0x65161 farwritetext UnknownText_0x65161
buttonsound buttonsound
jump PhoneScript_HangupText_Female sjump PhoneScript_HangupText_Female
UnknownScript_0xa0980: UnknownScript_0xa0980:
farwritetext UnknownText_0x65a23 farwritetext UnknownText_0x65a23
buttonsound buttonsound
jump PhoneScript_HangupText_Male sjump PhoneScript_HangupText_Male
UnknownScript_0xa0988: UnknownScript_0xa0988:
farwritetext UnknownText_0x65d5c farwritetext UnknownText_0x65d5c
buttonsound buttonsound
jump PhoneScript_HangupText_Male sjump PhoneScript_HangupText_Male
UnknownScript_0xa0990: UnknownScript_0xa0990:
farwritetext UnknownText_0x65ff2 farwritetext UnknownText_0x65ff2
buttonsound buttonsound
jump PhoneScript_HangupText_Male sjump PhoneScript_HangupText_Male
UnknownScript_0xa0998: UnknownScript_0xa0998:
farwritetext UnknownText_0x6651e farwritetext UnknownText_0x6651e
buttonsound buttonsound
jump PhoneScript_HangupText_Male sjump PhoneScript_HangupText_Male
UnknownScript_0xa09a0: UnknownScript_0xa09a0:
farwritetext UnknownText_0x66882 farwritetext UnknownText_0x66882
buttonsound buttonsound
jump PhoneScript_HangupText_Female sjump PhoneScript_HangupText_Female
VanceLookingForward: VanceLookingForward:
farwritetext VanceLookingForwardText farwritetext VanceLookingForwardText
buttonsound buttonsound
jump PhoneScript_HangupText_Male sjump PhoneScript_HangupText_Male
WiltonHaventFoundAnything: WiltonHaventFoundAnything:
farwritetext WiltonHaventFoundAnythingText farwritetext WiltonHaventFoundAnythingText
buttonsound buttonsound
jump PhoneScript_HangupText_Male sjump PhoneScript_HangupText_Male
ParryBattleWithMe: ParryBattleWithMe:
farwritetext ParryBattleWithMeText farwritetext ParryBattleWithMeText
buttonsound buttonsound
jump PhoneScript_HangupText_Male sjump PhoneScript_HangupText_Male
ErinWorkingHardScript: ErinWorkingHardScript:
farwritetext ErinWorkingHardText farwritetext ErinWorkingHardText
buttonsound buttonsound
jump PhoneScript_HangupText_Female sjump PhoneScript_HangupText_Female
UnknownScript_0xa09c8: UnknownScript_0xa09c8:
random 3 random 3
@ -137,17 +137,17 @@ UnknownScript_0xa09c8:
UnknownScript_0xa09d6: UnknownScript_0xa09d6:
farwritetext UnknownText_0x64846 farwritetext UnknownText_0x64846
buttonsound buttonsound
jump PhoneScript_HangupText_Male sjump PhoneScript_HangupText_Male
UnknownScript_0xa09de: UnknownScript_0xa09de:
farwritetext UnknownText_0x64881 farwritetext UnknownText_0x64881
buttonsound buttonsound
jump PhoneScript_HangupText_Male sjump PhoneScript_HangupText_Male
UnknownScript_0xa09e6: UnknownScript_0xa09e6:
farwritetext UnknownText_0x648dc farwritetext UnknownText_0x648dc
buttonsound buttonsound
jump PhoneScript_HangupText_Male sjump PhoneScript_HangupText_Male
KenjiAnswerPhoneScript: KenjiAnswerPhoneScript:
readvar VAR_KENJI_BREAK readvar VAR_KENJI_BREAK
@ -155,12 +155,12 @@ KenjiAnswerPhoneScript:
ifequal 1, .OnBreak ifequal 1, .OnBreak
farwritetext UnknownText_0x66e17 farwritetext UnknownText_0x66e17
buttonsound buttonsound
jump PhoneScript_HangupText_Male sjump PhoneScript_HangupText_Male
.Training: .Training:
farwritetext UnknownText_0x66e67 farwritetext UnknownText_0x66e67
buttonsound buttonsound
jump PhoneScript_HangupText_Male sjump PhoneScript_HangupText_Male
.OnBreak: .OnBreak:
checktime MORN checktime MORN
@ -170,14 +170,14 @@ KenjiAnswerPhoneScript:
setevent EVENT_KENJI_ON_BREAK setevent EVENT_KENJI_ON_BREAK
farwritetext KenjiBreakText farwritetext KenjiBreakText
buttonsound buttonsound
jump PhoneScript_HangupText_Male sjump PhoneScript_HangupText_Male
.Morning: .Morning:
farwritetext UnknownText_0x66ed3 farwritetext UnknownText_0x66ed3
buttonsound buttonsound
jump PhoneScript_HangupText_Male sjump PhoneScript_HangupText_Male
.Night: .Night:
farwritetext UnknownText_0x66f52 farwritetext UnknownText_0x66f52
buttonsound buttonsound
jump PhoneScript_HangupText_Male sjump PhoneScript_HangupText_Male

20
engine/phone/scripts/hangups_2.asm
View File

@ -1,49 +1,49 @@
UnknownScript_0xa0aa5: UnknownScript_0xa0aa5:
farwritetext UnknownText_0x174895 farwritetext UnknownText_0x174895
buttonsound buttonsound
jump PhoneScript_HangupText_Female sjump PhoneScript_HangupText_Female
UnknownScript_0xa0aad: UnknownScript_0xa0aad:
farwritetext UnknownText_0x17529c farwritetext UnknownText_0x17529c
buttonsound buttonsound
jump PhoneScript_HangupText_Male sjump PhoneScript_HangupText_Male
UnknownScript_0xa0ab5: UnknownScript_0xa0ab5:
farwritetext UnknownText_0x175b6d farwritetext UnknownText_0x175b6d
buttonsound buttonsound
jump PhoneScript_HangupText_Male sjump PhoneScript_HangupText_Male
UnknownScript_0xa0abd: UnknownScript_0xa0abd:
farwritetext UnknownText_0x17750e farwritetext UnknownText_0x17750e
buttonsound buttonsound
jump PhoneScript_HangupText_Female sjump PhoneScript_HangupText_Female
UnknownScript_0xa0ac5: UnknownScript_0xa0ac5:
farwritetext UnknownText_0x64f1a farwritetext UnknownText_0x64f1a
buttonsound buttonsound
jump PhoneScript_HangupText_Male sjump PhoneScript_HangupText_Male
UnknownScript_0xa0acd: UnknownScript_0xa0acd:
farwritetext UnknownText_0x6520f farwritetext UnknownText_0x6520f
buttonsound buttonsound
jump PhoneScript_HangupText_Female sjump PhoneScript_HangupText_Female
UnknownScript_0xa0ad5: UnknownScript_0xa0ad5:
farwritetext UnknownText_0x65da6 farwritetext UnknownText_0x65da6
buttonsound buttonsound
jump PhoneScript_HangupText_Male sjump PhoneScript_HangupText_Male
UnknownScript_0xa0add: UnknownScript_0xa0add:
farwritetext UnknownText_0x66087 farwritetext UnknownText_0x66087
buttonsound buttonsound
jump PhoneScript_HangupText_Male sjump PhoneScript_HangupText_Male
UnknownScript_0xa0ae5: UnknownScript_0xa0ae5:
farwritetext UnknownText_0x6691d farwritetext UnknownText_0x6691d
buttonsound buttonsound
jump PhoneScript_HangupText_Female sjump PhoneScript_HangupText_Female
WiltonWantThis: WiltonWantThis:
farwritetext WiltonWantThisText farwritetext WiltonWantThisText
buttonsound buttonsound
jump PhoneScript_HangupText_Male sjump PhoneScript_HangupText_Male

8
engine/phone/scripts/huey.asm
View File

@ -12,11 +12,11 @@ HueyPhoneCalleeScript:
.NotWednesday: .NotWednesday:
special RandomPhoneMon special RandomPhoneMon
farjump UnknownScript_0xa0908 farsjump UnknownScript_0xa0908
.WantsBattle: .WantsBattle:
getlandmarkname STRING_BUFFER_5, LIGHTHOUSE getlandmarkname STRING_BUFFER_5, LIGHTHOUSE
farjump HueyWantsBattleScript farsjump HueyWantsBattleScript
HueyPhoneCallerScript: HueyPhoneCallerScript:
gettrainername STRING_BUFFER_3, SAILOR, HUEY1 gettrainername STRING_BUFFER_3, SAILOR, HUEY1
@ -30,7 +30,7 @@ HueyPhoneCallerScript:
ifequal 1, HueyWantsBattle ifequal 1, HueyWantsBattle
.Flavor: .Flavor:
farjump PhoneScript_MonFlavorText farsjump PhoneScript_MonFlavorText
HueyWednesdayNight: HueyWednesdayNight:
setflag ENGINE_HUEY_WEDNESDAY_NIGHT setflag ENGINE_HUEY_WEDNESDAY_NIGHT
@ -38,4 +38,4 @@ HueyWednesdayNight:
HueyWantsBattle: HueyWantsBattle:
getlandmarkname STRING_BUFFER_5, LIGHTHOUSE getlandmarkname STRING_BUFFER_5, LIGHTHOUSE
setflag ENGINE_HUEY setflag ENGINE_HUEY
farjump PhoneScript_WantsToBattle_Male farsjump PhoneScript_WantsToBattle_Male

8
engine/phone/scripts/irwin.asm
View File

@ -3,17 +3,17 @@ IrwinPhoneCalleeScript:
farscall PhoneScript_AnswerPhone_Male farscall PhoneScript_AnswerPhone_Male
checkflag ENGINE_ROCKETS_IN_RADIO_TOWER checkflag ENGINE_ROCKETS_IN_RADIO_TOWER
iftrue .Rockets iftrue .Rockets
farjump UnknownScript_0xa09c8 farsjump UnknownScript_0xa09c8
.Rockets: .Rockets:
farjump IrwinRocketRumor farsjump IrwinRocketRumor
IrwinPhoneCallerScript: IrwinPhoneCallerScript:
gettrainername STRING_BUFFER_3, JUGGLER, IRWIN1 gettrainername STRING_BUFFER_3, JUGGLER, IRWIN1
farscall PhoneScript_GreetPhone_Male farscall PhoneScript_GreetPhone_Male
checkflag ENGINE_ROCKETS_IN_RADIO_TOWER checkflag ENGINE_ROCKETS_IN_RADIO_TOWER
iftrue .Rockets iftrue .Rockets
farjump IrwinRumorScript farsjump IrwinRumorScript
.Rockets: .Rockets:
farjump IrwinRocketRumor farsjump IrwinRocketRumor

26
engine/phone/scripts/irwin_gossip.asm
View File

@ -25,64 +25,64 @@ IrwinRumorScript:
iftrue .PlainBadge iftrue .PlainBadge
farwritetext IrwinCalledRightAwayText farwritetext IrwinCalledRightAwayText
buttonsound buttonsound
jump PhoneScript_HangupText_Male sjump PhoneScript_HangupText_Male
.PlainBadge: .PlainBadge:
farwritetext UnknownText_0x64099 farwritetext UnknownText_0x64099
buttonsound buttonsound
jump PhoneScript_HangupText_Male sjump PhoneScript_HangupText_Male
.JasmineReturned: .JasmineReturned:
farwritetext UnknownText_0x640e6 farwritetext UnknownText_0x640e6
buttonsound buttonsound
jump PhoneScript_HangupText_Male sjump PhoneScript_HangupText_Male
.RocketHideout: .RocketHideout:
farwritetext UnknownText_0x6416d farwritetext UnknownText_0x6416d
buttonsound buttonsound
jump PhoneScript_HangupText_Male sjump PhoneScript_HangupText_Male
.RadioTower: .RadioTower:
farwritetext UnknownText_0x641e8 farwritetext UnknownText_0x641e8
buttonsound buttonsound
jump PhoneScript_HangupText_Male sjump PhoneScript_HangupText_Male
.RisingBadge: .RisingBadge:
farwritetext UnknownText_0x64247 farwritetext UnknownText_0x64247
buttonsound buttonsound
jump PhoneScript_HangupText_Male sjump PhoneScript_HangupText_Male
.EliteFour: .EliteFour:
farwritetext UnknownText_0x642bb farwritetext UnknownText_0x642bb
buttonsound buttonsound
jump PhoneScript_HangupText_Male sjump PhoneScript_HangupText_Male
.VermilionCity: .VermilionCity:
farwritetext UnknownText_0x643d4 farwritetext UnknownText_0x643d4
buttonsound buttonsound
jump PhoneScript_HangupText_Male sjump PhoneScript_HangupText_Male
.TrainPass: .TrainPass:
farwritetext UnknownText_0x64448 farwritetext UnknownText_0x64448
buttonsound buttonsound
jump PhoneScript_HangupText_Male sjump PhoneScript_HangupText_Male
.Snorlax: .Snorlax:
farwritetext UnknownText_0x6455b farwritetext UnknownText_0x6455b
buttonsound buttonsound
jump PhoneScript_HangupText_Male sjump PhoneScript_HangupText_Male
.MtSilver: .MtSilver:
farwritetext UnknownText_0x645ff farwritetext UnknownText_0x645ff
buttonsound buttonsound
jump PhoneScript_HangupText_Male sjump PhoneScript_HangupText_Male
.FogBadge: .FogBadge:
farwritetext UnknownText_0x646df farwritetext UnknownText_0x646df
buttonsound buttonsound
jump PhoneScript_HangupText_Male sjump PhoneScript_HangupText_Male
.MarshBadge: .MarshBadge:
farwritetext UnknownText_0x647d8 farwritetext UnknownText_0x647d8
buttonsound buttonsound
jump PhoneScript_HangupText_Male sjump PhoneScript_HangupText_Male

12
engine/phone/scripts/jack.asm
View File

@ -11,11 +11,11 @@ JackPhoneCalleeScript:
iftrue JackMondayMorning iftrue JackMondayMorning
.NotMonday: .NotMonday:
farjump JackPhoneTips farsjump JackPhoneTips
.WantsBattle: .WantsBattle:
getlandmarkname STRING_BUFFER_5, NATIONAL_PARK getlandmarkname STRING_BUFFER_5, NATIONAL_PARK
farjump JackWantsBattleScript farsjump JackWantsBattleScript
JackPhoneCallerScript: JackPhoneCallerScript:
gettrainername STRING_BUFFER_3, SCHOOLBOY, JACK1 gettrainername STRING_BUFFER_3, SCHOOLBOY, JACK1
@ -32,7 +32,7 @@ JackPhoneCallerScript:
.WaitingForBattle: .WaitingForBattle:
farscall PhoneScript_Random3 farscall PhoneScript_Random3
ifequal 0, JackFindsRare ifequal 0, JackFindsRare
farjump Phone_GenericCall_Male farsjump Phone_GenericCall_Male
JackMondayMorning: JackMondayMorning:
setflag ENGINE_JACK_MONDAY_MORNING setflag ENGINE_JACK_MONDAY_MORNING
@ -40,10 +40,10 @@ JackMondayMorning:
JackWantsToBattle: JackWantsToBattle:
getlandmarkname STRING_BUFFER_5, NATIONAL_PARK getlandmarkname STRING_BUFFER_5, NATIONAL_PARK
setflag ENGINE_JACK setflag ENGINE_JACK
farjump PhoneScript_WantsToBattle_Male farsjump PhoneScript_WantsToBattle_Male
JackFindsRare: JackFindsRare:
farjump Phone_CheckIfUnseenRare_Male farsjump Phone_CheckIfUnseenRare_Male
JackBattleTrivia: JackBattleTrivia:
farjump JackTriviaScript farsjump JackTriviaScript

22
engine/phone/scripts/jack_gossip.asm
View File

@ -15,54 +15,54 @@ JackTriviaScript:
.Thunder: .Thunder:
farwritetext JackThunderTriviaText farwritetext JackThunderTriviaText
buttonsound buttonsound
jump PhoneScript_HangupText_Male sjump PhoneScript_HangupText_Male
.Rollout: .Rollout:
farwritetext JackRolloutTriviaText farwritetext JackRolloutTriviaText
buttonsound buttonsound
jump PhoneScript_HangupText_Male sjump PhoneScript_HangupText_Male
.Solarbeam: .Solarbeam:
farwritetext JackSolarbeamTriviaText farwritetext JackSolarbeamTriviaText
buttonsound buttonsound
jump PhoneScript_HangupText_Male sjump PhoneScript_HangupText_Male
.Stomp: .Stomp:
farwritetext JackStompTriviaText farwritetext JackStompTriviaText
buttonsound buttonsound
jump PhoneScript_HangupText_Male sjump PhoneScript_HangupText_Male
.Gust: .Gust:
farwritetext JackGustTriviaText farwritetext JackGustTriviaText
buttonsound buttonsound
jump PhoneScript_HangupText_Male sjump PhoneScript_HangupText_Male
.Twister: .Twister:
farwritetext JackTwisterTriviaText farwritetext JackTwisterTriviaText
buttonsound buttonsound
jump PhoneScript_HangupText_Male sjump PhoneScript_HangupText_Male
.Earthquake: .Earthquake:
farwritetext JackEarthquakeTriviaText farwritetext JackEarthquakeTriviaText
buttonsound buttonsound
jump PhoneScript_HangupText_Male sjump PhoneScript_HangupText_Male
.Magnitude: .Magnitude:
farwritetext JackMagnitudeTriviaText farwritetext JackMagnitudeTriviaText
buttonsound buttonsound
jump PhoneScript_HangupText_Male sjump PhoneScript_HangupText_Male
.Sandstorm: .Sandstorm:
farwritetext JackSandstormTriviaText farwritetext JackSandstormTriviaText
buttonsound buttonsound
jump PhoneScript_HangupText_Male sjump PhoneScript_HangupText_Male
.SunnyDay: .SunnyDay:
farwritetext JackSunnyDayTriviaText farwritetext JackSunnyDayTriviaText
buttonsound buttonsound
jump PhoneScript_HangupText_Male sjump PhoneScript_HangupText_Male
.RainDance: .RainDance:
farwritetext JackRainDanceTriviaText farwritetext JackRainDanceTriviaText
buttonsound buttonsound
jump PhoneScript_HangupText_Male sjump PhoneScript_HangupText_Male

8
engine/phone/scripts/joey.asm
View File

@ -12,11 +12,11 @@ JoeyPhoneCalleeScript:
.NotMonday: .NotMonday:
special RandomPhoneMon special RandomPhoneMon
farjump UnknownScript_0xa0930 farsjump UnknownScript_0xa0930
.WantsBattle: .WantsBattle:
getlandmarkname STRING_BUFFER_5, ROUTE_30 getlandmarkname STRING_BUFFER_5, ROUTE_30
farjump UnknownScript_0xa0a4b farsjump UnknownScript_0xa0a4b
JoeyPhoneCallerScript: JoeyPhoneCallerScript:
gettrainername STRING_BUFFER_3, YOUNGSTER, JOEY1 gettrainername STRING_BUFFER_3, YOUNGSTER, JOEY1
@ -30,7 +30,7 @@ JoeyPhoneCallerScript:
ifequal 1, JoeyWantsBattle ifequal 1, JoeyWantsBattle
.Generic: .Generic:
farjump Phone_GenericCall_Male farsjump Phone_GenericCall_Male
JoeyMondayAfternoon: JoeyMondayAfternoon:
setflag ENGINE_JOEY_MONDAY_AFTERNOON setflag ENGINE_JOEY_MONDAY_AFTERNOON
@ -38,4 +38,4 @@ JoeyMondayAfternoon:
JoeyWantsBattle: JoeyWantsBattle:
getlandmarkname STRING_BUFFER_5, ROUTE_30 getlandmarkname STRING_BUFFER_5, ROUTE_30
setflag ENGINE_JOEY setflag ENGINE_JOEY
farjump PhoneScript_WantsToBattle_Male farsjump PhoneScript_WantsToBattle_Male

14
engine/phone/scripts/jose.asm
View File

@ -13,15 +13,15 @@ JosePhoneCalleeScript:
iftrue JoseSaturdayNight iftrue JoseSaturdayNight
.NotSaturday: .NotSaturday:
farjump UnknownScript_0xa0920 farsjump UnknownScript_0xa0920
.WantsBattle: .WantsBattle:
getlandmarkname STRING_BUFFER_5, ROUTE_27 getlandmarkname STRING_BUFFER_5, ROUTE_27
farjump UnknownScript_0xa0a41 farsjump UnknownScript_0xa0a41
.HasItem: .HasItem:
getlandmarkname STRING_BUFFER_5, ROUTE_27 getlandmarkname STRING_BUFFER_5, ROUTE_27
farjump UnknownScript_0xa0a41 farsjump UnknownScript_0xa0a41
JosePhoneCallerScript: JosePhoneCallerScript:
gettrainername STRING_BUFFER_3, BIRD_KEEPER, JOSE2 gettrainername STRING_BUFFER_3, BIRD_KEEPER, JOSE2
@ -40,7 +40,7 @@ JosePhoneCallerScript:
.Generic: .Generic:
farscall PhoneScript_Random3 farscall PhoneScript_Random3
ifequal 0, JoseFoundRare ifequal 0, JoseFoundRare
farjump Phone_GenericCall_Male farsjump Phone_GenericCall_Male
JoseSaturdayNight: JoseSaturdayNight:
setflag ENGINE_JOSE_SATURDAY_NIGHT setflag ENGINE_JOSE_SATURDAY_NIGHT
@ -48,12 +48,12 @@ JoseSaturdayNight:
JoseWantsBattle: JoseWantsBattle:
getlandmarkname STRING_BUFFER_5, ROUTE_27 getlandmarkname STRING_BUFFER_5, ROUTE_27
setflag ENGINE_JOSE setflag ENGINE_JOSE
farjump PhoneScript_WantsToBattle_Male farsjump PhoneScript_WantsToBattle_Male
JoseFoundRare: JoseFoundRare:
farjump Phone_CheckIfUnseenRare_Male farsjump Phone_CheckIfUnseenRare_Male
JoseHasStarPiece: JoseHasStarPiece:
setflag ENGINE_JOSE_HAS_STAR_PIECE setflag ENGINE_JOSE_HAS_STAR_PIECE
getlandmarkname STRING_BUFFER_5, ROUTE_27 getlandmarkname STRING_BUFFER_5, ROUTE_27
farjump PhoneScript_FoundItem_Male farsjump PhoneScript_FoundItem_Male

4
engine/phone/scripts/kenji.asm
View File

@ -1,9 +1,9 @@
KenjiPhoneCalleeScript: KenjiPhoneCalleeScript:
gettrainername STRING_BUFFER_3, BLACKBELT_T, KENJI3 gettrainername STRING_BUFFER_3, BLACKBELT_T, KENJI3
farscall PhoneScript_AnswerPhone_Male farscall PhoneScript_AnswerPhone_Male
farjump KenjiAnswerPhoneScript farsjump KenjiAnswerPhoneScript
KenjiPhoneCallerScript: KenjiPhoneCallerScript:
gettrainername STRING_BUFFER_3, BLACKBELT_T, KENJI3 gettrainername STRING_BUFFER_3, BLACKBELT_T, KENJI3
farscall PhoneScript_GreetPhone_Male farscall PhoneScript_GreetPhone_Male
farjump KenjiCallingPhoneScript farsjump KenjiCallingPhoneScript

30
engine/phone/scripts/liz.asm
View File

@ -12,11 +12,11 @@ LizPhoneCalleeScript:
.NotThursday: .NotThursday:
special RandomPhoneMon special RandomPhoneMon
farjump UnknownScript_0xa0948 farsjump UnknownScript_0xa0948
.WantsBattle: .WantsBattle:
getlandmarkname STRING_BUFFER_5, ROUTE_32 getlandmarkname STRING_BUFFER_5, ROUTE_32
farjump UnknownScript_0xa0a5a farsjump UnknownScript_0xa0a5a
LizPhoneCallerScript: LizPhoneCallerScript:
gettrainername STRING_BUFFER_3, PICNICKER, LIZ1 gettrainername STRING_BUFFER_3, PICNICKER, LIZ1
@ -37,7 +37,7 @@ LizPhoneCallerScript:
ifequal 0, LizWantsBattle ifequal 0, LizWantsBattle
.Generic: .Generic:
farjump Phone_GenericCall_Female farsjump Phone_GenericCall_Female
LizThursdayAfternoon: LizThursdayAfternoon:
setflag ENGINE_LIZ_THURSDAY_AFTERNOON setflag ENGINE_LIZ_THURSDAY_AFTERNOON
@ -45,10 +45,10 @@ LizThursdayAfternoon:
LizWantsBattle: LizWantsBattle:
getlandmarkname STRING_BUFFER_5, ROUTE_32 getlandmarkname STRING_BUFFER_5, ROUTE_32
setflag ENGINE_LIZ setflag ENGINE_LIZ
farjump PhoneScript_WantsToBattle_Female farsjump PhoneScript_WantsToBattle_Female
LizWrongNumber: LizWrongNumber:
farjump LizWrongNumberScript farsjump LizWrongNumberScript
LizGossip: LizGossip:
random 9 random 9
@ -64,39 +64,39 @@ LizGossip:
.CoolTrainerM: .CoolTrainerM:
gettrainerclassname STRING_BUFFER_4, COOLTRAINERM gettrainerclassname STRING_BUFFER_4, COOLTRAINERM
jump LizGossipScript sjump LizGossipScript
.Beauty: .Beauty:
gettrainerclassname STRING_BUFFER_4, BEAUTY gettrainerclassname STRING_BUFFER_4, BEAUTY
jump LizGossipScript sjump LizGossipScript
.Grunt: .Grunt:
gettrainerclassname STRING_BUFFER_4, GRUNTM gettrainerclassname STRING_BUFFER_4, GRUNTM
jump LizGossipScript sjump LizGossipScript
.Teacher: .Teacher:
gettrainerclassname STRING_BUFFER_4, TEACHER gettrainerclassname STRING_BUFFER_4, TEACHER
jump LizGossipScript sjump LizGossipScript
.SwimmerF: .SwimmerF:
gettrainerclassname STRING_BUFFER_4, SWIMMERF gettrainerclassname STRING_BUFFER_4, SWIMMERF
jump LizGossipScript sjump LizGossipScript
.KimonoGirl: .KimonoGirl:
gettrainerclassname STRING_BUFFER_4, KIMONO_GIRL gettrainerclassname STRING_BUFFER_4, KIMONO_GIRL
jump LizGossipScript sjump LizGossipScript
.Skier: .Skier:
gettrainerclassname STRING_BUFFER_4, SKIER gettrainerclassname STRING_BUFFER_4, SKIER
jump LizGossipScript sjump LizGossipScript
.Medium: .Medium:
gettrainerclassname STRING_BUFFER_4, MEDIUM gettrainerclassname STRING_BUFFER_4, MEDIUM
jump LizGossipScript sjump LizGossipScript
.PokefanM: .PokefanM:
gettrainerclassname STRING_BUFFER_4, POKEFANM gettrainerclassname STRING_BUFFER_4, POKEFANM
jump LizGossipScript sjump LizGossipScript
LizGossipScript: LizGossipScript:
farjump UnknownScript_0xa06da farsjump UnknownScript_0xa06da

20
engine/phone/scripts/liz_gossip.asm
View File

@ -14,49 +14,49 @@ UnknownScript_0xa06da:
.RuinsOfAlph: .RuinsOfAlph:
farwritetext UnknownText_0x176223 farwritetext UnknownText_0x176223
buttonsound buttonsound
jump PhoneScript_HangupText_Female sjump PhoneScript_HangupText_Female
.Falkner: .Falkner:
farwritetext UnknownText_0x1762c3 farwritetext UnknownText_0x1762c3
buttonsound buttonsound
jump PhoneScript_HangupText_Female sjump PhoneScript_HangupText_Female
.Earl: .Earl:
farwritetext UnknownText_0x17638a farwritetext UnknownText_0x17638a
buttonsound buttonsound
jump PhoneScript_HangupText_Female sjump PhoneScript_HangupText_Female
.SurfPikachu: .SurfPikachu:
farwritetext UnknownText_0x176424 farwritetext UnknownText_0x176424
buttonsound buttonsound
jump PhoneScript_HangupText_Female sjump PhoneScript_HangupText_Female
.MooMooMilk: .MooMooMilk:
farwritetext UnknownText_0x1764eb farwritetext UnknownText_0x1764eb
buttonsound buttonsound
jump PhoneScript_HangupText_Female sjump PhoneScript_HangupText_Female
.Salon: .Salon:
farwritetext UnknownText_0x176599 farwritetext UnknownText_0x176599
buttonsound buttonsound
jump PhoneScript_HangupText_Female sjump PhoneScript_HangupText_Female
.Whitney: .Whitney:
farwritetext UnknownText_0x1766ac farwritetext UnknownText_0x1766ac
buttonsound buttonsound
jump PhoneScript_HangupText_Female sjump PhoneScript_HangupText_Female
.BugCatchingContest: .BugCatchingContest:
farwritetext UnknownText_0x17674f farwritetext UnknownText_0x17674f
buttonsound buttonsound
jump PhoneScript_HangupText_Female sjump PhoneScript_HangupText_Female
.BeautifulMon: .BeautifulMon:
farwritetext UnknownText_0x176816 farwritetext UnknownText_0x176816
buttonsound buttonsound
jump PhoneScript_HangupText_Female sjump PhoneScript_HangupText_Female
.Forgot: .Forgot:
farwritetext UnknownText_0x17686d farwritetext UnknownText_0x17686d
buttonsound buttonsound
jump PhoneScript_HangupText_Female sjump PhoneScript_HangupText_Female

40
engine/phone/scripts/mom.asm
View File

@ -7,7 +7,7 @@ MomPhoneCalleeScript:
iftrue MomPhoneNoGymQuestScript iftrue MomPhoneNoGymQuestScript
checkevent EVENT_GOT_A_POKEMON_FROM_ELM checkevent EVENT_GOT_A_POKEMON_FROM_ELM
iftrue MomPhoneNoPokedexScript iftrue MomPhoneNoPokedexScript
jump MomPhoneNoPokemonScript sjump MomPhoneNoPokemonScript
.bcec5 .bcec5
checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_8 checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_8
@ -18,12 +18,12 @@ MomPhoneCalleeScript:
readvar VAR_ROOFPALETTE readvar VAR_ROOFPALETTE
ifequal 1, MomPhonePalette1 ifequal 1, MomPhonePalette1
ifequal 2, MomPhonePalette2 ifequal 2, MomPhonePalette2
jump MomPhoneOther sjump MomPhoneOther
MomPhoneLandmark: MomPhoneLandmark:
farwritetext MomPhoneLandmarkText farwritetext MomPhoneLandmarkText
buttonsound buttonsound
jump MomSavingMoney sjump MomSavingMoney
MomPhonePalette1: MomPhonePalette1:
readvar VAR_MAPGROUP readvar VAR_MAPGROUP
@ -34,87 +34,87 @@ MomPhonePalette1:
ifequal GROUP_GOLDENROD_CITY, .goldenrod ifequal GROUP_GOLDENROD_CITY, .goldenrod
farwritetext MomPhoneGenericAreaText farwritetext MomPhoneGenericAreaText
buttonsound buttonsound
jump MomSavingMoney sjump MomSavingMoney
.newbark .newbark
farwritetext MomPhoneNewBarkText farwritetext MomPhoneNewBarkText
buttonsound buttonsound
jump MomSavingMoney sjump MomSavingMoney
.cherrygrove .cherrygrove
farwritetext MomPhoneCherrygroveText farwritetext MomPhoneCherrygroveText
buttonsound buttonsound
jump MomSavingMoney sjump MomSavingMoney
.violet .violet
getlandmarkname STRING_BUFFER_4, SPROUT_TOWER getlandmarkname STRING_BUFFER_4, SPROUT_TOWER
jump MomPhoneLandmark sjump MomPhoneLandmark
.azalea .azalea
getlandmarkname STRING_BUFFER_4, SLOWPOKE_WELL getlandmarkname STRING_BUFFER_4, SLOWPOKE_WELL
jump MomPhoneLandmark sjump MomPhoneLandmark
.goldenrod .goldenrod
getlandmarkname STRING_BUFFER_4, RADIO_TOWER getlandmarkname STRING_BUFFER_4, RADIO_TOWER
jump MomPhoneLandmark sjump MomPhoneLandmark
MomPhonePalette2: MomPhonePalette2:
farwritetext MomOtherAreaText farwritetext MomOtherAreaText
buttonsound buttonsound
jump MomSavingMoney sjump MomSavingMoney
MomPhoneOther: MomPhoneOther:
farwritetext MomDeterminedText farwritetext MomDeterminedText
buttonsound buttonsound
jump MomSavingMoney sjump MomSavingMoney
MomSavingMoney: MomSavingMoney:
checkflag ENGINE_MOM_SAVING_MONEY checkflag ENGINE_MOM_SAVING_MONEY
iffalse .NotSaving iffalse .NotSaving
checkmoney MOMS_MONEY, 0 checkmoney MOMS_MONEY, 0
ifequal HAVE_MORE, .SavingHasMoney ifequal HAVE_MORE, .SavingHasMoney
jump .SavingNoMoney sjump .SavingNoMoney
.NotSaving: .NotSaving:
checkmoney MOMS_MONEY, 0 checkmoney MOMS_MONEY, 0
ifequal HAVE_MORE, .HasMoney ifequal HAVE_MORE, .HasMoney
jump .NoMoney sjump .NoMoney
.SavingHasMoney: .SavingHasMoney:
getmoney STRING_BUFFER_3, MOMS_MONEY getmoney STRING_BUFFER_3, MOMS_MONEY
farwritetext MomCheckBalanceText farwritetext MomCheckBalanceText
yesorno yesorno
iftrue MomPhoneSaveMoneyScript iftrue MomPhoneSaveMoneyScript
jump MomPhoneWontSaveMoneyScript sjump MomPhoneWontSaveMoneyScript
.SavingNoMoney: .SavingNoMoney:
farwritetext MomImportantToSaveText farwritetext MomImportantToSaveText
yesorno yesorno
iftrue MomPhoneSaveMoneyScript iftrue MomPhoneSaveMoneyScript
jump MomPhoneWontSaveMoneyScript sjump MomPhoneWontSaveMoneyScript
.NoMoney: .NoMoney:
farwritetext MomYoureNotSavingText farwritetext MomYoureNotSavingText
yesorno yesorno
iftrue MomPhoneSaveMoneyScript iftrue MomPhoneSaveMoneyScript
jump MomPhoneWontSaveMoneyScript sjump MomPhoneWontSaveMoneyScript
.HasMoney: .HasMoney:
getmoney STRING_BUFFER_3, MOMS_MONEY getmoney STRING_BUFFER_3, MOMS_MONEY
farwritetext MomYouveSavedText farwritetext MomYouveSavedText
yesorno yesorno
iftrue MomPhoneSaveMoneyScript iftrue MomPhoneSaveMoneyScript
jump MomPhoneWontSaveMoneyScript sjump MomPhoneWontSaveMoneyScript
MomPhoneSaveMoneyScript: MomPhoneSaveMoneyScript:
setflag ENGINE_MOM_SAVING_MONEY setflag ENGINE_MOM_SAVING_MONEY
farwritetext MomOKIllSaveText farwritetext MomOKIllSaveText
buttonsound buttonsound
jump MomPhoneHangUpScript sjump MomPhoneHangUpScript
MomPhoneWontSaveMoneyScript: MomPhoneWontSaveMoneyScript:
clearflag ENGINE_MOM_SAVING_MONEY clearflag ENGINE_MOM_SAVING_MONEY
farwritetext MomPhoneWontSaveMoneyText farwritetext MomPhoneWontSaveMoneyText
buttonsound buttonsound
jump MomPhoneHangUpScript sjump MomPhoneHangUpScript
MomPhoneHangUpScript: MomPhoneHangUpScript:
farwritetext MomPhoneHangUpText farwritetext MomPhoneHangUpText
@ -139,4 +139,4 @@ MomPhoneLectureScript:
farwritetext MomPhoneLectureText farwritetext MomPhoneLectureText
yesorno yesorno
iftrue MomPhoneSaveMoneyScript iftrue MomPhoneSaveMoneyScript
jump MomPhoneWontSaveMoneyScript sjump MomPhoneWontSaveMoneyScript

8
engine/phone/scripts/parry.asm
View File

@ -11,11 +11,11 @@ ParryPhoneCalleeScript:
iftrue ParryFridayDay iftrue ParryFridayDay
.WantsRematch: .WantsRematch:
farjump ParryBattleWithMe farsjump ParryBattleWithMe
.WantsBattle: .WantsBattle:
getlandmarkname STRING_BUFFER_5, ROUTE_45 getlandmarkname STRING_BUFFER_5, ROUTE_45
farjump ParryHaventYouGottenTo farsjump ParryHaventYouGottenTo
ParryPhoneCallerScript: ParryPhoneCallerScript:
gettrainername STRING_BUFFER_3, HIKER, PARRY1 gettrainername STRING_BUFFER_3, HIKER, PARRY1
@ -29,7 +29,7 @@ ParryPhoneCallerScript:
ifequal 1, ParryWantsBattle ifequal 1, ParryWantsBattle
.GenericCall: .GenericCall:
farjump Phone_GenericCall_Male farsjump Phone_GenericCall_Male
ParryFridayDay: ParryFridayDay:
setflag ENGINE_PARRY_FRIDAY_AFTERNOON setflag ENGINE_PARRY_FRIDAY_AFTERNOON
@ -37,4 +37,4 @@ ParryFridayDay:
ParryWantsBattle: ParryWantsBattle:
getlandmarkname STRING_BUFFER_5, ROUTE_45 getlandmarkname STRING_BUFFER_5, ROUTE_45
setflag ENGINE_PARRY setflag ENGINE_PARRY
farjump PhoneScript_WantsToBattle_Male farsjump PhoneScript_WantsToBattle_Male

14
engine/phone/scripts/ralph.asm
View File

@ -12,15 +12,15 @@ RalphPhoneCalleeScript:
.CheckSwarm: .CheckSwarm:
checkflag ENGINE_FISH_SWARM checkflag ENGINE_FISH_SWARM
iftrue .ReportSwarm iftrue .ReportSwarm
farjump UnknownScript_0xa0940 farsjump UnknownScript_0xa0940
.Rematch: .Rematch:
getlandmarkname STRING_BUFFER_5, ROUTE_32 getlandmarkname STRING_BUFFER_5, ROUTE_32
farjump UnknownScript_0xa0a55 farsjump UnknownScript_0xa0a55
.ReportSwarm: .ReportSwarm:
getlandmarkname STRING_BUFFER_5, ROUTE_32 getlandmarkname STRING_BUFFER_5, ROUTE_32
farjump UnknownScript_0xa0af5 farsjump UnknownScript_0xa0af5
RalphPhoneCallerScript: RalphPhoneCallerScript:
gettrainername STRING_BUFFER_3, FISHER, RALPH1 gettrainername STRING_BUFFER_3, FISHER, RALPH1
@ -36,14 +36,14 @@ RalphPhoneCallerScript:
.CheckSwarm: .CheckSwarm:
farscall PhoneScript_Random5 farscall PhoneScript_Random5
ifequal 0, Ralph_SetUpSwarm ifequal 0, Ralph_SetUpSwarm
farjump Phone_GenericCall_Male farsjump Phone_GenericCall_Male
Ralph_WednesdayMorning: Ralph_WednesdayMorning:
setflag ENGINE_RALPH_WEDNESDAY_MORNING setflag ENGINE_RALPH_WEDNESDAY_MORNING
Ralph_FightMe: Ralph_FightMe:
getlandmarkname STRING_BUFFER_5, ROUTE_32 getlandmarkname STRING_BUFFER_5, ROUTE_32
setflag ENGINE_RALPH setflag ENGINE_RALPH
farjump PhoneScript_WantsToBattle_Male farsjump PhoneScript_WantsToBattle_Male
Ralph_SetUpSwarm: Ralph_SetUpSwarm:
checkflag ENGINE_FISH_SWARM checkflag ENGINE_FISH_SWARM
@ -53,7 +53,7 @@ Ralph_SetUpSwarm:
getlandmarkname STRING_BUFFER_5, ROUTE_32 getlandmarkname STRING_BUFFER_5, ROUTE_32
setval FISHSWARM_QWILFISH setval FISHSWARM_QWILFISH
special ActivateFishingSwarm special ActivateFishingSwarm
farjump UnknownScript_0xa05d6 farsjump UnknownScript_0xa05d6
.Generic: .Generic:
farjump Phone_GenericCall_Male farsjump Phone_GenericCall_Male

8
engine/phone/scripts/reena.asm
View File

@ -11,11 +11,11 @@ ReenaPhoneCalleeScript:
iftrue ReenaSundayMorning iftrue ReenaSundayMorning
.NotSunday: .NotSunday:
farjump UnknownScript_0xa0928 farsjump UnknownScript_0xa0928
.WantsBattle: .WantsBattle:
getlandmarkname STRING_BUFFER_5, ROUTE_27 getlandmarkname STRING_BUFFER_5, ROUTE_27
farjump UnknownScript_0xa0a46 farsjump UnknownScript_0xa0a46
ReenaPhoneCallerScript: ReenaPhoneCallerScript:
gettrainername STRING_BUFFER_3, COOLTRAINERF, REENA1 gettrainername STRING_BUFFER_3, COOLTRAINERF, REENA1
@ -28,7 +28,7 @@ ReenaPhoneCallerScript:
ifequal 0, ReenaWantsBattle ifequal 0, ReenaWantsBattle
.Generic: .Generic:
farjump Phone_GenericCall_Female farsjump Phone_GenericCall_Female
ReenaSundayMorning: ReenaSundayMorning:
setflag ENGINE_REENA_SUNDAY_MORNING setflag ENGINE_REENA_SUNDAY_MORNING
@ -36,4 +36,4 @@ ReenaSundayMorning:
ReenaWantsBattle: ReenaWantsBattle:
getlandmarkname STRING_BUFFER_5, ROUTE_27 getlandmarkname STRING_BUFFER_5, ROUTE_27
setflag ENGINE_REENA setflag ENGINE_REENA
farjump PhoneScript_WantsToBattle_Female farsjump PhoneScript_WantsToBattle_Female

26
engine/phone/scripts/tiffany.asm
View File

@ -13,15 +13,15 @@ TiffanyPhoneCalleeScript:
iftrue TiffanyTuesdayAfternoon iftrue TiffanyTuesdayAfternoon
.NotTuesday: .NotTuesday:
farjump UnknownScript_0xa09a0 farsjump UnknownScript_0xa09a0
.WantsBattle: .WantsBattle:
getlandmarkname STRING_BUFFER_5, ROUTE_43 getlandmarkname STRING_BUFFER_5, ROUTE_43
farjump UnknownScript_0xa0a8c farsjump UnknownScript_0xa0a8c
.HasItem: .HasItem:
getlandmarkname STRING_BUFFER_5, ROUTE_43 getlandmarkname STRING_BUFFER_5, ROUTE_43
farjump UnknownScript_0xa0ae5 farsjump UnknownScript_0xa0ae5
TiffanyPhoneCallerScript: TiffanyPhoneCallerScript:
gettrainername STRING_BUFFER_3, PICNICKER, TIFFANY3 gettrainername STRING_BUFFER_3, PICNICKER, TIFFANY3
@ -46,7 +46,7 @@ TiffanyPhoneCallerScript:
ifequal 0, TiffanyHasPinkBow ifequal 0, TiffanyHasPinkBow
.Generic: .Generic:
farjump Phone_GenericCall_Female farsjump Phone_GenericCall_Female
TiffanyTuesdayAfternoon: TiffanyTuesdayAfternoon:
setflag ENGINE_TIFFANY_TUESDAY_AFTERNOON setflag ENGINE_TIFFANY_TUESDAY_AFTERNOON
@ -54,7 +54,7 @@ TiffanyTuesdayAfternoon:
TiffanyWantsBattle: TiffanyWantsBattle:
getlandmarkname STRING_BUFFER_5, ROUTE_43 getlandmarkname STRING_BUFFER_5, ROUTE_43
setflag ENGINE_TIFFANY setflag ENGINE_TIFFANY
farjump PhoneScript_WantsToBattle_Female farsjump PhoneScript_WantsToBattle_Female
TiffanysFamilyMembers: TiffanysFamilyMembers:
random 6 random 6
@ -67,32 +67,32 @@ TiffanysFamilyMembers:
.Grandma: .Grandma:
getstring STRING_BUFFER_4, GrandmaString getstring STRING_BUFFER_4, GrandmaString
jump .PoorClefairy sjump .PoorClefairy
.Grandpa: .Grandpa:
getstring STRING_BUFFER_4, GrandpaString getstring STRING_BUFFER_4, GrandpaString
jump .PoorClefairy sjump .PoorClefairy
.Mom: .Mom:
getstring STRING_BUFFER_4, MomString getstring STRING_BUFFER_4, MomString
jump .PoorClefairy sjump .PoorClefairy
.Dad: .Dad:
getstring STRING_BUFFER_4, DadString getstring STRING_BUFFER_4, DadString
jump .PoorClefairy sjump .PoorClefairy
.Sister: .Sister:
getstring STRING_BUFFER_4, SisterString getstring STRING_BUFFER_4, SisterString
jump .PoorClefairy sjump .PoorClefairy
.Brother: .Brother:
getstring STRING_BUFFER_4, BrotherString getstring STRING_BUFFER_4, BrotherString
jump .PoorClefairy sjump .PoorClefairy
.PoorClefairy: .PoorClefairy:
farjump TiffanyItsAwful farsjump TiffanyItsAwful
TiffanyHasPinkBow: TiffanyHasPinkBow:
setflag ENGINE_TIFFANY_HAS_PINK_BOW setflag ENGINE_TIFFANY_HAS_PINK_BOW
getlandmarkname STRING_BUFFER_5, ROUTE_43 getlandmarkname STRING_BUFFER_5, ROUTE_43
farjump PhoneScript_FoundItem_Female farsjump PhoneScript_FoundItem_Female

14
engine/phone/scripts/todd.asm
View File

@ -13,14 +13,14 @@ ToddPhoneCalleeScript:
.NotSaturday: .NotSaturday:
checkflag ENGINE_GOLDENROD_DEPT_STORE_SALE_IS_ON checkflag ENGINE_GOLDENROD_DEPT_STORE_SALE_IS_ON
iftrue .SaleOn iftrue .SaleOn
farjump UnknownScript_0xa0958 farsjump UnknownScript_0xa0958
.WantsBattle: .WantsBattle:
getlandmarkname STRING_BUFFER_5, ROUTE_34 getlandmarkname STRING_BUFFER_5, ROUTE_34
farjump UnknownScript_0xa0a64 farsjump UnknownScript_0xa0a64
.SaleOn: .SaleOn:
farjump UnknownScript_0xa0b04 farsjump UnknownScript_0xa0b04
ToddPhoneCallerScript: ToddPhoneCallerScript:
gettrainername STRING_BUFFER_3, CAMPER, TODD1 gettrainername STRING_BUFFER_3, CAMPER, TODD1
@ -41,7 +41,7 @@ ToddPhoneCallerScript:
.NoGoldenrod: .NoGoldenrod:
farscall PhoneScript_Random3 farscall PhoneScript_Random3
ifequal 0, ToddFoundRare ifequal 0, ToddFoundRare
farjump Phone_GenericCall_Male farsjump Phone_GenericCall_Male
ToddSaturdayMorning: ToddSaturdayMorning:
setflag ENGINE_TODD_SATURDAY_MORNING setflag ENGINE_TODD_SATURDAY_MORNING
@ -49,11 +49,11 @@ ToddSaturdayMorning:
ToddWantsBattle: ToddWantsBattle:
getlandmarkname STRING_BUFFER_5, ROUTE_34 getlandmarkname STRING_BUFFER_5, ROUTE_34
setflag ENGINE_TODD setflag ENGINE_TODD
farjump PhoneScript_WantsToBattle_Male farsjump PhoneScript_WantsToBattle_Male
ToddFoundRare: ToddFoundRare:
farjump Phone_CheckIfUnseenRare_Male farsjump Phone_CheckIfUnseenRare_Male
ToddDeptStoreSale: ToddDeptStoreSale:
setflag ENGINE_GOLDENROD_DEPT_STORE_SALE_IS_ON setflag ENGINE_GOLDENROD_DEPT_STORE_SALE_IS_ON
farjump UnknownScript_0xa0644 farsjump UnknownScript_0xa0644

12
engine/phone/scripts/tully.asm
View File

@ -13,15 +13,15 @@ TullyPhoneCalleeScript:
iftrue TullySundayNight iftrue TullySundayNight
.NotSunday: .NotSunday:
farjump UnknownScript_0xa0990 farsjump UnknownScript_0xa0990
.WantsBattle: .WantsBattle:
getlandmarkname STRING_BUFFER_5, ROUTE_42 getlandmarkname STRING_BUFFER_5, ROUTE_42
farjump UnknownScript_0xa0a82 farsjump UnknownScript_0xa0a82
.WaterStone: .WaterStone:
getlandmarkname STRING_BUFFER_5, ROUTE_42 getlandmarkname STRING_BUFFER_5, ROUTE_42
farjump UnknownScript_0xa0add farsjump UnknownScript_0xa0add
TullyPhoneCallerScript: TullyPhoneCallerScript:
gettrainername STRING_BUFFER_3, FISHER, TULLY1 gettrainername STRING_BUFFER_3, FISHER, TULLY1
@ -44,7 +44,7 @@ TullyPhoneCallerScript:
ifequal 0, TullyFoundWaterStone ifequal 0, TullyFoundWaterStone
.Generic: .Generic:
farjump Phone_GenericCall_Male farsjump Phone_GenericCall_Male
TullySundayNight: TullySundayNight:
setflag ENGINE_TULLY_SUNDAY_NIGHT setflag ENGINE_TULLY_SUNDAY_NIGHT
@ -52,9 +52,9 @@ TullySundayNight:
TullyWantsBattle: TullyWantsBattle:
getlandmarkname STRING_BUFFER_5, ROUTE_42 getlandmarkname STRING_BUFFER_5, ROUTE_42
setflag ENGINE_TULLY setflag ENGINE_TULLY
farjump PhoneScript_WantsToBattle_Male farsjump PhoneScript_WantsToBattle_Male
TullyFoundWaterStone: TullyFoundWaterStone:
setflag ENGINE_TULLY_HAS_WATER_STONE setflag ENGINE_TULLY_HAS_WATER_STONE
getlandmarkname STRING_BUFFER_5, ROUTE_42 getlandmarkname STRING_BUFFER_5, ROUTE_42
farjump PhoneScript_FoundItem_Male farsjump PhoneScript_FoundItem_Male

8
engine/phone/scripts/vance.asm
View File

@ -11,11 +11,11 @@ VancePhoneCalleeScript:
iftrue VanceWednesdayNight iftrue VanceWednesdayNight
.NotWednesday: .NotWednesday:
farjump VanceLookingForward farsjump VanceLookingForward
.WantsBattle: .WantsBattle:
getlandmarkname STRING_BUFFER_5, ROUTE_44 getlandmarkname STRING_BUFFER_5, ROUTE_44
farjump VanceHurryHurry farsjump VanceHurryHurry
VancePhoneCallerScript: VancePhoneCallerScript:
gettrainername STRING_BUFFER_3, BIRD_KEEPER, VANCE1 gettrainername STRING_BUFFER_3, BIRD_KEEPER, VANCE1
@ -29,7 +29,7 @@ VancePhoneCallerScript:
ifequal 1, VanceWantsRematch ifequal 1, VanceWantsRematch
.WantsBattle: .WantsBattle:
farjump Phone_GenericCall_Male farsjump Phone_GenericCall_Male
VanceWednesdayNight: VanceWednesdayNight:
setflag ENGINE_VANCE_WEDNESDAY_NIGHT setflag ENGINE_VANCE_WEDNESDAY_NIGHT
@ -37,4 +37,4 @@ VanceWednesdayNight:
VanceWantsRematch: VanceWantsRematch:
getlandmarkname STRING_BUFFER_5, ROUTE_44 getlandmarkname STRING_BUFFER_5, ROUTE_44
setflag ENGINE_VANCE setflag ENGINE_VANCE
farjump PhoneScript_WantsToBattle_Male farsjump PhoneScript_WantsToBattle_Male

24
engine/phone/scripts/wade.asm
View File

@ -23,18 +23,18 @@ WadePhoneCalleeScript:
ifequal SATURDAY, .ContestToday ifequal SATURDAY, .ContestToday
.NoContest: .NoContest:
farjump UnknownScript_0xa0938 farsjump UnknownScript_0xa0938
.ContestToday: .ContestToday:
farjump PhoneScript_BugCatchingContest farsjump PhoneScript_BugCatchingContest
.WantsBattle: .WantsBattle:
getlandmarkname STRING_BUFFER_5, ROUTE_31 getlandmarkname STRING_BUFFER_5, ROUTE_31
farjump UnknownScript_0xa0a50 farsjump UnknownScript_0xa0a50
.HasItem: .HasItem:
getlandmarkname STRING_BUFFER_5, ROUTE_31 getlandmarkname STRING_BUFFER_5, ROUTE_31
farjump UnknownScript_0xa0ab5 farsjump UnknownScript_0xa0ab5
WadePhoneCallerScript: WadePhoneCallerScript:
gettrainername STRING_BUFFER_3, BUG_CATCHER, WADE1 gettrainername STRING_BUFFER_3, BUG_CATCHER, WADE1
@ -65,10 +65,10 @@ WadePhoneCallerScript:
.next: .next:
farscall PhoneScript_Random3 farscall PhoneScript_Random3
ifequal 0, WadeFoundRare ifequal 0, WadeFoundRare
farjump Phone_GenericCall_Male farsjump Phone_GenericCall_Male
.ContestToday: .ContestToday:
farjump PhoneScript_BugCatchingContest farsjump PhoneScript_BugCatchingContest
WadeTuesdayNight: WadeTuesdayNight:
setflag ENGINE_WADE_TUESDAY_NIGHT setflag ENGINE_WADE_TUESDAY_NIGHT
@ -76,10 +76,10 @@ WadeTuesdayNight:
WadeWantsBattle2: WadeWantsBattle2:
getlandmarkname STRING_BUFFER_5, ROUTE_31 getlandmarkname STRING_BUFFER_5, ROUTE_31
setflag ENGINE_WADE setflag ENGINE_WADE
farjump PhoneScript_WantsToBattle_Male farsjump PhoneScript_WantsToBattle_Male
WadeFoundRare: WadeFoundRare:
farjump Phone_CheckIfUnseenRare_Male farsjump Phone_CheckIfUnseenRare_Male
WadeHasItem2: WadeHasItem2:
setflag ENGINE_WADE_HAS_ITEM setflag ENGINE_WADE_HAS_ITEM
@ -96,18 +96,18 @@ WadeHasItem2:
.Berry: .Berry:
setevent EVENT_WADE_HAS_BERRY setevent EVENT_WADE_HAS_BERRY
jump .FoundBerry sjump .FoundBerry
.PsnCureBerry: .PsnCureBerry:
setevent EVENT_WADE_HAS_PSNCUREBERRY setevent EVENT_WADE_HAS_PSNCUREBERRY
jump .FoundBerry sjump .FoundBerry
.PrzCureBerry: .PrzCureBerry:
setevent EVENT_WADE_HAS_PRZCUREBERRY setevent EVENT_WADE_HAS_PRZCUREBERRY
jump .FoundBerry sjump .FoundBerry
.Bitterberry: .Bitterberry:
setevent EVENT_WADE_HAS_BITTER_BERRY setevent EVENT_WADE_HAS_BITTER_BERRY
.FoundBerry: .FoundBerry:
farjump PhoneScript_FoundItem_Male farsjump PhoneScript_FoundItem_Male

18
engine/phone/scripts/wilton.asm
View File

@ -13,15 +13,15 @@ WiltonPhoneCalleeScript:
iftrue WiltonThursdayMorning iftrue WiltonThursdayMorning
.NotThursday: .NotThursday:
farjump WiltonHaventFoundAnything farsjump WiltonHaventFoundAnything
.WantsBattle: .WantsBattle:
getlandmarkname STRING_BUFFER_5, ROUTE_44 getlandmarkname STRING_BUFFER_5, ROUTE_44
farjump WiltonNotBiting farsjump WiltonNotBiting
.HasItem: .HasItem:
getlandmarkname STRING_BUFFER_5, ROUTE_44 getlandmarkname STRING_BUFFER_5, ROUTE_44
farjump WiltonWantThis farsjump WiltonWantThis
WiltonPhoneCallerScript: WiltonPhoneCallerScript:
gettrainername STRING_BUFFER_3, FISHER, WILTON1 gettrainername STRING_BUFFER_3, FISHER, WILTON1
@ -38,7 +38,7 @@ WiltonPhoneCallerScript:
ifequal 0, WiltonHasItem ifequal 0, WiltonHasItem
.GenericCall: .GenericCall:
farjump Phone_GenericCall_Male farsjump Phone_GenericCall_Male
WiltonThursdayMorning: WiltonThursdayMorning:
setflag ENGINE_WILTON_THURSDAY_MORNING setflag ENGINE_WILTON_THURSDAY_MORNING
@ -46,7 +46,7 @@ WiltonThursdayMorning:
WiltonWantsBattle: WiltonWantsBattle:
getlandmarkname STRING_BUFFER_5, ROUTE_44 getlandmarkname STRING_BUFFER_5, ROUTE_44
setflag ENGINE_WILTON setflag ENGINE_WILTON
farjump PhoneScript_WantsToBattle_Male farsjump PhoneScript_WantsToBattle_Male
WiltonHasItem: WiltonHasItem:
setflag ENGINE_WILTON_HAS_ITEM setflag ENGINE_WILTON_HAS_ITEM
@ -58,18 +58,18 @@ WiltonHasItem:
ifequal 0, .UltraBall ifequal 0, .UltraBall
random 3 random 3
ifequal 0, .GreatBall ifequal 0, .GreatBall
jump .PokeBall sjump .PokeBall
.UltraBall: .UltraBall:
setevent EVENT_WILTON_HAS_ULTRA_BALL setevent EVENT_WILTON_HAS_ULTRA_BALL
jump .FoundItem sjump .FoundItem
.GreatBall: .GreatBall:
setevent EVENT_WILTON_HAS_GREAT_BALL setevent EVENT_WILTON_HAS_GREAT_BALL
jump .FoundItem sjump .FoundItem
.PokeBall: .PokeBall:
setevent EVENT_WILTON_HAS_POKE_BALL setevent EVENT_WILTON_HAS_POKE_BALL
.FoundItem: .FoundItem:
farjump PhoneScript_FoundItem_Male farsjump PhoneScript_FoundItem_Male

8
macros/legacy.asm
View File

@ -15,6 +15,14 @@ checkmorn EQUS "checktime MORN"
checkday EQUS "checktime DAY" checkday EQUS "checktime DAY"
checknite EQUS "checktime NITE" checknite EQUS "checktime NITE"
jump EQUS "sjump"
farjump EQUS "farsjump"
priorityjump EQUS "prioritysjump"
ptcall EQUS "memcall"
ptjump EQUS "memjump"
ptpriorityjump EQUS "stopandsjump"
ptcallasm EQUS "memcallasm"
if_equal EQUS "ifequal" if_equal EQUS "ifequal"
if_not_equal EQUS "ifnotequal" if_not_equal EQUS "ifnotequal"
if_greater_than EQUS "ifgreater" if_greater_than EQUS "ifgreater"

42
macros/scripts/events.asm
View File

@ -13,27 +13,27 @@ farscall: MACRO
dba \1 dba \1
ENDM ENDM
enum ptcall_command ; $02 enum memcall_command ; $02
ptcall: MACRO memcall: MACRO
db ptcall_command db memcall_command
dw \1 ; pointer dw \1 ; pointer
ENDM ENDM
enum jump_command ; $03 enum sjump_command ; $03
jump: MACRO sjump: MACRO
db jump_command db sjump_command
dw \1 ; pointer dw \1 ; pointer
ENDM ENDM
enum farjump_command ; $04 enum farsjump_command ; $04
farjump: MACRO farsjump: MACRO
db farjump_command db farsjump_command
dba \1 dba \1
ENDM ENDM
enum ptjump_command ; $05 enum memjump_command ; $05
ptjump: MACRO memjump: MACRO
db ptjump_command db memjump_command
dw \1 ; pointer dw \1 ; pointer
ENDM ENDM
@ -101,9 +101,9 @@ special: MACRO
dw (\1Special - SpecialsPointers) / 3 dw (\1Special - SpecialsPointers) / 3
ENDM ENDM
enum ptcallasm_command ; $10 enum memcallasm_command ; $10
ptcallasm: MACRO memcallasm: MACRO
db ptcallasm_command db memcallasm_command
dw \1 ; asm dw \1 ; asm
ENDM ENDM
@ -885,9 +885,9 @@ deactivatefacing: MACRO
db \1 ; time db \1 ; time
ENDM ENDM
enum priorityjump_command ; $8d enum prioritysjump_command ; $8d
priorityjump: MACRO prioritysjump: MACRO
db priorityjump_command db prioritysjump_command
dw \1 ; pointer dw \1 ; pointer
ENDM ENDM
@ -896,9 +896,9 @@ warpcheck: MACRO
db warpcheck_command db warpcheck_command
ENDM ENDM
enum ptpriorityjump_command ; $8f enum stopandsjump_command ; $8f
ptpriorityjump: MACRO stopandsjump: MACRO
db ptpriorityjump_command db stopandsjump_command
dw \1 ; pointer dw \1 ; pointer
ENDM ENDM

8
maps/AzaleaTown.asm
View File

@ -43,7 +43,7 @@ AzaleaTownRivalBattleScene1:
appear AZALEATOWN_SILVER appear AZALEATOWN_SILVER
applymovement AZALEATOWN_SILVER, AzaleaTownRivalBattleApproachMovement1 applymovement AZALEATOWN_SILVER, AzaleaTownRivalBattleApproachMovement1
turnobject PLAYER, DOWN turnobject PLAYER, DOWN
jump AzaleaTownRivalBattleScript sjump AzaleaTownRivalBattleScript
AzaleaTownRivalBattleScene2: AzaleaTownRivalBattleScene2:
turnobject PLAYER, RIGHT turnobject PLAYER, RIGHT
@ -70,7 +70,7 @@ AzaleaTownRivalBattleScript:
startbattle startbattle
dontrestartmapmusic dontrestartmapmusic
reloadmapafterbattle reloadmapafterbattle
jump .AfterBattle sjump .AfterBattle
.Totodile: .Totodile:
winlosstext AzaleaTownRivalWinText, AzaleaTownRivalLossText winlosstext AzaleaTownRivalWinText, AzaleaTownRivalLossText
@ -79,7 +79,7 @@ AzaleaTownRivalBattleScript:
startbattle startbattle
dontrestartmapmusic dontrestartmapmusic
reloadmapafterbattle reloadmapafterbattle
jump .AfterBattle sjump .AfterBattle
.Chikorita: .Chikorita:
winlosstext AzaleaTownRivalWinText, AzaleaTownRivalLossText winlosstext AzaleaTownRivalWinText, AzaleaTownRivalLossText
@ -88,7 +88,7 @@ AzaleaTownRivalBattleScript:
startbattle startbattle
dontrestartmapmusic dontrestartmapmusic
reloadmapafterbattle reloadmapafterbattle
jump .AfterBattle sjump .AfterBattle
.AfterBattle: .AfterBattle:
playmusic MUSIC_RIVAL_AFTER playmusic MUSIC_RIVAL_AFTER

28
maps/BattleTower1F.asm
View File

@ -19,18 +19,18 @@ BattleTower1F_MapScripts:
setval BATTLETOWERACTION_GET_CHALLENGE_STATE ; readmem sBattleTowerChallengeState setval BATTLETOWERACTION_GET_CHALLENGE_STATE ; readmem sBattleTowerChallengeState
special BattleTowerAction special BattleTowerAction
ifequal $0, .SkipEverything ifequal $0, .SkipEverything
ifequal $2, .priorityjump1 ifequal $2, .LeftWithoutSaving
ifequal $3, .SkipEverything ifequal $3, .SkipEverything
ifequal $4, .SkipEverything ifequal $4, .SkipEverything
opentext opentext
writetext Text_WeveBeenWaitingForYou writetext Text_WeveBeenWaitingForYou
waitbutton waitbutton
closetext closetext
priorityjump Script_ResumeBattleTowerChallenge prioritysjump Script_ResumeBattleTowerChallenge
end end
.priorityjump1 .LeftWithoutSaving
priorityjump BattleTower_LeftWithoutSaving prioritysjump BattleTower_LeftWithoutSaving
setval BATTLETOWERACTION_CHALLENGECANCELED setval BATTLETOWERACTION_CHALLENGECANCELED
special BattleTowerAction special BattleTowerAction
setval BATTLETOWERACTION_06 setval BATTLETOWERACTION_06
@ -61,7 +61,7 @@ BattleTower1FReceptionistScript:
setval BATTLETOWERACTION_CHECK_EXPLANATION_READ ; if new save file: bit 1, [sBattleTowerSaveFileFlags] setval BATTLETOWERACTION_CHECK_EXPLANATION_READ ; if new save file: bit 1, [sBattleTowerSaveFileFlags]
special BattleTowerAction special BattleTowerAction
ifnotequal $0, Script_Menu_ChallengeExplanationCancel ifnotequal $0, Script_Menu_ChallengeExplanationCancel
jump Script_BattleTowerIntroductionYesNo sjump Script_BattleTowerIntroductionYesNo
Script_Menu_ChallengeExplanationCancel: Script_Menu_ChallengeExplanationCancel:
writetext Text_WantToGoIntoABattleRoom writetext Text_WantToGoIntoABattleRoom
@ -69,7 +69,7 @@ Script_Menu_ChallengeExplanationCancel:
special Menu_ChallengeExplanationCancel special Menu_ChallengeExplanationCancel
ifequal 1, Script_ChooseChallenge ifequal 1, Script_ChooseChallenge
ifequal 2, Script_BattleTowerExplanation ifequal 2, Script_BattleTowerExplanation
jump Script_BattleTowerHopeToServeYouAgain sjump Script_BattleTowerHopeToServeYouAgain
Script_ChooseChallenge: Script_ChooseChallenge:
setval BATTLETOWERACTION_RESETDATA ; ResetBattleTowerTrainerSRAM setval BATTLETOWERACTION_RESETDATA ; ResetBattleTowerTrainerSRAM
@ -95,7 +95,7 @@ Script_ChooseChallenge:
closetext closetext
setval BATTLETOWERACTION_CHOOSEREWARD setval BATTLETOWERACTION_CHOOSEREWARD
special BattleTowerAction special BattleTowerAction
jump Script_WalkToBattleTowerElevator sjump Script_WalkToBattleTowerElevator
Script_ResumeBattleTowerChallenge: Script_ResumeBattleTowerChallenge:
closetext closetext
@ -146,7 +146,7 @@ Script_BattleTowerExplanation:
Script_BattleTowerSkipExplanation: Script_BattleTowerSkipExplanation:
setval BATTLETOWERACTION_SET_EXPLANATION_READ setval BATTLETOWERACTION_SET_EXPLANATION_READ
special BattleTowerAction special BattleTowerAction
jump Script_Menu_ChallengeExplanationCancel sjump Script_Menu_ChallengeExplanationCancel
Script_BattleTowerHopeToServeYouAgain: Script_BattleTowerHopeToServeYouAgain:
writetext Text_WeHopeToServeYouAgain writetext Text_WeHopeToServeYouAgain
@ -196,7 +196,7 @@ UnreferencedScript_0x9e4ea:
special BattleTowerAction special BattleTowerAction
ifequal $0, .zero ifequal $0, .zero
writetext Text_CantBeRegistered_PreviousRecordDeleted writetext Text_CantBeRegistered_PreviousRecordDeleted
jump continue sjump continue
.zero .zero
writetext Text_CantBeRegistered writetext Text_CantBeRegistered
@ -216,22 +216,22 @@ continue:
special BattleTowerAction special BattleTowerAction
writetext Text_RightThisWayToYourBattleRoom writetext Text_RightThisWayToYourBattleRoom
waitbutton waitbutton
jump Script_ResumeBattleTowerChallenge sjump Script_ResumeBattleTowerChallenge
UnreferencedScript_0x9e53b: UnreferencedScript_0x9e53b:
writetext Text_FiveDayBattleLimit_Mobile writetext Text_FiveDayBattleLimit_Mobile
waitbutton waitbutton
jump Script_BattleTowerHopeToServeYouAgain sjump Script_BattleTowerHopeToServeYouAgain
Script_AMonLevelExceeds: Script_AMonLevelExceeds:
writetext Text_AMonLevelExceeds writetext Text_AMonLevelExceeds
waitbutton waitbutton
jump Script_Menu_ChallengeExplanationCancel sjump Script_Menu_ChallengeExplanationCancel
Script_MayNotEnterABattleRoomUnderL70: Script_MayNotEnterABattleRoomUnderL70:
writetext Text_MayNotEnterABattleRoomUnderL70 writetext Text_MayNotEnterABattleRoomUnderL70
waitbutton waitbutton
jump Script_Menu_ChallengeExplanationCancel sjump Script_Menu_ChallengeExplanationCancel
Script_MobileError: Script_MobileError:
special BattleTowerMobileError special BattleTowerMobileError
@ -242,7 +242,7 @@ BattleTower_LeftWithoutSaving:
opentext opentext
writetext Text_BattleTower_LeftWithoutSaving writetext Text_BattleTower_LeftWithoutSaving
waitbutton waitbutton
jump Script_BattleTowerHopeToServeYouAgain sjump Script_BattleTowerHopeToServeYouAgain
BattleTower1FYoungsterScript: BattleTower1FYoungsterScript:
faceplayer faceplayer

8
maps/BattleTowerBattleRoom.asm
View File

@ -11,7 +11,7 @@ BattleTowerBattleRoom_MapScripts:
.EnterBattleRoom: .EnterBattleRoom:
disappear BATTLETOWERBATTLEROOM_YOUNGSTER disappear BATTLETOWERBATTLEROOM_YOUNGSTER
priorityjump Script_BattleRoom prioritysjump Script_BattleRoom
setscene SCENE_FINISHED setscene SCENE_FINISHED
.DummyScene: .DummyScene:
end end
@ -59,7 +59,7 @@ Script_ContinueAndBattleNextOpponent:
closetext closetext
applymovement PLAYER, MovementData_BattleTowerBattleRoomPlayerTurnsToFaceNextOpponent applymovement PLAYER, MovementData_BattleTowerBattleRoomPlayerTurnsToFaceNextOpponent
applymovement BATTLETOWERBATTLEROOM_RECEPTIONIST, MovementData_BattleTowerBattleRoomReceptionistWalksAway applymovement BATTLETOWERBATTLEROOM_RECEPTIONIST, MovementData_BattleTowerBattleRoomReceptionistWalksAway
jump Script_BattleRoomLoop sjump Script_BattleRoomLoop
Script_DontBattleNextOpponent: Script_DontBattleNextOpponent:
writetext Text_SaveAndEndTheSession writetext Text_SaveAndEndTheSession
@ -87,7 +87,7 @@ Script_DontSaveAndEndTheSession:
special FadeOutPalettes special FadeOutPalettes
warpfacing UP, BATTLE_TOWER_1F, 7, 7 warpfacing UP, BATTLE_TOWER_1F, 7, 7
opentext opentext
jump Script_BattleTowerHopeToServeYouAgain sjump Script_BattleTowerHopeToServeYouAgain
Script_FailedBattleTowerChallenge: Script_FailedBattleTowerChallenge:
pause 60 pause 60
@ -108,7 +108,7 @@ Script_BeatenAllTrainers:
Script_BeatenAllTrainers2: Script_BeatenAllTrainers2:
opentext opentext
writetext Text_CongratulationsYouveBeatenAllTheTrainers writetext Text_CongratulationsYouveBeatenAllTheTrainers
jump Script_GivePlayerHisPrize sjump Script_GivePlayerHisPrize
UnreferencedScript_0x9f4eb: UnreferencedScript_0x9f4eb:
setval BATTLETOWERACTION_CHALLENGECANCELED setval BATTLETOWERACTION_CHALLENGECANCELED

2
maps/BattleTowerElevator.asm
View File

@ -9,7 +9,7 @@ BattleTowerElevator_MapScripts:
db 0 ; callbacks db 0 ; callbacks
.Scene0: .Scene0:
priorityjump .RideElevator prioritysjump .RideElevator
setscene SCENE_FINISHED setscene SCENE_FINISHED
.Scene1: .Scene1:
end end

14
maps/BattleTowerHallway.asm
View File

@ -9,7 +9,7 @@ BattleTowerHallway_MapScripts:
db 0 ; callbacks db 0 ; callbacks
.Scene0: .Scene0:
priorityjump .ChooseBattleRoom prioritysjump .ChooseBattleRoom
setscene SCENE_FINISHED setscene SCENE_FINISHED
.Scene1: .Scene1:
end end
@ -17,7 +17,7 @@ BattleTowerHallway_MapScripts:
.ChooseBattleRoom: .ChooseBattleRoom:
follow BATTLETOWERHALLWAY_RECEPTIONIST, PLAYER follow BATTLETOWERHALLWAY_RECEPTIONIST, PLAYER
callasm .asm_load_battle_room callasm .asm_load_battle_room
jump .WalkToChosenBattleRoom sjump .WalkToChosenBattleRoom
.asm_load_battle_room .asm_load_battle_room
ldh a, [rSVBK] ldh a, [rSVBK]
@ -45,23 +45,23 @@ BattleTowerHallway_MapScripts:
ifequal 9, .L90L100 ifequal 9, .L90L100
ifequal 10, .L90L100 ifequal 10, .L90L100
applymovement BATTLETOWERHALLWAY_RECEPTIONIST, MovementData_BattleTowerHallwayWalkTo1020Room applymovement BATTLETOWERHALLWAY_RECEPTIONIST, MovementData_BattleTowerHallwayWalkTo1020Room
jump .EnterBattleRoom sjump .EnterBattleRoom
.L30L40: .L30L40:
applymovement BATTLETOWERHALLWAY_RECEPTIONIST, MovementData_BattleTowerHallwayWalkTo3040Room applymovement BATTLETOWERHALLWAY_RECEPTIONIST, MovementData_BattleTowerHallwayWalkTo3040Room
jump .EnterBattleRoom sjump .EnterBattleRoom
.L50L60: .L50L60:
applymovement BATTLETOWERHALLWAY_RECEPTIONIST, MovementData_BattleTowerHallwayWalkTo5060Room applymovement BATTLETOWERHALLWAY_RECEPTIONIST, MovementData_BattleTowerHallwayWalkTo5060Room
jump .EnterBattleRoom sjump .EnterBattleRoom
.L70L80: .L70L80:
applymovement BATTLETOWERHALLWAY_RECEPTIONIST, MovementData_BattleTowerHallwayWalkTo7080Room applymovement BATTLETOWERHALLWAY_RECEPTIONIST, MovementData_BattleTowerHallwayWalkTo7080Room
jump .EnterBattleRoom sjump .EnterBattleRoom
.L90L100: .L90L100:
applymovement BATTLETOWERHALLWAY_RECEPTIONIST, MovementData_BattleTowerHallwayWalkTo90100Room applymovement BATTLETOWERHALLWAY_RECEPTIONIST, MovementData_BattleTowerHallwayWalkTo90100Room
jump .EnterBattleRoom sjump .EnterBattleRoom
.EnterBattleRoom: .EnterBattleRoom:
faceobject PLAYER, BATTLETOWERHALLWAY_RECEPTIONIST faceobject PLAYER, BATTLETOWERHALLWAY_RECEPTIONIST

2
maps/BillsFamilysHouse.asm
View File

@ -95,7 +95,7 @@ BillsSisterScript:
.NoRoom: .NoRoom:
writetext BillsSisterPhoneFullText writetext BillsSisterPhoneFullText
buttonsound buttonsound
jump .Refused sjump .Refused
BillsHouseBookshelf1: BillsHouseBookshelf1:
jumpstd picturebookshelf jumpstd picturebookshelf

12
maps/BillsHouse.asm
View File

@ -40,7 +40,7 @@ BillsGrandpa:
ifnotequal LICKITUNG, .WrongPokemon ifnotequal LICKITUNG, .WrongPokemon
scall .CorrectPokemon scall .CorrectPokemon
setevent EVENT_SHOWED_LICKITUNG_TO_BILLS_GRANDPA setevent EVENT_SHOWED_LICKITUNG_TO_BILLS_GRANDPA
jump .ShowedLickitung sjump .ShowedLickitung
.GotEverstone: .GotEverstone:
writetext BillsGrandpaOddishText writetext BillsGrandpaOddishText
@ -54,7 +54,7 @@ BillsGrandpa:
ifnotequal ODDISH, .WrongPokemon ifnotequal ODDISH, .WrongPokemon
scall .CorrectPokemon scall .CorrectPokemon
setevent EVENT_SHOWED_ODDISH_TO_BILLS_GRANDPA setevent EVENT_SHOWED_ODDISH_TO_BILLS_GRANDPA
jump .ShowedOddish sjump .ShowedOddish
.GotLeafStone: .GotLeafStone:
writetext BillsGrandpaStaryuText writetext BillsGrandpaStaryuText
@ -68,7 +68,7 @@ BillsGrandpa:
ifnotequal STARYU, .WrongPokemon ifnotequal STARYU, .WrongPokemon
scall .CorrectPokemon scall .CorrectPokemon
setevent EVENT_SHOWED_STARYU_TO_BILLS_GRANDPA setevent EVENT_SHOWED_STARYU_TO_BILLS_GRANDPA
jump .ShowedStaryu sjump .ShowedStaryu
.GotWaterStone: .GotWaterStone:
checkver checkver
@ -84,7 +84,7 @@ BillsGrandpa:
ifnotequal GROWLITHE, .WrongPokemon ifnotequal GROWLITHE, .WrongPokemon
scall .CorrectPokemon scall .CorrectPokemon
setevent EVENT_SHOWED_GROWLITHE_VULPIX_TO_BILLS_GRANDPA setevent EVENT_SHOWED_GROWLITHE_VULPIX_TO_BILLS_GRANDPA
jump .ShowedGrowlitheVulpix sjump .ShowedGrowlitheVulpix
.AskVulpix: .AskVulpix:
writetext BillsGrandpaVulpixText writetext BillsGrandpaVulpixText
@ -98,7 +98,7 @@ BillsGrandpa:
ifnotequal VULPIX, .WrongPokemon ifnotequal VULPIX, .WrongPokemon
scall .CorrectPokemon scall .CorrectPokemon
setevent EVENT_SHOWED_GROWLITHE_VULPIX_TO_BILLS_GRANDPA setevent EVENT_SHOWED_GROWLITHE_VULPIX_TO_BILLS_GRANDPA
jump .ShowedGrowlitheVulpix sjump .ShowedGrowlitheVulpix
.GotFireStone: .GotFireStone:
writetext BillsGrandpaPichuText writetext BillsGrandpaPichuText
@ -112,7 +112,7 @@ BillsGrandpa:
ifnotequal PICHU, .WrongPokemon ifnotequal PICHU, .WrongPokemon
scall .CorrectPokemon scall .CorrectPokemon
setevent EVENT_SHOWED_PICHU_TO_BILLS_GRANDPA setevent EVENT_SHOWED_PICHU_TO_BILLS_GRANDPA
jump .ShowedPichu sjump .ShowedPichu
.ShowedLickitung: .ShowedLickitung:
checkevent EVENT_GOT_EVERSTONE_FROM_BILLS_GRANDPA checkevent EVENT_GOT_EVERSTONE_FROM_BILLS_GRANDPA

2
maps/BlackthornGym1F.asm
View File

@ -76,7 +76,7 @@ BlackthornGymClairScript:
setevent EVENT_GOT_TM24_DRAGONBREATH setevent EVENT_GOT_TM24_DRAGONBREATH
writetext BlackthornGymClairText_DescribeTM24 writetext BlackthornGymClairText_DescribeTM24
buttonsound buttonsound
jump .GotTM24 sjump .GotTM24
.BagFull: .BagFull:
writetext BlackthornGymClairText_BagFull writetext BlackthornGymClairText_BagFull

6
maps/BlackthornGym2F.asm
View File

@ -29,15 +29,15 @@ BlackthornGym2F_MapScripts:
.Boulder1: .Boulder1:
disappear BLACKTHORNGYM2F_BOULDER1 disappear BLACKTHORNGYM2F_BOULDER1
jump .Fall sjump .Fall
.Boulder2: .Boulder2:
disappear BLACKTHORNGYM2F_BOULDER2 disappear BLACKTHORNGYM2F_BOULDER2
jump .Fall sjump .Fall
.Boulder3: .Boulder3:
disappear BLACKTHORNGYM2F_BOULDER3 disappear BLACKTHORNGYM2F_BOULDER3
jump .Fall sjump .Fall
.Fall: .Fall:
pause 30 pause 30

2
maps/BrunosRoom.asm
View File

@ -10,7 +10,7 @@ BrunosRoom_MapScripts:
callback MAPCALLBACK_TILES, .BrunosRoomDoors callback MAPCALLBACK_TILES, .BrunosRoomDoors
.LockDoor: .LockDoor:
priorityjump .BrunosDoorLocksBehindYou prioritysjump .BrunosDoorLocksBehindYou
end end
.DummyScene: .DummyScene:

8
maps/BurnedTower1F.asm
View File

@ -15,7 +15,7 @@ BurnedTower1F_MapScripts:
callback MAPCALLBACK_TILES, .HoleAndLadder callback MAPCALLBACK_TILES, .HoleAndLadder
.EusineScene: .EusineScene:
priorityjump .MeetEusine prioritysjump .MeetEusine
end end
.DummyScene1: .DummyScene1:
@ -70,7 +70,7 @@ BurnedTowerRivalBattleScript:
startbattle startbattle
dontrestartmapmusic dontrestartmapmusic
reloadmapafterbattle reloadmapafterbattle
jump .returnfrombattle sjump .returnfrombattle
.totodile .totodile
winlosstext BurnedTowerSilver_WinText, BurnedTowerSilver_LossText winlosstext BurnedTowerSilver_WinText, BurnedTowerSilver_LossText
@ -79,7 +79,7 @@ BurnedTowerRivalBattleScript:
startbattle startbattle
dontrestartmapmusic dontrestartmapmusic
reloadmapafterbattle reloadmapafterbattle
jump .returnfrombattle sjump .returnfrombattle
.chikorita .chikorita
winlosstext BurnedTowerSilver_WinText, BurnedTowerSilver_LossText winlosstext BurnedTowerSilver_WinText, BurnedTowerSilver_LossText
@ -88,7 +88,7 @@ BurnedTowerRivalBattleScript:
startbattle startbattle
dontrestartmapmusic dontrestartmapmusic
reloadmapafterbattle reloadmapafterbattle
jump .returnfrombattle sjump .returnfrombattle
.returnfrombattle .returnfrombattle
playmusic MUSIC_RIVAL_AFTER playmusic MUSIC_RIVAL_AFTER

2
maps/BurnedTowerB1F.asm
View File

@ -106,7 +106,7 @@ BurnedTowerB1FEusine:
readvar VAR_FACING readvar VAR_FACING
ifequal UP, .Movement2 ifequal UP, .Movement2
applymovement BURNEDTOWERB1F_EUSINE, BurnedTowerB1FEusineMovement1 applymovement BURNEDTOWERB1F_EUSINE, BurnedTowerB1FEusineMovement1
jump .Finish sjump .Finish
.Movement2: .Movement2:
applymovement BURNEDTOWERB1F_EUSINE, BurnedTowerB1FEusineMovement2 applymovement BURNEDTOWERB1F_EUSINE, BurnedTowerB1FEusineMovement2

12
maps/CeladonDeptStore6F.asm
View File

@ -43,7 +43,7 @@ CeladonDeptStore6FVendingMachine:
iffalse .NotEnoughSpace iffalse .NotEnoughSpace
takemoney YOUR_MONEY, CELADONDEPTSTORE6F_FRESH_WATER_PRICE takemoney YOUR_MONEY, CELADONDEPTSTORE6F_FRESH_WATER_PRICE
getitemname STRING_BUFFER_3, FRESH_WATER getitemname STRING_BUFFER_3, FRESH_WATER
jump .VendItem sjump .VendItem
.SodaPop: .SodaPop:
checkmoney YOUR_MONEY, CELADONDEPTSTORE6F_SODA_POP_PRICE checkmoney YOUR_MONEY, CELADONDEPTSTORE6F_SODA_POP_PRICE
@ -52,7 +52,7 @@ CeladonDeptStore6FVendingMachine:
iffalse .NotEnoughSpace iffalse .NotEnoughSpace
takemoney YOUR_MONEY, CELADONDEPTSTORE6F_SODA_POP_PRICE takemoney YOUR_MONEY, CELADONDEPTSTORE6F_SODA_POP_PRICE
getitemname STRING_BUFFER_3, SODA_POP getitemname STRING_BUFFER_3, SODA_POP
jump .VendItem sjump .VendItem
.Lemonade: .Lemonade:
checkmoney YOUR_MONEY, CELADONDEPTSTORE6F_LEMONADE_PRICE checkmoney YOUR_MONEY, CELADONDEPTSTORE6F_LEMONADE_PRICE
@ -61,7 +61,7 @@ CeladonDeptStore6FVendingMachine:
iffalse .NotEnoughSpace iffalse .NotEnoughSpace
takemoney YOUR_MONEY, CELADONDEPTSTORE6F_LEMONADE_PRICE takemoney YOUR_MONEY, CELADONDEPTSTORE6F_LEMONADE_PRICE
getitemname STRING_BUFFER_3, LEMONADE getitemname STRING_BUFFER_3, LEMONADE
jump .VendItem sjump .VendItem
.VendItem: .VendItem:
pause 10 pause 10
@ -69,17 +69,17 @@ CeladonDeptStore6FVendingMachine:
writetext CeladonClangText writetext CeladonClangText
buttonsound buttonsound
itemnotify itemnotify
jump .Start sjump .Start
.NotEnoughMoney: .NotEnoughMoney:
writetext CeladonVendingNoMoneyText writetext CeladonVendingNoMoneyText
waitbutton waitbutton
jump .Start sjump .Start
.NotEnoughSpace: .NotEnoughSpace:
writetext CeladonVendingNoSpaceText writetext CeladonVendingNoSpaceText
waitbutton waitbutton
jump .Start sjump .Start
.MenuHeader: .MenuHeader:
db MENU_BACKUP_TILES ; flags db MENU_BACKUP_TILES ; flags

18
maps/CeladonGameCornerPrizeRoom.asm
View File

@ -36,7 +36,7 @@ CeladonPrizeRoom_tmcounterloop:
ifequal 1, .DoubleTeam ifequal 1, .DoubleTeam
ifequal 2, .Psychic ifequal 2, .Psychic
ifequal 3, .HyperBeam ifequal 3, .HyperBeam
jump CeladonPrizeRoom_CancelPurchaseScript sjump CeladonPrizeRoom_CancelPurchaseScript
.DoubleTeam: .DoubleTeam:
checkcoins CELADONGAMECORNERPRIZEROOM_TM32_COINS checkcoins CELADONGAMECORNERPRIZEROOM_TM32_COINS
@ -47,7 +47,7 @@ CeladonPrizeRoom_tmcounterloop:
giveitem TM_DOUBLE_TEAM giveitem TM_DOUBLE_TEAM
iffalse CeladonPrizeRoom_notenoughroom iffalse CeladonPrizeRoom_notenoughroom
takecoins CELADONGAMECORNERPRIZEROOM_TM32_COINS takecoins CELADONGAMECORNERPRIZEROOM_TM32_COINS
jump CeladonPrizeRoom_purchased sjump CeladonPrizeRoom_purchased
.Psychic: .Psychic:
checkcoins CELADONGAMECORNERPRIZEROOM_TM29_COINS checkcoins CELADONGAMECORNERPRIZEROOM_TM29_COINS
@ -58,7 +58,7 @@ CeladonPrizeRoom_tmcounterloop:
giveitem TM_PSYCHIC_M giveitem TM_PSYCHIC_M
iffalse CeladonPrizeRoom_notenoughroom iffalse CeladonPrizeRoom_notenoughroom
takecoins CELADONGAMECORNERPRIZEROOM_TM29_COINS takecoins CELADONGAMECORNERPRIZEROOM_TM29_COINS
jump CeladonPrizeRoom_purchased sjump CeladonPrizeRoom_purchased
.HyperBeam: .HyperBeam:
checkcoins CELADONGAMECORNERPRIZEROOM_TM15_COINS checkcoins CELADONGAMECORNERPRIZEROOM_TM15_COINS
@ -69,7 +69,7 @@ CeladonPrizeRoom_tmcounterloop:
giveitem TM_HYPER_BEAM giveitem TM_HYPER_BEAM
iffalse CeladonPrizeRoom_notenoughroom iffalse CeladonPrizeRoom_notenoughroom
takecoins CELADONGAMECORNERPRIZEROOM_TM15_COINS takecoins CELADONGAMECORNERPRIZEROOM_TM15_COINS
jump CeladonPrizeRoom_purchased sjump CeladonPrizeRoom_purchased
CeladonPrizeRoom_askbuy: CeladonPrizeRoom_askbuy:
writetext CeladonPrizeRoom_ConfirmPurchaseText writetext CeladonPrizeRoom_ConfirmPurchaseText
@ -81,7 +81,7 @@ CeladonPrizeRoom_purchased:
playsound SFX_TRANSACTION playsound SFX_TRANSACTION
writetext CeladonPrizeRoom_HereYouGoText writetext CeladonPrizeRoom_HereYouGoText
waitbutton waitbutton
jump CeladonPrizeRoom_tmcounterloop sjump CeladonPrizeRoom_tmcounterloop
CeladonPrizeRoom_notenoughcoins: CeladonPrizeRoom_notenoughcoins:
writetext CeladonPrizeRoom_NotEnoughCoinsText writetext CeladonPrizeRoom_NotEnoughCoinsText
@ -137,7 +137,7 @@ CeladonGameCornerPrizeRoomPokemonVendor:
ifequal 1, .Pikachu ifequal 1, .Pikachu
ifequal 2, .Porygon ifequal 2, .Porygon
ifequal 3, .Larvitar ifequal 3, .Larvitar
jump CeladonPrizeRoom_CancelPurchaseScript sjump CeladonPrizeRoom_CancelPurchaseScript
.Pikachu: .Pikachu:
checkcoins CELADONGAMECORNERPRIZEROOM_PIKACHU_COINS checkcoins CELADONGAMECORNERPRIZEROOM_PIKACHU_COINS
@ -155,7 +155,7 @@ CeladonGameCornerPrizeRoomPokemonVendor:
special GameCornerPrizeMonCheckDex special GameCornerPrizeMonCheckDex
givepoke PIKACHU, 25 givepoke PIKACHU, 25
takecoins CELADONGAMECORNERPRIZEROOM_PIKACHU_COINS takecoins CELADONGAMECORNERPRIZEROOM_PIKACHU_COINS
jump .loop sjump .loop
.Porygon: .Porygon:
checkcoins CELADONGAMECORNERPRIZEROOM_PORYGON_COINS checkcoins CELADONGAMECORNERPRIZEROOM_PORYGON_COINS
@ -173,7 +173,7 @@ CeladonGameCornerPrizeRoomPokemonVendor:
special GameCornerPrizeMonCheckDex special GameCornerPrizeMonCheckDex
givepoke PORYGON, 15 givepoke PORYGON, 15
takecoins CELADONGAMECORNERPRIZEROOM_PORYGON_COINS takecoins CELADONGAMECORNERPRIZEROOM_PORYGON_COINS
jump .loop sjump .loop
.Larvitar: .Larvitar:
checkcoins CELADONGAMECORNERPRIZEROOM_LARVITAR_COINS checkcoins CELADONGAMECORNERPRIZEROOM_LARVITAR_COINS
@ -191,7 +191,7 @@ CeladonGameCornerPrizeRoomPokemonVendor:
special GameCornerPrizeMonCheckDex special GameCornerPrizeMonCheckDex
givepoke LARVITAR, 40 givepoke LARVITAR, 40
takecoins CELADONGAMECORNERPRIZEROOM_LARVITAR_COINS takecoins CELADONGAMECORNERPRIZEROOM_LARVITAR_COINS
jump .loop sjump .loop
.MenuHeader: .MenuHeader:
db MENU_BACKUP_TILES ; flags db MENU_BACKUP_TILES ; flags

2
maps/CeladonPokecenter1F.asm
View File

@ -45,7 +45,7 @@ CeladonEusine:
readvar VAR_FACING readvar VAR_FACING
ifequal UP, .Location1 ifequal UP, .Location1
applymovement CELADONPOKECENTER1F_EUSINE, .Movement1 applymovement CELADONPOKECENTER1F_EUSINE, .Movement1
jump .Continue sjump .Continue
.Location1: .Location1:
applymovement CELADONPOKECENTER1F_EUSINE, .Movement2 applymovement CELADONPOKECENTER1F_EUSINE, .Movement2

2
maps/CeruleanGym.asm
View File

@ -17,7 +17,7 @@ CeruleanGym_MapScripts:
end end
.GruntRunsOut: .GruntRunsOut:
priorityjump .GruntRunsOutScript prioritysjump .GruntRunsOutScript
end end
.GruntRunsOutScript: .GruntRunsOutScript:

10
maps/CherrygroveCity.asm
View File

@ -29,7 +29,7 @@ CherrygroveCityGuideGent:
writetext GuideGentIntroText writetext GuideGentIntroText
yesorno yesorno
iffalse .No iffalse .No
jump .Yes sjump .Yes
.Yes: .Yes:
writetext GuideGentTourText1 writetext GuideGentTourText1
waitbutton waitbutton
@ -125,7 +125,7 @@ CherrygroveSilverSceneNorth:
dontrestartmapmusic dontrestartmapmusic
reloadmap reloadmap
iftrue .AfterVictorious iftrue .AfterVictorious
jump .AfterYourDefeat sjump .AfterYourDefeat
.Totodile: .Totodile:
winlosstext SilverCherrygroveWinText, SilverCherrygroveLossText winlosstext SilverCherrygroveWinText, SilverCherrygroveLossText
@ -136,7 +136,7 @@ CherrygroveSilverSceneNorth:
dontrestartmapmusic dontrestartmapmusic
reloadmap reloadmap
iftrue .AfterVictorious iftrue .AfterVictorious
jump .AfterYourDefeat sjump .AfterYourDefeat
.Chikorita: .Chikorita:
winlosstext SilverCherrygroveWinText, SilverCherrygroveLossText winlosstext SilverCherrygroveWinText, SilverCherrygroveLossText
@ -147,7 +147,7 @@ CherrygroveSilverSceneNorth:
dontrestartmapmusic dontrestartmapmusic
reloadmap reloadmap
iftrue .AfterVictorious iftrue .AfterVictorious
jump .AfterYourDefeat sjump .AfterYourDefeat
.AfterVictorious: .AfterVictorious:
playmusic MUSIC_RIVAL_AFTER playmusic MUSIC_RIVAL_AFTER
@ -155,7 +155,7 @@ CherrygroveSilverSceneNorth:
writetext CherrygroveRivalText_YouWon writetext CherrygroveRivalText_YouWon
waitbutton waitbutton
closetext closetext
jump .FinishRival sjump .FinishRival
.AfterYourDefeat: .AfterYourDefeat:
playmusic MUSIC_RIVAL_AFTER playmusic MUSIC_RIVAL_AFTER

2
maps/Colosseum.asm
View File

@ -13,7 +13,7 @@ Colosseum_MapScripts:
callback MAPCALLBACK_NEWMAP, .PreparePokecenter2F callback MAPCALLBACK_NEWMAP, .PreparePokecenter2F
.InitializeColosseum: .InitializeColosseum:
priorityjump .InitializeAndPreparePokecenter2F prioritysjump .InitializeAndPreparePokecenter2F
end end
.DummyScene1: .DummyScene1:

20
maps/CopycatsHouse2F.asm
View File

@ -17,7 +17,7 @@ CopycatsHouse2F_MapScripts:
iftrue .Female iftrue .Female
disappear COPYCATSHOUSE2F_COPYCAT2 disappear COPYCATSHOUSE2F_COPYCAT2
appear COPYCATSHOUSE2F_COPYCAT1 appear COPYCATSHOUSE2F_COPYCAT1
jump .Done sjump .Done
.Female: .Female:
disappear COPYCATSHOUSE2F_COPYCAT1 disappear COPYCATSHOUSE2F_COPYCAT1
appear COPYCATSHOUSE2F_COPYCAT2 appear COPYCATSHOUSE2F_COPYCAT2
@ -37,7 +37,7 @@ Copycat:
applymovement COPYCATSHOUSE2F_COPYCAT1, CopycatSpinAroundMovementData applymovement COPYCATSHOUSE2F_COPYCAT1, CopycatSpinAroundMovementData
faceplayer faceplayer
variablesprite SPRITE_COPYCAT, SPRITE_CHRIS variablesprite SPRITE_COPYCAT, SPRITE_CHRIS
jump .Default_Merge_1 sjump .Default_Merge_1
.Default_Female_1: .Default_Female_1:
applymovement COPYCATSHOUSE2F_COPYCAT2, CopycatSpinAroundMovementData applymovement COPYCATSHOUSE2F_COPYCAT2, CopycatSpinAroundMovementData
@ -51,7 +51,7 @@ Copycat:
checkflag ENGINE_PLAYER_IS_FEMALE checkflag ENGINE_PLAYER_IS_FEMALE
iftrue .Default_Female_2a iftrue .Default_Female_2a
writetext CopycatText_Male_1 writetext CopycatText_Male_1
jump .Default_Merge_2a sjump .Default_Merge_2a
.Default_Female_2a: .Default_Female_2a:
writetext CopycatText_Female_1 writetext CopycatText_Female_1
@ -61,7 +61,7 @@ Copycat:
checkflag ENGINE_PLAYER_IS_FEMALE checkflag ENGINE_PLAYER_IS_FEMALE
iftrue .Default_Female_3a iftrue .Default_Female_3a
applymovement COPYCATSHOUSE2F_COPYCAT1, CopycatSpinAroundMovementData applymovement COPYCATSHOUSE2F_COPYCAT1, CopycatSpinAroundMovementData
jump .Default_Merge_3a sjump .Default_Merge_3a
.Default_Female_3a: .Default_Female_3a:
applymovement COPYCATSHOUSE2F_COPYCAT2, CopycatSpinAroundMovementData applymovement COPYCATSHOUSE2F_COPYCAT2, CopycatSpinAroundMovementData
@ -80,7 +80,7 @@ Copycat:
checkflag ENGINE_PLAYER_IS_FEMALE checkflag ENGINE_PLAYER_IS_FEMALE
iftrue .Default_Female_2b iftrue .Default_Female_2b
writetext CopycatText_Male_2 writetext CopycatText_Male_2
jump .Default_Merge_2b sjump .Default_Merge_2b
.Default_Female_2b: .Default_Female_2b:
writetext CopycatText_Female_2 writetext CopycatText_Female_2
@ -90,7 +90,7 @@ Copycat:
checkflag ENGINE_PLAYER_IS_FEMALE checkflag ENGINE_PLAYER_IS_FEMALE
iftrue .Default_Female_3b iftrue .Default_Female_3b
applymovement COPYCATSHOUSE2F_COPYCAT1, CopycatSpinAroundMovementData applymovement COPYCATSHOUSE2F_COPYCAT1, CopycatSpinAroundMovementData
jump .Default_Merge_3b sjump .Default_Merge_3b
.Default_Female_3b: .Default_Female_3b:
applymovement COPYCATSHOUSE2F_COPYCAT2, CopycatSpinAroundMovementData applymovement COPYCATSHOUSE2F_COPYCAT2, CopycatSpinAroundMovementData
@ -112,7 +112,7 @@ Copycat:
takeitem LOST_ITEM takeitem LOST_ITEM
setevent EVENT_RETURNED_LOST_ITEM_TO_COPYCAT setevent EVENT_RETURNED_LOST_ITEM_TO_COPYCAT
clearevent EVENT_COPYCATS_HOUSE_2F_DOLL clearevent EVENT_COPYCATS_HOUSE_2F_DOLL
jump .GivePass sjump .GivePass
.TryGivePassAgain: .TryGivePassAgain:
opentext opentext
@ -133,7 +133,7 @@ Copycat:
applymovement COPYCATSHOUSE2F_COPYCAT1, CopycatSpinAroundMovementData applymovement COPYCATSHOUSE2F_COPYCAT1, CopycatSpinAroundMovementData
faceplayer faceplayer
variablesprite SPRITE_COPYCAT, SPRITE_CHRIS variablesprite SPRITE_COPYCAT, SPRITE_CHRIS
jump .GotPass_Merge_1 sjump .GotPass_Merge_1
.GotPass_Female_1: .GotPass_Female_1:
applymovement COPYCATSHOUSE2F_COPYCAT2, CopycatSpinAroundMovementData applymovement COPYCATSHOUSE2F_COPYCAT2, CopycatSpinAroundMovementData
@ -145,7 +145,7 @@ Copycat:
checkflag ENGINE_PLAYER_IS_FEMALE checkflag ENGINE_PLAYER_IS_FEMALE
iftrue .GotPass_Female_2 iftrue .GotPass_Female_2
writetext CopycatText_Male_3 writetext CopycatText_Male_3
jump .GotPass_Merge_2 sjump .GotPass_Merge_2
.GotPass_Female_2: .GotPass_Female_2:
writetext CopycatText_Female_3 writetext CopycatText_Female_3
@ -155,7 +155,7 @@ Copycat:
checkflag ENGINE_PLAYER_IS_FEMALE checkflag ENGINE_PLAYER_IS_FEMALE
iftrue .GotPass_Female_3 iftrue .GotPass_Female_3
applymovement COPYCATSHOUSE2F_COPYCAT1, CopycatSpinAroundMovementData applymovement COPYCATSHOUSE2F_COPYCAT1, CopycatSpinAroundMovementData
jump .GotPass_Merge_3 sjump .GotPass_Merge_3
.GotPass_Female_3: .GotPass_Female_3:
applymovement COPYCATSHOUSE2F_COPYCAT2, CopycatSpinAroundMovementData applymovement COPYCATSHOUSE2F_COPYCAT2, CopycatSpinAroundMovementData

2
maps/DanceTheatre.asm
View File

@ -86,7 +86,7 @@ DanceTheaterSurfGuy:
iffalse .KimonoGirlsUndefeated iffalse .KimonoGirlsUndefeated
checkevent EVENT_BEAT_KIMONO_GIRL_MIKI checkevent EVENT_BEAT_KIMONO_GIRL_MIKI
iffalse .KimonoGirlsUndefeated iffalse .KimonoGirlsUndefeated
jump .GetSurf sjump .GetSurf
.KimonoGirlsUndefeated: .KimonoGirlsUndefeated:
checkflag ENGINE_PLAYER_IS_FEMALE checkflag ENGINE_PLAYER_IS_FEMALE

2
maps/DragonShrine.asm
View File

@ -12,7 +12,7 @@ DragonShrine_MapScripts:
db 0 ; callbacks db 0 ; callbacks
.DragonShrineTest: .DragonShrineTest:
priorityjump .DragonShrineTestScript prioritysjump .DragonShrineTestScript
end end
.DummyScene: .DummyScene:

2
maps/DragonsDenB1F.asm
View File

@ -66,7 +66,7 @@ DragonsDenB1F_ClairScene:
writetext ClairText_WhatsTheMatterDragonDen writetext ClairText_WhatsTheMatterDragonDen
waitbutton waitbutton
closetext closetext
jump .FinishClair sjump .FinishClair
.BagFull: .BagFull:
writetext ClairText_NoRoom writetext ClairText_NoRoom

10
maps/EarlsPokemonAcademy.asm
View File

@ -78,27 +78,27 @@ AcademyBlackboard:
.Poison: .Poison:
writetext AcademyPoisonText writetext AcademyPoisonText
waitbutton waitbutton
jump .Loop sjump .Loop
.Paralysis: .Paralysis:
writetext AcademyParalysisText writetext AcademyParalysisText
waitbutton waitbutton
jump .Loop sjump .Loop
.Sleep: .Sleep:
writetext AcademySleepText writetext AcademySleepText
waitbutton waitbutton
jump .Loop sjump .Loop
.Burn: .Burn:
writetext AcademyBurnText writetext AcademyBurnText
waitbutton waitbutton
jump .Loop sjump .Loop
.Freeze: .Freeze:
writetext AcademyFreezeText writetext AcademyFreezeText
waitbutton waitbutton
jump .Loop sjump .Loop
.BlackboardMenuHeader: .BlackboardMenuHeader:
db MENU_BACKUP_TILES ; flags db MENU_BACKUP_TILES ; flags

2
maps/EcruteakGym.asm
View File

@ -15,7 +15,7 @@ EcruteakGym_MapScripts:
db 0 ; callbacks db 0 ; callbacks
.ForcedToLeave: .ForcedToLeave:
priorityjump EcruteakGymClosed prioritysjump EcruteakGymClosed
end end
.DummyScene: .DummyScene:

4
maps/EcruteakPokecenter1F.asm
View File

@ -13,7 +13,7 @@ EcruteakPokecenter1F_MapScripts:
db 0 ; callbacks db 0 ; callbacks
.MeetBill: .MeetBill:
priorityjump .BillActivatesTimeCapsule prioritysjump .BillActivatesTimeCapsule
end end
.DummyScene: .DummyScene:
@ -39,7 +39,7 @@ EcruteakPokecenter1F_MapScripts:
opentext opentext
writetext EcruteakPokecenter1F_BillText1 writetext EcruteakPokecenter1F_BillText1
buttonsound buttonsound
jump .PointlessJump sjump .PointlessJump
.PointlessJump: .PointlessJump:
writetext EcruteakPokecenter1F_BillText2 writetext EcruteakPokecenter1F_BillText2

14
maps/ElmsLab.asm
View File

@ -19,7 +19,7 @@ ElmsLab_MapScripts:
callback MAPCALLBACK_OBJECTS, .MoveElmCallback callback MAPCALLBACK_OBJECTS, .MoveElmCallback
.MeetElm: .MeetElm:
priorityjump .WalkUpToElm prioritysjump .WalkUpToElm
end end
.DummyScene1: .DummyScene1:
@ -54,7 +54,7 @@ ElmsLab_MapScripts:
yesorno yesorno
iftrue .ElmGetsEmail iftrue .ElmGetsEmail
writetext ElmText_Refused writetext ElmText_Refused
jump .MustSayYes sjump .MustSayYes
.ElmGetsEmail: .ElmGetsEmail:
writetext ElmText_Accepted writetext ElmText_Accepted
@ -123,7 +123,7 @@ ElmEggHatchedScript:
setval TOGETIC setval TOGETIC
special FindPartyMonThatSpeciesYourTrainerID special FindPartyMonThatSpeciesYourTrainerID
iftrue ShowElmTogepiScript iftrue ShowElmTogepiScript
jump ElmCheckGotEggAgain sjump ElmCheckGotEggAgain
ElmCheckTogepiEgg: ElmCheckTogepiEgg:
checkevent EVENT_GOT_TOGEPI_EGG_FROM_ELMS_AIDE checkevent EVENT_GOT_TOGEPI_EGG_FROM_ELMS_AIDE
@ -183,7 +183,7 @@ CyndaquilPokeBallScript:
readvar VAR_FACING readvar VAR_FACING
ifequal RIGHT, ElmDirectionsScript ifequal RIGHT, ElmDirectionsScript
applymovement PLAYER, AfterCyndaquilMovement applymovement PLAYER, AfterCyndaquilMovement
jump ElmDirectionsScript sjump ElmDirectionsScript
TotodilePokeBallScript: TotodilePokeBallScript:
checkevent EVENT_GOT_A_POKEMON_FROM_ELM checkevent EVENT_GOT_A_POKEMON_FROM_ELM
@ -211,7 +211,7 @@ TotodilePokeBallScript:
givepoke TOTODILE, 5, BERRY givepoke TOTODILE, 5, BERRY
closetext closetext
applymovement PLAYER, AfterTotodileMovement applymovement PLAYER, AfterTotodileMovement
jump ElmDirectionsScript sjump ElmDirectionsScript
ChikoritaPokeBallScript: ChikoritaPokeBallScript:
checkevent EVENT_GOT_A_POKEMON_FROM_ELM checkevent EVENT_GOT_A_POKEMON_FROM_ELM
@ -239,7 +239,7 @@ ChikoritaPokeBallScript:
givepoke CHIKORITA, 5, BERRY givepoke CHIKORITA, 5, BERRY
closetext closetext
applymovement PLAYER, AfterChikoritaMovement applymovement PLAYER, AfterChikoritaMovement
jump ElmDirectionsScript sjump ElmDirectionsScript
DidntChooseStarterScript: DidntChooseStarterScript:
writetext DidntChooseStarterText writetext DidntChooseStarterText
@ -569,7 +569,7 @@ ElmsLabWindow:
iftrue .Normal iftrue .Normal
checkevent EVENT_ELM_CALLED_ABOUT_STOLEN_POKEMON checkevent EVENT_ELM_CALLED_ABOUT_STOLEN_POKEMON
iftrue .BreakIn iftrue .BreakIn
jump .Normal sjump .Normal
.BreakIn: .BreakIn:
writetext ElmsLabWindowText2 writetext ElmsLabWindowText2

2
maps/FastShip1F.asm
View File

@ -16,7 +16,7 @@ FastShip1F_MapScripts:
end end
.EnterFastShip: .EnterFastShip:
priorityjump .EnterFastShipScript prioritysjump .EnterFastShipScript
end end
.DummyScene2: .DummyScene2:

4
maps/FastShipCabins_SE_SSE_CaptainsCabin.asm
View File

@ -65,7 +65,7 @@ SSAquaGranddaughterBefore:
writetext SSAquaGranddaughterWasPlayingMText writetext SSAquaGranddaughterWasPlayingMText
waitbutton waitbutton
closetext closetext
jump .cont sjump .cont
.PlayerIsFemale: .PlayerIsFemale:
opentext opentext
@ -80,7 +80,7 @@ SSAquaGranddaughterBefore:
buttonsound buttonsound
setevent EVENT_VERMILION_PORT_SAILOR_AT_GANGWAY setevent EVENT_VERMILION_PORT_SAILOR_AT_GANGWAY
setmapscene FAST_SHIP_1F, SCENE_DEFAULT setmapscene FAST_SHIP_1F, SCENE_DEFAULT
jump SSAquaMetalCoatAndDocking sjump SSAquaMetalCoatAndDocking
SSAquaGrandpa: SSAquaGrandpa:
faceplayer faceplayer

2
maps/FuchsiaGym.asm
View File

@ -39,7 +39,7 @@ FuchsiaGymJanineScript:
playsound SFX_GET_BADGE playsound SFX_GET_BADGE
waitsfx waitsfx
setflag ENGINE_SOULBADGE setflag ENGINE_SOULBADGE
jump .AfterBattle sjump .AfterBattle
.FightDone: .FightDone:
faceplayer faceplayer
opentext opentext

10
maps/GoldenrodCity.asm
View File

@ -69,28 +69,28 @@ MoveTutorScript:
ifequal MOVETUTOR_FLAMETHROWER, .Flamethrower ifequal MOVETUTOR_FLAMETHROWER, .Flamethrower
ifequal MOVETUTOR_THUNDERBOLT, .Thunderbolt ifequal MOVETUTOR_THUNDERBOLT, .Thunderbolt
ifequal MOVETUTOR_ICE_BEAM, .IceBeam ifequal MOVETUTOR_ICE_BEAM, .IceBeam
jump .Incompatible sjump .Incompatible
.Flamethrower: .Flamethrower:
setval MOVETUTOR_FLAMETHROWER setval MOVETUTOR_FLAMETHROWER
writetext UnknownText_0x1991cf writetext UnknownText_0x1991cf
special MoveTutor special MoveTutor
ifequal FALSE, .TeachMove ifequal FALSE, .TeachMove
jump .Incompatible sjump .Incompatible
.Thunderbolt: .Thunderbolt:
setval MOVETUTOR_THUNDERBOLT setval MOVETUTOR_THUNDERBOLT
writetext UnknownText_0x1991cf writetext UnknownText_0x1991cf
special MoveTutor special MoveTutor
ifequal FALSE, .TeachMove ifequal FALSE, .TeachMove
jump .Incompatible sjump .Incompatible
.IceBeam: .IceBeam:
setval MOVETUTOR_ICE_BEAM setval MOVETUTOR_ICE_BEAM
writetext UnknownText_0x1991cf writetext UnknownText_0x1991cf
special MoveTutor special MoveTutor
ifequal FALSE, .TeachMove ifequal FALSE, .TeachMove
jump .Incompatible sjump .Incompatible
.MoveMenuHeader: .MoveMenuHeader:
db MENU_BACKUP_TILES ; flags db MENU_BACKUP_TILES ; flags
@ -131,7 +131,7 @@ MoveTutorScript:
readvar VAR_FACING readvar VAR_FACING
ifequal LEFT, .WalkAroundPlayer ifequal LEFT, .WalkAroundPlayer
applymovement GOLDENRODCITY_MOVETUTOR, MovementData_0x198a5f applymovement GOLDENRODCITY_MOVETUTOR, MovementData_0x198a5f
jump .GoInside sjump .GoInside
.WalkAroundPlayer: .WalkAroundPlayer:
applymovement GOLDENRODCITY_MOVETUTOR, MovementData_0x198a63 applymovement GOLDENRODCITY_MOVETUTOR, MovementData_0x198a63

6
maps/GoldenrodDeptStore5F.asm
View File

@ -29,12 +29,12 @@ GoldenrodDeptStore5FClerkScript:
iftrue .headbutt iftrue .headbutt
checkevent EVENT_GOT_TM08_ROCK_SMASH checkevent EVENT_GOT_TM08_ROCK_SMASH
iftrue .onlyrocksmash iftrue .onlyrocksmash
jump .neither sjump .neither
.headbutt .headbutt
checkevent EVENT_GOT_TM08_ROCK_SMASH checkevent EVENT_GOT_TM08_ROCK_SMASH
iftrue .both iftrue .both
jump .onlyheadbutt sjump .onlyheadbutt
.neither .neither
pokemart MARTTYPE_STANDARD, MART_GOLDENROD_5F_1 pokemart MARTTYPE_STANDARD, MART_GOLDENROD_5F_1
@ -68,7 +68,7 @@ GoldenrodDeptStore5FReceptionistScript:
buttonsound buttonsound
ifgreater 150 - 1, .VeryHappy ifgreater 150 - 1, .VeryHappy
ifgreater 50 - 1, .SomewhatHappy ifgreater 50 - 1, .SomewhatHappy
jump .NotVeryHappy sjump .NotVeryHappy
.VeryHappy: .VeryHappy:
writetext UnknownText_0x5615a writetext UnknownText_0x5615a

12
maps/GoldenrodDeptStore6F.asm
View File

@ -32,7 +32,7 @@ GoldenrodVendingMachine:
iffalse .NotEnoughSpace iffalse .NotEnoughSpace
takemoney YOUR_MONEY, GOLDENRODDEPTSTORE6F_FRESH_WATER_PRICE takemoney YOUR_MONEY, GOLDENRODDEPTSTORE6F_FRESH_WATER_PRICE
getitemname STRING_BUFFER_3, FRESH_WATER getitemname STRING_BUFFER_3, FRESH_WATER
jump .VendItem sjump .VendItem
.SodaPop: .SodaPop:
checkmoney YOUR_MONEY, GOLDENRODDEPTSTORE6F_SODA_POP_PRICE checkmoney YOUR_MONEY, GOLDENRODDEPTSTORE6F_SODA_POP_PRICE
@ -41,7 +41,7 @@ GoldenrodVendingMachine:
iffalse .NotEnoughSpace iffalse .NotEnoughSpace
takemoney YOUR_MONEY, GOLDENRODDEPTSTORE6F_SODA_POP_PRICE takemoney YOUR_MONEY, GOLDENRODDEPTSTORE6F_SODA_POP_PRICE
getitemname STRING_BUFFER_3, SODA_POP getitemname STRING_BUFFER_3, SODA_POP
jump .VendItem sjump .VendItem
.Lemonade: .Lemonade:
checkmoney YOUR_MONEY, GOLDENRODDEPTSTORE6F_LEMONADE_PRICE checkmoney YOUR_MONEY, GOLDENRODDEPTSTORE6F_LEMONADE_PRICE
@ -50,7 +50,7 @@ GoldenrodVendingMachine:
iffalse .NotEnoughSpace iffalse .NotEnoughSpace
takemoney YOUR_MONEY, GOLDENRODDEPTSTORE6F_LEMONADE_PRICE takemoney YOUR_MONEY, GOLDENRODDEPTSTORE6F_LEMONADE_PRICE
getitemname STRING_BUFFER_3, LEMONADE getitemname STRING_BUFFER_3, LEMONADE
jump .VendItem sjump .VendItem
.VendItem: .VendItem:
pause 10 pause 10
@ -58,17 +58,17 @@ GoldenrodVendingMachine:
writetext GoldenrodClangText writetext GoldenrodClangText
buttonsound buttonsound
itemnotify itemnotify
jump .Start sjump .Start
.NotEnoughMoney: .NotEnoughMoney:
writetext GoldenrodVendingNoMoneyText writetext GoldenrodVendingNoMoneyText
waitbutton waitbutton
jump .Start sjump .Start
.NotEnoughSpace: .NotEnoughSpace:
writetext GoldenrodVendingNoSpaceText writetext GoldenrodVendingNoSpaceText
waitbutton waitbutton
jump .Start sjump .Start
.MenuHeader: .MenuHeader:
db MENU_BACKUP_TILES ; flags db MENU_BACKUP_TILES ; flags

4
maps/GoldenrodDeptStoreB1F.asm
View File

@ -18,11 +18,11 @@ GoldenrodDeptStoreB1F_MapScripts:
.ClearBoxes: .ClearBoxes:
checkevent EVENT_RECEIVED_CARD_KEY checkevent EVENT_RECEIVED_CARD_KEY
iftrue .GotCardKey iftrue .GotCardKey
jump .Continue sjump .Continue
.GotCardKey: .GotCardKey:
changeblock 16, 4, $0d ; floor changeblock 16, 4, $0d ; floor
jump .Continue sjump .Continue
.Continue: .Continue:
checkevent EVENT_GOLDENROD_DEPT_STORE_B1F_LAYOUT_2 checkevent EVENT_GOLDENROD_DEPT_STORE_B1F_LAYOUT_2

18
maps/GoldenrodGameCorner.asm
View File

@ -72,7 +72,7 @@ GoldenrodGameCornerTMVendor_LoopScript:
ifequal 1, .Thunder ifequal 1, .Thunder
ifequal 2, .Blizzard ifequal 2, .Blizzard
ifequal 3, .FireBlast ifequal 3, .FireBlast
jump GoldenrodGameCornerPrizeVendor_CancelPurchaseScript sjump GoldenrodGameCornerPrizeVendor_CancelPurchaseScript
.Thunder: .Thunder:
checkcoins GOLDENRODGAMECORNER_TM25_COINS checkcoins GOLDENRODGAMECORNER_TM25_COINS
@ -83,7 +83,7 @@ GoldenrodGameCornerTMVendor_LoopScript:
giveitem TM_THUNDER giveitem TM_THUNDER
iffalse GoldenrodGameCornerPrizeMonVendor_NoRoomForPrizeScript iffalse GoldenrodGameCornerPrizeMonVendor_NoRoomForPrizeScript
takecoins GOLDENRODGAMECORNER_TM25_COINS takecoins GOLDENRODGAMECORNER_TM25_COINS
jump GoldenrodGameCornerTMVendor_FinishScript sjump GoldenrodGameCornerTMVendor_FinishScript
.Blizzard: .Blizzard:
checkcoins GOLDENRODGAMECORNER_TM14_COINS checkcoins GOLDENRODGAMECORNER_TM14_COINS
@ -94,7 +94,7 @@ GoldenrodGameCornerTMVendor_LoopScript:
giveitem TM_BLIZZARD giveitem TM_BLIZZARD
iffalse GoldenrodGameCornerPrizeMonVendor_NoRoomForPrizeScript iffalse GoldenrodGameCornerPrizeMonVendor_NoRoomForPrizeScript
takecoins GOLDENRODGAMECORNER_TM14_COINS takecoins GOLDENRODGAMECORNER_TM14_COINS
jump GoldenrodGameCornerTMVendor_FinishScript sjump GoldenrodGameCornerTMVendor_FinishScript
.FireBlast: .FireBlast:
checkcoins GOLDENRODGAMECORNER_TM38_COINS checkcoins GOLDENRODGAMECORNER_TM38_COINS
@ -105,7 +105,7 @@ GoldenrodGameCornerTMVendor_LoopScript:
giveitem TM_FIRE_BLAST giveitem TM_FIRE_BLAST
iffalse GoldenrodGameCornerPrizeMonVendor_NoRoomForPrizeScript iffalse GoldenrodGameCornerPrizeMonVendor_NoRoomForPrizeScript
takecoins GOLDENRODGAMECORNER_TM38_COINS takecoins GOLDENRODGAMECORNER_TM38_COINS
jump GoldenrodGameCornerTMVendor_FinishScript sjump GoldenrodGameCornerTMVendor_FinishScript
GoldenrodGameCornerPrizeVendor_ConfirmPurchaseScript: GoldenrodGameCornerPrizeVendor_ConfirmPurchaseScript:
writetext GoldenrodGameCornerPrizeVendorConfirmPrizeText writetext GoldenrodGameCornerPrizeVendorConfirmPrizeText
@ -117,7 +117,7 @@ GoldenrodGameCornerTMVendor_FinishScript:
playsound SFX_TRANSACTION playsound SFX_TRANSACTION
writetext GoldenrodGameCornerPrizeVendorHereYouGoText writetext GoldenrodGameCornerPrizeVendorHereYouGoText
waitbutton waitbutton
jump GoldenrodGameCornerTMVendor_LoopScript sjump GoldenrodGameCornerTMVendor_LoopScript
GoldenrodGameCornerPrizeVendor_NotEnoughCoinsScript: GoldenrodGameCornerPrizeVendor_NotEnoughCoinsScript:
writetext GoldenrodGameCornerPrizeVendorNeedMoreCoinsText writetext GoldenrodGameCornerPrizeVendorNeedMoreCoinsText
@ -173,7 +173,7 @@ GoldenrodGameCornerPrizeMonVendorScript:
ifequal 1, .Abra ifequal 1, .Abra
ifequal 2, .Cubone ifequal 2, .Cubone
ifequal 3, .Wobbuffet ifequal 3, .Wobbuffet
jump GoldenrodGameCornerPrizeVendor_CancelPurchaseScript sjump GoldenrodGameCornerPrizeVendor_CancelPurchaseScript
.Abra: .Abra:
checkcoins GOLDENRODGAMECORNER_ABRA_COINS checkcoins GOLDENRODGAMECORNER_ABRA_COINS
@ -191,7 +191,7 @@ GoldenrodGameCornerPrizeMonVendorScript:
special GameCornerPrizeMonCheckDex special GameCornerPrizeMonCheckDex
givepoke ABRA, 5 givepoke ABRA, 5
takecoins GOLDENRODGAMECORNER_ABRA_COINS takecoins GOLDENRODGAMECORNER_ABRA_COINS
jump .loop sjump .loop
.Cubone: .Cubone:
checkcoins GOLDENRODGAMECORNER_CUBONE_COINS checkcoins GOLDENRODGAMECORNER_CUBONE_COINS
@ -209,7 +209,7 @@ GoldenrodGameCornerPrizeMonVendorScript:
special GameCornerPrizeMonCheckDex special GameCornerPrizeMonCheckDex
givepoke CUBONE, 15 givepoke CUBONE, 15
takecoins GOLDENRODGAMECORNER_CUBONE_COINS takecoins GOLDENRODGAMECORNER_CUBONE_COINS
jump .loop sjump .loop
.Wobbuffet: .Wobbuffet:
checkcoins GOLDENRODGAMECORNER_WOBBUFFET_COINS checkcoins GOLDENRODGAMECORNER_WOBBUFFET_COINS
@ -227,7 +227,7 @@ GoldenrodGameCornerPrizeMonVendorScript:
special GameCornerPrizeMonCheckDex special GameCornerPrizeMonCheckDex
givepoke WOBBUFFET, 15 givepoke WOBBUFFET, 15
takecoins GOLDENRODGAMECORNER_WOBBUFFET_COINS takecoins GOLDENRODGAMECORNER_WOBBUFFET_COINS
jump .loop sjump .loop
.MenuHeader: .MenuHeader:
db MENU_BACKUP_TILES ; flags db MENU_BACKUP_TILES ; flags

2
maps/GoldenrodHappinessRater.asm
View File

@ -19,7 +19,7 @@ GoldenrodHappinessRaterTeacherScript:
ifgreater 150 - 1, .SortOfHappy ifgreater 150 - 1, .SortOfHappy
ifgreater 100 - 1, .QuiteCute ifgreater 100 - 1, .QuiteCute
ifgreater 50 - 1, .NotUsedToYou ifgreater 50 - 1, .NotUsedToYou
jump .LooksMean sjump .LooksMean
.LovesYouALot: .LovesYouALot:
writetext GoldenrodHappinessRatingText_LovesYouALot writetext GoldenrodHappinessRatingText_LovesYouALot

28
maps/GoldenrodUnderground.asm
View File

@ -160,7 +160,7 @@ BitterMerchantScript:
readvar VAR_WEEKDAY readvar VAR_WEEKDAY
ifequal SUNDAY, .Open ifequal SUNDAY, .Open
ifequal SATURDAY, .Open ifequal SATURDAY, .Open
jump GoldenrodUndergroundScript_ShopClosed sjump GoldenrodUndergroundScript_ShopClosed
.Open: .Open:
pokemart MARTTYPE_BITTER, MART_UNDERGROUND pokemart MARTTYPE_BITTER, MART_UNDERGROUND
@ -173,7 +173,7 @@ BargainMerchantScript:
iftrue GoldenrodUndergroundScript_ShopClosed iftrue GoldenrodUndergroundScript_ShopClosed
readvar VAR_WEEKDAY readvar VAR_WEEKDAY
ifequal MONDAY, .CheckMorn ifequal MONDAY, .CheckMorn
jump GoldenrodUndergroundScript_ShopClosed sjump GoldenrodUndergroundScript_ShopClosed
.CheckMorn: .CheckMorn:
checktime MORN checktime MORN
@ -188,7 +188,7 @@ OlderHaircutBrotherScript:
ifequal TUESDAY, .DoHaircut ifequal TUESDAY, .DoHaircut
ifequal THURSDAY, .DoHaircut ifequal THURSDAY, .DoHaircut
ifequal SATURDAY, .DoHaircut ifequal SATURDAY, .DoHaircut
jump GoldenrodUndergroundScript_ShopClosed sjump GoldenrodUndergroundScript_ShopClosed
.DoHaircut: .DoHaircut:
checkflag ENGINE_GOLDENROD_UNDERGROUND_GOT_HAIRCUT checkflag ENGINE_GOLDENROD_UNDERGROUND_GOT_HAIRCUT
@ -207,25 +207,25 @@ OlderHaircutBrotherScript:
setflag ENGINE_GOLDENROD_UNDERGROUND_GOT_HAIRCUT setflag ENGINE_GOLDENROD_UNDERGROUND_GOT_HAIRCUT
ifequal $2, .two ifequal $2, .two
ifequal $3, .three ifequal $3, .three
jump .else sjump .else
.two .two
setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
clearevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2 clearevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2
clearevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_3 clearevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_3
jump .then sjump .then
.three .three
clearevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 clearevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2 setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2
clearevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_3 clearevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_3
jump .then sjump .then
.else .else
clearevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 clearevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
clearevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2 clearevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2
setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_3 setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_3
jump .then sjump .then
.then .then
takemoney YOUR_MONEY, GOLDENRODUNDERGROUND_OLDER_HAIRCUT_PRICE takemoney YOUR_MONEY, GOLDENRODUNDERGROUND_OLDER_HAIRCUT_PRICE
@ -245,7 +245,7 @@ OlderHaircutBrotherScript:
iftrue EitherHaircutBrotherScript_SlightlyHappier iftrue EitherHaircutBrotherScript_SlightlyHappier
checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2 checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2
iftrue EitherHaircutBrotherScript_Happier iftrue EitherHaircutBrotherScript_Happier
jump EitherHaircutBrotherScript_MuchHappier sjump EitherHaircutBrotherScript_MuchHappier
.Refused: .Refused:
writetext UnknownText_0x7c6ea writetext UnknownText_0x7c6ea
@ -271,7 +271,7 @@ YoungerHaircutBrotherScript:
ifequal SUNDAY, .DoHaircut ifequal SUNDAY, .DoHaircut
ifequal WEDNESDAY, .DoHaircut ifequal WEDNESDAY, .DoHaircut
ifequal FRIDAY, .DoHaircut ifequal FRIDAY, .DoHaircut
jump GoldenrodUndergroundScript_ShopClosed sjump GoldenrodUndergroundScript_ShopClosed
.DoHaircut: .DoHaircut:
checkflag ENGINE_GOLDENROD_UNDERGROUND_GOT_HAIRCUT checkflag ENGINE_GOLDENROD_UNDERGROUND_GOT_HAIRCUT
@ -290,25 +290,25 @@ YoungerHaircutBrotherScript:
setflag ENGINE_GOLDENROD_UNDERGROUND_GOT_HAIRCUT setflag ENGINE_GOLDENROD_UNDERGROUND_GOT_HAIRCUT
ifequal $2, .two ifequal $2, .two
ifequal $3, .three ifequal $3, .three
jump .else sjump .else
.two .two
setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
clearevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2 clearevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2
clearevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_3 clearevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_3
jump .then sjump .then
.three .three
clearevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 clearevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2 setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2
clearevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_3 clearevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_3
jump .then sjump .then
.else .else
clearevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 clearevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
clearevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2 clearevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2
setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_3 setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_3
jump .then sjump .then
.then .then
takemoney YOUR_MONEY, GOLDENRODUNDERGROUND_YOUNGER_HAIRCUT_PRICE takemoney YOUR_MONEY, GOLDENRODUNDERGROUND_YOUNGER_HAIRCUT_PRICE
@ -328,7 +328,7 @@ YoungerHaircutBrotherScript:
iftrue EitherHaircutBrotherScript_SlightlyHappier iftrue EitherHaircutBrotherScript_SlightlyHappier
checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2 checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2
iftrue EitherHaircutBrotherScript_Happier iftrue EitherHaircutBrotherScript_Happier
jump EitherHaircutBrotherScript_MuchHappier sjump EitherHaircutBrotherScript_MuchHappier
.Refused: .Refused:
writetext UnknownText_0x7c842 writetext UnknownText_0x7c842

22
maps/GoldenrodUndergroundSwitchRoomEntrances.asm
View File

@ -176,7 +176,7 @@ UndergroundSilverBattleScript:
startbattle startbattle
dontrestartmapmusic dontrestartmapmusic
reloadmapafterbattle reloadmapafterbattle
jump .FinishRivalBattle sjump .FinishRivalBattle
.Totodile: .Totodile:
winlosstext UndergroundSilverWinText, UndergroundSilverLossText winlosstext UndergroundSilverWinText, UndergroundSilverLossText
@ -185,7 +185,7 @@ UndergroundSilverBattleScript:
startbattle startbattle
dontrestartmapmusic dontrestartmapmusic
reloadmapafterbattle reloadmapafterbattle
jump .FinishRivalBattle sjump .FinishRivalBattle
.Chikorita: .Chikorita:
winlosstext UndergroundSilverWinText, UndergroundSilverLossText winlosstext UndergroundSilverWinText, UndergroundSilverLossText
@ -194,7 +194,7 @@ UndergroundSilverBattleScript:
startbattle startbattle
dontrestartmapmusic dontrestartmapmusic
reloadmapafterbattle reloadmapafterbattle
jump .FinishRivalBattle sjump .FinishRivalBattle
.FinishRivalBattle: .FinishRivalBattle:
playmusic MUSIC_RIVAL_AFTER playmusic MUSIC_RIVAL_AFTER
@ -283,7 +283,7 @@ Switch1Script:
addval 1 addval 1
writemem wUndergroundSwitchPositions writemem wUndergroundSwitchPositions
setevent EVENT_SWITCH_1 setevent EVENT_SWITCH_1
jump GoldenrodUndergroundSwitchRoomEntrances_UpdateDoors sjump GoldenrodUndergroundSwitchRoomEntrances_UpdateDoors
.On: .On:
writetext SwitchRoomText_OnTurnOff writetext SwitchRoomText_OnTurnOff
@ -293,7 +293,7 @@ Switch1Script:
addval -1 addval -1
writemem wUndergroundSwitchPositions writemem wUndergroundSwitchPositions
clearevent EVENT_SWITCH_1 clearevent EVENT_SWITCH_1
jump GoldenrodUndergroundSwitchRoomEntrances_UpdateDoors sjump GoldenrodUndergroundSwitchRoomEntrances_UpdateDoors
Switch2Script: Switch2Script:
opentext opentext
@ -308,7 +308,7 @@ Switch2Script:
addval 2 addval 2
writemem wUndergroundSwitchPositions writemem wUndergroundSwitchPositions
setevent EVENT_SWITCH_2 setevent EVENT_SWITCH_2
jump GoldenrodUndergroundSwitchRoomEntrances_UpdateDoors sjump GoldenrodUndergroundSwitchRoomEntrances_UpdateDoors
.On: .On:
writetext SwitchRoomText_OnTurnOff writetext SwitchRoomText_OnTurnOff
@ -318,7 +318,7 @@ Switch2Script:
addval -2 addval -2
writemem wUndergroundSwitchPositions writemem wUndergroundSwitchPositions
clearevent EVENT_SWITCH_2 clearevent EVENT_SWITCH_2
jump GoldenrodUndergroundSwitchRoomEntrances_UpdateDoors sjump GoldenrodUndergroundSwitchRoomEntrances_UpdateDoors
Switch3Script: Switch3Script:
opentext opentext
@ -333,7 +333,7 @@ Switch3Script:
addval 3 addval 3
writemem wUndergroundSwitchPositions writemem wUndergroundSwitchPositions
setevent EVENT_SWITCH_3 setevent EVENT_SWITCH_3
jump GoldenrodUndergroundSwitchRoomEntrances_UpdateDoors sjump GoldenrodUndergroundSwitchRoomEntrances_UpdateDoors
.On: .On:
writetext SwitchRoomText_OnTurnOff writetext SwitchRoomText_OnTurnOff
@ -343,7 +343,7 @@ Switch3Script:
addval -3 addval -3
writemem wUndergroundSwitchPositions writemem wUndergroundSwitchPositions
clearevent EVENT_SWITCH_3 clearevent EVENT_SWITCH_3
jump GoldenrodUndergroundSwitchRoomEntrances_UpdateDoors sjump GoldenrodUndergroundSwitchRoomEntrances_UpdateDoors
EmergencySwitchScript: EmergencySwitchScript:
opentext opentext
@ -360,7 +360,7 @@ EmergencySwitchScript:
setevent EVENT_SWITCH_1 setevent EVENT_SWITCH_1
setevent EVENT_SWITCH_2 setevent EVENT_SWITCH_2
setevent EVENT_SWITCH_3 setevent EVENT_SWITCH_3
jump GoldenrodUndergroundSwitchRoomEntrances_UpdateDoors sjump GoldenrodUndergroundSwitchRoomEntrances_UpdateDoors
.On: .On:
writetext SwitchRoomText_OnTurnOff writetext SwitchRoomText_OnTurnOff
@ -372,7 +372,7 @@ EmergencySwitchScript:
clearevent EVENT_SWITCH_1 clearevent EVENT_SWITCH_1
clearevent EVENT_SWITCH_2 clearevent EVENT_SWITCH_2
clearevent EVENT_SWITCH_3 clearevent EVENT_SWITCH_3
jump GoldenrodUndergroundSwitchRoomEntrances_UpdateDoors sjump GoldenrodUndergroundSwitchRoomEntrances_UpdateDoors
GoldenrodUndergroundSwitchRoomEntrances_DontToggle: GoldenrodUndergroundSwitchRoomEntrances_DontToggle:
closetext closetext

2
maps/HallOfFame.asm
View File

@ -9,7 +9,7 @@ HallOfFame_MapScripts:
db 0 ; callbacks db 0 ; callbacks
.EnterHallOfFame: .EnterHallOfFame:
priorityjump .EnterHallOfFameScript prioritysjump .EnterHallOfFameScript
end end
.DummyScene: .DummyScene:

8
maps/IcePathB1F.asm
View File

@ -28,22 +28,22 @@ IcePathB1F_MapScripts:
.Boulder1: .Boulder1:
disappear ICEPATHB1F_BOULDER1 disappear ICEPATHB1F_BOULDER1
clearevent EVENT_BOULDER_IN_ICE_PATH_1A clearevent EVENT_BOULDER_IN_ICE_PATH_1A
jump .FinishBoulder sjump .FinishBoulder
.Boulder2: .Boulder2:
disappear ICEPATHB1F_BOULDER2 disappear ICEPATHB1F_BOULDER2
clearevent EVENT_BOULDER_IN_ICE_PATH_2A clearevent EVENT_BOULDER_IN_ICE_PATH_2A
jump .FinishBoulder sjump .FinishBoulder
.Boulder3: .Boulder3:
disappear ICEPATHB1F_BOULDER3 disappear ICEPATHB1F_BOULDER3
clearevent EVENT_BOULDER_IN_ICE_PATH_3A clearevent EVENT_BOULDER_IN_ICE_PATH_3A
jump .FinishBoulder sjump .FinishBoulder
.Boulder4: .Boulder4:
disappear ICEPATHB1F_BOULDER4 disappear ICEPATHB1F_BOULDER4
clearevent EVENT_BOULDER_IN_ICE_PATH_4A clearevent EVENT_BOULDER_IN_ICE_PATH_4A
jump .FinishBoulder sjump .FinishBoulder
.FinishBoulder: .FinishBoulder:
pause 30 pause 30

2
maps/IlexForest.asm
View File

@ -430,7 +430,7 @@ IlexForestSignpost:
IlexForestShrineScript: IlexForestShrineScript:
checkevent EVENT_FOREST_IS_RESTLESS checkevent EVENT_FOREST_IS_RESTLESS
iftrue .ForestIsRestless iftrue .ForestIsRestless
jump .DontDoCelebiEvent sjump .DontDoCelebiEvent
.ForestIsRestless: .ForestIsRestless:
checkitem GS_BALL checkitem GS_BALL

Some files were not shown because too many files have changed in this diff Show More