diff options
| author | pikalaxalt <PikalaxALT@gmail.com> | 2016-05-17 08:40:42 -0400 |
|---|---|---|
| committer | pikalaxalt <PikalaxALT@gmail.com> | 2016-05-17 08:40:56 -0400 |
| commit | 98f443f70c60f8fdbcf8621ab2c4f9dd37c66bde (patch) | |
| tree | 42dc1cc21f8916c6d6ffe3b503fffddc4cab68cf /engine/events.asm | |
| parent | 2eeb78d1bcecf09b2a48035dc24c19a726c41819 (diff) | |
engine/events.asm labels finished
fixed palred/green/blue macros
Diffstat (limited to 'engine/events.asm')
| -rw-r--r-- | engine/events.asm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/engine/events.asm b/engine/events.asm index 0e8b29afc..e7598b595 100644 --- a/engine/events.asm +++ b/engine/events.asm @@ -167,10 +167,10 @@ HandleMap: ; 96773 cp 2 ; HandleMap ret nz - call Function967d1 + call HandleMapObjects call NextOverworldFrame - call Function967e1 - call Function967f4 + call HandleMapBackground + call CheckPlayerState ret ; 96795 @@ -226,21 +226,21 @@ HandleMapTimeAndJoypad: ; 967c1 ret ; 967d1 -Function967d1: ; 967d1 +HandleMapObjects: ; 967d1 callba HandleNPCStep ; engine/map_objects.asm callba _HandlePlayerStep call _CheckObjectEnteringVisibleRange ret ; 967e1 -Function967e1: ; 967e1 +HandleMapBackground: ; 967e1 callba _UpdateSprites callba ScrollScreen callba PlaceMapNameSign ret ; 967f4 -Function967f4: ; 967f4 +CheckPlayerState: ; 967f4 ld a, [wPlayerStepFlags] bit 5, a ; in the middle of step jr z, .events |