pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-04-09 05:44:44 -07: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

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