ref: 388336353d3376933aa7254eceaeb001e3fb898b
parent: 07a12b37b643941192271383e242a3613dec587a
author: IIMarckus <iimarckus@gmail.com>
date: Fri Jul 10 02:12:28 EDT 2015
Fix mislabeled engine flags.
--- a/constants/engine_flags.asm
+++ b/constants/engine_flags.asm
@@ -16,9 +16,9 @@
ENGINE_CREDITS_SKIP EQU $0f
ENGINE_BUG_CONTEST_ON EQU $10
ENGINE_BUG_CONTEST_TIMER EQU $11
-ENGINE_ROCKETS_IN_RADIO_TOWER EQU $12
-ENGINE_BIKE_SHOP_CALL_ENABLED EQU $13
-ENGINE_14 EQU $14
+ENGINE_12 EQU $12
+ENGINE_ROCKETS_IN_RADIO_TOWER EQU $13
+ENGINE_BIKE_SHOP_CALL_ENABLED EQU $14
ENGINE_GIVE_POKERUS EQU $15
ENGINE_16 EQU $16
ENGINE_ROCKETS_IN_MAHOGANY EQU $17
--- a/engine/buena_phone_scripts.asm
+++ b/engine/buena_phone_scripts.asm
@@ -1,5 +1,5 @@
UnknownScript_0xa0b14:
- checkflag ENGINE_BIKE_SHOP_CALL_ENABLED
+ checkflag ENGINE_ROCKETS_IN_RADIO_TOWER
iftrue UnknownScript_0xa0b73
checkcode VAR_HOUR
if_greater_than $11, UnknownScript_0xa0b4b
@@ -7,7 +7,7 @@
jump UnknownScript_0xa0c0e
UnknownScript_0xa0b26:
- checkflag ENGINE_BIKE_SHOP_CALL_ENABLED
+ checkflag ENGINE_ROCKETS_IN_RADIO_TOWER
iftrue UnknownScript_0xa0b73
scall UnknownScript_0xa0b4f
jump UnknownScript_0xa0b77
--- a/engine/more_phone_scripts.asm
+++ b/engine/more_phone_scripts.asm
@@ -1655,6 +1655,6 @@
UnknownScript_0xa0b09:
farwritetext UnknownText_0x174000
- clearflag ENGINE_14
+ clearflag ENGINE_BIKE_SHOP_CALL_ENABLED
specialphonecall $0000
end
--- a/engine/phone_scripts.asm
+++ b/engine/phone_scripts.asm
@@ -1054,7 +1054,7 @@
iftrue UnknownScript_0xbd7cc
UnknownScript_0xbd768:
- checkflag ENGINE_BIKE_SHOP_CALL_ENABLED
+ checkflag ENGINE_ROCKETS_IN_RADIO_TOWER
iftrue UnknownScript_0xbd772
farjump UnknownScript_0xa0960
@@ -1072,7 +1072,7 @@
UnknownScript_0xbd784:
trainertotext PICNICKER, 2, $0
farscall UnknownScript_0xbe41e
- checkflag ENGINE_BIKE_SHOP_CALL_ENABLED
+ checkflag ENGINE_ROCKETS_IN_RADIO_TOWER
iftrue UnknownScript_0xbd7d9
checkflag ENGINE_GINA
iftrue UnknownScript_0xbd7c8
@@ -1115,7 +1115,7 @@
UnknownScript_0xbd7e7:
trainertotext JUGGLER, 1, $0
farscall UnknownScript_0xbde4e
- checkflag ENGINE_BIKE_SHOP_CALL_ENABLED
+ checkflag ENGINE_ROCKETS_IN_RADIO_TOWER
iftrue UnknownScript_0xbd7f9
farjump UnknownScript_0xa09c8
@@ -1125,7 +1125,7 @@
UnknownScript_0xbd7fd:
trainertotext JUGGLER, 1, $0
farscall UnknownScript_0xbe1b6
- checkflag ENGINE_BIKE_SHOP_CALL_ENABLED
+ checkflag ENGINE_ROCKETS_IN_RADIO_TOWER
iftrue UnknownScript_0xbd80f
farjump UnknownScript_0xa0848
--- a/engine/std_scripts.asm
+++ b/engine/std_scripts.asm
@@ -291,7 +291,7 @@
end
RadioTowerRocketsScript:
- setflag ENGINE_BIKE_SHOP_CALL_ENABLED
+ setflag ENGINE_ROCKETS_IN_RADIO_TOWER
setevent $06cf
setevent $06d1
clearevent $06ce
--- a/maps/GoldenrodBikeShop.asm
+++ b/maps/GoldenrodBikeShop.asm
@@ -24,7 +24,7 @@
playsound SFX_KEY_ITEM
waitbutton
itemnotify
- setflag ENGINE_14
+ setflag ENGINE_BIKE_SHOP_CALL_ENABLED
setevent EVENT_GOT_BICYCLE
UnknownScript_0x54775:
writetext UnknownText_0x5485f
--- a/maps/MahoganyRedGyaradosSpeechHouse.asm
+++ b/maps/MahoganyRedGyaradosSpeechHouse.asm
@@ -11,7 +11,7 @@
TeacherScript_0x199982:
faceplayer
loadfont
- checkflag ENGINE_BIKE_SHOP_CALL_ENABLED
+ checkflag ENGINE_ROCKETS_IN_RADIO_TOWER
iftrue UnknownScript_0x199990
writetext UnknownText_0x199a0e
closetext
--- a/maps/RadioTower1F.asm
+++ b/maps/RadioTower1F.asm
@@ -8,7 +8,7 @@
ReceptionistScript_0x5cd29:
faceplayer
loadfont
- checkflag ENGINE_BIKE_SHOP_CALL_ENABLED
+ checkflag ENGINE_ROCKETS_IN_RADIO_TOWER
iftrue UnknownScript_0x5cd37
writetext UnknownText_0x5ce77
closetext
--- a/maps/RadioTower2F.asm
+++ b/maps/RadioTower2F.asm
@@ -14,7 +14,7 @@
TeacherScript_0x5d701:
faceplayer
loadfont
- checkflag ENGINE_BIKE_SHOP_CALL_ENABLED
+ checkflag ENGINE_ROCKETS_IN_RADIO_TOWER
iftrue UnknownScript_0x5d70f
writetext UnknownText_0x5d956
closetext
@@ -152,7 +152,7 @@
Buena:
faceplayer
loadfont
- checkflag ENGINE_BIKE_SHOP_CALL_ENABLED
+ checkflag ENGINE_ROCKETS_IN_RADIO_TOWER
iftrue UnknownScript_0x5d865
checkevent EVENT_MET_BUENA
iffalse UnknownScript_0x5d800