From e1659ecd41dfac70eb021c0f5fe983ed6f043433 Mon Sep 17 00:00:00 2001
From: luckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com>
Date: Tue, 3 Jul 2018 17:07:05 -0400
Subject: Introduce linkerscript.

Addresses of sections will now be added to the linkerscript via `org`, and the section name will be the path/to/file. If there is more than one section in the file, then add a @SectionName after the path/to/file to describe the section.
---
 engine/overworld/object_collision.asm | 8 ++++----
 engine/overworld/player_movement.asm  | 8 ++++----
 engine/overworld/spawn_points.asm     | 4 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'engine/overworld')

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
diff --git a/engine/overworld/player_movement.asm b/engine/overworld/player_movement.asm
index 3c8cf7c..39b75bb 100644
--- a/engine/overworld/player_movement.asm
+++ b/engine/overworld/player_movement.asm
@@ -1,6 +1,6 @@
 INCLUDE "constants.asm"
 
-SECTION "Player Movement", ROMX[$4000], BANK[$03]
+SECTION "engine/overworld/player_movement.asm@Player Movement", ROMX
 
 OverworldMovementCheck:: ; 03:4000
 	jp _OverworldMovementCheck
@@ -1080,7 +1080,7 @@ GetCollisionType::
 	pop de
 	ret
 
-SECTION "Rest of Player Movement", ROMX[$4764], BANK[$03]
+SECTION "engine/overworld/player_movement.asm@Rest of Player Movement", ROMX
 	
 _UnusedReturnFalse:: ; 03:4764
 	xor a
@@ -1122,7 +1122,7 @@ CheckCollisionSometimesSolid:: ; 03:4769
 	ret
 
 
-SECTION "_RedrawPlayerSprite", ROMX[$4000], BANK[$05]
+SECTION "engine/overworld/player_movement.asm@_RedrawPlayerSprite", ROMX
 
 _RedrawPlayerSprite: ; 05:4000
 	call GetPlayerSprite
@@ -1159,4 +1159,4 @@ PlayerSpriteTable: ; 03:402d
 	db PLAYER_BIKE,   SPRITE_GOLD_BIKE
 	db PLAYER_SKATE,  SPRITE_GOLD_SKATEBOARD
 	db PLAYER_SURF,   SPRITE_LAPLACE
-	db -1
+	db -1
\ No newline at end of file
diff --git a/engine/overworld/spawn_points.asm b/engine/overworld/spawn_points.asm
index 2476c46..e07c150 100755
--- a/engine/overworld/spawn_points.asm
+++ b/engine/overworld/spawn_points.asm
@@ -1,6 +1,6 @@
 INCLUDE "constants.asm"
 
-SECTION "LoadSpawnPoint", ROMX[$4791], BANK[$03]
+SECTION "engine/overworld/spawn_points.asm", ROMX
 
 LoadSpawnPoint: ; 03:4791
 ; loads the spawn point in wDefaultSpawnPoint
@@ -56,4 +56,4 @@ IsSpawnPoint: ; 03:47b6
 	ret
 .succeed
 	scf
-	ret
+	ret
\ No newline at end of file
-- 
cgit v1.2.3