shithub: pokecrystal

Download patch

ref: 94d4c89e093b76a0964114bd7a370046e70e965e
parent: 7872b7e8b3b8774ac6c2800c47cc3cfb384f1f57
parent: d31dbfc7804cc0fa0a48a28779b8f9db1a0032c8
author: Bryan Bishop <[email protected]>
date: Mon Sep 30 19:17:04 EDT 2013

Merge pull request #209 from yenatch/script-commands

use updated script commands from pokemontools

git/query: bad hash f3fb1f24eaffce571d3fe5555adf41232aad3f67
--- a/battle/effect_commands.asm
+++ b/battle/effect_commands.asm
@@ -11015,7 +11015,7 @@
 
 
 BattleCommandaa: ; 37e80
-; wait
+; movedelay
 ; Wait 40 frames.
 	ld c, 40
 	jp DelayFrames
--- a/battle/moves/move_effects.asm
+++ b/battle/moves/move_effects.asm
@@ -2201,7 +2201,7 @@
 BeatUp:
 	checkobedience
 	usedmovetext
-	wait
+	movedelay
 	doturn
 	startloop
 	effect0x0a
--- a/engine/scripting.asm
+++ b/engine/scripting.asm
@@ -9,8 +9,8 @@
 	dw Script_if_not_equal
 	dw Script_iffalse
 	dw Script_iftrue
-	dw Script_if_less_than
 	dw Script_if_greater_than
+	dw Script_if_less_than
 	dw Script_jumpstd
 	dw Script_callstd
 	dw Script_3callasm
@@ -48,14 +48,14 @@
 	dw Script_giveegg
 	dw Script_givepokeitem
 	dw Script_checkpokeitem
-	dw Script_checkbit1
-	dw Script_clearbit1
-	dw Script_setbit1
-	dw Script_checkbit2
-	dw Script_clearbit2
-	dw Script_setbit2
-	dw Script_wildoff
+	dw Script_checkevent
+	dw Script_clearevent
+	dw Script_setevent
+	dw Script_checkflag
+	dw Script_clearflag
+	dw Script_setflag
 	dw Script_wildon
+	dw Script_wildoff
 	dw Script_xycompare
 	dw Script_warpmod
 	dw Script_blackoutmod
@@ -165,9 +165,9 @@
 	dw Script_warpfacing
 	dw Script_storetext
 	dw Script_displaylocation
-	dw Script_unknown0xa6
-	dw Script_unknown0xa7
-	dw Script_unknown0xa8
+	dw Script_trainerclassname
+	dw Script_name
+	dw Script_wait
 	dw Script_unknown0xa9
 ; 0x96e05
 
@@ -1734,7 +1734,7 @@
 	jr SkipTwoScriptBytes ; 0x97554 $40
 ; 0x97556
 
-Script_if_less_than: ; 0x97556
+Script_if_greater_than: ; 0x97556
 ; script command 0xa
 ; parameters:
 ;     byte (SingleByteParam)
@@ -1748,7 +1748,7 @@
 	jr SkipTwoScriptBytes ; 0x97560 $34
 ; 0x97562
 
-Script_if_greater_than: ; 0x97562
+Script_if_less_than: ; 0x97562
 ; script command 0xb
 ; parameters:
 ;     byte (SingleByteParam)
@@ -2151,6 +2151,7 @@
 ; script command 0xa5
 ; parameters:
 ;     id (SingleByteParam)
+;     memory (SingleByteParam)
 
 	call GetScriptByte
 	jr Unknown_976f4 ; 0x97704 $ee
@@ -2173,8 +2174,11 @@
 	jr Unknown_976c0 ; 0x97714 $aa
 ; 0x97716
 
-Script_unknown0xa7: ; 0x97716
+Script_name: ; 0x97716
 ; script command 0xa7
+; parameters:
+;     type (SingleByteParam)
+;     id (SingleByteParam)
 
 	call GetScriptByte
 	ld [$cf61], a
@@ -2187,7 +2191,7 @@
 	jp Unknown_976c0
 ; 0x9772b
 
-Script_unknown0xa6: ; 0x9772b
+Script_trainerclassname: ; 0x9772b
 ; script command 0xa6
 
 	ld a, $7
@@ -2667,7 +2671,7 @@
 	ret
 ; 0x97988
 
-Script_setbit1: ; 0x97988
+Script_setevent: ; 0x97988
 ; script command 0x33
 ; parameters:
 ;     bit_number (MultiByteParam)
@@ -2681,7 +2685,7 @@
 	ret
 ; 0x97996
 
-Script_clearbit1: ; 0x97996
+Script_clearevent: ; 0x97996
 ; script command 0x32
 ; parameters:
 ;     bit_number (MultiByteParam)
@@ -2695,7 +2699,7 @@
 	ret
 ; 0x979a4
 
-Script_checkbit1: ; 0x979a4
+Script_checkevent: ; 0x979a4
 ; script command 0x31
 ; parameters:
 ;     bit_number (MultiByteParam)
@@ -2715,7 +2719,7 @@
 	ret
 ; 0x979bb
 
-Script_setbit2: ; 0x979bb
+Script_setflag: ; 0x979bb
 ; script command 0x36
 ; parameters:
 ;     bit_number (MultiByteParam)
@@ -2729,7 +2733,7 @@
 	ret
 ; 0x979c9
 
-Script_clearbit2: ; 0x979c9
+Script_clearflag: ; 0x979c9
 ; script command 0x35
 ; parameters:
 ;     bit_number (MultiByteParam)
@@ -2743,7 +2747,7 @@
 	ret
 ; 0x979d7
 
-Script_checkbit2: ; 0x979d7
+Script_checkflag: ; 0x979d7
 ; script command 0x34
 ; parameters:
 ;     bit_number (MultiByteParam)
@@ -2770,18 +2774,18 @@
 	ret
 ; 0x979f5
 
-Script_wildon: ; 0x979f5
+Script_wildoff: ; 0x979f5
 ; script command 0x38
 
-	ld hl, $d84c
+	ld hl, StatusFlags
 	set 5, [hl]
 	ret
 ; 0x979fb
 
-Script_wildoff: ; 0x979fb
+Script_wildon: ; 0x979fb
 ; script command 0x37
 
-	ld hl, $d84c
+	ld hl, StatusFlags
 	res 5, [hl]
 	ret
 ; 0x97a01
@@ -3211,7 +3215,7 @@
 	ret
 ; 0x97c05
 
-Script_unknown0xa8: ; 0x97c05
+Script_wait: ; 0x97c05
 ; script command 0xa8
 ; parameters:
 ;     unknown (SingleByteParam)
--- a/engine/std_scripts.asm
+++ b/engine/std_scripts.asm
@@ -72,7 +72,7 @@
 
 .morn
 ; Different text if we're in the com center
-	checkbit1 $032a
+	checkevent $032a
 	iftrue .morn_comcenter
 ; Good morning! Welcome to ...
 	3writetext BANK(UnknownText_0x1b0000), UnknownText_0x1b0000
@@ -86,7 +86,7 @@
 
 .day
 ; Different text if we're in the com center
-	checkbit1 $032a
+	checkevent $032a
 	iftrue .day_comcenter
 ; Hello! Welcome to ...
 	3writetext BANK(UnknownText_0x1b002b), UnknownText_0x1b002b
@@ -100,7 +100,7 @@
 
 .nite
 ; Different text if we're in the com center
-	checkbit1 $032a
+	checkevent $032a
 	iftrue .nite_comcenter
 ; Good evening! You're out late. ...
 	3writetext BANK(UnknownText_0x1b004f), UnknownText_0x1b004f
@@ -114,7 +114,7 @@
 
 .heal
 ; If we come back, don't welcome us to the com center again
-	clearbit1 $032a
+	clearevent $032a
 ; Ask if you want to heal
 	3writetext BANK(UnknownText_0x1b017a), UnknownText_0x1b017a
 	yesorno
@@ -138,7 +138,7 @@
 	checkphonecall
 	iftrue .done
 ; Has Pokerus already been found in the Pokecenter?
-	checkbit2 $000d
+	checkflag $000d
 	iftrue .done
 ; Check for Pokerus
 	special $004e ; SPECIAL_CHECKPOKERUS
@@ -164,7 +164,7 @@
 ; Different text for com center (excludes 'in a Pokemon Center')
 ; Since flag $32a is cleared when healing,
 ; this text is never actually seen
-	checkbit1 $032a
+	checkevent $032a
 	iftrue .pokerus_comcenter
 ; Your Pokemon appear to be infected ...
 	3writetext BANK(UnknownText_0x1b0241), UnknownText_0x1b0241
@@ -178,7 +178,7 @@
 	loadmovesprites
 .endpokerus
 ; Don't tell us about Pokerus again
-	setbit2 $000d
+	setflag $000d
 ; Trigger Elm's Pokerus phone call
 	specialphonecall $0001
 	end
@@ -354,17 +354,17 @@
 ; bc23e
 
 UnknownScript_0xbc23e: ; 0xbc23e
-	clearbit1 $06cd
+	clearevent $06cd
 	end
 ; 0xbc242
 
 UnknownScript_0xbc242: ; 0xbc242
-	setbit2 $0013
-	setbit1 $06cf
-	setbit1 $06d1
-	clearbit1 $06ce
-	clearbit1 $0025
-	setbit1 $0756
+	setflag $0013
+	setevent $06cf
+	setevent $06d1
+	clearevent $06ce
+	clearevent $0025
+	setevent $0756
 	specialphonecall $0004
 	domaptrigger GROUP_MAHOGANY_TOWN, MAP_MAHOGANY_TOWN, $1
 	end
@@ -373,19 +373,19 @@
 UnknownScript_0xbc25c: ; 0xbc25c
 	special $0034
 	2call UnknownScript_0xbc380
-	setbit1 $0747
-	clearbit1 $0748
-	setbit1 $02d2
+	setevent $0747
+	clearevent $0748
+	setevent $02d2
 	warp GROUP_ROUTE_36_NATIONAL_PARK_GATE, MAP_ROUTE_36_NATIONAL_PARK_GATE, $0, $4
 	applymovement $0, MovementData_0xbcea1
 
 UnknownScript_0xbc274: ; bc274
-	clearbit2 $0011
-	clearbit1 $02d2
-	clearbit1 $0313
-	clearbit1 $0314
-	clearbit1 $0315
-	clearbit1 $0316
+	clearflag $0011
+	clearevent $02d2
+	clearevent $0313
+	clearevent $0314
+	clearevent $0315
+	clearevent $0316
 	loadfont
 	3writetext $6c, $45bf
 	closetext
@@ -407,7 +407,7 @@
 UnknownScript_0xbc2b1: ; 0xbc2b1
 	3writetext $6c, $465b
 	keeptextopen
-	checkbit1 $0308
+	checkevent $0308
 	iffalse $42c4
 	3writetext $6c, $46d9
 	closetext
@@ -420,33 +420,33 @@
 	loadmovesprites
 	dotrigger $0
 	domaptrigger GROUP_ROUTE_35_NATIONAL_PARK_GATE, MAP_ROUTE_35_NATIONAL_PARK_GATE, $0
-	setbit1 $0716
-	setbit1 $0717
-	setbit1 $0718
-	setbit1 $0719
-	setbit1 $071a
-	setbit1 $071b
-	setbit1 $071c
-	setbit1 $071d
-	setbit1 $071e
-	setbit1 $071f
-	setbit1 $0720
-	setbit1 $0721
-	setbit1 $0722
-	setbit1 $0723
-	setbit1 $0724
-	setbit1 $0725
-	setbit1 $0726
-	setbit1 $0727
-	setbit1 $0728
-	setbit1 $0729
-	setbit2 $0051
+	setevent $0716
+	setevent $0717
+	setevent $0718
+	setevent $0719
+	setevent $071a
+	setevent $071b
+	setevent $071c
+	setevent $071d
+	setevent $071e
+	setevent $071f
+	setevent $0720
+	setevent $0721
+	setevent $0722
+	setevent $0723
+	setevent $0724
+	setevent $0725
+	setevent $0726
+	setevent $0727
+	setevent $0728
+	setevent $0729
+	setflag $0051
 	special $003c
 	end
 ; 0xbc31e
 
 UnknownScript_0xbc31e: ; 0xbc31e
-	setbit1 $0000
+	setevent $0000
 	itemtotext SUN_STONE, $1
 	3writetext $6c, $4621
 	closetext
@@ -476,7 +476,7 @@
 UnknownScript_0xbc354: ; 0xbc354
 	3writetext $6c, $48cc
 	keeptextopen
-	setbit1 $0313
+	setevent $0313
 	2jump UnknownScript_0xbc2b1
 ; 0xbc35f
 
@@ -483,7 +483,7 @@
 UnknownScript_0xbc35f: ; 0xbc35f
 	3writetext $6c, $48cc
 	keeptextopen
-	setbit1 $0314
+	setevent $0314
 	2jump UnknownScript_0xbc2b1
 ; 0xbc36a
 
@@ -490,7 +490,7 @@
 UnknownScript_0xbc36a: ; 0xbc36a
 	3writetext $6c, $48cc
 	keeptextopen
-	setbit1 $0315
+	setevent $0315
 	2jump UnknownScript_0xbc2b1
 ; 0xbc375
 
@@ -497,170 +497,170 @@
 UnknownScript_0xbc375: ; 0xbc375
 	3writetext $6c, $48cc
 	keeptextopen
-	setbit1 $0316
+	setevent $0316
 	2jump $42a9
 ; 0xbc380
 
 UnknownScript_0xbc380: ; 0xbc380
-	checkbit1 $0716
+	checkevent $0716
 	iftrue .skip1
-	clearbit1 $0720
+	clearevent $0720
 .skip1
-	checkbit1 $0717
+	checkevent $0717
 	iftrue .skip2
-	clearbit1 $0721
+	clearevent $0721
 .skip2
-	checkbit1 $0718
+	checkevent $0718
 	iftrue .skip3
-	clearbit1 $0722
+	clearevent $0722
 .skip3
-	checkbit1 $0719
+	checkevent $0719
 	iftrue .skip4
-	clearbit1 $0723
+	clearevent $0723
 .skip4
-	checkbit1 $071a
+	checkevent $071a
 	iftrue .skip5
-	clearbit1 $0724
+	clearevent $0724
 .skip5
-	checkbit1 $071b
+	checkevent $071b
 	iftrue .skip6
-	clearbit1 $0725
+	clearevent $0725
 .skip6
-	checkbit1 $071c
+	checkevent $071c
 	iftrue .skip7
-	clearbit1 $0726
+	clearevent $0726
 .skip7
-	checkbit1 $071d
+	checkevent $071d
 	iftrue .skip8
-	clearbit1 $0727
+	clearevent $0727
 .skip8
-	checkbit1 $071e
+	checkevent $071e
 	iftrue .skip9
-	clearbit1 $0728
+	clearevent $0728
 .skip9
-	checkbit1 $071f
+	checkevent $071f
 	iftrue .skip10
-	clearbit1 $0729
+	clearevent $0729
 .skip10
 	end
 ; 0xbc3db
 
 UnknownScript_0xbc3db: ; 0xbc3db
-	setbit1 $06cb
-	setbit1 $06ce
-	setbit1 $06cd
-	setbit1 $06d0
-	setbit1 $06f3
-	setbit1 $06e9
-	setbit1 $06f4
-	setbit1 $06d5
-	setbit1 $06de
-	setbit1 $06dd
-	setbit1 $06df
-	setbit1 $06c0
-	setbit1 $06e4
-	setbit1 $0025
-	setbit1 $06be
-	setbit1 $06bf
-	setbit1 $06c1
-	setbit1 $06f9
-	setbit1 $06fd
-	setbit1 $06ff
-	setbit1 $0700
-	setbit1 $0702
-	setbit1 $0703
-	setbit1 $0704
-	setbit1 $070d
-	setbit1 $070e
-	setbit1 $070f
-	setbit1 $0710
-	setbit1 $0715
-	setbit1 $0716
-	setbit1 $0717
-	setbit1 $0718
-	setbit1 $0719
-	setbit1 $071a
-	setbit1 $071b
-	setbit1 $071c
-	setbit1 $071d
-	setbit1 $071e
-	setbit1 $071f
-	setbit1 $0720
-	setbit1 $0721
-	setbit1 $0722
-	setbit1 $0723
-	setbit1 $0724
-	setbit1 $0725
-	setbit1 $0726
-	setbit1 $0727
-	setbit1 $0728
-	setbit1 $0729
-	setbit1 $072c
-	setbit1 $072f
-	setbit1 $072d
-	setbit1 $0735
-	setbit1 $0736
-	setbit1 $073c
-	setbit1 $073d
-	setbit1 $0741
-	setbit1 $0742
-	setbit1 $0743
-	setbit1 $0744
-	setbit1 $02a4
-	setbit1 $02af
-	setbit1 $0749
-	setbit1 $06d3
-	setbit1 $074d
-	setbit1 $0712
-	setbit1 $0713
-	setbit1 $0711
-	setbit1 $06d4
-	setbit1 $0304
-	setbit1 $0307
-	setbit1 $06d8
-	setbit1 $06c3
-	setbit1 $06c2
-	setbit1 $06c6
-	setbit1 $075f
-	setbit1 $0731
-	setbit1 $074a
-	setbit1 $0762
-	setbit1 $0738
-	setbit1 $073a
-	setbit1 $073b
-	setbit1 $0733
-	setbit1 $073f
-	setbit1 $078d
-	setbit1 $0766
-	setbit1 $0768
-	setbit1 $0769
-	setbit1 $076a
-	setbit1 $078e
-	setbit1 $078f
-	setbit1 $0790
-	setbit1 $0791
-	setbit1 $0793
-	setbit1 $07a4
-	setbit1 $07a4
-	setbit1 $07a5
-	setbit1 $06ec
-	setbit1 $06ed
-	setbit1 $06f0
-	setbit1 $07a9
-	setbit1 $07aa
-	setbit1 $06c8
-	setbit1 $07ac
-	setbit1 $07ad
-	setbit1 $07b5
-	setbit1 $07b6
-	setbit1 $07c5
-	setbit1 $07b7
-	setbit1 $07b0
-	setbit1 $07af
-	setbit1 $07ae
-	setbit1 $07cf
-	setbit2 $000e
-	setbit2 $0017
+	setevent $06cb
+	setevent $06ce
+	setevent $06cd
+	setevent $06d0
+	setevent $06f3
+	setevent $06e9
+	setevent $06f4
+	setevent $06d5
+	setevent $06de
+	setevent $06dd
+	setevent $06df
+	setevent $06c0
+	setevent $06e4
+	setevent $0025
+	setevent $06be
+	setevent $06bf
+	setevent $06c1
+	setevent $06f9
+	setevent $06fd
+	setevent $06ff
+	setevent $0700
+	setevent $0702
+	setevent $0703
+	setevent $0704
+	setevent $070d
+	setevent $070e
+	setevent $070f
+	setevent $0710
+	setevent $0715
+	setevent $0716
+	setevent $0717
+	setevent $0718
+	setevent $0719
+	setevent $071a
+	setevent $071b
+	setevent $071c
+	setevent $071d
+	setevent $071e
+	setevent $071f
+	setevent $0720
+	setevent $0721
+	setevent $0722
+	setevent $0723
+	setevent $0724
+	setevent $0725
+	setevent $0726
+	setevent $0727
+	setevent $0728
+	setevent $0729
+	setevent $072c
+	setevent $072f
+	setevent $072d
+	setevent $0735
+	setevent $0736
+	setevent $073c
+	setevent $073d
+	setevent $0741
+	setevent $0742
+	setevent $0743
+	setevent $0744
+	setevent $02a4
+	setevent $02af
+	setevent $0749
+	setevent $06d3
+	setevent $074d
+	setevent $0712
+	setevent $0713
+	setevent $0711
+	setevent $06d4
+	setevent $0304
+	setevent $0307
+	setevent $06d8
+	setevent $06c3
+	setevent $06c2
+	setevent $06c6
+	setevent $075f
+	setevent $0731
+	setevent $074a
+	setevent $0762
+	setevent $0738
+	setevent $073a
+	setevent $073b
+	setevent $0733
+	setevent $073f
+	setevent $078d
+	setevent $0766
+	setevent $0768
+	setevent $0769
+	setevent $076a
+	setevent $078e
+	setevent $078f
+	setevent $0790
+	setevent $0791
+	setevent $0793
+	setevent $07a4
+	setevent $07a4
+	setevent $07a5
+	setevent $06ec
+	setevent $06ed
+	setevent $06f0
+	setevent $07a9
+	setevent $07aa
+	setevent $06c8
+	setevent $07ac
+	setevent $07ad
+	setevent $07b5
+	setevent $07b6
+	setevent $07c5
+	setevent $07b7
+	setevent $07b0
+	setevent $07af
+	setevent $07ae
+	setevent $07cf
+	setflag $000e
+	setflag $0017
 	variablesprite $4, $52
 	variablesprite $5, $4
 	variablesprite $6, $35
@@ -670,18 +670,18 @@
 	variablesprite $a, $a
 	variablesprite $b, $28
 	variablesprite $c, $28
-	setbit1 $00fb
-	setbit1 $076d
-	setbit1 $076c
-	setbit1 $076e
-	setbit1 $076f
-	setbit1 $0773
-	setbit1 $0776
-	setbit1 $0777
-	setbit1 $0779
-	setbit1 $0772
-	setbit1 $077b
-	setbit1 $0036
+	setevent $00fb
+	setevent $076d
+	setevent $076c
+	setevent $076e
+	setevent $076f
+	setevent $0773
+	setevent $0776
+	setevent $0777
+	setevent $0779
+	setevent $0772
+	setevent $077b
+	setevent $0036
 	return
 ; 0xbc574
 
@@ -2298,8 +2298,8 @@
 	faceplayer
 	loadfont
 	special $0059
-	if_greater_than $32, UnknownScript_0xbce9a
-	if_greater_than $96, UnknownScript_0xbce93
+	if_less_than $32, UnknownScript_0xbce9a
+	if_less_than $96, UnknownScript_0xbce93
 	3writetext $6c, $492a
 	closetext
 	loadmovesprites
@@ -2332,18 +2332,18 @@
 	end
 
 MomPhoneScript: ; 0xbceaa
-	checkbit1 $0040
+	checkevent $0040
 	iftrue .bcec5
-	checkbit1 $0041 ; if dude talked to you, then you left home without talking to mom
+	checkevent $0041 ; if dude talked to you, then you left home without talking to mom
 	iftrue MomPhoneLectureScript
-	checkbit1 $001f
+	checkevent $001f
 	iftrue MomPhoneNoGymQuestScript
-	checkbit1 $001a
+	checkevent $001a
 	iftrue MomPhoneNoPokedexScript
 	2jump MomPhoneNoPokemonScript
 
 .bcec5 ; 0xbcec5
-	checkbit1 $0007
+	checkevent $0007
 	iftrue MomPhoneHangUpScript
 	3writetext BANK(MomPhoneGreetingText), MomPhoneGreetingText
 	keeptextopen
@@ -2350,7 +2350,7 @@
 	mapnametotext $0
 	checkcode $f
 	if_equal $1, UnknownScript_0xbcee7
-	if_equal $2, $4f27
+	if_equal $2, UnknownScript_0xbcf27
 	2jump UnknownScript_0xbcf2f
 
 UnknownScript_0xbcedf: ; 0xbcedf
@@ -2380,14 +2380,16 @@
 	2jump UnknownScript_0xbcf37
 
 .violet ; 0xbcf15
-	displaylocation $7 ; sprout tower
-	3call $3, UnknownScript_0xbcedf
+	displaylocation $7, 1 ; sprout tower
+	2jump UnknownScript_0xbcedf
 .azalea ; 0xbcf1b
-	displaylocation $d ; slowpoke well
-	3call $3, UnknownScript_0xbcedf
+	displaylocation $d, 1 ; slowpoke well
+	2jump UnknownScript_0xbcedf
 .goldenrod ; 0xbcf21
-	displaylocation $11 ; radio tower
-	3call $3, UnknownScript_0xbcedf
+	displaylocation $11, 1 ; radio tower
+	2jump UnknownScript_0xbcedf
+
+UnknownScript_0xbcf27: ; 0xbcf27
 	3writetext $6d, $411c
 	keeptextopen
 	2jump UnknownScript_0xbcf37
@@ -2398,7 +2400,7 @@
 	2jump UnknownScript_0xbcf37
 
 UnknownScript_0xbcf37: ; 0xbcf37
-	checkbit2 $0008
+	checkflag $0008
 	iffalse UnknownScript_0xbcf49
 	checkmoney $1, 0
 	if_equal $0, UnknownScript_0xbcf55
@@ -2436,13 +2438,13 @@
 	2jump MomPhoneWontSaveMoneyScript
 
 MomPhoneSaveMoneyScript: ; 0xbcf87
-	setbit2 $0008
+	setflag $0008
 	3writetext $6d, $4289
 	keeptextopen
 	2jump MomPhoneHangUpScript
 
 MomPhoneWontSaveMoneyScript: ; 0xbcf92
-	clearbit2 $0008
+	clearflag $0008
 	3writetext BANK(MomPhoneWontSaveMoneyText), MomPhoneWontSaveMoneyText
 	keeptextopen
 	2jump MomPhoneHangUpScript
@@ -2464,8 +2466,8 @@
 	end
 
 MomPhoneLectureScript: ; 0xbcfb1
-	setbit1 $0040
-	setbit2 $0009
+	setevent $0040
+	setflag $0009
 	specialphonecall $0000
 	3writetext BANK(MomPhoneLectureText), MomPhoneLectureText
 	yesorno
@@ -2497,7 +2499,7 @@
 	checkcode $10
 	RAM2MEM $0
 	if_equal $0, .full
-	if_greater_than $6, .nearlyfull
+	if_less_than $6, .nearlyfull
 	3writetext BANK(BillPhoneNotFullText), BillPhoneNotFullText
 	end
 
@@ -2517,22 +2519,22 @@
 ElmPhoneScript1: ; 0xbd00d
 	checkcode $14
 	if_equal $1, .pokerus
-	checkbit1 $0055
+	checkevent $0055
 	iftrue .discovery
-	checkbit1 $002d
+	checkevent $002d
 	iffalse .next
-	checkbit1 $0054
+	checkevent $0054
 	iftrue .egghatched
 .next
-	checkbit1 $002d
+	checkevent $002d
 	iftrue .eggunhatched
-	checkbit1 $0701
+	checkevent $0701
 	iftrue .assistant
-	checkbit1 $001f
+	checkevent $001f
 	iftrue .checkingegg
-	checkbit1 $0043
+	checkevent $0043
 	iftrue .stolen
-	checkbit1 $001e
+	checkevent $001e
 	iftrue .sawmrpokemon
 	3writetext BANK(ElmPhoneStartText), ElmPhoneStartText
 	end
@@ -2559,7 +2561,7 @@
 
 .egghatched ; 0xbd061
 	3writetext BANK(ElmPhoneEggHatchedText), ElmPhoneEggHatchedText
-	setbit1 $0077
+	setevent $0077
 	end
 
 .discovery ; 0xbd069
@@ -2591,14 +2593,14 @@
 .disaster ; 0xbd09f
 	3writetext BANK(ElmPhoneDisasterText), ElmPhoneDisasterText
 	specialphonecall $0000
-	setbit1 $0043
+	setevent $0043
 	end
 
 .assistant ; 0xbd0aa
 	3writetext BANK(ElmPhoneEggAssistantText), ElmPhoneEggAssistantText
 	specialphonecall $0000
-	clearbit1 $0700
-	setbit1 $0701
+	clearevent $0700
+	setevent $0701
 	end
 
 .rocket ; 0xbd0b8