ref: 7563a990aa40d3ff6f0943cb35b8d9a0df03612e
parent: bd894f6fb01479c416fcd369dc0b7fc0baace210
author: IIMarckus <iimarckus@gmail.com>
date: Sun May 17 23:15:45 EDT 2015
w-prefix the new PokegearFlags variable.
--- a/engine/engine_flags.asm
+++ b/engine/engine_flags.asm
@@ -3,11 +3,11 @@
; location, bit
; pokegear
- dwb PokegearFlags, %00000010 ; radio card ; $0
- dwb PokegearFlags, %00000001 ; map card
- dwb PokegearFlags, %00000100 ; phone card
- dwb PokegearFlags, %00001000 ; expn card
- dwb PokegearFlags, %10000000 ; on/off
+ dwb wPokegearFlags, %00000010 ; radio card ; $0
+ dwb wPokegearFlags, %00000001 ; map card
+ dwb wPokegearFlags, %00000100 ; phone card
+ dwb wPokegearFlags, %00001000 ; expn card
+ dwb wPokegearFlags, %10000000 ; on/off
; wDaycareMan, %10000000 ; daycare 1 on
dwb wDaycareMan, %01000000 ; monster 1 and 2 are compatible
--- a/main.asm
+++ b/main.asm
@@ -13218,7 +13218,7 @@
call .AppendMenuList
.no_pack
- ld hl, PokegearFlags
+ ld hl, wPokegearFlags
bit 7, [hl]
jr z, .no_pokegear
ld a, 7 ; pokegear
@@ -70956,7 +70956,7 @@
ld bc, $8
ld a, $4f
call ByteFill
- ld de, PokegearFlags
+ ld de, wPokegearFlags
ld a, [de]
bit 0, a
call nz, Function90ee4
@@ -71046,7 +71046,7 @@
and D_RIGHT
ret z
- ld a, [PokegearFlags]
+ ld a, [wPokegearFlags]
bit 0, a
jr z, .asm_90f5a
ld c, $2
@@ -71054,7 +71054,7 @@
jr .asm_90f71
.asm_90f5a
- ld a, [PokegearFlags]
+ ld a, [wPokegearFlags]
bit 2, a
jr z, .asm_90f67
ld c, $7
@@ -71062,7 +71062,7 @@
jr .asm_90f71
.asm_90f67
- ld a, [PokegearFlags]
+ ld a, [wPokegearFlags]
bit 1, a
ret z
@@ -71165,7 +71165,7 @@
ret
.right
- ld a, [PokegearFlags]
+ ld a, [wPokegearFlags]
bit 2, a
jr z, .asm_91015
ld c, $7
@@ -71173,7 +71173,7 @@
jr .done
.asm_91015
- ld a, [PokegearFlags]
+ ld a, [wPokegearFlags]
bit 1, a
ret z
ld c, $b
@@ -71358,7 +71358,7 @@
ret
.left
- ld a, [PokegearFlags]
+ ld a, [wPokegearFlags]
bit 2, a
jr z, .asm_9113b
ld c, $7
@@ -71366,7 +71366,7 @@
jr .asm_9114c
.asm_9113b
- ld a, [PokegearFlags]
+ ld a, [wPokegearFlags]
bit 0, a
jr z, .asm_91148
ld c, $2
@@ -71417,7 +71417,7 @@
ret
.left
- ld a, [PokegearFlags]
+ ld a, [wPokegearFlags]
bit 0, a
jr z, .asm_9119c
ld c, $2
@@ -71429,7 +71429,7 @@
jr .asm_911ac
.right
- ld a, [PokegearFlags]
+ ld a, [wPokegearFlags]
bit 1, a
ret z
ld c, $b
@@ -72125,7 +72125,7 @@
.PlacesAndPeople
call .InJohto
jr c, .NoSignal
- ld a, [PokegearFlags]
+ ld a, [wPokegearFlags]
bit 3, a
jr z, .NoSignal
jp Function917ea
@@ -72133,7 +72133,7 @@
.LetsAllSing
call .InJohto
jr c, .NoSignal
- ld a, [PokegearFlags]
+ ld a, [wPokegearFlags]
bit 3, a
jr z, .NoSignal
jp Function917ff
@@ -72141,7 +72141,7 @@
.PokeFluteRadio
call .InJohto
jr c, .NoSignal
- ld a, [PokegearFlags]
+ ld a, [wPokegearFlags]
bit 3, a
jr z, .NoSignal
jp Function91829
--- a/wram.asm
+++ b/wram.asm
@@ -2106,7 +2106,7 @@
ds 1
-PokegearFlags:: ds 1
+wPokegearFlags:: ds 1
wd958:: ds 1
wd959:: ds 2
WhichRegisteredItem:: ; d95b