dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Corrected typos

Browse Source
This commit is contained in:
Tetrable
2019-01-03 01:54:55 +00:00
parent a3ebca4d81
commit 50aa222aff
20 changed files with 88 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
data/maps/BattleFrontier_ScottsHouse/scripts.inc
View File

@@ -13,7 +13,7 @@ BattleFrontier_ScottsHouse_EventScript_2636A8:: @ 82636A8
BattleFrontier_ScottsHouse_EventScript_2636CB:: @ 82636CB
goto_if_unset FLAG_SCOTT_GIVES_BATTLE_POINTS, BattleFrontier_ScottsHouse_EventScript_263943
goto_if_unset FLAG_COLLECTED_ALL_SILVER_SYMBOLS, BattleFrontier_ScottsHouse_EventScript_263704
goto_if_unset FLAG_RECIEVED_STARF_BERRY_FROM_SCOTT, BattleFrontier_ScottsHouse_EventScript_26376A
goto_if_unset FLAG_RECEIVED_STARF_BERRY_FROM_SCOTT, BattleFrontier_ScottsHouse_EventScript_26376A
goto BattleFrontier_ScottsHouse_EventScript_2636EC
end
@@ -52,7 +52,7 @@ BattleFrontier_ScottsHouse_EventScript_26376A:: @ 826376A
giveitem_std ITEM_STARF_BERRY
compare VAR_RESULT, 0
goto_if_eq BattleFrontier_ScottsHouse_EventScript_2637D0
setflag FLAG_RECIEVED_STARF_BERRY_FROM_SCOTT
setflag FLAG_RECEIVED_STARF_BERRY_FROM_SCOTT
setflag FLAG_TEMP_4
release
end

4
data/maps/LilycoveCity/scripts.inc
View File

@@ -34,14 +34,14 @@ LilycoveCity_EventScript_1E2BD8:: @ 81E2BD8
lock
faceplayer
dodailyevents
goto_if_set FLAG_DAILY_LILYCOVE_RECIEVED_BERRY, LilycoveCity_EventScript_1E2C18
goto_if_set FLAG_DAILY_LILYCOVE_RECEIVED_BERRY, LilycoveCity_EventScript_1E2C18
msgbox LilycoveCity_Text_2A7244, MSGBOX_DEFAULT
random 10
addvar VAR_RESULT, 133
giveitem_std VAR_RESULT
compare VAR_RESULT, 0
goto_if_eq LilycoveCity_EventScript_272054
setflag FLAG_DAILY_LILYCOVE_RECIEVED_BERRY
setflag FLAG_DAILY_LILYCOVE_RECEIVED_BERRY
msgbox LilycoveCity_Text_2A72E3, MSGBOX_DEFAULT
release
end

2
data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc
View File

@@ -569,7 +569,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA3AC:: @ 81FA3AC
waitfanfare
setflag FLAG_SYS_POKEDEX_GET
special sub_81AFDA0
setflag FLAG_RECIEVED_POKEDEX_FROM_BIRCH
setflag FLAG_RECEIVED_POKEDEX_FROM_BIRCH
setvar VAR_0x40CD, 1
return

4
data/maps/Route104_PrettyPetalFlowerShop/scripts.inc
View File

@@ -85,14 +85,14 @@ Route104_PrettyPetalFlowerShop_EventScript_22A442:: @ 822A442
lock
faceplayer
dodailyevents
goto_if_set FLAG_DAILY_FLOWER_SHOP_RECIEVED_BERRY, Route104_PrettyPetalFlowerShop_EventScript_22A482
goto_if_set FLAG_DAILY_FLOWER_SHOP_RECEIVED_BERRY, Route104_PrettyPetalFlowerShop_EventScript_22A482
msgbox Route104_PrettyPetalFlowerShop_Text_2A7A98, MSGBOX_DEFAULT
random 8
addvar VAR_RESULT, 133
giveitem_std VAR_RESULT
compare VAR_RESULT, 0
goto_if_eq Route104_PrettyPetalFlowerShop_EventScript_272054
setflag FLAG_DAILY_FLOWER_SHOP_RECIEVED_BERRY
setflag FLAG_DAILY_FLOWER_SHOP_RECEIVED_BERRY
msgbox Route104_PrettyPetalFlowerShop_Text_2A7AF3, MSGBOX_DEFAULT
release
end

4
data/maps/Route111/scripts.inc
View File

@@ -160,12 +160,12 @@ Route111_EventScript_1F0EB9:: @ 81F0EB9
lock
faceplayer
dodailyevents
goto_if_set FLAG_DAILY_ROUTE_111_RECIEVED_BERRY, Route111_EventScript_1F0EF4
goto_if_set FLAG_DAILY_ROUTE_111_RECEIVED_BERRY, Route111_EventScript_1F0EF4
msgbox Route111_Text_2A6EBD, MSGBOX_DEFAULT
giveitem_std ITEM_RAZZ_BERRY
compare VAR_RESULT, 0
goto_if_eq Route111_EventScript_272054
setflag FLAG_DAILY_ROUTE_111_RECIEVED_BERRY
setflag FLAG_DAILY_ROUTE_111_RECEIVED_BERRY
special GetPlayerBigGuyGirlString
msgbox Route111_Text_2A6F3D, MSGBOX_DEFAULT
release

4
data/maps/Route114/scripts.inc
View File

@@ -28,7 +28,7 @@ Route114_EventScript_1F2582:: @ 81F2582
lock
faceplayer
dodailyevents
goto_if_set FLAG_DAILY_ROUTE_114_RECIEVED_BERRY, Route114_EventScript_1F25C7
goto_if_set FLAG_DAILY_ROUTE_114_RECEIVED_BERRY, Route114_EventScript_1F25C7
msgbox Route114_Text_2A6FCB, MSGBOX_DEFAULT
random 5
addvar VAR_RESULT, 15
@@ -36,7 +36,7 @@ Route114_EventScript_1F2582:: @ 81F2582
giveitem_std VAR_RESULT
compare VAR_RESULT, 0
goto_if_eq Route114_EventScript_272054
setflag FLAG_DAILY_ROUTE_114_RECIEVED_BERRY
setflag FLAG_DAILY_ROUTE_114_RECEIVED_BERRY
msgbox Route114_Text_2A7034, MSGBOX_DEFAULT
release
end

4
data/maps/Route120/scripts.inc
View File

@@ -99,7 +99,7 @@ Route120_EventScript_1F5527:: @ 81F5527
lock
faceplayer
dodailyevents
goto_if_set FLAG_DAILY_ROUTE_120_RECIEVED_BERRY, Route120_EventScript_1F5625
goto_if_set FLAG_DAILY_ROUTE_120_RECEIVED_BERRY, Route120_EventScript_1F5625
msgbox Route120_Text_2A70C7, MSGBOX_YESNO
compare VAR_RESULT, 1
call_if_eq Route120_EventScript_1F562F
@@ -148,7 +148,7 @@ Route120_EventScript_1F5601:: @ 81F5601
giveitem_std VAR_0x8004
compare VAR_RESULT, 0
goto_if_eq Route120_EventScript_272054
setflag FLAG_DAILY_ROUTE_120_RECIEVED_BERRY
setflag FLAG_DAILY_ROUTE_120_RECEIVED_BERRY
msgbox Route120_Text_2A71D5, MSGBOX_DEFAULT
release
end

4
data/maps/Route123_BerryMastersHouse/scripts.inc
View File

@@ -10,7 +10,7 @@ Route123_BerryMastersHouse_EventScript_26F845:: @ 826F845
lock
faceplayer
dodailyevents
goto_if_set FLAG_DAILY_BERRY_MASTER_RECIEVED_BERRY, Route123_BerryMastersHouse_EventScript_26F8B6
goto_if_set FLAG_DAILY_BERRY_MASTER_RECEIVED_BERRY, Route123_BerryMastersHouse_EventScript_26F8B6
msgbox Route123_BerryMastersHouse_Text_2A7386, MSGBOX_DEFAULT
random 10
addvar VAR_RESULT, 20
@@ -18,7 +18,7 @@ Route123_BerryMastersHouse_EventScript_26F845:: @ 826F845
giveitem_std VAR_RESULT
compare VAR_RESULT, 0
goto_if_eq Route123_BerryMastersHouse_EventScript_272054
setflag FLAG_DAILY_BERRY_MASTER_RECIEVED_BERRY
setflag FLAG_DAILY_BERRY_MASTER_RECEIVED_BERRY
msgbox Route123_BerryMastersHouse_Text_2A7428, MSGBOX_DEFAULT
random 10
addvar VAR_RESULT, 20

16
data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc
View File

@@ -88,13 +88,13 @@ ShoalCave_LowTideEntranceRoom_EventScript_236ECF:: @ 8236ECF
end
ShoalCave_LowTideEntranceRoom_EventScript_236ED9:: @ 8236ED9
clearflag FLAG_RECIEVED_SHOAL_SALT_1
clearflag FLAG_RECIEVED_SHOAL_SALT_2
clearflag FLAG_RECIEVED_SHOAL_SALT_3
clearflag FLAG_RECIEVED_SHOAL_SALT_4
clearflag FLAG_RECIEVED_SHOAL_SHELL_1
clearflag FLAG_RECIEVED_SHOAL_SHELL_2
clearflag FLAG_RECIEVED_SHOAL_SHELL_3
clearflag FLAG_RECIEVED_SHOAL_SHELL_4
clearflag FLAG_RECEIVED_SHOAL_SALT_1
clearflag FLAG_RECEIVED_SHOAL_SALT_2
clearflag FLAG_RECEIVED_SHOAL_SALT_3
clearflag FLAG_RECEIVED_SHOAL_SALT_4
clearflag FLAG_RECEIVED_SHOAL_SHELL_1
clearflag FLAG_RECEIVED_SHOAL_SHELL_2
clearflag FLAG_RECEIVED_SHOAL_SHELL_3
clearflag FLAG_RECEIVED_SHOAL_SHELL_4
clearflag FLAG_SYS_SHOAL_ITEM
return

36
data/maps/ShoalCave_LowTideInnerRoom/scripts.inc
View File

@@ -20,39 +20,39 @@ ShoalCave_LowTideInnerRoom_MapScript1_236F16: @ 8236F16
end
ShoalCave_LowTideInnerRoom_EventScript_236F1C:: @ 8236F1C
goto_if_set FLAG_RECIEVED_SHOAL_SALT_1, ShoalCave_LowTideInnerRoom_EventScript_236F3D
goto_if_set FLAG_RECEIVED_SHOAL_SALT_1, ShoalCave_LowTideInnerRoom_EventScript_236F3D
goto_if_set FLAG_SYS_SHOAL_TIDE, ShoalCave_LowTideInnerRoom_EventScript_236F3D
setmetatile 31, 8, 856, 1
goto ShoalCave_LowTideInnerRoom_EventScript_236F3D
end
ShoalCave_LowTideInnerRoom_EventScript_236F3D:: @ 8236F3D
goto_if_set FLAG_RECIEVED_SHOAL_SALT_2, ShoalCave_LowTideInnerRoom_EventScript_236F5E
goto_if_set FLAG_RECEIVED_SHOAL_SALT_2, ShoalCave_LowTideInnerRoom_EventScript_236F5E
goto_if_set FLAG_SYS_SHOAL_TIDE, ShoalCave_LowTideInnerRoom_EventScript_236F5E
setmetatile 14, 26, 856, 1
goto ShoalCave_LowTideInnerRoom_EventScript_236F5E
end
ShoalCave_LowTideInnerRoom_EventScript_236F5E:: @ 8236F5E
goto_if_set FLAG_RECIEVED_SHOAL_SHELL_1, ShoalCave_LowTideInnerRoom_EventScript_236F76
goto_if_set FLAG_RECEIVED_SHOAL_SHELL_1, ShoalCave_LowTideInnerRoom_EventScript_236F76
setmetatile 41, 20, 857, 1
goto ShoalCave_LowTideInnerRoom_EventScript_236F76
end
ShoalCave_LowTideInnerRoom_EventScript_236F76:: @ 8236F76
goto_if_set FLAG_RECIEVED_SHOAL_SHELL_2, ShoalCave_LowTideInnerRoom_EventScript_236F8E
goto_if_set FLAG_RECEIVED_SHOAL_SHELL_2, ShoalCave_LowTideInnerRoom_EventScript_236F8E
setmetatile 41, 10, 857, 1
goto ShoalCave_LowTideInnerRoom_EventScript_236F8E
end
ShoalCave_LowTideInnerRoom_EventScript_236F8E:: @ 8236F8E
goto_if_set FLAG_RECIEVED_SHOAL_SHELL_3, ShoalCave_LowTideInnerRoom_EventScript_236FA6
goto_if_set FLAG_RECEIVED_SHOAL_SHELL_3, ShoalCave_LowTideInnerRoom_EventScript_236FA6
setmetatile 6, 9, 857, 1
goto ShoalCave_LowTideInnerRoom_EventScript_236FA6
end
ShoalCave_LowTideInnerRoom_EventScript_236FA6:: @ 8236FA6
goto_if_set FLAG_RECIEVED_SHOAL_SHELL_4, ShoalCave_LowTideInnerRoom_EventScript_236FB9
goto_if_set FLAG_RECEIVED_SHOAL_SHELL_4, ShoalCave_LowTideInnerRoom_EventScript_236FB9
setmetatile 16, 13, 857, 1
return
@@ -61,13 +61,13 @@ ShoalCave_LowTideInnerRoom_EventScript_236FB9:: @ 8236FB9
ShoalCave_LowTideInnerRoom_EventScript_236FBA:: @ 8236FBA
lockall
goto_if_set FLAG_RECIEVED_SHOAL_SHELL_1, ShoalCave_LowTideInnerRoom_EventScript_236FEC
goto_if_set FLAG_RECEIVED_SHOAL_SHELL_1, ShoalCave_LowTideInnerRoom_EventScript_236FEC
giveitem_std ITEM_SHOAL_SHELL
compare VAR_RESULT, 0
goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_272054
setmetatile 41, 20, 859, 0
special DrawWholeMapView
setflag FLAG_RECIEVED_SHOAL_SHELL_1
setflag FLAG_RECEIVED_SHOAL_SHELL_1
releaseall
end
@@ -78,49 +78,49 @@ ShoalCave_LowTideInnerRoom_EventScript_236FEC:: @ 8236FEC
ShoalCave_LowTideInnerRoom_EventScript_236FF6:: @ 8236FF6
lockall
goto_if_set FLAG_RECIEVED_SHOAL_SHELL_2, ShoalCave_LowTideInnerRoom_EventScript_236FEC
goto_if_set FLAG_RECEIVED_SHOAL_SHELL_2, ShoalCave_LowTideInnerRoom_EventScript_236FEC
giveitem_std ITEM_SHOAL_SHELL
compare VAR_RESULT, 0
goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_272054
setmetatile 41, 10, 859, 0
special DrawWholeMapView
setflag FLAG_RECIEVED_SHOAL_SHELL_2
setflag FLAG_RECEIVED_SHOAL_SHELL_2
releaseall
end
ShoalCave_LowTideInnerRoom_EventScript_237028:: @ 8237028
lockall
goto_if_set FLAG_RECIEVED_SHOAL_SHELL_3, ShoalCave_LowTideInnerRoom_EventScript_236FEC
goto_if_set FLAG_RECEIVED_SHOAL_SHELL_3, ShoalCave_LowTideInnerRoom_EventScript_236FEC
giveitem_std ITEM_SHOAL_SHELL
compare VAR_RESULT, 0
goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_272054
setmetatile 6, 9, 859, 0
special DrawWholeMapView
setflag FLAG_RECIEVED_SHOAL_SHELL_3
setflag FLAG_RECEIVED_SHOAL_SHELL_3
releaseall
end
ShoalCave_LowTideInnerRoom_EventScript_23705A:: @ 823705A
lockall
goto_if_set FLAG_RECIEVED_SHOAL_SHELL_4, ShoalCave_LowTideInnerRoom_EventScript_236FEC
goto_if_set FLAG_RECEIVED_SHOAL_SHELL_4, ShoalCave_LowTideInnerRoom_EventScript_236FEC
giveitem_std ITEM_SHOAL_SHELL
compare VAR_RESULT, 0
goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_272054
setmetatile 16, 13, 859, 0
special DrawWholeMapView
setflag FLAG_RECIEVED_SHOAL_SHELL_4
setflag FLAG_RECEIVED_SHOAL_SHELL_4
releaseall
end
ShoalCave_LowTideInnerRoom_EventScript_23708C:: @ 823708C
lockall
goto_if_set FLAG_RECIEVED_SHOAL_SALT_1, ShoalCave_LowTideInnerRoom_EventScript_2370BE
goto_if_set FLAG_RECEIVED_SHOAL_SALT_1, ShoalCave_LowTideInnerRoom_EventScript_2370BE
giveitem_std ITEM_SHOAL_SALT
compare VAR_RESULT, 0
goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_272054
setmetatile 31, 8, 858, 0
special DrawWholeMapView
setflag FLAG_RECIEVED_SHOAL_SALT_1
setflag FLAG_RECEIVED_SHOAL_SALT_1
releaseall
end
@@ -131,12 +131,12 @@ ShoalCave_LowTideInnerRoom_EventScript_2370BE:: @ 82370BE
ShoalCave_LowTideInnerRoom_EventScript_2370C8:: @ 82370C8
lockall
goto_if_set FLAG_RECIEVED_SHOAL_SALT_2, ShoalCave_LowTideInnerRoom_EventScript_2370BE
goto_if_set FLAG_RECEIVED_SHOAL_SALT_2, ShoalCave_LowTideInnerRoom_EventScript_2370BE
giveitem_std ITEM_SHOAL_SALT
compare VAR_RESULT, 0
goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_272054
setmetatile 14, 26, 858, 0
special DrawWholeMapView
setflag FLAG_RECIEVED_SHOAL_SALT_2
setflag FLAG_RECEIVED_SHOAL_SALT_2
releaseall
end

6
data/maps/ShoalCave_LowTideLowerRoom/scripts.inc
View File

@@ -7,7 +7,7 @@ ShoalCave_LowTideLowerRoom_MapScript1_23715C: @ 823715C
end
ShoalCave_LowTideLowerRoom_EventScript_237162:: @ 8237162
goto_if_set FLAG_RECIEVED_SHOAL_SALT_4, ShoalCave_LowTideLowerRoom_EventScript_237175
goto_if_set FLAG_RECEIVED_SHOAL_SALT_4, ShoalCave_LowTideLowerRoom_EventScript_237175
setmetatile 18, 2, 856, 1
return
@@ -16,13 +16,13 @@ ShoalCave_LowTideLowerRoom_EventScript_237175:: @ 8237175
ShoalCave_LowTideLowerRoom_EventScript_237176:: @ 8237176
lockall
goto_if_set FLAG_RECIEVED_SHOAL_SALT_4, ShoalCave_LowTideLowerRoom_EventScript_2371A8
goto_if_set FLAG_RECEIVED_SHOAL_SALT_4, ShoalCave_LowTideLowerRoom_EventScript_2371A8
giveitem_std ITEM_SHOAL_SALT
compare VAR_RESULT, 0
goto_if_eq ShoalCave_LowTideLowerRoom_EventScript_272054
setmetatile 18, 2, 858, 0
special DrawWholeMapView
setflag FLAG_RECIEVED_SHOAL_SALT_4
setflag FLAG_RECEIVED_SHOAL_SALT_4
releaseall
end

6
data/maps/ShoalCave_LowTideStairsRoom/scripts.inc
View File

@@ -7,7 +7,7 @@ ShoalCave_LowTideStairsRoom_MapScript1_237100: @ 8237100
end
ShoalCave_LowTideStairsRoom_EventScript_237106:: @ 8237106
goto_if_set FLAG_RECIEVED_SHOAL_SALT_3, ShoalCave_LowTideStairsRoom_EventScript_237119
goto_if_set FLAG_RECEIVED_SHOAL_SALT_3, ShoalCave_LowTideStairsRoom_EventScript_237119
setmetatile 11, 11, 856, 1
return
@@ -16,13 +16,13 @@ ShoalCave_LowTideStairsRoom_EventScript_237119:: @ 8237119
ShoalCave_LowTideStairsRoom_EventScript_23711A:: @ 823711A
lockall
goto_if_set FLAG_RECIEVED_SHOAL_SALT_3, ShoalCave_LowTideStairsRoom_EventScript_23714C
goto_if_set FLAG_RECEIVED_SHOAL_SALT_3, ShoalCave_LowTideStairsRoom_EventScript_23714C
giveitem_std ITEM_SHOAL_SALT
compare VAR_RESULT, 0
goto_if_eq ShoalCave_LowTideStairsRoom_EventScript_272054
setmetatile 11, 11, 858, 0
special DrawWholeMapView
setflag FLAG_RECIEVED_SHOAL_SALT_3
setflag FLAG_RECEIVED_SHOAL_SALT_3
releaseall
end

4
data/maps/SlateportCity/scripts.inc
View File

@@ -722,10 +722,10 @@ SlateportCity_EventScript_1DD365:: @ 81DD365
SlateportCity_EventScript_1DD36E:: @ 81DD36E
lock
faceplayer
goto_if_set FLAG_RECIEVED_POWDER_JAR, SlateportCity_EventScript_1DD39A
goto_if_set FLAG_RECEIVED_POWDER_JAR, SlateportCity_EventScript_1DD39A
msgbox SlateportCity_Text_1DEBCE, MSGBOX_DEFAULT
giveitem_std ITEM_POWDER_JAR
setflag FLAG_RECIEVED_POWDER_JAR
setflag FLAG_RECEIVED_POWDER_JAR
msgbox SlateportCity_Text_1DED27, MSGBOX_DEFAULT
release
end

4
data/maps/SootopolisCity/scripts.inc
View File

@@ -744,7 +744,7 @@ SootopolisCity_EventScript_1E5F10:: @ 81E5F10
SootopolisCity_EventScript_1E5F1B:: @ 81E5F1B
dodailyevents
special GetPlayerBigGuyGirlString
goto_if_set FLAG_DAILY_SOOTOPOLIS_RECIEVED_BERRY, SootopolisCity_EventScript_1E5FBB
goto_if_set FLAG_DAILY_SOOTOPOLIS_RECEIVED_BERRY, SootopolisCity_EventScript_1E5FBB
msgbox SootopolisCity_Text_2A7BB0, MSGBOX_DEFAULT
random 10
addvar VAR_RESULT, 20
@@ -752,7 +752,7 @@ SootopolisCity_EventScript_1E5F1B:: @ 81E5F1B
giveitem_std VAR_RESULT
compare VAR_RESULT, 0
goto_if_eq SootopolisCity_EventScript_272054
setflag FLAG_DAILY_SOOTOPOLIS_RECIEVED_BERRY
setflag FLAG_DAILY_SOOTOPOLIS_RECEIVED_BERRY
msgbox SootopolisCity_Text_2A7C7C, MSGBOX_DEFAULT
random 2
compare VAR_RESULT, 0