pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-09-08 08:13:02 -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
Download Patch File Download Diff File Expand all files Collapse all files

10
engine/events/overworld.asm
View File

@@ -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