ref: 3a24cff5eb7ae82b6f9ee8ac24e64496adab7a7e
parent: bc7b63b44a2d57d4cd67e4470fa88fbe6e303218
author: yenatch <[email protected]>
date: Fri Aug 23 11:48:26 EDT 2013
BitTableFunc -> FlagAction
--- a/engine/scripting.asm
+++ b/engine/scripting.asm
@@ -843,7 +843,7 @@
ld d, [hl]
call GetScriptByte
ld b, a
- call BitTable1Func
+ call EventFlagAction
ld a, c
and a
ret z
@@ -1256,7 +1256,7 @@
xor a
ret
.asm_97321
- call BitTable1Func
+ call EventFlagAction
ret
; 0x97325
@@ -2677,7 +2677,7 @@
call GetScriptByte
ld d, a
ld b, $1
- call BitTable1Func
+ call EventFlagAction
ret
; 0x97996
@@ -2691,7 +2691,7 @@
call GetScriptByte
ld d, a
ld b, $0
- call BitTable1Func
+ call EventFlagAction
ret
; 0x979a4
@@ -2705,7 +2705,7 @@
call GetScriptByte
ld d, a
ld b, $2
- call BitTable1Func
+ call EventFlagAction
ld a, c
and a
jr z, .asm_979b7 ; 0x979b3 $2
--- a/main.asm
+++ b/main.asm
@@ -7266,12 +7266,12 @@
; 2e6f
-BitTable1Func: ; 0x2e6f
+EventFlagAction: ; 0x2e6f
ld hl, EventFlags
- call BitTableFunc
+ call FlagAction
ret
-BitTableFunc: ; 0x2e76
+FlagAction: ; 0x2e76
; Perform a function on a bit in memory.
; inputs:
@@ -9224,7 +9224,7 @@
inc hl
ld d, [hl]
ld b, CHECK_FLAG
- call BitTable1Func
+ call EventFlagAction
ld a, c
pop de
pop bc
@@ -9379,7 +9379,7 @@
ld e, l
push de
ld b, $2
- call BitTable1Func
+ call EventFlagAction
pop de
ld a, c
and a
@@ -30776,7 +30776,7 @@
ld d, $0
ld b, $1
ld hl, WalkingDirection
- call BitTableFunc
+ call FlagAction
call Function15fc3
ld de, Money
ld bc, $ffc3
@@ -30838,7 +30838,7 @@
ld d, $0
ld b, $2
ld hl, WalkingDirection
- call BitTableFunc
+ call FlagAction
ld a, c
and a
jr nz, .asm_15dd8
@@ -34862,7 +34862,7 @@
push bc
call Function26a30
pop bc
- call BitTable1Func
+ call EventFlagAction
ret
; 26a44
@@ -48336,7 +48336,7 @@
ld e, a
ld d, 0
ld hl, FruitTreeFlags
- call BitTableFunc
+ call FlagAction
pop de
pop hl
ret
@@ -56916,7 +56916,7 @@
call GetSecondaryMapHeaderPointer
ld de, $0326
ld b, $1
- call BitTable1Func
+ call EventFlagAction
.done
ret
; 0x8adef
@@ -56935,7 +56935,7 @@
jr nz, .asm_8ae4a
ld de, $0329
ld b, $1
- call BitTable1Func
+ call EventFlagAction
scf
jr .asm_8ae4b
@@ -60459,7 +60459,7 @@
ld e, l
ld d, h
ld b, $2
- call BitTable1Func
+ call EventFlagAction
ld a, c
and a
pop hl
@@ -63124,7 +63124,7 @@
ld d, h
ld e, l
ld b, $2
- call BitTable1Func
+ call EventFlagAction
ld a, c
and a
jr z, .asm_b81df