aboutsummaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorLinus Unnebäck <linus@folkdatorn.se>2023-11-17 19:50:27 +0100
committerGitHub <noreply@github.com>2023-11-17 12:50:27 -0600
commit83b373ad734fb0bf4b476b0f38dbeec8ea205f19 (patch)
treeb4178b8d993b12ec11fa5369c3f924e27fe2cfcb /scripts
parentUse map object consts in data/maps/hide_show_data.asm (#432) (diff)
downloadpokeyellow-83b373ad734fb0bf4b476b0f38dbeec8ea205f19.tar.gz
pokeyellow-83b373ad734fb0bf4b476b0f38dbeec8ea205f19.tar.xz
pokeyellow-83b373ad734fb0bf4b476b0f38dbeec8ea205f19.zip
Add constants for wMapConnections bits and group map header wram labels
* Add constants for wMapConnections bits * Apply Vulcandth and Rangi42 feedback --------- Co-authored-by: vulcandth <vulcandth@gmail.com>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/OaksLab.asm4
-rw-r--r--scripts/ViridianMart.asm4
2 files changed, 4 insertions, 4 deletions
diff --git a/scripts/OaksLab.asm b/scripts/OaksLab.asm
index 407ee3e5..30ee93ed 100644
--- a/scripts/OaksLab.asm
+++ b/scripts/OaksLab.asm
@@ -715,9 +715,9 @@ OaksLabCalcRivalMovementScript:
OaksLabLoadTextPointers2Script:
ld hl, OaksLab_TextPointers2
ld a, l
- ld [wMapTextPtr], a
+ ld [wCurMapTextPtr], a
ld a, h
- ld [wMapTextPtr + 1], a
+ ld [wCurMapTextPtr + 1], a
ret
OaksLab_TextPointers:
diff --git a/scripts/ViridianMart.asm b/scripts/ViridianMart.asm
index 2e78a036..8f91afd6 100644
--- a/scripts/ViridianMart.asm
+++ b/scripts/ViridianMart.asm
@@ -14,9 +14,9 @@ ViridianMartCheckParcelDeliveredScript:
ld hl, ViridianMart_TextPointers2
.done
ld a, l
- ld [wMapTextPtr], a
+ ld [wCurMapTextPtr], a
ld a, h
- ld [wMapTextPtr+1], a
+ ld [wCurMapTextPtr+1], a
ret
ViridianMart_ScriptPointers: