diff options
Diffstat (limited to 'engine/events_2.asm')
| -rw-r--r-- | engine/events_2.asm | 45 |
1 files changed, 17 insertions, 28 deletions
diff --git a/engine/events_2.asm b/engine/events_2.asm index 42e3ed8e4..12476bd31 100644 --- a/engine/events_2.asm +++ b/engine/events_2.asm @@ -50,42 +50,42 @@ LoadScriptBDE:: ; 97c4f ret ; 97c5f -CheckFacingTileEvent:: ; 97c5f +TryTileCollisionEvent:: ; 97c5f call GetFacingTileCoord ld [EngineBuffer1], a ld c, a - callba CheckFacingTileForStd + farcall CheckFacingTileForStdScript jr c, .done call CheckCutTreeTile jr nz, .whirlpool - callba TryCutOW + farcall TryCutOW jr .done .whirlpool ld a, [EngineBuffer1] call CheckWhirlpoolTile jr nz, .waterfall - callba TryWhirlpoolOW + farcall TryWhirlpoolOW jr .done .waterfall ld a, [EngineBuffer1] call CheckWaterfallTile jr nz, .headbutt - callba TryWaterfallOW + farcall TryWaterfallOW jr .done .headbutt ld a, [EngineBuffer1] call CheckHeadbuttTreeTile jr nz, .surf - callba TryHeadbuttOW + farcall TryHeadbuttOW jr c, .done jr .noevent .surf - callba TrySurfOW + farcall TrySurfOW jr nc, .noevent jr .done @@ -111,7 +111,7 @@ RandomEncounter:: ; 97cc0 ld hl, StatusFlags2 bit 2, [hl] ; bug contest jr nz, .bug_contest - callba TryWildEncounter + farcall TryWildEncounter jr nz, .nope jr .ok @@ -152,12 +152,12 @@ CanUseSweetScent:: ; 97cfd ld hl, StatusFlags bit 5, [hl] jr nz, .no - ld a, [wPermission] + ld a, [wEnvironment] cp CAVE jr z, .ice_check cp DUNGEON jr z, .ice_check - callba CheckGrassCollision + farcall CheckGrassCollision jr nc, .no .ice_check @@ -176,7 +176,7 @@ _TryWildEncounter_BugContest: ; 97d23 call TryWildEncounter_BugContest ret nc call ChooseWildEncounter_BugContest - callba CheckRepelEffect + farcall CheckRepelEffect ret ; 97d31 @@ -242,8 +242,8 @@ TryWildEncounter_BugContest: ; 97d64 ld b, 20 percent .ok - callba ApplyMusicEffectOnEncounterRate - callba ApplyCleanseTagEffectOnEncounterRate + farcall ApplyMusicEffectOnEncounterRate + farcall ApplyCleanseTagEffectOnEncounterRate call Random ld a, [hRandomAdd] cp b @@ -253,20 +253,9 @@ TryWildEncounter_BugContest: ; 97d64 ret ; 97d87 -ContestMons: ; 97d87 - ; %, species, min, max - db 20, CATERPIE, 7, 18 - db 20, WEEDLE, 7, 18 - db 10, METAPOD, 9, 18 - db 10, KAKUNA, 9, 18 - db 5, BUTTERFREE, 12, 15 - db 5, BEEDRILL, 12, 15 - db 10, VENONAT, 10, 16 - db 10, PARAS, 10, 17 - db 5, SCYTHER, 13, 14 - db 5, PINSIR, 13, 14 - db -1, VENOMOTH, 30, 40 -; 97db3 + +INCLUDE "data/wild/bug_contest_mons.asm" + DoBikeStep:: ; 97db3 nop @@ -627,7 +616,7 @@ CmdQueue_StoneTable: ; 97f42 ld hl, OBJECT_MOVEMENTTYPE add hl, de ld a, [hl] - cp STEP_TYPE_SKYFALL_TOP + cp SPRITEMOVEDATA_STRENGTH_BOULDER jr nz, .next ld hl, OBJECT_NEXT_TILE |