diff options
| author | luckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com> | 2018-07-22 09:20:33 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-22 09:20:33 -0400 |
| commit | a586811e197d2a28d3a08dff03548fb69342da96 (patch) | |
| tree | d5eec033243b0031afd3a82d47bbe1b7779d1675 /engine/overworld/object_collision.asm | |
| parent | 5ec276e7c77244befe0b6c9931cda191aa3818b6 (diff) | |
| parent | 5b4ef99f4bfec7a1cf41cd3eab601d355bb0fadf (diff) | |
Merge pull request #38 from luckytyphlosion/section-reorg
Add linkerscript to replace completely anonymous sections.
Diffstat (limited to 'engine/overworld/object_collision.asm')
| -rw-r--r-- | engine/overworld/object_collision.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engine/overworld/object_collision.asm b/engine/overworld/object_collision.asm index 8d42a93..bfc99cb 100644 --- a/engine/overworld/object_collision.asm +++ b/engine/overworld/object_collision.asm @@ -1,6 +1,6 @@ INCLUDE "constants.asm" -SECTION "GetSpritesNextTile", ROMX[$774a], BANK[$01] +SECTION "engine/overworld/object_collision.asm@GetSpritesNextTile", ROMX ; Get the tile that the sprite will walk onto next GetSpritesNextTile: ; 01:774a @@ -31,7 +31,7 @@ _IsObjectCollisionTileSolid: ; 01:775a -SECTION "_CheckObjectCollision", ROMX[$77dd], BANK[$01] +SECTION "engine/overworld/object_collision.asm@_CheckObjectCollision", ROMX ; returns the carry flag if a sprite is at coords d, e ; will not collide with sprite index stored in hEventCollisionException @@ -92,7 +92,7 @@ _CheckObjectCollision: ; 01:77dd scf ret -SECTION "_CheckPlayerObjectCollision", ROMX[$7894], BANK[$01] +SECTION "engine/overworld/object_collision.asm@_CheckPlayerObjectCollision", ROMX ; Sets the carry flag if the player will collide with another sprite's current or next position _CheckPlayerObjectCollision: ; 01:7894 @@ -154,4 +154,4 @@ _CheckPlayerObjectCollision: ; 01:7894 .collision scf - ret + ret
\ No newline at end of file |