summaryrefslogtreecommitdiff
path: root/maps
diff options
context:
space:
mode:
authorluckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com>2018-07-03 17:07:05 -0400
committerluckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com>2018-07-03 17:07:05 -0400
commite1659ecd41dfac70eb021c0f5fe983ed6f043433 (patch)
tree86ec6137c666650168716247fa63241e79b1788b /maps
parentf3f0e711bf4f4205fd29f2b448c93ff5597507e5 (diff)
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.
Diffstat (limited to 'maps')
-rw-r--r--maps/Map13.asm2
-rw-r--r--maps/PlayersHouse1F.asm2
-rw-r--r--maps/PlayersHouse2F.asm2
-rw-r--r--maps/Route1Gate1F.asm3
-rw-r--r--maps/Route1Gate2F.asm2
-rw-r--r--maps/Route1P1.asm2
-rw-r--r--maps/Route1P2.asm2
-rw-r--r--maps/SilentHills.asm2
-rw-r--r--maps/SilentHouse.asm2
-rw-r--r--maps/SilentLabP1.asm2
-rw-r--r--maps/SilentLabP2.asm2
-rw-r--r--maps/SilentPokecenter.asm2
12 files changed, 12 insertions, 13 deletions
diff --git a/maps/Map13.asm b/maps/Map13.asm
index b69dc4b..ed74a16 100644
--- a/maps/Map13.asm
+++ b/maps/Map13.asm
@@ -1,6 +1,6 @@
include "constants.asm"
-SECTION "Map 13 Script", ROMX[$6078], BANK[$34]
+SECTION "maps/Map13.asm", ROMX
Map13ScriptLoader:: ; 6078
ld hl, Map13ScriptPointers
diff --git a/maps/PlayersHouse1F.asm b/maps/PlayersHouse1F.asm
index 5157d63..f93f363 100644
--- a/maps/PlayersHouse1F.asm
+++ b/maps/PlayersHouse1F.asm
@@ -1,6 +1,6 @@
include "constants.asm"
-SECTION "Player's House 1F", ROMX[$409C], BANK[$34]
+SECTION "maps/PlayersHouse1F.asm", ROMX
PlayersHouse1FScriptLoader:: ; 409C
ld hl, PlayersHouse1FScriptPointers
diff --git a/maps/PlayersHouse2F.asm b/maps/PlayersHouse2F.asm
index e96a07b..973b57c 100644
--- a/maps/PlayersHouse2F.asm
+++ b/maps/PlayersHouse2F.asm
@@ -1,6 +1,6 @@
include "constants.asm"
-SECTION "Player's House 2F", ROMX[$418B], BANK[$34]
+SECTION "maps/PlayersHouse2F.asm", ROMX
PlayersHouse2FScriptLoader:: ; 418B
ld hl, PlayersHouse2FScriptPointers
diff --git a/maps/Route1Gate1F.asm b/maps/Route1Gate1F.asm
index 4772da7..1ab0485 100644
--- a/maps/Route1Gate1F.asm
+++ b/maps/Route1Gate1F.asm
@@ -1,6 +1,6 @@
include "constants.asm"
-SECTION "Route 1 Gate 1F", ROMX[$4061], BANK[$26]
+SECTION "maps/Route1Gate1F.asm", ROMX
Route1Gate1FScriptLoader: ;4061
ld hl, Route1Gate1FScriptPointers
@@ -52,4 +52,3 @@ Route1Gate1FText2String: ; 40AC
done
;ends at 40D9
-
diff --git a/maps/Route1Gate2F.asm b/maps/Route1Gate2F.asm
index 0ab81a8..7f9ec79 100644
--- a/maps/Route1Gate2F.asm
+++ b/maps/Route1Gate2F.asm
@@ -1,6 +1,6 @@
include "constants.asm"
-SECTION "Route 1 Gate 2F", ROMX[$411F], BANK[$26]
+SECTION "maps/Route1Gate2F.asm", ROMX
Route1Gate2FScriptLoader:: ; 411F
ld hl, Route1Gate2FScriptPointers
diff --git a/maps/Route1P1.asm b/maps/Route1P1.asm
index d67ffd9..28bb505 100644
--- a/maps/Route1P1.asm
+++ b/maps/Route1P1.asm
@@ -1,6 +1,6 @@
include "constants.asm"
-SECTION "Route 1 East", ROMX[$7B98], BANK[$36]
+SECTION "maps/Route1P1.asm", ROMX
Route1P1ScriptLoader:: ; 7B98
ld hl, Route1P1ScriptPointers
diff --git a/maps/Route1P2.asm b/maps/Route1P2.asm
index 9fa72ec..f47cce9 100644
--- a/maps/Route1P2.asm
+++ b/maps/Route1P2.asm
@@ -1,6 +1,6 @@
include "constants.asm"
-SECTION "Route 1 West", ROMX[$7C68], BANK[$36]
+SECTION "maps/Route1P2.asm", ROMX
Route1P2ScriptLoader:: ; 7C67
ld hl, Route1P2ScriptPointers
diff --git a/maps/SilentHills.asm b/maps/SilentHills.asm
index ed7639c..37f567f 100644
--- a/maps/SilentHills.asm
+++ b/maps/SilentHills.asm
@@ -1,6 +1,6 @@
include "constants.asm"
-SECTION "Silent Hills Script", ROMX[$7669], BANK[$36]
+SECTION "maps/SilentHills.asm", ROMX
SilentHillsScriptLoader:: ; 7669
ld hl, SilentHillsScriptPointers1
diff --git a/maps/SilentHouse.asm b/maps/SilentHouse.asm
index 70a6649..3d542ec 100644
--- a/maps/SilentHouse.asm
+++ b/maps/SilentHouse.asm
@@ -1,6 +1,6 @@
include "constants.asm"
-SECTION "Silent Hills House", ROMX[$4839], BANK[$34]
+SECTION "maps/SilentHouse.asm", ROMX
SilentHouseScriptLoader:: ; 4839
ld hl, SilentHouseScriptPointers
diff --git a/maps/SilentLabP1.asm b/maps/SilentLabP1.asm
index eb4cd57..6588e01 100644
--- a/maps/SilentLabP1.asm
+++ b/maps/SilentLabP1.asm
@@ -1,6 +1,6 @@
include "constants.asm"
-SECTION "Silent Lab P1", ROMX[$4BBC], BANK[$34]
+SECTION "maps/SilentLabP1.asm", ROMX
SilentLabP1ScriptLoader:: ; 4BBC
ld hl, SilentLabP1ScriptPointers
diff --git a/maps/SilentLabP2.asm b/maps/SilentLabP2.asm
index 54aab8f..767e62a 100644
--- a/maps/SilentLabP2.asm
+++ b/maps/SilentLabP2.asm
@@ -1,6 +1,6 @@
include "constants.asm"
-SECTION "Silent Lab P2 Script", ROMX[$5C69], BANK[$34]
+SECTION "maps/SilentLabP2.asm", ROMX
SilentLabP2ScriptLoader:: ; 5C69
ld hl, SilentLabP2ScriptPointers
diff --git a/maps/SilentPokecenter.asm b/maps/SilentPokecenter.asm
index dc1a35a..30c27c1 100644
--- a/maps/SilentPokecenter.asm
+++ b/maps/SilentPokecenter.asm
@@ -1,6 +1,6 @@
include "constants.asm"
-SECTION "Silent Hills Pokecenter", ROMX[$4682], BANK[$34]
+SECTION "maps/SilentPokecenter.asm", ROMX
SilentPokecenterScriptLoader:: ; 4682
ld hl, SilentPokecenterScriptPointers