diff options
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/events.asm | 18 | ||||
| -rw-r--r-- | engine/events_2.asm | 12 | ||||
| -rw-r--r-- | engine/scripting.asm | 2 |
3 files changed, 16 insertions, 16 deletions
diff --git a/engine/events.asm b/engine/events.asm index cf8b4e647..b0f9fb769 100644 --- a/engine/events.asm +++ b/engine/events.asm @@ -133,7 +133,7 @@ EnterMap: ; 9673e xor a ld [wd453], a ld [wd454], a - call Function968d1 + call SetUpFiveStepWildEncounterCooldown callba RunMapSetupScript call ClearAllScriptFlags3 @@ -382,9 +382,9 @@ CheckTileEvent: ; 96874 call CheckBit4_ScriptFlags3 jr z, .ok - call RockSmashEncounter + call RandomEncounter ret c - jr .ok + jr .ok ; pointless .ok xor a @@ -419,8 +419,8 @@ CheckTileEvent: ; 96874 ; 968c7 -Function968c7:: ; 968c7 - ld hl, wd452 +CheckWildEncounterCooldown:: ; 968c7 + ld hl, wWildEncounterCooldown ld a, [hl] and a ret z @@ -430,9 +430,9 @@ Function968c7:: ; 968c7 ret ; 968d1 -Function968d1: ; 968d1 +SetUpFiveStepWildEncounterCooldown: ; 968d1 ld a, 5 - ld [wd452], a + ld [wWildEncounterCooldown], a ret ; 968d7 @@ -441,11 +441,11 @@ Function968d7: ; 968d7 ; 968d8 Function968d8: ; 968d8 - ld a, [wd452] + ld a, [wWildEncounterCooldown] cp 2 ret nc ld a, 2 - ld [wd452], a + ld [wWildEncounterCooldown], a ret ; 968e4 diff --git a/engine/events_2.asm b/engine/events_2.asm index 5a8ce7c2c..96ebfb515 100644 --- a/engine/events_2.asm +++ b/engine/events_2.asm @@ -95,10 +95,10 @@ CheckFacingTileEvent:: ; 97c5f ; 97cc0 -RockSmashEncounter:: ; 97cc0 -; Rock Smash encounter +RandomEncounter:: ; 97cc0 +; Random encounter - call Function968c7 + call CheckWildEncounterCooldown jr c, .nope call CanUseSweetScent jr nc, .nope @@ -120,8 +120,8 @@ RockSmashEncounter:: ; 97cc0 ret .ok - ld a, BANK(RockSmashBattleScript) - ld hl, RockSmashBattleScript + ld a, BANK(WildBattleScript) + ld hl, WildBattleScript jr .done .ok_bug_contest @@ -135,7 +135,7 @@ RockSmashEncounter:: ; 97cc0 ret ; 97cf9 -RockSmashBattleScript: ; 97cf9 +WildBattleScript: ; 97cf9 battlecheck startbattle returnafterbattle diff --git a/engine/scripting.asm b/engine/scripting.asm index f5e1347b8..bc5a0e790 100644 --- a/engine/scripting.asm +++ b/engine/scripting.asm @@ -2656,7 +2656,7 @@ Script_giveegg: ; 0x97968 ; level (DecimalParam) ; if no room in the party, return 0 in ScriptVar; else, return 2 - xor a + xor a ; PARTYMON ld [ScriptVar], a ld [MonType], a call GetScriptByte |