diff options
| author | Bryan Bishop <kanzure@gmail.com> | 2013-08-30 11:43:23 -0700 |
|---|---|---|
| committer | Bryan Bishop <kanzure@gmail.com> | 2013-08-30 11:43:23 -0700 |
| commit | a5f226246e068adf0ddabc8abe1afa868749162b (patch) | |
| tree | b2a055fcdf9f89c6d6d1c08e0adfa6c471e4423d /engine/scripting.asm | |
| parent | 9ce504f528a997b0d5bb1bd1c80fed91f9a8fa2a (diff) | |
| parent | 886ab6888409dc6ac0502c6866c74aade7d3568e (diff) | |
Merge pull request #175 from yenatch/rename-bittables
toss the useless "bittable" convention for event and engine flags
Diffstat (limited to 'engine/scripting.asm')
| -rw-r--r-- | engine/scripting.asm | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/engine/scripting.asm b/engine/scripting.asm index 79fbe69ee..0676c8681 100644 --- a/engine/scripting.asm +++ b/engine/scripting.asm @@ -843,7 +843,7 @@ Script_trainerstatus: ; 0x97132 ld d, [hl] call GetScriptByte ld b, a - call BitTable1Func + call EventFlagAction ld a, c and a ret z @@ -1256,7 +1256,7 @@ Unknown_0x9730b: ; 0x9730b xor a ret .asm_97321 - call BitTable1Func + call EventFlagAction ret ; 0x97325 @@ -1497,9 +1497,9 @@ Script_loadtrainer: ; 0x97424 Script_startbattle: ; 0x97436 ; script command 0x5f - call $2879 - ld a, $16 - call $2d83 + call Function2879 + ld a, PREDEF_START_BATTLE + call Predef ld a, [$d0ee] and $3f ld [$c2dd], a @@ -2677,7 +2677,7 @@ Script_setbit1: ; 0x97988 call GetScriptByte ld d, a ld b, $1 - call BitTable1Func + call EventFlagAction ret ; 0x97996 @@ -2691,7 +2691,7 @@ Script_clearbit1: ; 0x97996 call GetScriptByte ld d, a ld b, $0 - call BitTable1Func + call EventFlagAction ret ; 0x979a4 @@ -2705,7 +2705,7 @@ Script_checkbit1: ; 0x979a4 call GetScriptByte ld d, a ld b, $2 - call BitTable1Func + call EventFlagAction ld a, c and a jr z, .asm_979b7 ; 0x979b3 $2 |