diff options
| author | entrpntr <entrpntr@gmail.com> | 2020-04-27 03:33:13 -0400 |
|---|---|---|
| committer | entrpntr <entrpntr@gmail.com> | 2020-04-27 03:35:35 -0400 |
| commit | 70d3a3fdbc508eeb4557ddc43d78ba12ed41963e (patch) | |
| tree | 202f65e4131709331ae62cbe5eace4d6f8b6aa58 /engine/overworld | |
| parent | 75cf425d30db6a036743cf85c483c1b537063605 (diff) | |
Sync with the recent updates to pokecrystal.
Diffstat (limited to 'engine/overworld')
| -rw-r--r-- | engine/overworld/events.asm | 10 | ||||
| -rw-r--r-- | engine/overworld/scripting.asm | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/engine/overworld/events.asm b/engine/overworld/events.asm index ba50fb25..794fa074 100644 --- a/engine/overworld/events.asm +++ b/engine/overworld/events.asm @@ -371,7 +371,7 @@ SetUpFiveStepWildEncounterCooldown: ld [wWildEncounterCooldown], a ret -ret_968d7: +ret_96804: ret SetMinTwoStepWildEncounterCooldown: @@ -763,7 +763,7 @@ PlayerMovement: ret .jump: - call ret_968d7 ; mobile + call ret_96804 xor a ld c, a ret @@ -963,7 +963,7 @@ DoPlayerEvent: PlayerEventScriptPointers: ; entries correspond to PLAYEREVENT_* constants - dba Invalid_0x96c2d ; PLAYEREVENT_NONE + dba Invalid_0x96b60 ; PLAYEREVENT_NONE dba SeenByTrainerScript ; PLAYEREVENT_SEENBYTRAINER dba TalkToTrainerScript ; PLAYEREVENT_TALKTOTRAINER dba FindItemInBallScript ; PLAYEREVENT_ITEMBALL @@ -973,9 +973,9 @@ PlayerEventScriptPointers: dba Script_OverworldWhiteout ; PLAYEREVENT_WHITEOUT dba HatchEggScript ; PLAYEREVENT_HATCH dba ChangeDirectionScript ; PLAYEREVENT_JOYCHANGEFACING - dba Invalid_0x96c2d ; (NUM_PLAYER_EVENTS) + dba Invalid_0x96b60 ; (NUM_PLAYER_EVENTS) -Invalid_0x96c2d: +Invalid_0x96b60: end ; unused diff --git a/engine/overworld/scripting.asm b/engine/overworld/scripting.asm index 7c5bfe55..7659c42d 100644 --- a/engine/overworld/scripting.asm +++ b/engine/overworld/scripting.asm @@ -479,11 +479,11 @@ Script_verbosegiveitem: ld de, GiveItemScript jp ScriptCall -ret_96f76: +ret_96e71: ret GiveItemScript: - callasm ret_96f76 + callasm ret_96e71 writetext ReceivedItemText iffalse .Full waitsfx |