mirror of
https://gitlab.com/xCrystal/pokecrystal-board.git
synced 2025-04-09 05:44:44 -07:00
Rename some call/jump script commands to avoid confusion with jr/jp asm instructions
Fixes #580
This commit is contained in:
Rangi
parent
e002b536af
commit
f5c9958aea
@ -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>
|
||||
|
||||
|
||||
## `$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>
|
||||
@ -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>
|
||||
|
||||
|
||||
## `$10`: <code>ptcallasm <i>asm</i></code>
|
||||
## `$10`: <code>memcallasm <i>asm</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>
|
||||
|
||||
|
||||
## `$8D`: <code>priorityjump <i>script</i></code>
|
||||
## `$8D`: <code>prioritysjump <i>script</i></code>
|
||||
|
||||
|
||||
## `$8E`: `warpcheck`
|
||||
|
||||
|
||||
## `$8F`: <code>ptpriorityjump <i>script</i></code>
|
||||
## `$8F`: <code>stopandsjump <i>script</i></code>
|
||||
|
||||
|
||||
## `$90`: `return`
|
||||
|
||||
@ -29,4 +29,4 @@ _BasementKey:
|
||||
|
||||
.BasementKeyScript:
|
||||
closetext
|
||||
farjump BasementDoorScript
|
||||
farsjump BasementDoorScript
|
||||
|
||||
@ -20,7 +20,7 @@ BugCatchingContestOverScript::
|
||||
opentext
|
||||
writetext BugCatchingContestText_BeeepTimesUp
|
||||
waitbutton
|
||||
jump BugCatchingContestReturnToGateScript
|
||||
sjump BugCatchingContestReturnToGateScript
|
||||
|
||||
BugCatchingContestOutOfBallsScript:
|
||||
playsound SFX_ELEVATOR_END
|
||||
|
||||
@ -34,4 +34,4 @@ _CardKey:
|
||||
|
||||
.CardKeyScript:
|
||||
closetext
|
||||
farjump CardKeySlotScript
|
||||
farsjump CardKeySlotScript
|
||||
|
||||
@ -10,7 +10,7 @@ FruitTreeScript::
|
||||
iffalse .fruit
|
||||
writetext NothingHereText
|
||||
waitbutton
|
||||
jump .end
|
||||
sjump .end
|
||||
|
||||
.fruit
|
||||
writetext HeyItsFruitText
|
||||
@ -22,7 +22,7 @@ FruitTreeScript::
|
||||
callasm PickedFruitTree
|
||||
specialsound
|
||||
itemnotify
|
||||
jump .end
|
||||
sjump .end
|
||||
|
||||
.packisfull
|
||||
buttonsound
|
||||
|
||||
@ -20,7 +20,7 @@ HiddenItemScript::
|
||||
callasm SetMemEvent
|
||||
specialsound
|
||||
itemnotify
|
||||
jump .finish
|
||||
sjump .finish
|
||||
|
||||
.bag_full
|
||||
buttonsound
|
||||
|
||||
@ -26,7 +26,7 @@ MomTriesToBuySomething::
|
||||
|
||||
.Script:
|
||||
callasm .ASMFunction
|
||||
farjump Script_ReceivePhoneCall
|
||||
farsjump Script_ReceivePhoneCall
|
||||
|
||||
.ASMFunction:
|
||||
call MomBuysItem_DeductFunds
|
||||
|
||||
@ -857,7 +857,7 @@ dig_incave
|
||||
reloadmappart
|
||||
special UpdateTimePals
|
||||
writetext .Text_UsedEscapeRope
|
||||
jump .UsedDigOrEscapeRopeScript
|
||||
sjump .UsedDigOrEscapeRopeScript
|
||||
|
||||
.UsedDigScript:
|
||||
reloadmappart
|
||||
@ -1044,7 +1044,7 @@ AskStrengthScript:
|
||||
callasm TryStrengthOW
|
||||
iffalse .AskStrength
|
||||
ifequal $1, .DontMeetRequirements
|
||||
jump .AlreadyUsedStrength
|
||||
sjump .AlreadyUsedStrength
|
||||
|
||||
.DontMeetRequirements:
|
||||
jumptext UnknownText_0xcd73
|
||||
@ -1540,7 +1540,7 @@ FishFunction:
|
||||
Script_NotEvenANibble:
|
||||
scall Script_FishCastRod
|
||||
writetext UnknownText_0xd0a9
|
||||
jump Script_NotEvenANibble_FallThrough
|
||||
sjump Script_NotEvenANibble_FallThrough
|
||||
|
||||
Script_NotEvenANibble2:
|
||||
scall Script_FishCastRod
|
||||
@ -1557,7 +1557,7 @@ Script_GotABite:
|
||||
callasm Fishing_CheckFacingUp
|
||||
iffalse .NotFacingUp
|
||||
applymovement PLAYER, .Movement_FacingUp
|
||||
jump .FightTheHookedPokemon
|
||||
sjump .FightTheHookedPokemon
|
||||
|
||||
.NotFacingUp:
|
||||
applymovement PLAYER, .Movement_NotFacingUp
|
||||
@ -1767,7 +1767,7 @@ FinishGettingOffBike:
|
||||
|
||||
Script_GetOffBike_Register:
|
||||
loadvar VAR_MOVEMENT, PLAYER_NORMAL
|
||||
jump FinishGettingOffBike
|
||||
sjump FinishGettingOffBike
|
||||
|
||||
Script_CantGetOffBike:
|
||||
writetext .CantGetOffBikeText
|
||||
|
||||
@ -115,7 +115,7 @@ DoPoisonStep::
|
||||
end
|
||||
|
||||
.whiteout
|
||||
farjump Script_OverworldWhiteout
|
||||
farsjump Script_OverworldWhiteout
|
||||
|
||||
.CheckWhitedOut:
|
||||
xor a
|
||||
|
||||
@ -10,7 +10,7 @@ _Squirtbottle:
|
||||
special UpdateTimePals
|
||||
callasm .CheckCanUseSquirtbottle
|
||||
iffalse .NothingHappenedScript
|
||||
farjump WateredWeirdTreeScript
|
||||
farsjump WateredWeirdTreeScript
|
||||
|
||||
.NothingHappenedScript:
|
||||
jumptext .NothingHappenedText
|
||||
|
||||
@ -26,4 +26,4 @@ CheckFacingTileForStdScript::
|
||||
INCLUDE "data/events/collision_stdscripts.asm"
|
||||
|
||||
Script_JumpStdFromRAM:
|
||||
jump wJumpStdScriptBuffer
|
||||
sjump wJumpStdScriptBuffer
|
||||
|
||||
@ -63,40 +63,40 @@ PokecenterNurseScript:
|
||||
iftrue .day
|
||||
checktime NITE
|
||||
iftrue .nite
|
||||
jump .ok
|
||||
sjump .ok
|
||||
|
||||
.morn
|
||||
checkevent EVENT_WELCOMED_TO_POKECOM_CENTER
|
||||
iftrue .morn_comcenter
|
||||
farwritetext NurseMornText
|
||||
buttonsound
|
||||
jump .ok
|
||||
sjump .ok
|
||||
.morn_comcenter
|
||||
farwritetext PokeComNurseMornText
|
||||
buttonsound
|
||||
jump .ok
|
||||
sjump .ok
|
||||
|
||||
.day
|
||||
checkevent EVENT_WELCOMED_TO_POKECOM_CENTER
|
||||
iftrue .day_comcenter
|
||||
farwritetext NurseDayText
|
||||
buttonsound
|
||||
jump .ok
|
||||
sjump .ok
|
||||
.day_comcenter
|
||||
farwritetext PokeComNurseDayText
|
||||
buttonsound
|
||||
jump .ok
|
||||
sjump .ok
|
||||
|
||||
.nite
|
||||
checkevent EVENT_WELCOMED_TO_POKECOM_CENTER
|
||||
iftrue .nite_comcenter
|
||||
farwritetext NurseNiteText
|
||||
buttonsound
|
||||
jump .ok
|
||||
sjump .ok
|
||||
.nite_comcenter
|
||||
farwritetext PokeComNurseNiteText
|
||||
buttonsound
|
||||
jump .ok
|
||||
sjump .ok
|
||||
|
||||
.ok
|
||||
; only do this once
|
||||
@ -150,7 +150,7 @@ PokecenterNurseScript:
|
||||
farwritetext NursePokerusText
|
||||
waitbutton
|
||||
closetext
|
||||
jump .pokerus_done
|
||||
sjump .pokerus_done
|
||||
|
||||
.pokerus_comcenter
|
||||
farwritetext PokeComNursePokerusText
|
||||
@ -232,10 +232,10 @@ ElevatorButtonScript:
|
||||
end
|
||||
|
||||
StrengthBoulderScript:
|
||||
farjump AskStrengthScript
|
||||
farsjump AskStrengthScript
|
||||
|
||||
SmashRockScript:
|
||||
farjump AskRockSmashScript
|
||||
farsjump AskRockSmashScript
|
||||
|
||||
PokecenterSignScript:
|
||||
farjumptext PokecenterSignText
|
||||
@ -334,7 +334,7 @@ BugContestResultsScript:
|
||||
BugContestResults_DidNotWin:
|
||||
farwritetext ContestResults_DidNotWinText
|
||||
buttonsound
|
||||
jump BugContestResults_FinishUp
|
||||
sjump BugContestResults_FinishUp
|
||||
|
||||
BugContestResults_ReturnAfterWinnersPrize:
|
||||
farwritetext ContestResults_JoinUsNextTimeText
|
||||
@ -388,7 +388,7 @@ BugContestResults_FirstPlace:
|
||||
waitbutton
|
||||
verbosegiveitem SUN_STONE
|
||||
iffalse BugContestResults_NoRoomForSunStone
|
||||
jump BugContestResults_ReturnAfterWinnersPrize
|
||||
sjump BugContestResults_ReturnAfterWinnersPrize
|
||||
|
||||
BugContestResults_SecondPlace:
|
||||
getitemname STRING_BUFFER_4, EVERSTONE
|
||||
@ -396,7 +396,7 @@ BugContestResults_SecondPlace:
|
||||
waitbutton
|
||||
verbosegiveitem EVERSTONE
|
||||
iffalse BugContestResults_NoRoomForEverstone
|
||||
jump BugContestResults_ReturnAfterWinnersPrize
|
||||
sjump BugContestResults_ReturnAfterWinnersPrize
|
||||
|
||||
BugContestResults_ThirdPlace:
|
||||
getitemname STRING_BUFFER_4, GOLD_BERRY
|
||||
@ -404,31 +404,31 @@ BugContestResults_ThirdPlace:
|
||||
waitbutton
|
||||
verbosegiveitem GOLD_BERRY
|
||||
iffalse BugContestResults_NoRoomForGoldBerry
|
||||
jump BugContestResults_ReturnAfterWinnersPrize
|
||||
sjump BugContestResults_ReturnAfterWinnersPrize
|
||||
|
||||
BugContestResults_NoRoomForSunStone:
|
||||
farwritetext BugContestPrizeNoRoomText
|
||||
buttonsound
|
||||
setevent EVENT_CONTEST_OFFICER_HAS_SUN_STONE
|
||||
jump BugContestResults_ReturnAfterWinnersPrize
|
||||
sjump BugContestResults_ReturnAfterWinnersPrize
|
||||
|
||||
BugContestResults_NoRoomForEverstone:
|
||||
farwritetext BugContestPrizeNoRoomText
|
||||
buttonsound
|
||||
setevent EVENT_CONTEST_OFFICER_HAS_EVERSTONE
|
||||
jump BugContestResults_ReturnAfterWinnersPrize
|
||||
sjump BugContestResults_ReturnAfterWinnersPrize
|
||||
|
||||
BugContestResults_NoRoomForGoldBerry:
|
||||
farwritetext BugContestPrizeNoRoomText
|
||||
buttonsound
|
||||
setevent EVENT_CONTEST_OFFICER_HAS_GOLD_BERRY
|
||||
jump BugContestResults_ReturnAfterWinnersPrize
|
||||
sjump BugContestResults_ReturnAfterWinnersPrize
|
||||
|
||||
BugContestResults_NoRoomForBerry:
|
||||
farwritetext BugContestPrizeNoRoomText
|
||||
buttonsound
|
||||
setevent EVENT_CONTEST_OFFICER_HAS_BERRY
|
||||
jump BugContestResults_DidNotWin
|
||||
sjump BugContestResults_DidNotWin
|
||||
|
||||
BugContestResults_CopyContestantsToResults:
|
||||
checkevent EVENT_BUG_CATCHING_CONTESTANT_1A
|
||||
@ -1804,7 +1804,7 @@ CoinVendor_IntroScript:
|
||||
closewindow
|
||||
ifequal 1, .Buy50
|
||||
ifequal 2, .Buy500
|
||||
jump .Cancel
|
||||
sjump .Cancel
|
||||
|
||||
.Buy50:
|
||||
checkcoins MAX_COINS - 50
|
||||
@ -1817,7 +1817,7 @@ CoinVendor_IntroScript:
|
||||
playsound SFX_TRANSACTION
|
||||
farwritetext CoinVendor_Buy50CoinsText
|
||||
waitbutton
|
||||
jump .loop
|
||||
sjump .loop
|
||||
|
||||
.Buy500:
|
||||
checkcoins MAX_COINS - 500
|
||||
@ -1830,7 +1830,7 @@ CoinVendor_IntroScript:
|
||||
playsound SFX_TRANSACTION
|
||||
farwritetext CoinVendor_Buy500CoinsText
|
||||
waitbutton
|
||||
jump .loop
|
||||
sjump .loop
|
||||
|
||||
.NotEnoughMoney:
|
||||
farwritetext CoinVendor_NotEnoughMoneyText
|
||||
|
||||
@ -21,7 +21,7 @@ SweetScentFromMenu:
|
||||
end
|
||||
|
||||
.BugCatchingContest:
|
||||
farjump BugCatchingContestBattleScript
|
||||
farsjump BugCatchingContestBattleScript
|
||||
|
||||
SweetScentNothing:
|
||||
writetext UnknownText_0x5072b
|
||||
|
||||
@ -4,7 +4,7 @@ TalkToTrainerScript::
|
||||
iftrue AlreadyBeatenTrainerScript
|
||||
loadtemptrainer
|
||||
encountermusic
|
||||
jump StartBattleWithMapTrainerScript
|
||||
sjump StartBattleWithMapTrainerScript
|
||||
|
||||
SeenByTrainerScript::
|
||||
loadtemptrainer
|
||||
@ -14,7 +14,7 @@ SeenByTrainerScript::
|
||||
applymovementlasttalked wMovementBuffer
|
||||
writeobjectxy LAST_TALKED
|
||||
faceobject PLAYER, LAST_TALKED
|
||||
jump StartBattleWithMapTrainerScript
|
||||
sjump StartBattleWithMapTrainerScript
|
||||
|
||||
StartBattleWithMapTrainerScript:
|
||||
opentext
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
Script_BattleWhiteout::
|
||||
callasm BattleBGMap
|
||||
jump Script_Whiteout
|
||||
sjump Script_Whiteout
|
||||
|
||||
Script_OverworldWhiteout::
|
||||
refreshscreen
|
||||
|
||||
@ -841,11 +841,11 @@ CheckMenuOW:
|
||||
|
||||
StartMenuScript:
|
||||
callasm StartMenu
|
||||
jump StartMenuCallback
|
||||
sjump StartMenuCallback
|
||||
|
||||
SelectMenuScript:
|
||||
callasm SelectMenu
|
||||
jump SelectMenuCallback
|
||||
sjump SelectMenuCallback
|
||||
|
||||
StartMenuCallback:
|
||||
SelectMenuCallback:
|
||||
@ -855,10 +855,10 @@ SelectMenuCallback:
|
||||
end
|
||||
|
||||
.Script:
|
||||
ptjump wQueuedScriptBank
|
||||
memjump wQueuedScriptBank
|
||||
|
||||
.Asm:
|
||||
ptcallasm wQueuedScriptBank
|
||||
memcallasm wQueuedScriptBank
|
||||
end
|
||||
|
||||
CountStep:
|
||||
|
||||
@ -65,10 +65,10 @@ ScriptCommandTable:
|
||||
; entries correspond to macros/scripts/events.asm enumeration
|
||||
dw Script_scall ; 00
|
||||
dw Script_farscall ; 01
|
||||
dw Script_ptcall ; 02
|
||||
dw Script_jump ; 03
|
||||
dw Script_farjump ; 04
|
||||
dw Script_ptjump ; 05
|
||||
dw Script_memcall ; 02
|
||||
dw Script_sjump ; 03
|
||||
dw Script_farsjump ; 04
|
||||
dw Script_memjump ; 05
|
||||
dw Script_ifequal ; 06
|
||||
dw Script_ifnotequal ; 07
|
||||
dw Script_iffalse ; 08
|
||||
@ -79,7 +79,7 @@ ScriptCommandTable:
|
||||
dw Script_callstd ; 0d
|
||||
dw Script_callasm ; 0e
|
||||
dw Script_special ; 0f
|
||||
dw Script_ptcallasm ; 10
|
||||
dw Script_memcallasm ; 10
|
||||
dw Script_checkmapscene ; 11
|
||||
dw Script_setmapscene ; 12
|
||||
dw Script_checkscene ; 13
|
||||
@ -206,9 +206,9 @@ endc
|
||||
dw Script_newloadmap ; 8a
|
||||
dw Script_pause ; 8b
|
||||
dw Script_deactivatefacing ; 8c
|
||||
dw Script_priorityjump ; 8d
|
||||
dw Script_prioritysjump ; 8d
|
||||
dw Script_warpcheck ; 8e
|
||||
dw Script_ptpriorityjump ; 8f
|
||||
dw Script_stopandsjump ; 8f
|
||||
dw Script_return ; 90
|
||||
dw Script_end ; 91
|
||||
dw Script_reloadandreturn ; 92
|
||||
@ -276,7 +276,7 @@ Script_special:
|
||||
farcall Special
|
||||
ret
|
||||
|
||||
Script_ptcallasm:
|
||||
Script_memcallasm:
|
||||
; script command 0x10
|
||||
; parameters: asm
|
||||
|
||||
@ -1428,7 +1428,7 @@ Script_farscall:
|
||||
ld d, a
|
||||
jr ScriptCall
|
||||
|
||||
Script_ptcall:
|
||||
Script_memcall:
|
||||
; script command 0x2
|
||||
; parameters: pointer
|
||||
|
||||
@ -1480,7 +1480,7 @@ CallCallback::
|
||||
ld [wScriptBank], a
|
||||
jp ScriptCall
|
||||
|
||||
Script_jump:
|
||||
Script_sjump:
|
||||
; script command 0x3
|
||||
; parameters: pointer
|
||||
|
||||
@ -1492,7 +1492,7 @@ Script_jump:
|
||||
ld b, a
|
||||
jp ScriptJump
|
||||
|
||||
Script_farjump:
|
||||
Script_farsjump:
|
||||
; script command 0x4
|
||||
; parameters: pointer
|
||||
|
||||
@ -1504,7 +1504,7 @@ Script_farjump:
|
||||
ld h, a
|
||||
jp ScriptJump
|
||||
|
||||
Script_ptjump:
|
||||
Script_memjump:
|
||||
; script command 0x5
|
||||
; parameters: pointer
|
||||
|
||||
@ -1526,7 +1526,7 @@ Script_iffalse:
|
||||
ld a, [wScriptVar]
|
||||
and a
|
||||
jp nz, SkipTwoScriptBytes
|
||||
jp Script_jump
|
||||
jp Script_sjump
|
||||
|
||||
Script_iftrue:
|
||||
; script command 0x9
|
||||
@ -1534,7 +1534,7 @@ Script_iftrue:
|
||||
|
||||
ld a, [wScriptVar]
|
||||
and a
|
||||
jp nz, Script_jump
|
||||
jp nz, Script_sjump
|
||||
jp SkipTwoScriptBytes
|
||||
|
||||
Script_ifequal:
|
||||
@ -1544,7 +1544,7 @@ Script_ifequal:
|
||||
call GetScriptByte
|
||||
ld hl, wScriptVar
|
||||
cp [hl]
|
||||
jr z, Script_jump
|
||||
jr z, Script_sjump
|
||||
jr SkipTwoScriptBytes
|
||||
|
||||
Script_ifnotequal:
|
||||
@ -1554,7 +1554,7 @@ Script_ifnotequal:
|
||||
call GetScriptByte
|
||||
ld hl, wScriptVar
|
||||
cp [hl]
|
||||
jr nz, Script_jump
|
||||
jr nz, Script_sjump
|
||||
jr SkipTwoScriptBytes
|
||||
|
||||
Script_ifgreater:
|
||||
@ -1565,7 +1565,7 @@ Script_ifgreater:
|
||||
ld b, a
|
||||
call GetScriptByte
|
||||
cp b
|
||||
jr c, Script_jump
|
||||
jr c, Script_sjump
|
||||
jr SkipTwoScriptBytes
|
||||
|
||||
Script_ifless:
|
||||
@ -1576,7 +1576,7 @@ Script_ifless:
|
||||
ld b, a
|
||||
ld a, [wScriptVar]
|
||||
cp b
|
||||
jr c, Script_jump
|
||||
jr c, Script_sjump
|
||||
jr SkipTwoScriptBytes
|
||||
|
||||
Script_jumpstd:
|
||||
@ -1626,7 +1626,7 @@ ScriptJump:
|
||||
ld [wScriptPos + 1], a
|
||||
ret
|
||||
|
||||
Script_priorityjump:
|
||||
Script_prioritysjump:
|
||||
; script command 0x8d
|
||||
; parameters: pointer
|
||||
|
||||
@ -2697,12 +2697,12 @@ Script_deactivatefacing:
|
||||
call StopScript
|
||||
ret
|
||||
|
||||
Script_ptpriorityjump:
|
||||
Script_stopandsjump:
|
||||
; script command 0x8f
|
||||
; parameters: pointer
|
||||
|
||||
call StopScript
|
||||
jp Script_jump
|
||||
jp Script_sjump
|
||||
|
||||
Script_end:
|
||||
; script command 0x91
|
||||
|
||||
@ -281,7 +281,7 @@ CheckSpecialPhoneCall::
|
||||
|
||||
.script
|
||||
pause 30
|
||||
jump Script_ReceivePhoneCall
|
||||
sjump Script_ReceivePhoneCall
|
||||
|
||||
.DoSpecialPhoneCall:
|
||||
ld a, [wSpecialPhoneCallID]
|
||||
@ -378,7 +378,7 @@ Function90199:
|
||||
ret
|
||||
|
||||
UnknownScript_0x90205:
|
||||
ptcall wd002
|
||||
memcall wPhoneScriptBank
|
||||
return
|
||||
|
||||
UnknownScript_0x90209:
|
||||
@ -422,7 +422,7 @@ WrongNumber:
|
||||
Script_ReceivePhoneCall:
|
||||
refreshscreen
|
||||
callasm RingTwice_StartCall
|
||||
ptcall wPhoneScriptPointer
|
||||
memcall wPhoneScriptPointer
|
||||
waitbutton
|
||||
callasm HangUp
|
||||
closetext
|
||||
@ -431,7 +431,7 @@ Script_ReceivePhoneCall:
|
||||
|
||||
Script_SpecialBillCall::
|
||||
callasm .LoadBillScript
|
||||
jump Script_ReceivePhoneCall
|
||||
sjump Script_ReceivePhoneCall
|
||||
|
||||
.LoadBillScript:
|
||||
ld e, PHONE_BILL
|
||||
@ -440,7 +440,7 @@ Script_SpecialBillCall::
|
||||
UnknownScript_0x90261:
|
||||
callasm .LoadElmScript
|
||||
pause 30
|
||||
jump Script_ReceivePhoneCall
|
||||
sjump Script_ReceivePhoneCall
|
||||
|
||||
.LoadElmScript:
|
||||
ld e, PHONE_ELM
|
||||
|
||||
@ -13,15 +13,15 @@ AlanPhoneCalleeScript:
|
||||
iftrue AlanWednesdayDay
|
||||
|
||||
.NotWednesday:
|
||||
farjump UnknownScript_0xa0970
|
||||
farsjump UnknownScript_0xa0970
|
||||
|
||||
.WantsBattle:
|
||||
getlandmarkname STRING_BUFFER_5, ROUTE_36
|
||||
farjump UnknownScript_0xa0a73
|
||||
farsjump UnknownScript_0xa0a73
|
||||
|
||||
.FireStone:
|
||||
getlandmarkname STRING_BUFFER_5, ROUTE_36
|
||||
farjump UnknownScript_0xa0ac5
|
||||
farsjump UnknownScript_0xa0ac5
|
||||
|
||||
AlanPhoneCallerScript:
|
||||
gettrainername STRING_BUFFER_3, SCHOOLBOY, ALAN1
|
||||
@ -44,7 +44,7 @@ AlanPhoneCallerScript:
|
||||
ifequal 0, AlanHasFireStone
|
||||
|
||||
.Generic:
|
||||
farjump Phone_GenericCall_Male
|
||||
farsjump Phone_GenericCall_Male
|
||||
|
||||
AlanWednesdayDay:
|
||||
setflag ENGINE_ALAN_WEDNESDAY_AFTERNOON
|
||||
@ -52,9 +52,9 @@ AlanWednesdayDay:
|
||||
AlanWantsBattle:
|
||||
getlandmarkname STRING_BUFFER_5, ROUTE_36
|
||||
setflag ENGINE_ALAN
|
||||
farjump PhoneScript_WantsToBattle_Male
|
||||
farsjump PhoneScript_WantsToBattle_Male
|
||||
|
||||
AlanHasFireStone:
|
||||
setflag ENGINE_ALAN_HAS_FIRE_STONE
|
||||
getlandmarkname STRING_BUFFER_5, ROUTE_36
|
||||
farjump PhoneScript_FoundItem_Male
|
||||
farsjump PhoneScript_FoundItem_Male
|
||||
|
||||
@ -13,15 +13,15 @@ AnthonyPhoneCalleeScript:
|
||||
.NotFriday:
|
||||
checkflag ENGINE_DUNSPARCE_SWARM
|
||||
iftrue .AlreadySwarming
|
||||
farjump UnknownScript_0xa0950
|
||||
farsjump UnknownScript_0xa0950
|
||||
|
||||
.WantsBattle:
|
||||
getlandmarkname STRING_BUFFER_5, ROUTE_33
|
||||
farjump UnknownScript_0xa0a5f
|
||||
farsjump UnknownScript_0xa0a5f
|
||||
|
||||
.AlreadySwarming:
|
||||
getlandmarkname STRING_BUFFER_5, ROUTE_33
|
||||
farjump UnknownScript_0xa0afa
|
||||
farsjump UnknownScript_0xa0afa
|
||||
|
||||
AnthonyPhoneCallerScript:
|
||||
gettrainername STRING_BUFFER_3, HIKER, ANTHONY2
|
||||
@ -38,7 +38,7 @@ AnthonyPhoneCallerScript:
|
||||
.TriesSwarm:
|
||||
farscall PhoneScript_Random5
|
||||
ifequal 0, AnthonyTriesDunsparceSwarm
|
||||
farjump Phone_GenericCall_Male
|
||||
farsjump Phone_GenericCall_Male
|
||||
|
||||
AnthonyFridayNight:
|
||||
setflag ENGINE_ANTHONY_FRIDAY_NIGHT
|
||||
@ -46,7 +46,7 @@ AnthonyFridayNight:
|
||||
AnthonyWantsBattle:
|
||||
getlandmarkname STRING_BUFFER_5, ROUTE_33
|
||||
setflag ENGINE_ANTHONY
|
||||
farjump PhoneScript_WantsToBattle_Male
|
||||
farsjump PhoneScript_WantsToBattle_Male
|
||||
|
||||
AnthonyTriesDunsparceSwarm:
|
||||
checkflag ENGINE_DUNSPARCE_SWARM
|
||||
@ -55,7 +55,7 @@ AnthonyTriesDunsparceSwarm:
|
||||
getmonname STRING_BUFFER_4, DUNSPARCE
|
||||
swarm SWARM_DUNSPARCE, DARK_CAVE_VIOLET_ENTRANCE
|
||||
getlandmarkname STRING_BUFFER_5, DARK_CAVE
|
||||
farjump UnknownScript_0xa05de
|
||||
farsjump UnknownScript_0xa05de
|
||||
|
||||
.Generic:
|
||||
farjump Phone_GenericCall_Male
|
||||
farsjump Phone_GenericCall_Male
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user