summaryrefslogtreecommitdiff
path: root/misc
diff options
context:
space:
mode:
Diffstat (limited to 'misc')
-rw-r--r--misc/mobile_22.asm26
-rw-r--r--misc/mobile_22_2.asm6
-rw-r--r--misc/mobile_40.asm10
-rw-r--r--misc/mobile_45.asm2
-rwxr-xr-xmisc/mobile_46.asm20
-rwxr-xr-xmisc/mobile_5b.asm18
6 files changed, 41 insertions, 41 deletions
diff --git a/misc/mobile_22.asm b/misc/mobile_22.asm
index ef75aa5b9..86251d84f 100644
--- a/misc/mobile_22.asm
+++ b/misc/mobile_22.asm
@@ -38,7 +38,7 @@ Function89174: ; 89174 (22:5174)
ret
Function8917a: ; 8917a (22:517a)
- ld hl, DefaultFlypoint
+ ld hl, wd002
ld bc, $32
xor a
call ByteFill
@@ -484,7 +484,7 @@ Function8939a: ; 8939a
push bc
ld hl, 0
add hl, bc
- ld de, DefaultFlypoint
+ ld de, wd002
ld c, 6
call Function89193
pop bc
@@ -1365,8 +1365,8 @@ Function898aa: ; 898aa
Function898be: ; 898be
push bc
- ld de, DefaultFlypoint
- ld hl, DefaultFlypoint
+ ld de, wd002
+ ld hl, wd002
call Function89331
jr nc, .asm_898cd
ld de, String_89116
@@ -3106,7 +3106,7 @@ Function8a383: ; 8a383 (22:6383)
Function8a3a2: ; 8a3a2 (22:63a2)
ld a, [MenuSelection2]
dec a
- ld hl, DefaultFlypoint
+ ld hl, wd002
ld e, a
ld d, $0
add hl, de
@@ -3141,7 +3141,7 @@ Function8a3df: ; 8a3df (22:63df)
ld hl, $a603
call Function89b45
call CloseSRAM
- ld hl, DefaultFlypoint
+ ld hl, wd002
jr c, .asm_8a3f8
ld de, Unknown_8a408
call Function8a400
@@ -3620,7 +3620,7 @@ Function8a765: ; 8a765 (22:6765)
push bc
ld hl, $0
add hl, bc
- ld de, DefaultFlypoint
+ ld de, wd002
ld c, $6
call Function89185
pop bc
@@ -3641,7 +3641,7 @@ Function8a765: ; 8a765 (22:6765)
Function8a78c: ; 8a78c (22:678c)
call Function891fe
- ld de, DefaultFlypoint
+ ld de, wd002
ld b, $5
callba Function116c1
call OpenSRAMBank4
@@ -3651,7 +3651,7 @@ Function8a78c: ; 8a78c (22:678c)
add hl, bc
ld d, h
ld e, l
- ld hl, DefaultFlypoint
+ ld hl, wd002
call InitName
call CloseSRAM
call DelayFrame
@@ -3701,7 +3701,7 @@ Function8a7cb: ; 8a7cb (22:67cb)
Function8a818: ; 8a818 (22:6818)
call Function89a23
- ld hl, DefaultFlypoint
+ ld hl, wd002
call Function89331
jr c, .asm_8a875
ld hl, wd008
@@ -3716,7 +3716,7 @@ Function8a818: ; 8a818 (22:6818)
add hl, bc
ld d, h
ld e, l
- ld hl, DefaultFlypoint
+ ld hl, wd002
ld c, $6
call Function89193
pop bc
@@ -3851,7 +3851,7 @@ Function8a930: ; 8a930 (22:6930)
push bc
ld h, b
ld l, c
- ld de, DefaultFlypoint
+ ld de, wd002
ld bc, $25
call CopyBytes
pop de
@@ -3865,7 +3865,7 @@ Function8a930: ; 8a930 (22:6930)
ld bc, $25
call CopyBytes
pop de
- ld hl, DefaultFlypoint
+ ld hl, wd002
ld bc, $25
call CopyBytes
ld de, SFX_SWITCH_POKEMON
diff --git a/misc/mobile_22_2.asm b/misc/mobile_22_2.asm
index c1f671bf2..0abe8637c 100644
--- a/misc/mobile_22_2.asm
+++ b/misc/mobile_22_2.asm
@@ -887,7 +887,7 @@ Function8b84b: ; 8b84b
Function8b855: ; 8b855
ld a, $28
- ld hl, DefaultFlypoint
+ ld hl, wd002
ld [hli], a
ld c, $28
xor a
@@ -1061,7 +1061,7 @@ Function8b960: ; 8b960 (22:7960)
ret
Function8b99f: ; 8b99f (22:799f)
- ld hl, DefaultFlypoint
+ ld hl, wd002
dec a
ld c, a
ld b, $0
@@ -1135,7 +1135,7 @@ Function8b9e9: ; 8b9e9 (22:79e9)
scf
.asm_8ba0c
push af
- ld hl, DefaultFlypoint
+ ld hl, wd002
.asm_8ba10
ld a, [de]
inc de
diff --git a/misc/mobile_40.asm b/misc/mobile_40.asm
index d3705e725..4b6f31d16 100644
--- a/misc/mobile_40.asm
+++ b/misc/mobile_40.asm
@@ -5573,7 +5573,7 @@ Function10250c: ; 10250c
ld [wd003], a
ld a, [wcd4c]
dec a
- ld [DefaultFlypoint], a
+ ld [wd002], a
call Function102b9c
call Function102bdc
jr c, .asm_10256d
@@ -6003,7 +6003,7 @@ Function102814: ; 102814
ld [wcd52], a
ld a, [wcd4c]
dec a
- ld [DefaultFlypoint], a
+ ld [wd002], a
ld a, [wcd4d]
dec a
ld [wd003], a
@@ -6679,7 +6679,7 @@ Function102cee: ; 102cee
ld a, [wJumptableIndex]
dec a
call Function102d34
- ld de, DefaultFlypoint
+ ld de, wd002
ld bc, $002f
call CopyBytes
ld a, [wJumptableIndex]
@@ -6705,7 +6705,7 @@ Function102cee: ; 102cee
call Function102d34
ld d, h
ld e, l
- ld hl, DefaultFlypoint
+ ld hl, wd002
ld bc, $002f
call CopyBytes
ret
@@ -8068,7 +8068,7 @@ endr
callba Script_reloadmappart
callba Function4a94e
jr c, .asm_103870
- ld hl, DefaultFlypoint
+ ld hl, wd002
ld de, wdc5c
ld bc, $0003
call CopyBytes
diff --git a/misc/mobile_45.asm b/misc/mobile_45.asm
index c555ed848..193baee00 100644
--- a/misc/mobile_45.asm
+++ b/misc/mobile_45.asm
@@ -8373,7 +8373,7 @@ Function117bb6:
ld [rSVBK], a
ld a, $7
call GetSRAMBank
- ld hl, DefaultFlypoint
+ ld hl, wd002
ld de, $b000
ld bc, $1000
call CopyBytes
diff --git a/misc/mobile_46.asm b/misc/mobile_46.asm
index ee80a1388..185431a67 100755
--- a/misc/mobile_46.asm
+++ b/misc/mobile_46.asm
@@ -1580,7 +1580,7 @@ Function118b24: ; 118b24 (46:4b24)
; 118b42 (46:4b42)
Function118b42: ; 118b42
- ld hl, DefaultFlypoint
+ ld hl, wd002
ld a, l
ld [wcd51], a
ld a, h
@@ -1780,7 +1780,7 @@ Function118ded: ; 118ded
; 118e06
Function118e06: ; 118e06
- ld hl, DefaultFlypoint
+ ld hl, wd002
ld a, [wcd38]
and a
jr z, .asm_118e1d
@@ -2110,7 +2110,7 @@ Function119009:
Function119054: ; 119054
ld a, $6
call GetSRAMBank
- ld hl, DefaultFlypoint
+ ld hl, wd002
ld a, [wcd4f]
ld e, a
ld a, [wcd50]
@@ -2126,7 +2126,7 @@ Function119054: ; 119054
jr z, .asm_11908a
ld a, $6
ld [rSVBK], a
- ld hl, DefaultFlypoint
+ ld hl, wd002
ld a, [Unkn1Pals]
ld c, a
ld a, [wd001]
@@ -2198,7 +2198,7 @@ Function1190ec: ; 1190ec
ld c, a
ld a, [wd001]
ld b, a
- ld hl, DefaultFlypoint
+ ld hl, wd002
ld de, $a000
call Function119192
ret c
@@ -2211,7 +2211,7 @@ Function1190ec: ; 1190ec
ld c, a
ld a, [wd001]
ld b, a
- ld hl, DefaultFlypoint
+ ld hl, wd002
call Function119192
ret c
@@ -2729,7 +2729,7 @@ Function119451: ; 119451 (46:5451)
ld a, b
ld [wcd49], a
call Function1196cd
- ld a, [DefaultFlypoint]
+ ld a, [wd002]
ld hl, wd003
Function119471: ; 119471 (46:5471)
@@ -3146,7 +3146,7 @@ Function1196de: ; 1196de (46:56de)
; 1196f2 (46:56f2)
Function1196f2: ; 1196f2
- ld hl, DefaultFlypoint
+ ld hl, wd002
.asm_1196f5
call Function118b9a
ret nc
@@ -3314,7 +3314,7 @@ Function1197bf: ; 1197bf
; 1197c9
Function1197c9: ; 1197c9
- ld hl, DefaultFlypoint
+ ld hl, wd002
call Function118e39
ld a, $9
ld [wcd3c], a
@@ -3326,7 +3326,7 @@ Function1197dc:
call Function119ed8
ret c
call DelayFrame
- ld hl, DefaultFlypoint
+ ld hl, wd002
ld de, wcc60
ld bc, $0080
call CopyBytes
diff --git a/misc/mobile_5b.asm b/misc/mobile_5b.asm
index 4a14c61bf..133e8d43b 100755
--- a/misc/mobile_5b.asm
+++ b/misc/mobile_5b.asm
@@ -25,17 +25,17 @@ Function16c031: ; 16c031
xor a
ld [wJumptableIndex], a
ld [wcf64], a
- ld [DefaultFlypoint], a
+ ld [wd002], a
ld [wd003], a
.asm_16c03e
call DelayFrame
callba Function10635c
- ld a, [DefaultFlypoint]
+ ld a, [wd002]
ld hl, Jumptable_16c05c
rst JumpTable
call Function16cb2e
call Function16cbae
- ld a, [DefaultFlypoint]
+ ld a, [wd002]
cp $ff
jr nz, .asm_16c03e
ret
@@ -60,7 +60,7 @@ Function16c074: ; 16c074
ld a, [wcf64]
and a
ret z
- ld [DefaultFlypoint], a
+ ld [wd002], a
xor a
ld [wd003], a
ret
@@ -69,7 +69,7 @@ Function16c074: ; 16c074
Function16c081: ; 16c081
push af
ld a, $ff
- ld [DefaultFlypoint], a
+ ld [wd002], a
pop af
ret
; 16c089
@@ -81,7 +81,7 @@ Function16c089: ; 16c089
xor a
ld [hWY], a
call Function16c0fa
- ld a, [DefaultFlypoint]
+ ld a, [wd002]
ld [wcf64], a
ret
; 16c09e
@@ -144,16 +144,16 @@ Function16c0ec: ; 16c0ec
call ClearScreen
push af
ld a, $ff
- ld [DefaultFlypoint], a
+ ld [wd002], a
pop af
ret
; 16c0fa
Function16c0fa: ; 16c0fa
push af
- ld a, [DefaultFlypoint]
+ ld a, [wd002]
inc a
- ld [DefaultFlypoint], a
+ ld [wd002], a
xor a
ld [wd003], a
pop af
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-01 17:40:17 +0000