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.

23 files changed, 60 insertions, 60 deletions

diff --git a/engine/Intro.asm b/engine/Intro.asm
index aa10842..3a60696 100644
--- a/engine/Intro.asm
+++ b/engine/Intro.asm
@@ -1,6 +1,6 @@
 include "constants.asm"
 
-SECTION "Oak Intro and Game Setup", ROMX[$558D], BANK[$01]
+SECTION "engine/Intro.asm", ROMX
 
 DemoStart:: ; 558D
 	ld de, OakPic
diff --git a/engine/battle/core.asm b/engine/battle/core.asm
index c79fb22..e1996c2 100644
--- a/engine/battle/core.asm
+++ b/engine/battle/core.asm
@@ -1,6 +1,6 @@
 include "constants.asm"
 
-SECTION "Battle Random", ROMX [$63DA], BANK [$0F]
+SECTION "engine/battle/core.asm", ROMX
 _BattleRandom: ; 3e3da (f:63da)
 ; If the normal RNG is used in a link battle it'll desync.
 ; To circumvent this a shared PRNG is used instead.
@@ -66,4 +66,4 @@ _BattleRandom: ; 3e3da (f:63da)
 	pop af
 	pop bc
 	pop hl
-	ret
+	ret
\ No newline at end of file
diff --git a/engine/battle_anims/bg_effects.asm b/engine/battle_anims/bg_effects.asm
index 7e51b03..ee1f132 100644
--- a/engine/battle_anims/bg_effects.asm
+++ b/engine/battle_anims/bg_effects.asm
@@ -1,6 +1,6 @@
 include "constants.asm"
 
-SECTION "Battle Anims BG Effects", ROMX [$4000], BANK [$32]
+SECTION "engine/battle_anims/bg_effects.asm", ROMX
 
 	const_def
 	const BGSQUARE_SIX
@@ -2373,4 +2373,4 @@ BattleBGEffects_Cosine: ; c8cf3 (32:4cf3)
 	ld a, e
 	ret
 
-; c906f (32:506f)
+; c906f (32:506f)
\ No newline at end of file
diff --git a/engine/bcd.asm b/engine/bcd.asm
index 6d441b2..20c94b8 100755
--- a/engine/bcd.asm
+++ b/engine/bcd.asm
@@ -1,6 +1,6 @@
 INCLUDE "constants.asm"
 	
-SECTION "BCD", ROMX[$4de3], BANK[$03]
+SECTION "engine/bcd.asm", ROMX
 
 AddBCD: ; 03:4de3
 	and a
@@ -52,4 +52,4 @@ SubBCD: ; 03:4df9
 	jr nz, .fill
 	scf
 .done
-	ret
+	ret
\ No newline at end of file
diff --git a/engine/events/field_moves.asm b/engine/events/field_moves.asm
index 741d601..b27f4b0 100755
--- a/engine/events/field_moves.asm
+++ b/engine/events/field_moves.asm
@@ -3,7 +3,7 @@ INCLUDE "constants.asm"
 
 ; TODO - need to constantize tile ids, movements
 
-SECTION "Field Moves", ROMX[$4fab], BANK[$03]
+SECTION "engine/events/field_moves.asm", ROMX
 
 CutFunction: ; 03:4fab
 	call .ResetScriptID
@@ -539,4 +539,4 @@ TeleportScript: ; 03:5375
 Text_ReturnToLastMonCenter: ; 03:5395
 	text "さいごに　たちよった"
 	line "#センターにもどります"
-	done
+	done
\ No newline at end of file
diff --git a/engine/gfx.asm b/engine/gfx.asm
index b97d2f5..7ab0071 100644
--- a/engine/gfx.asm
+++ b/engine/gfx.asm
@@ -1,6 +1,6 @@
 INCLUDE "constants.asm"
 
-SECTION "Misc GFX Loading Functions", ROMX[$4000], BANK[$3E]
+SECTION "engine/gfx.asm", ROMX
 
 LoadFontGraphics:: ; f8000 (3e:4000)
 	ld de, FontGFX
diff --git a/engine/items/inventory.asm b/engine/items/inventory.asm
index c30e5c0..a11bcec 100755
--- a/engine/items/inventory.asm
+++ b/engine/items/inventory.asm
@@ -1,6 +1,6 @@
 INCLUDE "constants.asm"
 
-SECTION "Inventory", ROMX[$4AA1], BANK[$03]
+SECTION "engine/items/inventory.asm@Inventory", ROMX
 
 _ReceiveItem: ; 03:4AA1
 	call DoesHLEqualwNumBagItems
@@ -588,7 +588,7 @@ GetNumberedTMHM: ; 03:4D1A
 	and a
 	ret
 
-SECTION "GetItemAmount", ROMX[$4e10], BANK[$03]
+SECTION "engine/items/inventory.asm@GetItemAmount", ROMX
 
 ; Returns carry if user has the item
 ; and the amount in b
@@ -634,7 +634,7 @@ CheckAmountInKeyItems: ; 03:4E2B
 	scf
 	ret
 	
-SECTION "_CheckTossableItem", ROMX[$53AD], BANK[$03]
+SECTION "engine/items/inventory.asm@_CheckTossableItem", ROMX
 
 ; Return 1 in wItemAttributeParamBuffer and
 ; carry if wCurItem can't be removed from the bag.
@@ -720,4 +720,4 @@ GetItemPrice: ; 03:540C
 	ld d, a
 	pop bc
 	pop hl
-	ret
+	ret
\ No newline at end of file
diff --git a/engine/items/item_effects.asm b/engine/items/item_effects.asm
index 7f886f1..6f854f0 100755
--- a/engine/items/item_effects.asm
+++ b/engine/items/item_effects.asm
@@ -1,6 +1,6 @@
 INCLUDE "constants.asm"
 
-SECTION "ApplyPPUp", ROMX[$78f6], BANK[$03]
+SECTION "engine/items/item_effects.asm", ROMX
 
 ApplyPPUp: ; 03:78f6
 	ld a, MON_MOVES
@@ -76,4 +76,4 @@ ComputeMaxPP: ; 03:792B
 .no_pp_up
 	ld [hl], b
 	pop bc
-	ret
+	ret
\ No newline at end of file
diff --git a/engine/landmarks.asm b/engine/landmarks.asm
index 9e3c95d..ac3ed9d 100644
--- a/engine/landmarks.asm
+++ b/engine/landmarks.asm
@@ -1,6 +1,6 @@
 INCLUDE "constants.asm"
 
-SECTION "GetLandmarkName", ROMX[$4AA5], BANK[$3F]
+SECTION "engine/landmarks.asm", ROMX
 
 GetLandmarkName::
 	dec a
@@ -8,4 +8,4 @@ GetLandmarkName::
 	call GetNthString
 	ld d, h
 	ld e, l
-	ret
+	ret
\ No newline at end of file
diff --git a/engine/link/place_waiting_text.asm b/engine/link/place_waiting_text.asm
index a9f712e..ae11c74 100644
--- a/engine/link/place_waiting_text.asm
+++ b/engine/link/place_waiting_text.asm
@@ -1,6 +1,6 @@
 INCLUDE "constants.asm"
 
-SECTION "PlaceWaitingText", ROMX[$4000], BANK[$01]
+SECTION "engine/link/place_waiting_text.asm", ROMX
 
 PlaceWaitingText:: ; 1:4000
 	hlcoord 3, 10
@@ -22,4 +22,4 @@ PlaceWaitingText:: ; 1:4000
 	jp DelayFrames
 
 .Waiting
-	db "つうしんたいきちゅう！@"
+	db "つうしんたいきちゅう！@"
\ No newline at end of file
diff --git a/engine/math/math.asm b/engine/math/math.asm
index 4395009..503743b 100644
--- a/engine/math/math.asm
+++ b/engine/math/math.asm
@@ -1,6 +1,6 @@
 include "constants.asm"
 
-SECTION "Multiply and Divide Engine", ROMX [$6810], BANK [$1]
+SECTION "engine/math/math.asm", ROMX
 
 _Multiply:: ; 6810
 
@@ -197,4 +197,4 @@ _Divide:: ; 6870
 	ldh [hDividend + 0], a
 
 	ret
-; 68f3
+; 68f3
\ No newline at end of file
diff --git a/engine/menu/debug_menu.asm b/engine/menu/debug_menu.asm
index be46a00..17f24af 100644
--- a/engine/menu/debug_menu.asm
+++ b/engine/menu/debug_menu.asm
@@ -1,6 +1,6 @@
 INCLUDE "constants.asm"
 
-SECTION "Debug Menu", ROMX[$4031], BANK[$01]
+SECTION "engine/menu/debug_menu.asm", ROMX
 
 DebugMenu:: ; $4031
 	call ClearTileMap
diff --git a/engine/menu/main_menu.asm b/engine/menu/main_menu.asm
index 432570a..75fd00a 100644
--- a/engine/menu/main_menu.asm
+++ b/engine/menu/main_menu.asm
@@ -1,6 +1,6 @@
 INCLUDE "constants.asm"
 
-SECTION "Main Menu", ROMX[$53CC], BANK[$01]
+SECTION "engine/menu/main_menu.asm", ROMX
 
 MainMenu:: ; 01:53CC
 	ld hl, wd4a9 
@@ -208,4 +208,4 @@ StartNewGame:: ; 555C
 	call DebugSetUpPlayer
 	jp IntroCleanup
 	
-; 558D
+; 558D
\ No newline at end of file
diff --git a/engine/menu/reset_dialog.asm b/engine/menu/reset_dialog.asm
index 5c676a7..688a2e3 100644
--- a/engine/menu/reset_dialog.asm
+++ b/engine/menu/reset_dialog.asm
@@ -1,6 +1,6 @@
 INCLUDE "constants.asm"
 
-SECTION "Debug Reset Menu", ROMX[$4362], BANK[$3F]
+SECTION "engine/menu/reset_dialog.asm", ROMX
 
 DisplayResetDialog:: ; fc362 (3f:4362)
 	ld hl, _ResetConfirmText
@@ -12,4 +12,4 @@ DisplayResetDialog:: ; fc362 (3f:4362)
 
 _ResetConfirmText::
 	text "ほんとにりセットしますか？"
-	done
+	done
\ No newline at end of file
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
diff --git a/engine/palettes.asm b/engine/palettes.asm
index 67ed9fe..b90c99e 100644
--- a/engine/palettes.asm
+++ b/engine/palettes.asm
@@ -1,6 +1,6 @@
 INCLUDE "constants.asm"
 
-SECTION "Overworld fade", ROMX[$433e], BANK[$23]
+SECTION "engine/palettes.asm@Overworld fade", ROMX
 
 OverworldFadeIn:: ; 23:433e
     ld c, 0
@@ -18,7 +18,7 @@ OverworldFadeOut:: ; 23:4349
 
 
 ; TODO: merge this
-SECTION "Palette fading, part 2?", ROMX[$43d1], BANK[$23]
+SECTION "engine/palettes.asm@Palette fading, part 2?", ROMX
 
 ApplyPalettesAtHL:: ; 23:43d1
     push hl
@@ -110,4 +110,4 @@ GetFadeStep:: ; 23:43fb
     db $e8, $d0, $d0
     db $90, $80, $80
     db $40, $40, $40
-    db $00, $00, $00
+    db $00, $00, $00
\ No newline at end of file
diff --git a/engine/pokemon/health.asm b/engine/pokemon/health.asm
index 8456623..fbee391 100755
--- a/engine/pokemon/health.asm
+++ b/engine/pokemon/health.asm
@@ -1,6 +1,6 @@
 INCLUDE "constants.asm"
 
-SECTION "HealParty", ROMX[$4d6f], BANK[$03]
+SECTION "engine/pokemon/health.asm@HealParty", ROMX
 
 HealParty: ; 03:4d6f
 	ld hl, wPartySpecies
@@ -95,7 +95,7 @@ HealParty: ; 03:4d6f
 	jr nz, .pp_up
 	ret
 	
-SECTION "HP Bar", ROMX[$4e3c], BANK[$03]
+SECTION "engine/pokemon/health.asm@HP Bar", ROMX
 	
 ComputeHPBarPixels: ; 03:4e3c
 	push hl
@@ -355,4 +355,4 @@ UpdateHPBar_CalcOldNewHPBarPixels: ; 03:4F8B
 	ld d, e
 	ld e, a
 	pop hl
-	ret
+	ret
\ No newline at end of file
diff --git a/engine/predef.asm b/engine/predef.asm
index 14de69f..c9293b4 100644
--- a/engine/predef.asm
+++ b/engine/predef.asm
@@ -1,10 +1,10 @@
 INCLUDE "constants.asm"
 
-if DEBUG
-SECTION "Predef pointers", ROMX[$62B0], BANK[$01]
-else
-SECTION "Predef pointers", ROMX[$62AD], BANK[$01]
-endc
+; if DEBUG
+SECTION "engine/predef.asm", ROMX
+; else
+; SECTION "Predef pointers", ROMX[$62AD], BANK[$01]
+; endc
 
 GetPredefPointer:: ; 1:62b0
 	ld a, h
@@ -33,4 +33,4 @@ GetPredefPointer:: ; 1:62b0
 	ld d, [hl]
 	ret
 
-INCLUDE "data/predef_pointers.inc"
+INCLUDE "data/predef_pointers.inc"
\ No newline at end of file
diff --git a/engine/smallflag.asm b/engine/smallflag.asm
index a231d0b..abf0df5 100755
--- a/engine/smallflag.asm
+++ b/engine/smallflag.asm
@@ -1,4 +1,4 @@
-SECTION "SmallFarFlagAction", ROMX[$4d33], BANK[$03]
+SECTION "engine/smallflag.asm", ROMX
 
 SmallFarFlagAction: ; 03:4d33
 ; Perform action b on bit c in flag array hl.
diff --git a/engine/sprites/sprites.asm b/engine/sprites/sprites.asm
index a1dc401..6f07956 100644
--- a/engine/sprites/sprites.asm
+++ b/engine/sprites/sprites.asm
@@ -1,6 +1,6 @@
 INCLUDE "constants.asm"
 
-SECTION "LoadOverworldSprite", ROMX[$4150], BANK[$05]
+SECTION "engine/sprites/sprites.asm@LoadOverworldSprite", ROMX
 
 LoadOverworldSprite: ; 05:4150
 	push af
@@ -53,7 +53,7 @@ GetOverworldSpriteData: ; 05:417d
 	pop hl
 	ret
 
-SECTION "OverworldSprites", ROMX[$423B], BANK[$05]
+SECTION "engine/sprites/sprites.asm@OverworldSprites", ROMX
 
 overworld_sprite: MACRO
 ; pointer, length, bank
@@ -152,4 +152,4 @@ OverworldSprites::
 	overworld_sprite OldLinkReceptionistSpriteGFX, 4
 	overworld_sprite OldLinkReceptionistSpriteGFX, 4
 	overworld_sprite EggSpriteGFX, 4
-	overworld_sprite BoulderSpriteGFX, 4
+	overworld_sprite BoulderSpriteGFX, 4
\ No newline at end of file
diff --git a/engine/title.asm b/engine/title.asm
index d7ae3a7..c39abdd 100644
--- a/engine/title.asm
+++ b/engine/title.asm
@@ -1,6 +1,6 @@
 INCLUDE "constants.asm"
 
-SECTION "Title screen", ROMX[$5D8C], BANK[$01]
+SECTION "engine/title.asm@Title screen", ROMX
 
 IntroSequence::
 	callab GameFreakIntro	; Bank $39 
@@ -629,15 +629,15 @@ SetTitleGfxNext::
 	jr nz, .loop
 	ret
 
-if DEBUG
-SECTION "Title screen TEMPORARY", ROMX[$62A5], BANK[$01] ; TODO: merge this with the main section above
-else
-SECTION "Title screen TEMPORARY", ROMX[$62A2], BANK[$01] ; TODO: merge this with the main section above
-endc
+; if DEBUG
+SECTION "engine/title.asm@Title screen TEMPORARY", ROMX
+; else
+; SECTION "Title screen TEMPORARY", ROMX[$62A2], BANK[$01] ; TODO: merge this with the main section above
+; endc
 	
 
 GameInit::
 	call ClearWindowData
 	ld a, $23
 	ld [wce5f], a
-	jp IntroSequence
+	jp IntroSequence
\ No newline at end of file