summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpfero <ohpee@loves.dicksinhisan.us>2018-06-06 00:50:05 +0200
committerpfero <ohpee@loves.dicksinhisan.us>2018-06-06 00:50:05 +0200
commit71811d4060f8542f0e92b6dcbace2e5bbd48ccd0 (patch)
treeb369b216b2fe0d98c54e042f01ddda0e8f01200a
parenta9519e401db0c8db0b96cee3c0130c3fe8a4a58b (diff)
Fix build
Please commit responsibly
-rw-r--r--home/map.asm9
-rw-r--r--home/names.asm1
-rw-r--r--home/overworld.asm34
3 files changed, 9 insertions, 35 deletions
diff --git a/home/map.asm b/home/map.asm
index 2583643..8ec34be 100644
--- a/home/map.asm
+++ b/home/map.asm
@@ -19,8 +19,17 @@ RunMapScript:: ; 20ff
ld de, .return
push de
jp hl
+
.return
pop bc
pop de
pop hl
ret
+
+SECTION "ClearMapBuffer", ROM0[$2123]
+ClearMapBuffer:: ; 00:2123
+ ld hl, wMapBuffer
+ ld bc, wMapBufferEnd - wMapBuffer
+ ld a, 0
+ call ByteFill
+ ret
diff --git a/home/names.asm b/home/names.asm
index 901d13a..f0ee433 100644
--- a/home/names.asm
+++ b/home/names.asm
@@ -75,7 +75,6 @@ GetName:: ; 00:36e0
call Bankswitch
ret
-
GetNthString::
; Return the address of the ath string starting from hl.
and a
diff --git a/home/overworld.asm b/home/overworld.asm
index 56e4e90..4b10b72 100644
--- a/home/overworld.asm
+++ b/home/overworld.asm
@@ -1,39 +1,5 @@
INCLUDE "constants.asm"
-SECTION "RunMapScript", ROM0[$20ff]
-RunMapScript:: ; 00:20ff
- push hl
- push de
- push bc
- ld a, [wMapScriptNumber]
- add a
- add a
- ld d, 0
- ld e, a
- add hl, de
- ld a, [hli]
- ld h, [hl]
- ld l, a
- ld de, .return
- push de
- jp hl
-
-.return
- pop bc
- pop de
- pop hl
- ret
-
-
-SECTION "ClearMapBuffer", ROM0[$2123]
-ClearMapBuffer: ; 00:2123
- ld hl, wMapBuffer
- ld bc, wMapBufferEnd - wMapBuffer
- ld a, 0
- call ByteFill
- ret
-
-
if DEBUG
SECTION "Startmenu and Select Button Check", ROM0[$2C05]
else