ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-26 03:34:15 +01:00
Code Issues 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
Show Stats 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

12
data/mystery_event_msg.s
View File

@ -169,7 +169,7 @@ MysteryEventScript_AuroraTicket:: @ 867533C
setvaddress MysteryEventScript_AuroraTicket
lock
faceplayer
checkflag FLAG_RECIEVED_AURORA_TICKET
checkflag FLAG_RECEIVED_AURORA_TICKET
vgoto_if 1, AuroraTicket_Obtained
checkflag FLAG_BATTLED_DEOXYS
vgoto_if 1, AuroraTicket_Obtained
@ -184,7 +184,7 @@ MysteryEventScript_AuroraTicket:: @ 867533C
vgoto_if 1, AuroraTicket_NoBagSpace
giveitem_std ITEM_AURORA_TICKET
setflag FLAG_ENABLE_SHIP_BIRTH_ISLAND
setflag FLAG_RECIEVED_AURORA_TICKET
setflag FLAG_RECEIVED_AURORA_TICKET
vmessage sText_AuroraTicket2
waitmessage
waitbuttonpress
@ -221,7 +221,7 @@ MysteryEventScript_MysticTicket:: @ 867550B
setvaddress MysteryEventScript_MysticTicket
lock
faceplayer
checkflag FLAG_RECIEVED_MYSTIC_TICKET
checkflag FLAG_RECEIVED_MYSTIC_TICKET
vgoto_if 1, MysticTicket_Obtained
checkflag FLAG_CAUGHT_LUGIA
vgoto_if 1, MysticTicket_Obtained
@ -238,7 +238,7 @@ MysteryEventScript_MysticTicket:: @ 867550B
vgoto_if 1, MysticTicket_NoBagSpace
giveitem_std ITEM_MYSTIC_TICKET
setflag FLAG_ENABLE_SHIP_NAVEL_ROCK
setflag FLAG_RECIEVED_MYSTIC_TICKET
setflag FLAG_RECEIVED_MYSTIC_TICKET
vmessage sText_MysticTicket1
waitmessage
waitbuttonpress
@ -293,7 +293,7 @@ MysteryEventScript_OldSeaMap:: @ 86757F4
setvaddress MysteryEventScript_OldSeaMap
lock
faceplayer
checkflag FLAG_RECIEVED_OLD_SEA_MAP
checkflag FLAG_RECEIVED_OLD_SEA_MAP
vgoto_if 1, OldSeaMap_Obtained
checkflag FLAG_CAUGHT_MEW
vgoto_if 1, OldSeaMap_Obtained
@ -308,7 +308,7 @@ MysteryEventScript_OldSeaMap:: @ 86757F4
vgoto_if 1, OldSeaMap_NoBagSpace
giveitem_std ITEM_OLD_SEA_MAP
setflag FLAG_ENABLE_SHIP_FARAWAY_ISLAND
setflag FLAG_RECIEVED_OLD_SEA_MAP
setflag FLAG_RECEIVED_OLD_SEA_MAP
vmessage sText_MysteryGiftOldSeaMap_1
waitmessage
waitbuttonpress

8
data/scripts/pokeblocks.inc
View File

@ -265,7 +265,7 @@ EventScript_Pblock1_No: @ 8293C70
EventScript_Pblock1_NoBerries: @ 8293C7A
msgbox Text_Pblock1_NoBerries, MSGBOX_DEFAULT
dodailyevents
goto_if_set FLAG_DAILY_CONTEST_LOBBY_RECIEVED_BERRY, LilycoveCity_ContestLobby_EventScript_293C92
goto_if_set FLAG_DAILY_CONTEST_LOBBY_RECEIVED_BERRY, LilycoveCity_ContestLobby_EventScript_293C92
goto LilycoveCity_ContestLobby_EventScript_293C9C
end
@ -277,7 +277,7 @@ LilycoveCity_ContestLobby_EventScript_293C92: @ 8293C92
LilycoveCity_ContestLobby_EventScript_293C9C: @ 8293C9C
msgbox LilycoveCity_ContestLobby_Text_292FD1, MSGBOX_DEFAULT
giveitem_std ITEM_PECHA_BERRY
setflag FLAG_DAILY_CONTEST_LOBBY_RECIEVED_BERRY
setflag FLAG_DAILY_CONTEST_LOBBY_RECEIVED_BERRY
goto EventScript_Pblock1_KnowHow
end
@ -552,7 +552,7 @@ LilycoveCity_ContestLobby_EventScript_293FF8: @ 8293FF8
compare VAR_RESULT, 65535
goto_if_eq LilycoveCity_ContestLobby_EventScript_294028
dodailyevents
goto_if_set FLAG_DAILY_CONTEST_LOBBY_RECIEVED_BERRY, LilycoveCity_ContestLobby_EventScript_294028
goto_if_set FLAG_DAILY_CONTEST_LOBBY_RECEIVED_BERRY, LilycoveCity_ContestLobby_EventScript_294028
goto LilycoveCity_ContestLobby_EventScript_294032
end
@ -564,7 +564,7 @@ LilycoveCity_ContestLobby_EventScript_294028: @ 8294028
LilycoveCity_ContestLobby_EventScript_294032: @ 8294032
msgbox LilycoveCity_ContestLobby_Text_293AF0, MSGBOX_DEFAULT
giveitem_std ITEM_PECHA_BERRY
setflag FLAG_DAILY_CONTEST_LOBBY_RECIEVED_BERRY
setflag FLAG_DAILY_CONTEST_LOBBY_RECEIVED_BERRY
msgbox LilycoveCity_ContestLobby_Text_293B76, MSGBOX_DEFAULT
release
end

48
include/constants/flags.h
View File

@ -127,7 +127,7 @@
#define FLAG_UNUSED_RS_LEGENDARY_BATTLE_DONE 0x71 // Unused Flag. Used in R/S to indicate whether player defeated or caught Groudon/Kyogre in Cave of Origin.
#define FLAG_SCOTT_CALL_NATIONAL_DEX 0x72 // Used in order to activate a phone call from Scott, inviting the player to the SS Tidal.
#define FLAG_RECEIVED_METEORITE 0x73
#define FLAG_ADVENTURE_STARTED 0x74 // Recieved Pokédex.
#define FLAG_ADVENTURE_STARTED 0x74 // RECEIVED Pokédex.
#define FLAG_DEFEATED_MAGMA_SPACE_CENTER 0x75 // Set when Team Magma is defeated at Mossdeep's Space Center.
#define FLAG_MET_HIDDEN_POWER_GIVER 0x76
@ -333,9 +333,9 @@
#define FLAG_WALLACE_GOES_TO_SKY_PILLAR 0x137 // Set after speaking to Wallace within the Cave of Origin.
#define FLAG_RECEIVED_HM07 0x138
#define FLAG_BEAT_MAGMA_GRUNT_JAGGED_PASS 0x139 // Beat Magma Grunt blocking Magma Hideout entrance.
#define FLAG_RECIEVED_AURORA_TICKET 0x13A // Recieved Aurora Ticket in Mystery Gift
#define FLAG_RECIEVED_MYSTIC_TICKET 0x13B // Recieved Mystic Ticket in Mystery Gift
#define FLAG_RECIEVED_OLD_SEA_MAP 0x13C // Recieved Old Sea Map in Mystery Gift
#define FLAG_RECEIVED_AURORA_TICKET 0x13A // RECEIVED Aurora Ticket in Mystery Gift
#define FLAG_RECEIVED_MYSTIC_TICKET 0x13B // RECEIVED Mystic Ticket in Mystery Gift
#define FLAG_RECEIVED_OLD_SEA_MAP 0x13C // RECEIVED Old Sea Map in Mystery Gift
#define FLAG_UNUSED_0x13D 0x13D // Unused Flag
#define FLAG_UNUSED_0x13E 0x13E // Unused Flag
@ -358,7 +358,7 @@
#define FLAG_MIRAGE_TOWER_VISIBLE 0x14E
#define FLAG_CHOSE_CLAW_FOSSIL 0x14F // Player chose Claw Fossil
#define FLAG_CHOSE_ROOT_FOSSIL 0x150 // Player chose Root Fossil
#define FLAG_RECIEVED_POWDER_JAR 0x151
#define FLAG_RECEIVED_POWDER_JAR 0x151
#define FLAG_CHOSEN_MULTI_BATTLE_NPC_PARTNER 0x152
@ -493,7 +493,7 @@
#define FLAG_MET_SCOTT_IN_EVERGRANDE 0x1CF
#define FLAG_MET_SCOTT_ON_SS_TIDAL 0x1D0
#define FLAG_SCOTT_GIVES_BATTLE_POINTS 0x1D1
#define FLAG_RECIEVED_STARF_BERRY_FROM_SCOTT 0x1D2
#define FLAG_RECEIVED_STARF_BERRY_FROM_SCOTT 0x1D2
#define FLAG_ENABLE_ROXANNE_MATCH_CALL 0x1D3
#define FLAG_ENABLE_BRAWLY_MATCH_CALL 0x1D4
#define FLAG_ENABLE_WATTSON_MATCH_CALL 0x1D5
@ -907,14 +907,14 @@
#define FLAG_HIDE_RUSTBORO_CITY_DEVON_CORP_3F_EMPLOYEE 0x3B5
#define FLAG_HIDE_SS_TIDAL_CORRIDOR_MR_BRINEY 0x3B6
#define FLAG_HIDE_SS_TIDAL_ROOMS_SNATCH_GIVER 0x3B7
#define FLAG_RECIEVED_SHOAL_SALT_1 0x3B8
#define FLAG_RECIEVED_SHOAL_SALT_2 0x3B9
#define FLAG_RECIEVED_SHOAL_SALT_3 0x3BA
#define FLAG_RECIEVED_SHOAL_SALT_4 0x3BB
#define FLAG_RECIEVED_SHOAL_SHELL_1 0x3BC
#define FLAG_RECIEVED_SHOAL_SHELL_2 0x3BD
#define FLAG_RECIEVED_SHOAL_SHELL_3 0x3BE
#define FLAG_RECIEVED_SHOAL_SHELL_4 0x3BF
#define FLAG_RECEIVED_SHOAL_SALT_1 0x3B8
#define FLAG_RECEIVED_SHOAL_SALT_2 0x3B9
#define FLAG_RECEIVED_SHOAL_SALT_3 0x3BA
#define FLAG_RECEIVED_SHOAL_SALT_4 0x3BB
#define FLAG_RECEIVED_SHOAL_SHELL_1 0x3BC
#define FLAG_RECEIVED_SHOAL_SHELL_2 0x3BD
#define FLAG_RECEIVED_SHOAL_SHELL_3 0x3BE
#define FLAG_RECEIVED_SHOAL_SHELL_4 0x3BF
#define FLAG_HIDE_ROUTE_111_SECRET_POWER_MAN 0x3C0
#define FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION 0x3C1
#define FLAG_HIDE_LILYCOVE_DEPARTMENT_STORE_ROOFTOP_SALE_WOMAN 0x3C2
@ -1373,7 +1373,7 @@
#define FLAG_LANDMARK_SKY_PILLAR (SYSTEM_FLAGS + 0x5E)
#define FLAG_SYS_SHOAL_ITEM (SYSTEM_FLAGS + 0x5F)
#define FLAG_SYS_B_DASH (SYSTEM_FLAGS + 0x60) // Recieved Running Shoes
#define FLAG_SYS_B_DASH (SYSTEM_FLAGS + 0x60) // RECEIVED Running Shoes
#define FLAG_SYS_CTRL_OBJ_DELETE (SYSTEM_FLAGS + 0x61)
#define FLAG_SYS_RESET_RTC_ENABLE (SYSTEM_FLAGS + 0x62)
@ -1418,7 +1418,7 @@
#define FLAG_UNUSED_0x8E3 (SYSTEM_FLAGS + 0x83) // Unused Flag
#define FLAG_RECIEVED_POKEDEX_FROM_BIRCH (SYSTEM_FLAGS + 0x84)
#define FLAG_RECEIVED_POKEDEX_FROM_BIRCH (SYSTEM_FLAGS + 0x84)
#define FLAG_UNUSED_0x8E5 (SYSTEM_FLAGS + 0x85) // Unused Flag
#define FLAG_UNUSED_0x8E6 (SYSTEM_FLAGS + 0x86) // Unused Flag
@ -1482,7 +1482,7 @@
// Daily Flags
#define FLAG_DAILY_0x920 (SYSTEM_FLAGS + 0xC0)
#define FLAG_DAILY_CONTEST_LOBBY_RECIEVED_BERRY (SYSTEM_FLAGS + 0xC1)
#define FLAG_DAILY_CONTEST_LOBBY_RECEIVED_BERRY (SYSTEM_FLAGS + 0xC1)
#define FLAG_DAILY_SECRET_BASE (SYSTEM_FLAGS + 0xC2)
#define FLAG_DAILY_0x923 (SYSTEM_FLAGS + 0xC3)
#define FLAG_DAILY_0x924 (SYSTEM_FLAGS + 0xC4)
@ -1492,14 +1492,14 @@
#define FLAG_DAILY_0x928 (SYSTEM_FLAGS + 0xC8)
#define FLAG_DAILY_0x929 (SYSTEM_FLAGS + 0xC9)
#define FLAG_DAILY_PICKED_LOTO_TICKET (SYSTEM_FLAGS + 0xCA)
#define FLAG_DAILY_ROUTE_114_RECIEVED_BERRY (SYSTEM_FLAGS + 0xCB)
#define FLAG_DAILY_ROUTE_111_RECIEVED_BERRY (SYSTEM_FLAGS + 0xCC)
#define FLAG_DAILY_BERRY_MASTER_RECIEVED_BERRY (SYSTEM_FLAGS + 0xCD)
#define FLAG_DAILY_ROUTE_120_RECIEVED_BERRY (SYSTEM_FLAGS + 0xCE)
#define FLAG_DAILY_LILYCOVE_RECIEVED_BERRY (SYSTEM_FLAGS + 0xCF)
#define FLAG_DAILY_FLOWER_SHOP_RECIEVED_BERRY (SYSTEM_FLAGS + 0xD0)
#define FLAG_DAILY_ROUTE_114_RECEIVED_BERRY (SYSTEM_FLAGS + 0xCB)
#define FLAG_DAILY_ROUTE_111_RECEIVED_BERRY (SYSTEM_FLAGS + 0xCC)
#define FLAG_DAILY_BERRY_MASTER_RECEIVED_BERRY (SYSTEM_FLAGS + 0xCD)
#define FLAG_DAILY_ROUTE_120_RECEIVED_BERRY (SYSTEM_FLAGS + 0xCE)
#define FLAG_DAILY_LILYCOVE_RECEIVED_BERRY (SYSTEM_FLAGS + 0xCF)
#define FLAG_DAILY_FLOWER_SHOP_RECEIVED_BERRY (SYSTEM_FLAGS + 0xD0)
#define FLAG_DAILY_BERRY_MASTERS_WIFE (SYSTEM_FLAGS + 0xD1)
#define FLAG_DAILY_SOOTOPOLIS_RECIEVED_BERRY (SYSTEM_FLAGS + 0xD2)
#define FLAG_DAILY_SOOTOPOLIS_RECEIVED_BERRY (SYSTEM_FLAGS + 0xD2)
#define FLAG_DAILY_0x933 (SYSTEM_FLAGS + 0xD3)
#define FLAG_DAILY_APPRENTICE_LEAVES (SYSTEM_FLAGS + 0xD4)
#define FLAG_0x935 (SYSTEM_FLAGS + 0xD5)

2
include/strings.h
View File

@ -403,7 +403,7 @@ extern const u8 gText_PkmnHPRestoredByVar2[];
extern const u8 gText_CantBeUsedOnPkmn[];
extern const u8 gText_CancelParticipation[];
extern const u8 gText_PkmnWasGivenItem[];
extern const u8 gText_RecievedItemFromPkmn[];
extern const u8 gText_ReceivedItemFromPkmn[];
extern const u8 gText_SwitchPkmnItem[];
extern const u8 gText_SwitchedPkmnItem[];
extern const u8 gText_BagFullCouldNotRemoveItem[];

2
src/party_menu.c
View File

@ -2799,7 +2799,7 @@ static void sub_81B1CD0(struct Pokemon *mon, u16 item, u8 c)
{
GetMonNickname(mon, gStringVar1);
CopyItemName(item, gStringVar2);
StringExpandPlaceholders(gStringVar4, gText_RecievedItemFromPkmn);
StringExpandPlaceholders(gStringVar4, gText_ReceivedItemFromPkmn);
sub_81B1B5C(gStringVar4, c);
schedule_bg_copy_tilemap_to_vram(2);
}

2
src/strings.c
View File

@ -390,7 +390,7 @@ const u8 gText_RemoveMailBeforeItem[] = _("MAIL must be removed before\nholding
const u8 gText_PkmnWasGivenItem[] = _("{STR_VAR_1} was given the\n{STR_VAR_2} to hold.{PAUSE_UNTIL_PRESS}");
const u8 gText_SwitchPkmnItem[] = _("{STR_VAR_1} is already holding\none {STR_VAR_2}.\pWould you like to switch the\ntwo items?");
const u8 gText_PkmnNotHolding[] = _("{STR_VAR_1} isn't holding\nanything.{PAUSE_UNTIL_PRESS}");
const u8 gText_RecievedItemFromPkmn[] = _("Received the {STR_VAR_2}\nfrom {STR_VAR_1}.{PAUSE_UNTIL_PRESS}");
const u8 gText_ReceivedItemFromPkmn[] = _("Received the {STR_VAR_2}\nfrom {STR_VAR_1}.{PAUSE_UNTIL_PRESS}");
const u8 gText_MailTakenFromPkmn[] = _("MAIL was taken from the\nPOKéMON.{PAUSE_UNTIL_PRESS}");
const u8 gText_SwitchedPkmnItem[] = _("The {STR_VAR_2} was taken and\nreplaced with the {STR_VAR_1}.{PAUSE_UNTIL_PRESS}");
const u8 gText_PkmnHoldingItemCantHoldMail[] = _("This POKéMON is holding an\nitem. It cannot hold MAIL.{PAUSE_UNTIL_PRESS}");