pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-11-16 11:27:33 -08:00
Code Issues Packages Projects Releases Wiki Activity

Fix mislabeled engine flags.

Browse Source
This commit is contained in:
IIMarckus 2015-07-10 06:12:28 -06:00
parent 07a12b37b6
commit 388336353d
9 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
constants/engine_flags.asm
View File

@ -16,9 +16,9 @@ ENGINE_ROCKET_SIGNAL_ON_CH20 EQU $0e
ENGINE_CREDITS_SKIP EQU $0f ENGINE_CREDITS_SKIP EQU $0f
ENGINE_BUG_CONTEST_ON EQU $10 ENGINE_BUG_CONTEST_ON EQU $10
ENGINE_BUG_CONTEST_TIMER EQU $11 ENGINE_BUG_CONTEST_TIMER EQU $11
ENGINE_ROCKETS_IN_RADIO_TOWER EQU $12 ENGINE_12 EQU $12
ENGINE_BIKE_SHOP_CALL_ENABLED EQU $13 ENGINE_ROCKETS_IN_RADIO_TOWER EQU $13
ENGINE_14 EQU $14 ENGINE_BIKE_SHOP_CALL_ENABLED EQU $14
ENGINE_GIVE_POKERUS EQU $15 ENGINE_GIVE_POKERUS EQU $15
ENGINE_16 EQU $16 ENGINE_16 EQU $16
ENGINE_ROCKETS_IN_MAHOGANY EQU $17 ENGINE_ROCKETS_IN_MAHOGANY EQU $17

4
engine/buena_phone_scripts.asm
View File

@ -1,5 +1,5 @@
UnknownScript_0xa0b14: UnknownScript_0xa0b14:
checkflag ENGINE_BIKE_SHOP_CALL_ENABLED checkflag ENGINE_ROCKETS_IN_RADIO_TOWER
iftrue UnknownScript_0xa0b73 iftrue UnknownScript_0xa0b73
checkcode VAR_HOUR checkcode VAR_HOUR
if_greater_than $11, UnknownScript_0xa0b4b if_greater_than $11, UnknownScript_0xa0b4b
@ -7,7 +7,7 @@ UnknownScript_0xa0b14:
jump UnknownScript_0xa0c0e jump UnknownScript_0xa0c0e
UnknownScript_0xa0b26: UnknownScript_0xa0b26:
checkflag ENGINE_BIKE_SHOP_CALL_ENABLED checkflag ENGINE_ROCKETS_IN_RADIO_TOWER
iftrue UnknownScript_0xa0b73 iftrue UnknownScript_0xa0b73
scall UnknownScript_0xa0b4f scall UnknownScript_0xa0b4f
jump UnknownScript_0xa0b77 jump UnknownScript_0xa0b77

2
engine/more_phone_scripts.asm
View File

@ -1655,6 +1655,6 @@ UnknownScript_0xa0b04:
UnknownScript_0xa0b09: UnknownScript_0xa0b09:
farwritetext UnknownText_0x174000 farwritetext UnknownText_0x174000
clearflag ENGINE_14 clearflag ENGINE_BIKE_SHOP_CALL_ENABLED
specialphonecall $0000 specialphonecall $0000
end end

8
engine/phone_scripts.asm
View File

@ -1054,7 +1054,7 @@ UnknownScript_0xbd743:
iftrue UnknownScript_0xbd7cc iftrue UnknownScript_0xbd7cc
UnknownScript_0xbd768: UnknownScript_0xbd768:
checkflag ENGINE_BIKE_SHOP_CALL_ENABLED checkflag ENGINE_ROCKETS_IN_RADIO_TOWER
iftrue UnknownScript_0xbd772 iftrue UnknownScript_0xbd772
farjump UnknownScript_0xa0960 farjump UnknownScript_0xa0960
@ -1072,7 +1072,7 @@ UnknownScript_0xbd77d:
UnknownScript_0xbd784: UnknownScript_0xbd784:
trainertotext PICNICKER, 2, $0 trainertotext PICNICKER, 2, $0
farscall UnknownScript_0xbe41e farscall UnknownScript_0xbe41e
checkflag ENGINE_BIKE_SHOP_CALL_ENABLED checkflag ENGINE_ROCKETS_IN_RADIO_TOWER
iftrue UnknownScript_0xbd7d9 iftrue UnknownScript_0xbd7d9
checkflag ENGINE_GINA checkflag ENGINE_GINA
iftrue UnknownScript_0xbd7c8 iftrue UnknownScript_0xbd7c8
@ -1115,7 +1115,7 @@ UnknownScript_0xbd7dd:
UnknownScript_0xbd7e7: UnknownScript_0xbd7e7:
trainertotext JUGGLER, 1, $0 trainertotext JUGGLER, 1, $0
farscall UnknownScript_0xbde4e farscall UnknownScript_0xbde4e
checkflag ENGINE_BIKE_SHOP_CALL_ENABLED checkflag ENGINE_ROCKETS_IN_RADIO_TOWER
iftrue UnknownScript_0xbd7f9 iftrue UnknownScript_0xbd7f9
farjump UnknownScript_0xa09c8 farjump UnknownScript_0xa09c8
@ -1125,7 +1125,7 @@ UnknownScript_0xbd7f9:
UnknownScript_0xbd7fd: UnknownScript_0xbd7fd:
trainertotext JUGGLER, 1, $0 trainertotext JUGGLER, 1, $0
farscall UnknownScript_0xbe1b6 farscall UnknownScript_0xbe1b6
checkflag ENGINE_BIKE_SHOP_CALL_ENABLED checkflag ENGINE_ROCKETS_IN_RADIO_TOWER
iftrue UnknownScript_0xbd80f iftrue UnknownScript_0xbd80f
farjump UnknownScript_0xa0848 farjump UnknownScript_0xa0848

2
engine/std_scripts.asm
View File

@ -291,7 +291,7 @@ GoldenrodRocketsScript:
end end
RadioTowerRocketsScript: RadioTowerRocketsScript:
setflag ENGINE_BIKE_SHOP_CALL_ENABLED setflag ENGINE_ROCKETS_IN_RADIO_TOWER
setevent $06cf setevent $06cf
setevent $06d1 setevent $06d1
clearevent $06ce clearevent $06ce

2
maps/GoldenrodBikeShop.asm
View File

@ -24,7 +24,7 @@ ClerkScript_0x54750:
playsound SFX_KEY_ITEM playsound SFX_KEY_ITEM
waitbutton waitbutton
itemnotify itemnotify
setflag ENGINE_14 setflag ENGINE_BIKE_SHOP_CALL_ENABLED
setevent EVENT_GOT_BICYCLE setevent EVENT_GOT_BICYCLE
UnknownScript_0x54775: UnknownScript_0x54775:
writetext UnknownText_0x5485f writetext UnknownText_0x5485f

2
maps/MahoganyRedGyaradosSpeechHouse.asm
View File

@ -11,7 +11,7 @@ BlackBeltScript_0x19997f:
TeacherScript_0x199982: TeacherScript_0x199982:
faceplayer faceplayer
loadfont loadfont
checkflag ENGINE_BIKE_SHOP_CALL_ENABLED checkflag ENGINE_ROCKETS_IN_RADIO_TOWER
iftrue UnknownScript_0x199990 iftrue UnknownScript_0x199990
writetext UnknownText_0x199a0e writetext UnknownText_0x199a0e
closetext closetext

2
maps/RadioTower1F.asm
View File

@ -8,7 +8,7 @@ RadioTower1F_MapScriptHeader:
ReceptionistScript_0x5cd29: ReceptionistScript_0x5cd29:
faceplayer faceplayer
loadfont loadfont
checkflag ENGINE_BIKE_SHOP_CALL_ENABLED checkflag ENGINE_ROCKETS_IN_RADIO_TOWER
iftrue UnknownScript_0x5cd37 iftrue UnknownScript_0x5cd37
writetext UnknownText_0x5ce77 writetext UnknownText_0x5ce77
closetext closetext

4
maps/RadioTower2F.asm
View File

@ -14,7 +14,7 @@ SuperNerdScript_0x5d6fe:
TeacherScript_0x5d701: TeacherScript_0x5d701:
faceplayer faceplayer
loadfont loadfont
checkflag ENGINE_BIKE_SHOP_CALL_ENABLED checkflag ENGINE_ROCKETS_IN_RADIO_TOWER
iftrue UnknownScript_0x5d70f iftrue UnknownScript_0x5d70f
writetext UnknownText_0x5d956 writetext UnknownText_0x5d956
closetext closetext
@ -152,7 +152,7 @@ GruntF2Script:
Buena: Buena:
faceplayer faceplayer
loadfont loadfont
checkflag ENGINE_BIKE_SHOP_CALL_ENABLED checkflag ENGINE_ROCKETS_IN_RADIO_TOWER
iftrue UnknownScript_0x5d865 iftrue UnknownScript_0x5d865
checkevent EVENT_MET_BUENA checkevent EVENT_MET_BUENA
iffalse UnknownScript_0x5d800 iffalse UnknownScript_0x5d800