summaryrefslogtreecommitdiff
path: root/misc
diff options
context:
space:
mode:
Diffstat (limited to 'misc')
-rw-r--r--misc/crystal_misc.asm2
-rw-r--r--misc/mobile_22.asm6
-rw-r--r--misc/mobile_22_2.asm6
-rw-r--r--misc/mobile_40.asm24
-rw-r--r--misc/mobile_45.asm78
-rw-r--r--misc/mobile_5f.asm2
6 files changed, 59 insertions, 59 deletions
diff --git a/misc/crystal_misc.asm b/misc/crystal_misc.asm
index 4844c826c..cb152cefd 100644
--- a/misc/crystal_misc.asm
+++ b/misc/crystal_misc.asm
@@ -483,7 +483,7 @@ Function17a964: ; 17a964 (5e:6964)
Function17a97b: ; 17a97b (5e:697b)
hlcoord 1, 1
- ld bc, $212
+ lb bc, 2, 18
call ClearBox
hlcoord 3, 2
ld de, Buffer1
diff --git a/misc/mobile_22.asm b/misc/mobile_22.asm
index 1f883a944..716ad50a3 100644
--- a/misc/mobile_22.asm
+++ b/misc/mobile_22.asm
@@ -247,7 +247,7 @@ Function89261: ; 89261
add $5
ld [hl], a
pop af
- ld [wPocketCursorBuffer], a
+ ld [wMenuCursorBuffer], a
call BackUpTiles
call Function8923c
call Function89209
@@ -2194,7 +2194,7 @@ Function89d5e: ; 89d5e (22:5d5e)
push af
call CopyMenuDataHeader
pop af
- ld [wPocketCursorBuffer], a
+ ld [wMenuCursorBuffer], a
call Function8923c
call Function1c89
call Function1c10
@@ -3050,7 +3050,7 @@ Function8a31c: ; 8a31c (22:631c)
call Function8a3b2
pop bc
ld a, c
- ld [wPocketCursorBuffer], a
+ ld [wMenuCursorBuffer], a
ld [MenuSelection], a
call Function1c89
call Function1c10
diff --git a/misc/mobile_22_2.asm b/misc/mobile_22_2.asm
index 059672fad..af4e834a3 100644
--- a/misc/mobile_22_2.asm
+++ b/misc/mobile_22_2.asm
@@ -803,7 +803,7 @@ Function8b7bd: ; 8b7bd
ld hl, MenuDataHeader_0x8b867
call CopyMenuDataHeader
ld a, [wd030]
- ld [wPocketCursorBuffer], a
+ ld [wMenuCursorBuffer], a
ld a, [wd031]
ld [wd0e4], a
ld a, [wd032]
@@ -881,7 +881,7 @@ Function8b83e: ; 8b83e
Function8b84b: ; 8b84b
ld [wd0e4], a
ld a, [wcfa9]
- ld [wPocketCursorBuffer], a
+ ld [wMenuCursorBuffer], a
ret
; 8b855
@@ -939,7 +939,7 @@ Function8b88c: ; 8b88c
call Function8931b
call Function8932d
jr c, .asm_8b8a3
- ld hl, $0000
+ ld hl, 0
add hl, bc
ld d, h
ld e, l
diff --git a/misc/mobile_40.asm b/misc/mobile_40.asm
index ebc303400..821a8eaf8 100644
--- a/misc/mobile_40.asm
+++ b/misc/mobile_40.asm
@@ -246,17 +246,17 @@ Function10016f: ; 10016f
.asm_1001af
ld a, $d7
- ld de, $0000
+ ld de, 0
jr .asm_1001d7
.asm_1001b6
ld a, $d5
- ld de, $0000
+ ld de, 0
jr .asm_1001d7
.asm_1001bd
ld a, $d6
- ld de, $0000
+ ld de, 0
jr .asm_1001d7
.asm_1001c4
@@ -271,7 +271,7 @@ Function10016f: ; 10016f
.asm_1001d2
ld a, $d0
- ld de, $0000
+ ld de, 0
.asm_1001d7
ld [wc300], a
@@ -645,7 +645,7 @@ Function100406: ; 100406
Function10043a: ; 10043a
push hl
push bc
- ld de, $0000
+ ld de, 0
.asm_10043f
ld a, [hli]
add e
@@ -1787,12 +1787,12 @@ Function100b12: ; 100b12
ld a, BANK(BattleMenuDataHeader)
ld [wcf94], a
ld a, [wd0d2]
- ld [wPocketCursorBuffer], a
+ ld [wMenuCursorBuffer], a
call Function100e72
call Function100b45
callba Function8e85
call Function100ed4
- ld a, [wPocketCursorBuffer]
+ ld a, [wMenuCursorBuffer]
ld [wd0d2], a
call ExitMenu
ret
@@ -1819,7 +1819,7 @@ Function100b45: ; 100b45
ld c, a
ld a, [wcfa3]
call SimpleMultiply
- ld [wPocketCursorBuffer], a
+ ld [wMenuCursorBuffer], a
and a
ret
; 100b7a
@@ -3637,7 +3637,7 @@ Function10177b: ; 10177b
ld c, a
ld b, $0
ld a, [wcd3a]
- ld hl, $0000
+ ld hl, 0
call AddNTimes
ld e, l
ld d, h
@@ -6667,7 +6667,7 @@ Function102cee: ; 102cee
sub c
ret z
ld bc, $002f
- ld hl, $0000
+ ld hl, 0
call AddNTimes
push hl
ld a, [wJumptableIndex]
@@ -7474,7 +7474,7 @@ Function10343c: ; 10343c
call Function1034e0
.asm_10345f
- ld bc, $0000
+ ld bc, 0
call Function10350f
ld bc, $0001
call Function103487
@@ -7689,7 +7689,7 @@ Function103612: ; 103612
ld a, [wdc40]
and $f
jr z, .asm_103622
- ld [wPocketCursorBuffer], a
+ ld [wMenuCursorBuffer], a
.asm_103622
call InterpretMenu2
diff --git a/misc/mobile_45.asm b/misc/mobile_45.asm
index e0ea8d457..1a891ce6c 100644
--- a/misc/mobile_45.asm
+++ b/misc/mobile_45.asm
@@ -14428,7 +14428,7 @@ Function11ad1b: ; 11ad1b
ld a, [wcfa9]
ld [wcd82], a
dec a
- ld [hConnectedMapWidth], a
+ ld [hObjectStructIndexBuffer], a
ld a, $10
ld [wc3b7], a
ld hl, Function8e83f
@@ -15521,7 +15521,7 @@ Function11b3d9: ; 11b3d9
add [hl]
cp e
jr z, .asm_11b40d
- ld hl, $0000
+ ld hl, 0
ld bc, $0070
call AddNTimes
ld e, l
@@ -16285,29 +16285,29 @@ Function11b93b: ; 11b93b
xor a
ld [$a800], a
ld hl, $a823
- ld de, $c608
+ ld de, wEnemyMoveStruct
ld bc, $008f
call CopyBytes
call CloseSRAM
- ld a, $8
- ld [BGMapBuffer], a
- ld a, $c6
+ ld a, wEnemyMoveStruct % $100
+ ld [wcd20], a
+ ld a, wEnemyMoveStruct / $100
ld [wcd21], a
- ld a, $11
- ld [CreditsTimer], a
- ld a, $c6
+ ld a, $c611 % $100
+ ld [wcd22], a
+ ld a, $c611 / $100
ld [wcd23], a
- ld a, $41
+ ld a, $c641 % $100
ld [wcd24], a
- ld a, $c6
+ ld a, $c641 / $100
ld [wcd25], a
- ld a, $46
+ ld a, $c646 % $100
ld [wcd26], a
- ld a, $c6
+ ld a, $c646 / $100
ld [wcd27], a
- ld a, $4b
+ ld a, $c64b % $100
ld [wcd28], a
- ld a, $c6
+ ld a, $c64b / $100
ld [wcd29], a
call Function11b98f
callba Function14a58
@@ -16319,17 +16319,17 @@ Function11b98f: ; 11b98f
ld a, [hl]
ld e, a
inc [hl]
- ld a, [BGMapBuffer]
+ ld a, [wcd20]
ld l, a
ld a, [wcd21]
ld h, a
inc hl
ld bc, PartySpecies
ld d, e
-.asm_11b9a2
+.loop1
inc bc
dec d
- jr nz, .asm_11b9a2
+ jr nz, .loop1
ld a, e
ld [CurPartyMon], a
ld a, [hl]
@@ -16341,11 +16341,11 @@ Function11b98f: ; 11b98f
ld bc, PartyMon2 - PartyMon1
ld a, e
ld [wcd2a], a
-.asm_11b9ba
+.loop2
add hl, bc
dec a
and a
- jr nz, .asm_11b9ba
+ jr nz, .loop2
ld e, l
ld d, h
ld a, [CreditsTimer]
@@ -16355,49 +16355,49 @@ Function11b98f: ; 11b98f
ld bc, PartyMon2 - PartyMon1
call CopyBytes
ld hl, PartyMonOT
- ld bc, $000b
+ ld bc, NAME_LENGTH
ld a, [wcd2a]
-.asm_11b9d8
+.loop3
add hl, bc
dec a
and a
- jr nz, .asm_11b9d8
+ jr nz, .loop3
ld e, l
ld d, h
ld a, [wcd24]
ld l, a
ld a, [wcd25]
ld h, a
- ld bc, $000a
+ ld bc, PKMN_NAME_LENGTH - 1
call CopyBytes
- ld a, $50
+ ld a, "@"
ld [de], a
ld hl, PartyMonNicknames
- ld bc, $000b
+ ld bc, PKMN_NAME_LENGTH
ld a, [wcd2a]
-.asm_11b9f9
+.loop4
add hl, bc
dec a
and a
- jr nz, .asm_11b9f9
+ jr nz, .loop4
ld e, l
ld d, h
ld a, [wcd26]
ld l, a
ld a, [wcd27]
ld h, a
- ld bc, $000a
+ ld bc, PKMN_NAME_LENGTH - 1
call CopyBytes
- ld a, $50
+ ld a, "@"
ld [de], a
- ld hl, $a600
- ld bc, $002f
+ ld hl, s0_a600
+ ld bc, party_struct_length - 1
ld a, [wcd2a]
-.asm_11ba1a
+.loop5
add hl, bc
dec a
and a
- jr nz, .asm_11ba1a
+ jr nz, .loop5
ld a, $0
call GetSRAMBank
ld e, l
@@ -16406,14 +16406,14 @@ Function11b98f: ; 11b98f
ld l, a
ld a, [wcd29]
ld h, a
- ld bc, $002f
+ ld bc, party_struct_length - 1
call CopyBytes
call CloseSRAM
ret
; 11ba38
Function11ba38: ; 11ba38
- callba Functione538
+ callba CheckCurPartyMonFainted
ret c
xor a
ld [ScriptVar], a
@@ -23950,7 +23950,7 @@ endr
ld a, EGG_TICKET
ld [CurItem], a
ld a, $1
- ld [wd10c], a
+ ld [wItemQuantityChangeBuffer], a
ld a, $ff
ld [wd107], a
ld hl, NumItems
@@ -24234,9 +24234,9 @@ Function_LoadOpponentTrainerAndPokemonsWithOTSprite: ; 0x170b44
ld hl, UsedSprites
add hl, de
ld [hli], a
- ld [$ffbd], a
+ ld [hUsedSpriteIndex], a
ld a, [hl]
- ld [$ffbe], a
+ ld [hUsedSpriteTile], a
callba Function143c8
ret
; 170b90
diff --git a/misc/mobile_5f.asm b/misc/mobile_5f.asm
index bb1814945..66d696729 100644
--- a/misc/mobile_5f.asm
+++ b/misc/mobile_5f.asm
@@ -2693,7 +2693,7 @@ Function17e0fd: ; 17e0fd
ld a, [hli]
ld [CurItem], a
ld a, [hli]
- ld [wd10c], a
+ ld [wItemQuantityChangeBuffer], a
push hl
ld hl, NumItems
call ReceiveItem
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-19 05:10:52 +0000