diff options
Diffstat (limited to 'engine/overworld')
| -rw-r--r--[-rwxr-xr-x] | engine/overworld/auto_movement.asm | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | engine/overworld/cut.asm | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | engine/overworld/cut2.asm | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | engine/overworld/doors.asm | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | engine/overworld/dust_smoke.asm | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | engine/overworld/elevator.asm | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | engine/overworld/emotion_bubbles.asm | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | engine/overworld/healing_machine.asm | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | engine/overworld/hidden_objects.asm | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | engine/overworld/ledges.asm | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | engine/overworld/map_sprites.asm | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | engine/overworld/player_animations.asm | 0 | ||||
| -rw-r--r-- | engine/overworld/tilesets.asm | 2 | ||||
| -rw-r--r--[-rwxr-xr-x] | engine/overworld/trainer_sight.asm | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | engine/overworld/turn_sprite.asm | 0 | ||||
| -rw-r--r-- | engine/overworld/update_map.asm | 6 |
16 files changed, 4 insertions, 4 deletions
diff --git a/engine/overworld/auto_movement.asm b/engine/overworld/auto_movement.asm index 9c078f08..9c078f08 100755..100644 --- a/engine/overworld/auto_movement.asm +++ b/engine/overworld/auto_movement.asm diff --git a/engine/overworld/cut.asm b/engine/overworld/cut.asm index 6a92ccc0..6a92ccc0 100755..100644 --- a/engine/overworld/cut.asm +++ b/engine/overworld/cut.asm diff --git a/engine/overworld/cut2.asm b/engine/overworld/cut2.asm index 3d4a5905..3d4a5905 100755..100644 --- a/engine/overworld/cut2.asm +++ b/engine/overworld/cut2.asm diff --git a/engine/overworld/doors.asm b/engine/overworld/doors.asm index d38818fa..d38818fa 100755..100644 --- a/engine/overworld/doors.asm +++ b/engine/overworld/doors.asm diff --git a/engine/overworld/dust_smoke.asm b/engine/overworld/dust_smoke.asm index a20a0591..a20a0591 100755..100644 --- a/engine/overworld/dust_smoke.asm +++ b/engine/overworld/dust_smoke.asm diff --git a/engine/overworld/elevator.asm b/engine/overworld/elevator.asm index fa404602..fa404602 100755..100644 --- a/engine/overworld/elevator.asm +++ b/engine/overworld/elevator.asm diff --git a/engine/overworld/emotion_bubbles.asm b/engine/overworld/emotion_bubbles.asm index 5a41c226..5a41c226 100755..100644 --- a/engine/overworld/emotion_bubbles.asm +++ b/engine/overworld/emotion_bubbles.asm diff --git a/engine/overworld/healing_machine.asm b/engine/overworld/healing_machine.asm index 62abc7ee..62abc7ee 100755..100644 --- a/engine/overworld/healing_machine.asm +++ b/engine/overworld/healing_machine.asm diff --git a/engine/overworld/hidden_objects.asm b/engine/overworld/hidden_objects.asm index 855328e7..855328e7 100755..100644 --- a/engine/overworld/hidden_objects.asm +++ b/engine/overworld/hidden_objects.asm diff --git a/engine/overworld/ledges.asm b/engine/overworld/ledges.asm index f01ae5ef..f01ae5ef 100755..100644 --- a/engine/overworld/ledges.asm +++ b/engine/overworld/ledges.asm diff --git a/engine/overworld/map_sprites.asm b/engine/overworld/map_sprites.asm index fa3a37dc..fa3a37dc 100755..100644 --- a/engine/overworld/map_sprites.asm +++ b/engine/overworld/map_sprites.asm diff --git a/engine/overworld/player_animations.asm b/engine/overworld/player_animations.asm index c458a013..c458a013 100755..100644 --- a/engine/overworld/player_animations.asm +++ b/engine/overworld/player_animations.asm diff --git a/engine/overworld/tilesets.asm b/engine/overworld/tilesets.asm index f40cbbc2..fa5cf626 100644 --- a/engine/overworld/tilesets.asm +++ b/engine/overworld/tilesets.asm @@ -23,7 +23,7 @@ LoadTilesetHeader: dec c jr nz, .copyTilesetHeaderLoop ld a, [hl] - ldh [hTilesetType], a + ldh [hTileAnimations], a xor a ldh [hMovingBGTilesCounter1], a pop hl diff --git a/engine/overworld/trainer_sight.asm b/engine/overworld/trainer_sight.asm index 816dea7f..816dea7f 100755..100644 --- a/engine/overworld/trainer_sight.asm +++ b/engine/overworld/trainer_sight.asm diff --git a/engine/overworld/turn_sprite.asm b/engine/overworld/turn_sprite.asm index 7b34a03a..7b34a03a 100755..100644 --- a/engine/overworld/turn_sprite.asm +++ b/engine/overworld/turn_sprite.asm diff --git a/engine/overworld/update_map.asm b/engine/overworld/update_map.asm index 53a5592d..dbf28dae 100644 --- a/engine/overworld/update_map.asm +++ b/engine/overworld/update_map.asm @@ -52,11 +52,11 @@ RedrawMapView: ret z ldh a, [hAutoBGTransferEnabled] push af - ldh a, [hTilesetType] + ldh a, [hTileAnimations] push af xor a ldh [hAutoBGTransferEnabled], a - ldh [hTilesetType], a ; no flower/water BG tile animations + ldh [hTileAnimations], a call LoadCurrentMapView call RunDefaultPaletteCommand ld hl, wMapViewVRAMPointer @@ -112,7 +112,7 @@ RedrawMapView: dec c jr nz, .redrawRowLoop pop af - ldh [hTilesetType], a + ldh [hTileAnimations], a pop af ldh [hAutoBGTransferEnabled], a ret |