summaryrefslogtreecommitdiff
path: root/misc
diff options
context:
space:
mode:
Diffstat (limited to 'misc')
-rw-r--r--misc/crystal_misc.asm22
-rw-r--r--misc/mobile_22.asm24
-rw-r--r--misc/mobile_22_2.asm6
-rw-r--r--misc/mobile_40.asm4
-rw-r--r--misc/mobile_45.asm20
-rwxr-xr-xmisc/mobile_46.asm40
-rwxr-xr-xmisc/mobile_5b.asm2
-rwxr-xr-xmisc/mobile_5c.asm52
8 files changed, 85 insertions, 85 deletions
diff --git a/misc/crystal_misc.asm b/misc/crystal_misc.asm
index 978a0fc14..c23f4566c 100644
--- a/misc/crystal_misc.asm
+++ b/misc/crystal_misc.asm
@@ -144,14 +144,14 @@ Function17a751: ; 17a751 (5e:6751)
ret
Function17a770: ; 17a770 (5e:6770)
- ld a, [hOAMUpdate] ; $ff00+$d8
+ ld a, [hOAMUpdate]
push af
ld a, $1
- ld [hOAMUpdate], a ; $ff00+$d8
+ ld [hOAMUpdate], a
call HideSprites
call Function17a9cb
pop af
- ld [hOAMUpdate], a ; $ff00+$d8
+ ld [hOAMUpdate], a
ret
Function17a781: ; 17a781 (5e:6781)
@@ -251,7 +251,7 @@ Function17a7ff: ; 17a7ff (5e:67ff)
Function17a81a: ; 17a81a (5e:681a)
call IsSFXPlaying
ret nc
- ld a, [hJoyPressed] ; $ff00+$a7
+ ld a, [hJoyPressed]
and $3
ret z
call ExitMenu
@@ -269,7 +269,7 @@ Function17a83c: ; 17a83c (5e:683c)
ld a, [hJoyLast]
and $f0
ld c, a
- ld a, [hJoyPressed] ; $ff00+$a7
+ ld a, [hJoyPressed]
and $b
or c
ld c, a
@@ -741,10 +741,10 @@ Unknown_17aaf7: ; 17aaf7
; 17aba0
Function17aba0: ; 17aba0 (5e:6ba0)
- ld a, [rVBK] ; $ff00+$4f
+ ld a, [rVBK]
push af
ld a, $1
- ld [rVBK], a ; $ff00+$4f
+ ld [rVBK], a
ld hl, VTiles5 tile $00
ld de, GFX_17afa5
@@ -752,7 +752,7 @@ Function17aba0: ; 17aba0 (5e:6ba0)
call Get2bpp
pop af
- ld [rVBK], a ; $ff00+$4f
+ ld [rVBK], a
ld hl, VTiles0 tile $00
ld de, GFX_17afa5 + $4c0
@@ -766,10 +766,10 @@ Function17aba0: ; 17aba0 (5e:6ba0)
ret
Function17abcf: ; 17abcf (5e:6bcf)
- ld a, [rSVBK] ; $ff00+$70
+ ld a, [rSVBK]
push af
ld a, BANK(Unkn1Pals)
- ld [rSVBK], a ; $ff00+$70
+ ld [rSVBK], a
ld hl, Palette_17ac55
ld de, Unkn1Pals ; $d000
@@ -793,7 +793,7 @@ Function17abcf: ; 17abcf (5e:6bcf)
call FarCopyBytes
pop af
- ld [rSVBK], a ; $ff00+$70
+ ld [rSVBK], a
ret
Function17ac0c: ; 17ac0c (5e:6c0c)
diff --git a/misc/mobile_22.asm b/misc/mobile_22.asm
index c11ca8a14..ef75aa5b9 100644
--- a/misc/mobile_22.asm
+++ b/misc/mobile_22.asm
@@ -816,16 +816,16 @@ endr
Function895c7: ; 895c7 (22:55c7)
- ld a, [rSVBK] ; $ff00+$70
+ ld a, [rSVBK]
push af
ld a, 5
- ld [rSVBK], a ; $ff00+$70
+ ld [rSVBK], a
ld hl, Palette_895de
ld de, wd030
ld bc, 8
call CopyBytes
pop af
- ld [rSVBK], a ; $ff00+$70
+ ld [rSVBK], a
ret
; 895de (22:55de)
@@ -2147,10 +2147,10 @@ Function89cdf: ; 89cdf (22:5cdf)
Function89d0d: ; 89d0d (22:5d0d)
call Function8923c
- ld a, [rSVBK] ; $ff00+$70
+ ld a, [rSVBK]
push af
ld a, $5
- ld [rSVBK], a ; $ff00+$70
+ ld [rSVBK], a
ld c, $8
ld de, Unkn1Pals
.asm_89d1c
@@ -2166,7 +2166,7 @@ Function89d0d: ; 89d0d (22:5d0d)
ld bc, $8
call CopyBytes
pop af
- ld [rSVBK], a ; $ff00+$70
+ ld [rSVBK], a
call SetPalettes
callba Function845db
call Function89240
@@ -2377,16 +2377,16 @@ Function89e6f: ; 89e6f (22:5e6f)
jp Function89e36
Function89e9a: ; 89e9a (22:5e9a)
- ld a, [rSVBK] ; $ff00+$70
+ ld a, [rSVBK]
push af
ld a, $5
- ld [rSVBK], a ; $ff00+$70
+ ld [rSVBK], a
ld hl, Palette_89eb1
ld de, wd028
ld bc, $8
call CopyBytes
pop af
- ld [rSVBK], a ; $ff00+$70
+ ld [rSVBK], a
ret
; 89eb1 (22:5eb1)
@@ -3383,10 +3383,10 @@ Function8a5a3: ; 8a5a3 (22:65a3)
ret
Function8a5b6: ; 8a5b6 (22:65b6)
- ld a, [rSVBK] ; $ff00+$70
+ ld a, [rSVBK]
push af
ld a, $5
- ld [rSVBK], a ; $ff00+$70
+ ld [rSVBK], a
ld hl, Palette_8a5e5
ld de, wd020
ld bc, $18
@@ -3400,7 +3400,7 @@ Function8a5b6: ; 8a5b6 (22:65b6)
ld bc, $8
call CopyBytes
pop af
- ld [rSVBK], a ; $ff00+$70
+ ld [rSVBK], a
ret
; 8a5e5 (22:65e5)
diff --git a/misc/mobile_22_2.asm b/misc/mobile_22_2.asm
index 6502d9043..c1f671bf2 100644
--- a/misc/mobile_22_2.asm
+++ b/misc/mobile_22_2.asm
@@ -252,7 +252,7 @@ Function8b45c: ; 8b45c (22:745c)
call Function8b4fd
call Function89c44
ld a, $1
- ld [hBGMapMode], a ; $ff00+$d4
+ ld [hBGMapMode], a
pop bc
call Function8b3dd
jr nc, .asm_8b46e
@@ -809,9 +809,9 @@ Function8b7bd: ; 8b7bd
ld a, [wd032]
and a
jr z, .asm_8b7e0
- ld a, [wcf81]
+ ld a, [wMenuFlags]
set 3, a
- ld [wcf81], a
+ ld [wMenuFlags], a
.asm_8b7e0
ld a, [wd0e3]
diff --git a/misc/mobile_40.asm b/misc/mobile_40.asm
index 7b7bc68f7..d3705e725 100644
--- a/misc/mobile_40.asm
+++ b/misc/mobile_40.asm
@@ -1825,7 +1825,7 @@ Function100b45: ; 100b45
; 100b7a
Function100b7a: ; 100b7a
- ld hl, Function1c66
+ ld hl, CopyMenuData2
ld a, [wcf94]
rst FarCall
callba Function24085
@@ -2088,7 +2088,7 @@ Function100d67: ; 100d67
call UpdateSprites
call Function1c89
call WaitBGMap
- call Function1c66
+ call CopyMenuData2
call Function1c10
ld hl, wcfa5
set 6, [hl]
diff --git a/misc/mobile_45.asm b/misc/mobile_45.asm
index c250da03f..c555ed848 100644
--- a/misc/mobile_45.asm
+++ b/misc/mobile_45.asm
@@ -7667,10 +7667,10 @@ Function11765d: ; 11765d (45:765d)
Function11766b: ; 11766b (45:766b)
call Function117699
- ld a, [rSVBK] ; $ff00+$70
+ ld a, [rSVBK]
push af
ld a, $5
- ld [rSVBK], a ; $ff00+$70
+ ld [rSVBK], a
call Function1176ee
ld a, $5
call GetSRAMBank
@@ -7683,7 +7683,7 @@ Function11766b: ; 11766b (45:766b)
call CopyBytes
call CloseSRAM
pop af
- ld [rSVBK], a ; $ff00+$70
+ ld [rSVBK], a
ret
Function117699: ; 117699 (45:7699)
@@ -7973,11 +7973,11 @@ Function1178aa: ; 1178aa (45:78aa)
ld hl, MenuDataHeader_1179b5
call LoadMenuDataHeader
call MenuBox
- call GetMemTileCoord
+ call MenuBoxCoord2Tile
ld hl, MenuDataHeader_1179bd
call LoadMenuDataHeader
call MenuBox
- call GetMemTileCoord
+ call MenuBoxCoord2Tile
callba Function104061
hlcoord 16, 8
ld de, String_1179c5
@@ -7993,7 +7993,7 @@ Function1178aa: ; 1178aa (45:78aa)
jp Function117a0a
Function1178e8: ; 1178e8 (45:78e8)
- ld a, [hJoyPressed] ; $ff00+$a7
+ ld a, [hJoyPressed]
cp $2
jr z, .asm_117939
cp $1
@@ -8076,7 +8076,7 @@ Function117984: ; 117984 (45:7984)
ld hl, MenuDataHeader_1179b5
call LoadMenuDataHeader
call MenuBox
- call GetMemTileCoord
+ call MenuBoxCoord2Tile
callba Function104061
hlcoord 1, 14
ld de, String_1179e1
@@ -8236,7 +8236,7 @@ Function117b14:
ld hl, Data117cbc
call LoadMenuDataHeader
call MenuBox
- call GetMemTileCoord
+ call MenuBoxCoord2Tile
jp Function117cdd
Function117b28:
@@ -8248,7 +8248,7 @@ Function117b31:
ld hl, Data117cc4
call LoadMenuDataHeader
call MenuBox
- call GetMemTileCoord
+ call MenuBoxCoord2Tile
hlcoord 16, 8
ld de, YesNo117ccc
call PlaceString
@@ -8386,7 +8386,7 @@ Function117c4a:
ld hl, Data117cbc
call LoadMenuDataHeader
call MenuBox
- call GetMemTileCoord
+ call MenuBoxCoord2Tile
callba Function104061
ld hl, MobileStadiumSuccessText
call PrintText
diff --git a/misc/mobile_46.asm b/misc/mobile_46.asm
index 9e22761b4..ee80a1388 100755
--- a/misc/mobile_46.asm
+++ b/misc/mobile_46.asm
@@ -311,10 +311,10 @@ Function118284: ; 118284
ld [wcd34], a
ld a, $5
ld [wc3f0], a
- ld a, [rSVBK] ; $ff00+$70
+ ld a, [rSVBK]
push af
ld a, $3
- ld [rSVBK], a ; $ff00+$70
+ ld [rSVBK], a
.asm_11829d
call JoyTextDelay
call Function118473
@@ -334,7 +334,7 @@ Function118284: ; 118284
cp [hl]
jr nz, .asm_11829d
pop af
- ld [rSVBK], a ; $ff00+$70
+ ld [rSVBK], a
call Function118452
ret
; 1182d5 (46:42d5)
@@ -1038,7 +1038,7 @@ Function11878d: ; 11878d (46:478d)
and $1
jr z, .asm_1187a7
ld a, $3
- ld [rSVBK], a ; $ff00+$70
+ ld [rSVBK], a
.asm_1187a7
jp Function119e2e
.asm_1187aa
@@ -1066,7 +1066,7 @@ Function11878d: ; 11878d (46:478d)
jr nz, .asm_118803
set 0, [hl]
ld a, $6
- ld [rSVBK], a ; $ff00+$70
+ ld [rSVBK], a
ld de, Unkn1Pals
ld bc, $1000
ld a, [hl]
@@ -1111,7 +1111,7 @@ Function118821: ; 118821 (46:4821)
jr c, .asm_11884a
cp $4
jr z, .asm_11884a
- ld a, [hJoyDown] ; $ff00+$a8
+ ld a, [hJoyDown]
cp $5
jr nz, .asm_11884a
ld a, $a
@@ -1285,7 +1285,7 @@ Function118936:
ld hl, MenuDataHeader_119cf7
call LoadMenuDataHeader
call MenuBox
- call GetMemTileCoord
+ call MenuBoxCoord2Tile
call Function321c
hlcoord 16, 8, AttrMap
ld a, $40
@@ -4092,10 +4092,10 @@ String_119d8c:
; 119d93
Function119d93: ; 119d93 (46:5d93)
- ld a, [rSVBK] ; $ff00+$70
+ ld a, [rSVBK]
push af
ld a, $1
- ld [rSVBK], a ; $ff00+$70
+ ld [rSVBK], a
ld a, [wcd4f]
ld c, 10
call SimpleMultiply
@@ -4122,7 +4122,7 @@ Function119d93: ; 119d93 (46:5d93)
dec a
jr nz, .asm_119daf
pop af
- ld [rSVBK], a ; $ff00+$70
+ ld [rSVBK], a
and a
ret
.asm_119dc6
@@ -4130,18 +4130,18 @@ Function119d93: ; 119d93 (46:5d93)
ld a, $4
ld [wcf66], a
pop af
- ld [rSVBK], a ; $ff00+$70
+ ld [rSVBK], a
scf
ret
Function119dd1: ; 119dd1 (46:5dd1)
- ld a, [rSVBK] ; $ff00+$70
+ ld a, [rSVBK]
push af
ld a, [wcd4f]
cp 70 / 10
jr nc, .asm_119e08
ld a, $1
- ld [rSVBK], a ; $ff00+$70
+ ld [rSVBK], a
ld hl, PartyMon1Level
ld bc, PARTYMON_STRUCT_LENGTH
ld de, PartySpecies
@@ -4169,7 +4169,7 @@ Function119dd1: ; 119dd1 (46:5dd1)
jr nz, .asm_119deb
.asm_119e08
pop af
- ld [rSVBK], a ; $ff00+$70
+ ld [rSVBK], a
and a
ret
.asm_119e0d
@@ -4184,7 +4184,7 @@ Function119dd1: ; 119dd1 (46:5dd1)
ld a, $a
ld [wcf66], a
pop af
- ld [rSVBK], a ; $ff00+$70
+ ld [rSVBK], a
scf
ret
; 119e2b (46:5e2b)
@@ -4333,15 +4333,15 @@ Function119ec2: ; 119ec2 (46:5ec2)
ret
Function119ed8: ; 119ed8 (46:5ed8)
- ld a, [rSVBK] ; $ff00+$70
+ ld a, [rSVBK]
ld [wcd8c], a
ld a, $1
- ld [rSVBK], a ; $ff00+$70
+ ld [rSVBK], a
call Function119eee
ld a, [wcd8c]
- ld [rSVBK], a ; $ff00+$70
+ ld [rSVBK], a
ld a, $1
- ld [hBGMapMode], a ; $ff00+$d4
+ ld [hBGMapMode], a
ret
Function119eee: ; 119eee (46:5eee)
@@ -4740,7 +4740,7 @@ Function11a207: ; 11a207
ld hl, MenuDataHeader_11a2de
call LoadMenuDataHeader
call MenuBox
- call GetMemTileCoord
+ call MenuBoxCoord2Tile
call Function321c
hlcoord 16, 8
ld de, String_11a2cf
diff --git a/misc/mobile_5b.asm b/misc/mobile_5b.asm
index 698858b2e..4a14c61bf 100755
--- a/misc/mobile_5b.asm
+++ b/misc/mobile_5b.asm
@@ -1163,7 +1163,7 @@ Function16d77a: ; 16d77a
ld b, a
ld a, [wcfa2]
ld c, a
- call GetTileCoord
+ call Coord2Tile
ld a, [wcfa7]
swap a
and $f
diff --git a/misc/mobile_5c.asm b/misc/mobile_5c.asm
index d82b84e82..85681221a 100755
--- a/misc/mobile_5c.asm
+++ b/misc/mobile_5c.asm
@@ -673,7 +673,7 @@ Function170737: ; 170737 (5c:4737)
Function17073e: ; 17073e (5c:473e)
call Random
- ld a, [hRandomAdd] ; $ff00+$e1
+ ld a, [hRandomAdd]
and $7
cp $6
jr c, .asm_17074b
@@ -842,28 +842,28 @@ Function17081d: ; 17081d (5c:481d)
Function170868: ; 170868 (5c:4868)
ld a, BANK(sbe47)
call GetSRAMBank
- ld a, [rSVBK] ; $ff00+$70
+ ld a, [rSVBK]
push af
ld a, $3
- ld [rSVBK], a ; $ff00+$70
+ ld [rSVBK], a
ld a, [wd000 + $800]
ld [sbe47], a
pop af
- ld [rSVBK], a ; $ff00+$70
+ ld [rSVBK], a
call CloseSRAM
ret
Function170881: ; 170881 (5c:4881)
ld a, BANK(sbe47)
call GetSRAMBank
- ld a, [rSVBK] ; $ff00+$70
+ ld a, [rSVBK]
push af
ld a, $3
- ld [rSVBK], a ; $ff00+$70
+ ld [rSVBK], a
ld a, [sbe47]
ld [wd000 + $800], a
pop af
- ld [rSVBK], a ; $ff00+$70
+ ld [rSVBK], a
call CloseSRAM
ret
@@ -1032,14 +1032,14 @@ String_1709a4: ; 1709a4
db "なぞナゾ@@"
Function1709aa: ; 1709aa (5c:49aa)
- ld a, [rSVBK] ; $ff00+$70
+ ld a, [rSVBK]
push af
ld a, BANK(w3_d090)
- ld [rSVBK], a ; $ff00+$70
+ ld [rSVBK], a
ld a, [w3_d090]
ld [ScriptVar], a
pop af
- ld [rSVBK], a ; $ff00+$70
+ ld [rSVBK], a
ret
Function1709bb: ; 1709bb (5c:49bb)
@@ -1575,13 +1575,13 @@ Function1719c8: ; 1719c8 (5c:59c8)
Function1719d6: ; 1719d6 (5c:59d6)
callba Function1183cb
call Function1719ed
- ld a, [rSVBK] ; $ff00+$70
+ ld a, [rSVBK]
push af
ld a, $5
- ld [rSVBK], a ; $ff00+$70
+ ld [rSVBK], a
call Function171a11
pop af
- ld [rSVBK], a ; $ff00+$70
+ ld [rSVBK], a
ret
Function1719ed: ; 1719ed (5c:59ed)
@@ -1656,13 +1656,13 @@ Function171a5d: ; 171a5d (5c:5a5d)
ld [wc302], a
ld a, $a
call Function3e32
- ld a, [rSVBK] ; $ff00+$70
+ ld a, [rSVBK]
push af
ld a, $1
- ld [rSVBK], a ; $ff00+$70
+ ld [rSVBK], a
callba Function118452
pop af
- ld [rSVBK], a ; $ff00+$70
+ ld [rSVBK], a
ld a, $a
ld [wcd49], a
ret
@@ -1700,13 +1700,13 @@ Function171ad7: ; 171ad7 (5c:5ad7)
jp Function171c66
Function171aec: ; 171aec (5c:5aec)
- ld a, [rSVBK] ; $ff00+$70
+ ld a, [rSVBK]
push af
ld a, $1
- ld [rSVBK], a ; $ff00+$70
+ ld [rSVBK], a
callba Function118452
pop af
- ld [rSVBK], a ; $ff00+$70
+ ld [rSVBK], a
hlcoord 2, 6
ld a, $8
.asm_171b01
@@ -1860,7 +1860,7 @@ Function171beb: ; 171beb (5c:5beb)
ld hl, MenuDataHeader_171c6b
call LoadMenuDataHeader
call MenuBox
- call GetMemTileCoord
+ call MenuBoxCoord2Tile
callba Function104061
hlcoord 1, 14
ld de, String_171c73
@@ -1952,10 +1952,10 @@ Function171c87: ; 171c87 (5c:5c87)
ret
Function171ccd: ; 171ccd (5c:5ccd)
- ld a, [rSVBK] ; $ff00+$70
+ ld a, [rSVBK]
push af
ld a, $5
- ld [rSVBK], a ; $ff00+$70
+ ld [rSVBK], a
ld hl, Palette_171d71
ld de, Unkn1Pals
ld bc, $40
@@ -1967,7 +1967,7 @@ Function171ccd: ; 171ccd (5c:5ccd)
ld [hl], a
call SetPalettes
pop af
- ld [rSVBK], a ; $ff00+$70
+ ld [rSVBK], a
ret
Function171cf0: ; 171cf0 (5c:5cf0)
@@ -2115,10 +2115,10 @@ Function172e78: ; 172e78 (5c:6e78)
; 172eb9 (5c:6eb9)
Function172eb9:
- ld a, [rSVBK] ; $ff00+$70
+ ld a, [rSVBK]
push af
ld a, $5
- ld [rSVBK], a ; $ff00+$70
+ ld [rSVBK], a
ld hl, Palette_172edf
ld de, Unkn1Pals
ld bc, $40
@@ -2129,7 +2129,7 @@ Function172eb9:
call CopyBytes
call SetPalettes
pop af
- ld [rSVBK], a ; $ff00+$70
+ ld [rSVBK], a
ret
; 172edf (5c:6edf)
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-20 16:02:43 +0000