Labeling of AI item and wild encounter functions

This commit is contained in:
PikalaxALT
2015-10-07 21:27:32 -04:00
parent edf42a54d5
commit 96b0e448c4
10 changed files with 124 additions and 123 deletions

View File

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