diff options
| -rw-r--r-- | constants/engine_flags.asm | 6 | ||||
| -rw-r--r-- | engine/buena_phone_scripts.asm | 4 | ||||
| -rw-r--r-- | engine/more_phone_scripts.asm | 2 | ||||
| -rw-r--r-- | engine/phone_scripts.asm | 8 | ||||
| -rw-r--r-- | engine/std_scripts.asm | 2 | ||||
| -rw-r--r-- | maps/GoldenrodBikeShop.asm | 2 | ||||
| -rw-r--r-- | maps/MahoganyRedGyaradosSpeechHouse.asm | 2 | ||||
| -rw-r--r-- | maps/RadioTower1F.asm | 2 | ||||
| -rw-r--r-- | maps/RadioTower2F.asm | 4 |
9 files changed, 16 insertions, 16 deletions
diff --git a/constants/engine_flags.asm b/constants/engine_flags.asm index 22b09ad24..6cce77a56 100644 --- a/constants/engine_flags.asm +++ b/constants/engine_flags.asm @@ -16,9 +16,9 @@ ENGINE_ROCKET_SIGNAL_ON_CH20 EQU $0e 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 diff --git a/engine/buena_phone_scripts.asm b/engine/buena_phone_scripts.asm index 4bfa66f14..4d0c79b61 100644 --- 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 @@ UnknownScript_0xa0b14: 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 diff --git a/engine/more_phone_scripts.asm b/engine/more_phone_scripts.asm index 96b43f954..985bb2089 100644 --- a/engine/more_phone_scripts.asm +++ b/engine/more_phone_scripts.asm @@ -1655,6 +1655,6 @@ UnknownScript_0xa0b04: UnknownScript_0xa0b09: farwritetext UnknownText_0x174000 - clearflag ENGINE_14 + clearflag ENGINE_BIKE_SHOP_CALL_ENABLED specialphonecall $0000 end diff --git a/engine/phone_scripts.asm b/engine/phone_scripts.asm index 892307f58..9d3969f5f 100644 --- a/engine/phone_scripts.asm +++ b/engine/phone_scripts.asm @@ -1054,7 +1054,7 @@ UnknownScript_0xbd743: 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_0xbd77d: 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_0xbd7dd: 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_0xbd7f9: 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 diff --git a/engine/std_scripts.asm b/engine/std_scripts.asm index 65ed1cc77..b3b68e5e5 100644 --- a/engine/std_scripts.asm +++ b/engine/std_scripts.asm @@ -291,7 +291,7 @@ GoldenrodRocketsScript: end RadioTowerRocketsScript: - setflag ENGINE_BIKE_SHOP_CALL_ENABLED + setflag ENGINE_ROCKETS_IN_RADIO_TOWER setevent $06cf setevent $06d1 clearevent $06ce diff --git a/maps/GoldenrodBikeShop.asm b/maps/GoldenrodBikeShop.asm index 1009de418..5f4cbdc01 100644 --- a/maps/GoldenrodBikeShop.asm +++ b/maps/GoldenrodBikeShop.asm @@ -24,7 +24,7 @@ ClerkScript_0x54750: playsound SFX_KEY_ITEM waitbutton itemnotify - setflag ENGINE_14 + setflag ENGINE_BIKE_SHOP_CALL_ENABLED setevent EVENT_GOT_BICYCLE UnknownScript_0x54775: writetext UnknownText_0x5485f diff --git a/maps/MahoganyRedGyaradosSpeechHouse.asm b/maps/MahoganyRedGyaradosSpeechHouse.asm index 85fe4727e..f81a64fd9 100644 --- a/maps/MahoganyRedGyaradosSpeechHouse.asm +++ b/maps/MahoganyRedGyaradosSpeechHouse.asm @@ -11,7 +11,7 @@ BlackBeltScript_0x19997f: TeacherScript_0x199982: faceplayer loadfont - checkflag ENGINE_BIKE_SHOP_CALL_ENABLED + checkflag ENGINE_ROCKETS_IN_RADIO_TOWER iftrue UnknownScript_0x199990 writetext UnknownText_0x199a0e closetext diff --git a/maps/RadioTower1F.asm b/maps/RadioTower1F.asm index 35ae1654b..715c2a8be 100644 --- a/maps/RadioTower1F.asm +++ b/maps/RadioTower1F.asm @@ -8,7 +8,7 @@ RadioTower1F_MapScriptHeader: ReceptionistScript_0x5cd29: faceplayer loadfont - checkflag ENGINE_BIKE_SHOP_CALL_ENABLED + checkflag ENGINE_ROCKETS_IN_RADIO_TOWER iftrue UnknownScript_0x5cd37 writetext UnknownText_0x5ce77 closetext diff --git a/maps/RadioTower2F.asm b/maps/RadioTower2F.asm index 9a2d6322c..4bc3e51e4 100644 --- a/maps/RadioTower2F.asm +++ b/maps/RadioTower2F.asm @@ -14,7 +14,7 @@ SuperNerdScript_0x5d6fe: 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 @@ GruntF2Script: 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 |