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

Document Fossil Maniac and Berry Master route houses

Browse Source
This commit is contained in:
GriffinR
2019-11-06 14:06:06 -05:00
committed by huderlem
parent 7d5d12877e
commit fbc3eee1f2
15 changed files with 165 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/maps/DesertUnderpass/map.json
+1 -1
View File
@@ -24,7 +24,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "DesertUnderpass_EventScript_23AF41", "script": "DesertUnderpass_EventScript_Fossil",
"flag": "FLAG_HIDE_DESERT_UNDERPASS_FOSSIL" "flag": "FLAG_HIDE_DESERT_UNDERPASS_FOSSIL"
} }
], ],
data/maps/DesertUnderpass/scripts.inc
+9 -7
View File
@@ -6,29 +6,31 @@ DesertUnderpass_OnTransition: @ 823AF3D
setflag FLAG_LANDMARK_DESERT_UNDERPASS setflag FLAG_LANDMARK_DESERT_UNDERPASS
end end
DesertUnderpass_EventScript_23AF41:: @ 823AF41 DesertUnderpass_EventScript_Fossil:: @ 823AF41
lock lock
faceplayer faceplayer
goto_if_set FLAG_CHOSE_CLAW_FOSSIL, DesertUnderpass_EventScript_23AF57 goto_if_set FLAG_CHOSE_ROOT_FOSSIL, DesertUnderpass_EventScript_GiveClawFossil
goto_if_set FLAG_CHOSE_ROOT_FOSSIL, DesertUnderpass_EventScript_23AF68 goto_if_set FLAG_CHOSE_CLAW_FOSSIL, DesertUnderpass_EventScript_GiveRootFossil
release release
end end
DesertUnderpass_EventScript_23AF57:: @ 823AF57 DesertUnderpass_EventScript_GiveClawFossil:: @ 823AF57
giveitem_std ITEM_CLAW_FOSSIL giveitem_std ITEM_CLAW_FOSSIL
removeobject 1 removeobject 1
release release
end end
DesertUnderpass_EventScript_23AF68:: @ 823AF68 DesertUnderpass_EventScript_GiveRootFossil:: @ 823AF68
giveitem_std ITEM_ROOT_FOSSIL giveitem_std ITEM_ROOT_FOSSIL
removeobject 1 removeobject 1
release release
end end
DesertUnderpass_Text_23AF79:: @ 823AF79 @ Unused
DesertUnderpass_Text_FoundRootFossil:: @ 823AF79
.string "{PLAYER} found the ROOT FOSSIL.$" .string "{PLAYER} found the ROOT FOSSIL.$"
DesertUnderpass_Text_23AF93:: @ 823AF93 @ Unused
DesertUnderpass_Text_FoundClawFossil:: @ 823AF93
.string "{PLAYER} found the CLAW FOSSIL.$" .string "{PLAYER} found the CLAW FOSSIL.$"
data/maps/MirageTower_4F/scripts.inc
+2 -2
View File
@@ -13,7 +13,7 @@ MirageTower_4F_EventScript_23AD48:: @ 823AD48
setflag FLAG_HIDE_MIRAGE_TOWER_CLAW_FOSSIL setflag FLAG_HIDE_MIRAGE_TOWER_CLAW_FOSSIL
removeobject 1 removeobject 1
delay 30 delay 30
setflag FLAG_CHOSE_CLAW_FOSSIL setflag FLAG_CHOSE_ROOT_FOSSIL
goto MirageTower_4F_EventScript_23ADCA goto MirageTower_4F_EventScript_23ADCA
end end
@@ -34,7 +34,7 @@ MirageTower_4F_EventScript_23AD89:: @ 823AD89
setflag FLAG_HIDE_MIRAGE_TOWER_ROOT_FOSSIL setflag FLAG_HIDE_MIRAGE_TOWER_ROOT_FOSSIL
removeobject 2 removeobject 2
delay 30 delay 30
setflag FLAG_CHOSE_ROOT_FOSSIL setflag FLAG_CHOSE_CLAW_FOSSIL
goto MirageTower_4F_EventScript_23ADCA goto MirageTower_4F_EventScript_23ADCA
end end
data/maps/Route111/scripts.inc
+1 -1
View File
@@ -136,7 +136,7 @@ Route111_EventScript_1F0E60:: @ 81F0E60
waitstate waitstate
setvar VAR_MIRAGE_TOWER_STATE, 2 setvar VAR_MIRAGE_TOWER_STATE, 2
clearflag FLAG_HIDE_DESERT_UNDERPASS_FOSSIL clearflag FLAG_HIDE_DESERT_UNDERPASS_FOSSIL
goto_if_set FLAG_CHOSE_ROOT_FOSSIL, Route111_EventScript_1F0EA7 goto_if_set FLAG_CHOSE_CLAW_FOSSIL, Route111_EventScript_1F0EA7
msgbox Route111_Text_1F1C74, MSGBOX_DEFAULT msgbox Route111_Text_1F1C74, MSGBOX_DEFAULT
releaseall releaseall
end end
data/maps/Route114_FossilManiacsHouse/map.json
+5 -5
View File
@@ -24,7 +24,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "Route114_FossilManiacsHouse_EventScript_22AD3A", "script": "Route114_FossilManiacsHouse_EventScript_FossilManiacsBrother",
"flag": "0" "flag": "0"
} }
], ],
@@ -59,7 +59,7 @@
"y": 3, "y": 3,
"elevation": 0, "elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
"script": "Route114_FossilManiacsHouse_EventScript_22AD73" "script": "Route114_FossilManiacsHouse_EventScript_RockDisplay"
}, },
{ {
"type": "sign", "type": "sign",
@@ -67,7 +67,7 @@
"y": 3, "y": 3,
"elevation": 0, "elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
"script": "Route114_FossilManiacsHouse_EventScript_22AD73" "script": "Route114_FossilManiacsHouse_EventScript_RockDisplay"
}, },
{ {
"type": "sign", "type": "sign",
@@ -75,7 +75,7 @@
"y": 2, "y": 2,
"elevation": 0, "elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
"script": "Route114_FossilManiacsHouse_EventScript_22AD7C" "script": "Route114_FossilManiacsHouse_EventScript_Bookshelf"
}, },
{ {
"type": "sign", "type": "sign",
@@ -83,7 +83,7 @@
"y": 2, "y": 2,
"elevation": 0, "elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
"script": "Route114_FossilManiacsHouse_EventScript_22AD7C" "script": "Route114_FossilManiacsHouse_EventScript_Bookshelf"
} }
] ]
} }
data/maps/Route114_FossilManiacsHouse/scripts.inc
+14 -14
View File
@@ -6,32 +6,32 @@ Route114_FossilManiacsHouse_OnTransition: @ 822AD36
setflag FLAG_LANDMARK_FOSSIL_MANIACS_HOUSE setflag FLAG_LANDMARK_FOSSIL_MANIACS_HOUSE
end end
Route114_FossilManiacsHouse_EventScript_22AD3A:: @ 822AD3A Route114_FossilManiacsHouse_EventScript_FossilManiacsBrother:: @ 822AD3A
lock lock
faceplayer faceplayer
goto_if_set FLAG_RECEIVED_TM28, Route114_FossilManiacsHouse_EventScript_22AD69 goto_if_set FLAG_RECEIVED_TM28, Route114_FossilManiacsHouse_EventScript_ReceivedDig
msgbox Route114_FossilManiacsHouse_Text_22AD85, MSGBOX_DEFAULT msgbox Route114_FossilManiacsHouse_Text_HaveThisToDigLikeMyBrother, MSGBOX_DEFAULT
giveitem_std ITEM_TM28 giveitem_std ITEM_TM28
compare VAR_RESULT, 0 compare VAR_RESULT, FALSE
goto_if_eq Common_EventScript_ShowBagIsFull goto_if_eq Common_EventScript_ShowBagIsFull
setflag FLAG_RECEIVED_TM28 setflag FLAG_RECEIVED_TM28
release release
end end
Route114_FossilManiacsHouse_EventScript_22AD69:: @ 822AD69 Route114_FossilManiacsHouse_EventScript_ReceivedDig:: @ 822AD69
msgbox Route114_FossilManiacsHouse_Text_22AE48, MSGBOX_DEFAULT msgbox Route114_FossilManiacsHouse_Text_DigReturnsYouToEntrance, MSGBOX_DEFAULT
release release
end end
Route114_FossilManiacsHouse_EventScript_22AD73:: @ 822AD73 Route114_FossilManiacsHouse_EventScript_RockDisplay:: @ 822AD73
msgbox Route114_FossilManiacsHouse_Text_22AE92, MSGBOX_SIGN msgbox Route114_FossilManiacsHouse_Text_RocksFillDisplayCase, MSGBOX_SIGN
end end
Route114_FossilManiacsHouse_EventScript_22AD7C:: @ 822AD7C Route114_FossilManiacsHouse_EventScript_Bookshelf:: @ 822AD7C
msgbox Route114_FossilManiacsHouse_Text_22AEC2, MSGBOX_SIGN msgbox Route114_FossilManiacsHouse_Text_CrammedWithBooks, MSGBOX_SIGN
end end
Route114_FossilManiacsHouse_Text_22AD85: @ 822AD85 Route114_FossilManiacsHouse_Text_HaveThisToDigLikeMyBrother: @ 822AD85
.string "My big brother's the FOSSIL MANIAC…\n" .string "My big brother's the FOSSIL MANIAC…\n"
.string "He's a nice guy who loves FOSSILS…\p" .string "He's a nice guy who loves FOSSILS…\p"
.string "He loves digging holes, too…\n" .string "He loves digging holes, too…\n"
@@ -39,15 +39,15 @@ Route114_FossilManiacsHouse_Text_22AD85: @ 822AD85
.string "You can have this, so you can DIG\n" .string "You can have this, so you can DIG\n"
.string "holes just like my big brother…$" .string "holes just like my big brother…$"
Route114_FossilManiacsHouse_Text_22AE48: @ 822AE48 Route114_FossilManiacsHouse_Text_DigReturnsYouToEntrance: @ 822AE48
.string "If you make a POKéMON DIG inside a\n" .string "If you make a POKéMON DIG inside a\n"
.string "cave, you're returned to the entrance…$" .string "cave, you're returned to the entrance…$"
Route114_FossilManiacsHouse_Text_22AE92: @ 822AE92 Route114_FossilManiacsHouse_Text_RocksFillDisplayCase: @ 822AE92
.string "Rocks in peculiar shapes fill\n" .string "Rocks in peculiar shapes fill\n"
.string "the display case…$" .string "the display case…$"
Route114_FossilManiacsHouse_Text_22AEC2: @ 822AEC2 Route114_FossilManiacsHouse_Text_CrammedWithBooks: @ 822AEC2
.string "THE COMPOSITION OF STRATA…\n" .string "THE COMPOSITION OF STRATA…\n"
.string "HOW RAIN SHAPES THE LAND…\l" .string "HOW RAIN SHAPES THE LAND…\l"
.string "STONES, SOIL, AND ROCK…\p" .string "STONES, SOIL, AND ROCK…\p"
data/maps/Route114_FossilManiacsTunnel/map.json
+3 -3
View File
@@ -24,7 +24,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "Route114_FossilManiacsTunnel_EventScript_22AF87", "script": "Route114_FossilManiacsTunnel_EventScript_FossilManiac",
"flag": "0" "flag": "0"
} }
], ],
@@ -59,7 +59,7 @@
"elevation": 3, "elevation": 3,
"var": "VAR_FOSSIL_MANIAC_STATE", "var": "VAR_FOSSIL_MANIAC_STATE",
"var_value": "1", "var_value": "1",
"script": "Route114_FossilManiacsTunnel_EventScript_22AF66" "script": "Route114_FossilManiacsTunnel_EventScript_ManiacMentionCaveIn"
}, },
{ {
"type": "trigger", "type": "trigger",
@@ -68,7 +68,7 @@
"elevation": 3, "elevation": 3,
"var": "VAR_FOSSIL_MANIAC_STATE", "var": "VAR_FOSSIL_MANIAC_STATE",
"var_value": "1", "var_value": "1",
"script": "Route114_FossilManiacsTunnel_EventScript_22AF66" "script": "Route114_FossilManiacsTunnel_EventScript_ManiacMentionCaveIn"
} }
], ],
"bg_events": [] "bg_events": []
data/maps/Route114_FossilManiacsTunnel/scripts.inc
+23 -23
View File
@@ -1,61 +1,61 @@
Route114_FossilManiacsTunnel_MapScripts:: @ 822AF28 Route114_FossilManiacsTunnel_MapScripts:: @ 822AF28
map_script MAP_SCRIPT_ON_TRANSITION, Route114_FossilManiacsTunnel_OnTransition map_script MAP_SCRIPT_ON_TRANSITION, Route114_FossilManiacsTunnel_OnTransition
map_script MAP_SCRIPT_ON_LOAD, Route114_FossilManiacsTunnel_MapScript1_22AF49 map_script MAP_SCRIPT_ON_LOAD, Route114_FossilManiacsTunnel_OnLoad
.byte 0 .byte 0
Route114_FossilManiacsTunnel_OnTransition: @ 822AF33 Route114_FossilManiacsTunnel_OnTransition: @ 822AF33
call_if_set FLAG_SYS_GAME_CLEAR, Route114_FossilManiacsTunnel_EventScript_22AF3D call_if_set FLAG_SYS_GAME_CLEAR, Route114_FossilManiacsTunnel_EventScript_MoveFossilManiac
end end
Route114_FossilManiacsTunnel_EventScript_22AF3D:: @ 822AF3D Route114_FossilManiacsTunnel_EventScript_MoveFossilManiac:: @ 822AF3D
setobjectxyperm 1, 6, 5 setobjectxyperm 1, 6, 5
setobjectmovementtype 1, MOVEMENT_TYPE_FACE_DOWN setobjectmovementtype 1, MOVEMENT_TYPE_FACE_DOWN
return return
Route114_FossilManiacsTunnel_MapScript1_22AF49: @ 822AF49 Route114_FossilManiacsTunnel_OnLoad: @ 822AF49
call_if_unset FLAG_SYS_GAME_CLEAR, Route114_FossilManiacsTunnel_EventScript_22AF53 call_if_unset FLAG_SYS_GAME_CLEAR, Route114_FossilManiacsTunnel_EventScript_CloseDesertUnderpass
end end
Route114_FossilManiacsTunnel_EventScript_22AF53:: @ 822AF53 Route114_FossilManiacsTunnel_EventScript_CloseDesertUnderpass:: @ 822AF53
setmetatile 6, 1, METATILE_Fallarbor_RedRockWall, 1 setmetatile 6, 1, METATILE_Fallarbor_RedRockWall, 1
setmetatile 6, 2, METATILE_Fallarbor_RedRockWall, 1 setmetatile 6, 2, METATILE_Fallarbor_RedRockWall, 1
return return
Route114_FossilManiacsTunnel_EventScript_22AF66:: @ 822AF66 Route114_FossilManiacsTunnel_EventScript_ManiacMentionCaveIn:: @ 822AF66
lockall lockall
applymovement 1, Common_Movement_WalkInPlaceFastestUp applymovement 1, Common_Movement_WalkInPlaceFastestUp
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown
waitmovement 0 waitmovement 0
msgbox Route114_FossilManiacsTunnel_Text_22B1F7, MSGBOX_DEFAULT msgbox Route114_FossilManiacsTunnel_Text_NotSafeThatWay, MSGBOX_DEFAULT
setvar VAR_FOSSIL_MANIAC_STATE, 2 setvar VAR_FOSSIL_MANIAC_STATE, 2
releaseall releaseall
end end
Route114_FossilManiacsTunnel_EventScript_22AF87:: @ 822AF87 Route114_FossilManiacsTunnel_EventScript_FossilManiac:: @ 822AF87
lock lock
faceplayer faceplayer
goto_if_set FLAG_RECEIVED_REVIVED_FOSSIL_MON, Route114_FossilManiacsTunnel_EventScript_22AFC6 goto_if_set FLAG_RECEIVED_REVIVED_FOSSIL_MON, Route114_FossilManiacsTunnel_EventScript_PlayerRevivedFossil
checkitem ITEM_ROOT_FOSSIL, 1 checkitem ITEM_ROOT_FOSSIL, 1
compare VAR_RESULT, 1 compare VAR_RESULT, TRUE
goto_if_eq Route114_FossilManiacsTunnel_EventScript_22AFBC goto_if_eq Route114_FossilManiacsTunnel_EventScript_PlayerHasFossil
checkitem ITEM_CLAW_FOSSIL, 1 checkitem ITEM_CLAW_FOSSIL, 1
compare VAR_RESULT, 1 compare VAR_RESULT, TRUE
goto_if_eq Route114_FossilManiacsTunnel_EventScript_22AFBC goto_if_eq Route114_FossilManiacsTunnel_EventScript_PlayerHasFossil
msgbox Route114_FossilManiacsTunnel_Text_22AFD0, MSGBOX_DEFAULT msgbox Route114_FossilManiacsTunnel_Text_LookInDesertForFossils, MSGBOX_DEFAULT
release release
end end
Route114_FossilManiacsTunnel_EventScript_22AFBC:: @ 822AFBC Route114_FossilManiacsTunnel_EventScript_PlayerHasFossil:: @ 822AFBC
msgbox Route114_FossilManiacsTunnel_Text_22B0D6, MSGBOX_DEFAULT msgbox Route114_FossilManiacsTunnel_Text_DevonCorpRevivingFossils, MSGBOX_DEFAULT
release release
end end
Route114_FossilManiacsTunnel_EventScript_22AFC6:: @ 822AFC6 Route114_FossilManiacsTunnel_EventScript_PlayerRevivedFossil:: @ 822AFC6
msgbox Route114_FossilManiacsTunnel_Text_22B1CC, MSGBOX_DEFAULT msgbox Route114_FossilManiacsTunnel_Text_FossilsAreWonderful, MSGBOX_DEFAULT
release release
end end
Route114_FossilManiacsTunnel_Text_22AFD0: @ 822AFD0 Route114_FossilManiacsTunnel_Text_LookInDesertForFossils: @ 822AFD0
.string "I'm the FOSSIL MANIAC…\n" .string "I'm the FOSSIL MANIAC…\n"
.string "I'm a nice guy who loves FOSSILS…\p" .string "I'm a nice guy who loves FOSSILS…\p"
.string "Do you want a FOSSIL?\p" .string "Do you want a FOSSIL?\p"
@@ -66,7 +66,7 @@ Route114_FossilManiacsTunnel_Text_22AFD0: @ 822AFD0
.string "are boulders and sand that may hide\l" .string "are boulders and sand that may hide\l"
.string "FOSSILS…$" .string "FOSSILS…$"
Route114_FossilManiacsTunnel_Text_22B0D6: @ 822B0D6 Route114_FossilManiacsTunnel_Text_DevonCorpRevivingFossils: @ 822B0D6
.string "You found a FOSSIL, didn't you?\n" .string "You found a FOSSIL, didn't you?\n"
.string "That's so nice… It's so dreamy…\p" .string "That's so nice… It's so dreamy…\p"
.string "What are you going to do with that\n" .string "What are you going to do with that\n"
@@ -77,11 +77,11 @@ Route114_FossilManiacsTunnel_Text_22B0D6: @ 822B0D6
.string "I love my FOSSILS, so I would never\n" .string "I love my FOSSILS, so I would never\n"
.string "do anything like that…$" .string "do anything like that…$"
Route114_FossilManiacsTunnel_Text_22B1CC: @ 822B1CC Route114_FossilManiacsTunnel_Text_FossilsAreWonderful: @ 822B1CC
.string "FOSSILS are so… Wonderful…\n" .string "FOSSILS are so… Wonderful…\n"
.string "It's so dreamy…$" .string "It's so dreamy…$"
Route114_FossilManiacsTunnel_Text_22B1F7: @ 822B1F7 Route114_FossilManiacsTunnel_Text_NotSafeThatWay: @ 822B1F7
.string "Oh…\n" .string "Oh…\n"
.string "It's not safe that way…\p" .string "It's not safe that way…\p"
.string "I was digging away, you see…\n" .string "I was digging away, you see…\n"
data/maps/Route123_BerryMastersHouse/map.json
+2 -2
View File
@@ -24,7 +24,7 @@
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "Route123_BerryMastersHouse_EventScript_26F845", "script": "Route123_BerryMastersHouse_EventScript_BerryMaster",
"flag": "0" "flag": "0"
}, },
{ {
@@ -37,7 +37,7 @@
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "Route123_BerryMastersHouse_EventScript_26F8C0", "script": "Route123_BerryMastersHouse_EventScript_BerryMastersWife",
"flag": "0" "flag": "0"
} }
], ],
data/maps/Route123_BerryMastersHouse/scripts.inc
+70 -70
View File
@@ -6,141 +6,141 @@ Route123_BerryMastersHouse_OnTransition: @ 826F841
setflag FLAG_LANDMARK_BERRY_MASTERS_HOUSE setflag FLAG_LANDMARK_BERRY_MASTERS_HOUSE
end end
Route123_BerryMastersHouse_EventScript_26F845:: @ 826F845 Route123_BerryMastersHouse_EventScript_BerryMaster:: @ 826F845
lock lock
faceplayer faceplayer
dotimebasedevents dotimebasedevents
goto_if_set FLAG_DAILY_BERRY_MASTER_RECEIVED_BERRY, Route123_BerryMastersHouse_EventScript_26F8B6 goto_if_set FLAG_DAILY_BERRY_MASTER_RECEIVED_BERRY, Route123_BerryMastersHouse_EventScript_ReceivedBerryToday
msgbox Route123_BerryMastersHouse_Text_2A7386, MSGBOX_DEFAULT msgbox Route123_BerryMastersHouse_Text_YoureDeservingOfBerry, MSGBOX_DEFAULT
random 10 random NUM_BERRY_MASTER_BERRIES
addvar VAR_RESULT, 20 addvar VAR_RESULT, NUM_BERRY_MASTER_BERRIES_SKIPPED
addvar VAR_RESULT, FIRST_BERRY_INDEX addvar VAR_RESULT, FIRST_BERRY_INDEX
giveitem_std VAR_RESULT giveitem_std VAR_RESULT
compare VAR_RESULT, 0 compare VAR_RESULT, FALSE
goto_if_eq Common_EventScript_ShowBagIsFull goto_if_eq Common_EventScript_ShowBagIsFull
setflag FLAG_DAILY_BERRY_MASTER_RECEIVED_BERRY setflag FLAG_DAILY_BERRY_MASTER_RECEIVED_BERRY
msgbox Route123_BerryMastersHouse_Text_2A7428, MSGBOX_DEFAULT msgbox Route123_BerryMastersHouse_Text_WhyBeStingyTakeAnother, MSGBOX_DEFAULT
random 10 random NUM_BERRY_MASTER_BERRIES
addvar VAR_RESULT, 20 addvar VAR_RESULT, NUM_BERRY_MASTER_BERRIES_SKIPPED
addvar VAR_RESULT, FIRST_BERRY_INDEX addvar VAR_RESULT, FIRST_BERRY_INDEX
giveitem_std VAR_RESULT giveitem_std VAR_RESULT
compare VAR_RESULT, 0 compare VAR_RESULT, FALSE
goto_if_eq Common_EventScript_ShowBagIsFull goto_if_eq Common_EventScript_ShowBagIsFull
msgbox Route123_BerryMastersHouse_Text_2A7445, MSGBOX_DEFAULT msgbox Route123_BerryMastersHouse_Text_VisitPrettyPetalFlowerShop, MSGBOX_DEFAULT
release release
end end
Route123_BerryMastersHouse_EventScript_26F8B6:: @ 826F8B6 Route123_BerryMastersHouse_EventScript_ReceivedBerryToday:: @ 826F8B6
msgbox Route123_BerryMastersHouse_Text_2A749E, MSGBOX_DEFAULT msgbox Route123_BerryMastersHouse_Text_DoneForToday, MSGBOX_DEFAULT
release release
end end
Route123_BerryMastersHouse_EventScript_26F8C0:: @ 826F8C0 Route123_BerryMastersHouse_EventScript_BerryMastersWife:: @ 826F8C0
lock lock
faceplayer faceplayer
dotimebasedevents dotimebasedevents
goto_if_set FLAG_DAILY_BERRY_MASTERS_WIFE, Route123_BerryMastersHouse_EventScript_26FA6F goto_if_set FLAG_DAILY_BERRY_MASTERS_WIFE, Route123_BerryMastersHouse_EventScript_ReceivedWifeBerryToday
msgbox Route123_BerryMastersHouse_Text_2A74E6, MSGBOX_DEFAULT msgbox Route123_BerryMastersHouse_Text_HeardAGoodSayingLately, MSGBOX_DEFAULT
setvar VAR_0x8004, EASY_CHAT_TYPE_GOOD_SAYING setvar VAR_0x8004, EASY_CHAT_TYPE_GOOD_SAYING
call Common_ShowEasyChatScreen call Common_ShowEasyChatScreen
lock lock
faceplayer faceplayer
compare VAR_RESULT, 1 compare VAR_RESULT, TRUE
goto_if_eq Route123_BerryMastersHouse_EventScript_26F909 goto_if_eq Route123_BerryMastersHouse_EventScript_GavePhrase
compare VAR_RESULT, 0 compare VAR_RESULT, FALSE
goto_if_eq Route123_BerryMastersHouse_EventScript_26F8F7 goto_if_eq Route123_BerryMastersHouse_EventScript_CancelPhrase
end end
Route123_BerryMastersHouse_EventScript_26F8F7:: @ 826F8F7 Route123_BerryMastersHouse_EventScript_CancelPhrase:: @ 826F8F7
msgbox Route123_BerryMastersHouse_Text_2A7682, MSGBOX_DEFAULT msgbox Route123_BerryMastersHouse_Text_Ah, MSGBOX_DEFAULT
msgbox Route123_BerryMastersHouse_Text_2A761B, MSGBOX_DEFAULT msgbox Route123_BerryMastersHouse_Text_JoyNeverGoesOutOfMyLife, MSGBOX_DEFAULT
release release
end end
Route123_BerryMastersHouse_EventScript_26F909:: @ 826F909 Route123_BerryMastersHouse_EventScript_GavePhrase:: @ 826F909
compare VAR_0x8004, 0 compare VAR_0x8004, NOT_SPECIAL_PHRASE
goto_if_eq Route123_BerryMastersHouse_EventScript_26F94C goto_if_eq Route123_BerryMastersHouse_EventScript_GiveNormalBerry
compare VAR_0x8004, 1 compare VAR_0x8004, PHRASE_GREAT_BATTLE
goto_if_eq Route123_BerryMastersHouse_EventScript_26F97A goto_if_eq Route123_BerryMastersHouse_EventScript_GiveSpelonBerry
compare VAR_0x8004, 2 compare VAR_0x8004, PHRASE_CHALLENGE_CONTEST
goto_if_eq Route123_BerryMastersHouse_EventScript_26F9AB goto_if_eq Route123_BerryMastersHouse_EventScript_GivePamtreBerry
compare VAR_0x8004, 3 compare VAR_0x8004, PHRASE_OVERWHELMING_LATIAS
goto_if_eq Route123_BerryMastersHouse_EventScript_26F9DC goto_if_eq Route123_BerryMastersHouse_EventScript_GiveWatmelBerry
compare VAR_0x8004, 4 compare VAR_0x8004, PHRASE_COOL_LATIOS
goto_if_eq Route123_BerryMastersHouse_EventScript_26FA0D goto_if_eq Route123_BerryMastersHouse_EventScript_GiveDurinBerry
compare VAR_0x8004, 5 compare VAR_0x8004, PHRASE_SUPER_HUSTLE
goto_if_eq Route123_BerryMastersHouse_EventScript_26FA3E goto_if_eq Route123_BerryMastersHouse_EventScript_GiveBelueBerry
end end
Route123_BerryMastersHouse_EventScript_26F94C:: @ 826F94C Route123_BerryMastersHouse_EventScript_GiveNormalBerry:: @ 826F94C
msgbox Route123_BerryMastersHouse_Text_2A75D0, MSGBOX_DEFAULT msgbox Route123_BerryMastersHouse_Text_GoodSayingTakeThis, MSGBOX_DEFAULT
random 10 random NUM_BERRY_MASTER_WIFE_BERRIES
addvar VAR_RESULT, FIRST_BERRY_INDEX addvar VAR_RESULT, FIRST_BERRY_INDEX
giveitem_std VAR_RESULT giveitem_std VAR_RESULT
compare VAR_RESULT, 0 compare VAR_RESULT, FALSE
goto_if_eq Common_EventScript_ShowBagIsFull goto_if_eq Common_EventScript_ShowBagIsFull
goto Route123_BerryMastersHouse_EventScript_26FA79 goto Route123_BerryMastersHouse_EventScript_GaveBerry
release release
end end
Route123_BerryMastersHouse_EventScript_26F97A:: @ 826F97A Route123_BerryMastersHouse_EventScript_GiveSpelonBerry:: @ 826F97A
goto_if_set FLAG_RECEIVED_SPELON_BERRY, Route123_BerryMastersHouse_EventScript_26F94C goto_if_set FLAG_RECEIVED_SPELON_BERRY, Route123_BerryMastersHouse_EventScript_GiveNormalBerry
msgbox Route123_BerryMastersHouse_Text_2A7583, MSGBOX_DEFAULT msgbox Route123_BerryMastersHouse_Text_InspirationalTakeThis, MSGBOX_DEFAULT
giveitem_std ITEM_SPELON_BERRY giveitem_std ITEM_SPELON_BERRY
compare VAR_RESULT, 0 compare VAR_RESULT, FALSE
goto_if_eq Common_EventScript_ShowBagIsFull goto_if_eq Common_EventScript_ShowBagIsFull
setflag FLAG_RECEIVED_SPELON_BERRY setflag FLAG_RECEIVED_SPELON_BERRY
goto Route123_BerryMastersHouse_EventScript_26FA79 goto Route123_BerryMastersHouse_EventScript_GaveBerry
end end
Route123_BerryMastersHouse_EventScript_26F9AB:: @ 826F9AB Route123_BerryMastersHouse_EventScript_GivePamtreBerry:: @ 826F9AB
goto_if_set FLAG_RECEIVED_PAMTRE_BERRY, Route123_BerryMastersHouse_EventScript_26F94C goto_if_set FLAG_RECEIVED_PAMTRE_BERRY, Route123_BerryMastersHouse_EventScript_GiveNormalBerry
msgbox Route123_BerryMastersHouse_Text_2A7583, MSGBOX_DEFAULT msgbox Route123_BerryMastersHouse_Text_InspirationalTakeThis, MSGBOX_DEFAULT
giveitem_std ITEM_PAMTRE_BERRY giveitem_std ITEM_PAMTRE_BERRY
compare VAR_RESULT, 0 compare VAR_RESULT, FALSE
goto_if_eq Common_EventScript_ShowBagIsFull goto_if_eq Common_EventScript_ShowBagIsFull
setflag FLAG_RECEIVED_PAMTRE_BERRY setflag FLAG_RECEIVED_PAMTRE_BERRY
goto Route123_BerryMastersHouse_EventScript_26FA79 goto Route123_BerryMastersHouse_EventScript_GaveBerry
end end
Route123_BerryMastersHouse_EventScript_26F9DC:: @ 826F9DC Route123_BerryMastersHouse_EventScript_GiveWatmelBerry:: @ 826F9DC
goto_if_set FLAG_RECEIVED_WATMEL_BERRY, Route123_BerryMastersHouse_EventScript_26F94C goto_if_set FLAG_RECEIVED_WATMEL_BERRY, Route123_BerryMastersHouse_EventScript_GiveNormalBerry
msgbox Route123_BerryMastersHouse_Text_2A7583, MSGBOX_DEFAULT msgbox Route123_BerryMastersHouse_Text_InspirationalTakeThis, MSGBOX_DEFAULT
giveitem_std ITEM_WATMEL_BERRY giveitem_std ITEM_WATMEL_BERRY
compare VAR_RESULT, 0 compare VAR_RESULT, FALSE
goto_if_eq Common_EventScript_ShowBagIsFull goto_if_eq Common_EventScript_ShowBagIsFull
setflag FLAG_RECEIVED_WATMEL_BERRY setflag FLAG_RECEIVED_WATMEL_BERRY
goto Route123_BerryMastersHouse_EventScript_26FA79 goto Route123_BerryMastersHouse_EventScript_GaveBerry
end end
Route123_BerryMastersHouse_EventScript_26FA0D:: @ 826FA0D Route123_BerryMastersHouse_EventScript_GiveDurinBerry:: @ 826FA0D
goto_if_set FLAG_RECEIVED_DURIN_BERRY, Route123_BerryMastersHouse_EventScript_26F94C goto_if_set FLAG_RECEIVED_DURIN_BERRY, Route123_BerryMastersHouse_EventScript_GiveNormalBerry
msgbox Route123_BerryMastersHouse_Text_2A7583, MSGBOX_DEFAULT msgbox Route123_BerryMastersHouse_Text_InspirationalTakeThis, MSGBOX_DEFAULT
giveitem_std ITEM_DURIN_BERRY giveitem_std ITEM_DURIN_BERRY
compare VAR_RESULT, 0 compare VAR_RESULT, FALSE
goto_if_eq Common_EventScript_ShowBagIsFull goto_if_eq Common_EventScript_ShowBagIsFull
setflag FLAG_RECEIVED_DURIN_BERRY setflag FLAG_RECEIVED_DURIN_BERRY
goto Route123_BerryMastersHouse_EventScript_26FA79 goto Route123_BerryMastersHouse_EventScript_GaveBerry
end end
Route123_BerryMastersHouse_EventScript_26FA3E:: @ 826FA3E Route123_BerryMastersHouse_EventScript_GiveBelueBerry:: @ 826FA3E
goto_if_set FLAG_RECEIVED_BELUE_BERRY, Route123_BerryMastersHouse_EventScript_26F94C goto_if_set FLAG_RECEIVED_BELUE_BERRY, Route123_BerryMastersHouse_EventScript_GiveNormalBerry
msgbox Route123_BerryMastersHouse_Text_2A7583, MSGBOX_DEFAULT msgbox Route123_BerryMastersHouse_Text_InspirationalTakeThis, MSGBOX_DEFAULT
giveitem_std ITEM_BELUE_BERRY giveitem_std ITEM_BELUE_BERRY
compare VAR_RESULT, 0 compare VAR_RESULT, FALSE
goto_if_eq Common_EventScript_ShowBagIsFull goto_if_eq Common_EventScript_ShowBagIsFull
setflag FLAG_RECEIVED_BELUE_BERRY setflag FLAG_RECEIVED_BELUE_BERRY
goto Route123_BerryMastersHouse_EventScript_26FA79 goto Route123_BerryMastersHouse_EventScript_GaveBerry
end end
Route123_BerryMastersHouse_EventScript_26FA6F:: @ 826FA6F Route123_BerryMastersHouse_EventScript_ReceivedWifeBerryToday:: @ 826FA6F
msgbox Route123_BerryMastersHouse_Text_2A761B, MSGBOX_DEFAULT msgbox Route123_BerryMastersHouse_Text_JoyNeverGoesOutOfMyLife, MSGBOX_DEFAULT
release release
end end
Route123_BerryMastersHouse_EventScript_26FA79:: @ 826FA79 Route123_BerryMastersHouse_EventScript_GaveBerry:: @ 826FA79
setflag FLAG_DAILY_BERRY_MASTERS_WIFE setflag FLAG_DAILY_BERRY_MASTERS_WIFE
msgbox Route123_BerryMastersHouse_Text_2A761B, MSGBOX_DEFAULT msgbox Route123_BerryMastersHouse_Text_JoyNeverGoesOutOfMyLife, MSGBOX_DEFAULT
release release
end end
data/text/berries.inc
+9 -9
View File
@@ -88,50 +88,50 @@ LilycoveCity_Text_2A7321: @ 82A7321
.string "The way dignified simplicity suits me,\n" .string "The way dignified simplicity suits me,\n"
.string "{POKEBLOCK}S perfectly suit POKéMON.$" .string "{POKEBLOCK}S perfectly suit POKéMON.$"
Route123_BerryMastersHouse_Text_2A7386: @ 82A7386 Route123_BerryMastersHouse_Text_YoureDeservingOfBerry: @ 82A7386
.string "You may call me the BERRY MASTER.\p" .string "You may call me the BERRY MASTER.\p"
.string "I dream of filling the world with\n" .string "I dream of filling the world with\n"
.string "beautiful flowers, so I raise BERRIES\l" .string "beautiful flowers, so I raise BERRIES\l"
.string "and hand them out to everyone.\p" .string "and hand them out to everyone.\p"
.string "You're deserving of one!$" .string "You're deserving of one!$"
Route123_BerryMastersHouse_Text_2A7428: @ 82A7428 Route123_BerryMastersHouse_Text_WhyBeStingyTakeAnother: @ 82A7428
.string "Why be stingy?\n" .string "Why be stingy?\n"
.string "Take another!$" .string "Take another!$"
Route123_BerryMastersHouse_Text_2A7445: @ 82A7445 Route123_BerryMastersHouse_Text_VisitPrettyPetalFlowerShop: @ 82A7445
.string "Be sure to visit the PRETTY PETAL\n" .string "Be sure to visit the PRETTY PETAL\n"
.string "flower shop near RUSTBORO.\p" .string "flower shop near RUSTBORO.\p"
.string "Let flowers fill the world!$" .string "Let flowers fill the world!$"
Route123_BerryMastersHouse_Text_2A749E: @ 82A749E Route123_BerryMastersHouse_Text_DoneForToday: @ 82A749E
.string "I'm done for today.\n" .string "I'm done for today.\n"
.string "Come again another day.\p" .string "Come again another day.\p"
.string "Let flowers fill the world!$" .string "Let flowers fill the world!$"
Route123_BerryMastersHouse_Text_2A74E6: @ 82A74E6 Route123_BerryMastersHouse_Text_HeardAGoodSayingLately: @ 82A74E6
.string "The way my husband grows BERRIES,\n" .string "The way my husband grows BERRIES,\n"
.string "oh, he's the best in the world.\p" .string "oh, he's the best in the world.\p"
.string "He makes me proud, that he does.\p" .string "He makes me proud, that he does.\p"
.string "Incidentally, child, have you heard\n" .string "Incidentally, child, have you heard\n"
.string "a good saying lately?$" .string "a good saying lately?$"
Route123_BerryMastersHouse_Text_2A7583: @ 82A7583 Route123_BerryMastersHouse_Text_InspirationalTakeThis: @ 82A7583
.string "Ah! What a remarkable saying!\n" .string "Ah! What a remarkable saying!\n"
.string "Inspirational, it is!\p" .string "Inspirational, it is!\p"
.string "I want you to have this.$" .string "I want you to have this.$"
Route123_BerryMastersHouse_Text_2A75D0: @ 82A75D0 Route123_BerryMastersHouse_Text_GoodSayingTakeThis: @ 82A75D0
.string "Oh! A good saying it is.\n" .string "Oh! A good saying it is.\n"
.string "You're quite remarkable.\p" .string "You're quite remarkable.\p"
.string "I want you to have this.$" .string "I want you to have this.$"
Route123_BerryMastersHouse_Text_2A761B: @ 82A761B Route123_BerryMastersHouse_Text_JoyNeverGoesOutOfMyLife: @ 82A761B
.string "Our four grandchildren should become\n" .string "Our four grandchildren should become\n"
.string "more accomplished than my husband.\p" .string "more accomplished than my husband.\p"
.string "Joy never goes out of my life!$" .string "Joy never goes out of my life!$"
Route123_BerryMastersHouse_Text_2A7682: @ 82A7682 Route123_BerryMastersHouse_Text_Ah: @ 82A7682
.string "Ah…$" .string "Ah…$"
Route104_PrettyPetalFlowerShop_Text_ThisIsPrettyPetalFlowerShop: @ 82A7686 Route104_PrettyPetalFlowerShop_Text_ThisIsPrettyPetalFlowerShop: @ 82A7686
include/constants/easy_chat.h
+8
View File
@@ -1097,6 +1097,14 @@
#define EC_WORD_UGLY (EC_GROUP_TRENDY_SAYING << 9) | 0x20 #define EC_WORD_UGLY (EC_GROUP_TRENDY_SAYING << 9) | 0x20
#define NUM_ADDITIONAL_PHRASES 33 #define NUM_ADDITIONAL_PHRASES 33
// Special Berry Masters Wife phrases
#define NOT_SPECIAL_PHRASE 0
#define PHRASE_GREAT_BATTLE 1
#define PHRASE_CHALLENGE_CONTEST 2
#define PHRASE_OVERWHELMING_LATIAS 3
#define PHRASE_COOL_LATIOS 4
#define PHRASE_SUPER_HUSTLE 5
#define EC_POKEMON(mon) ((EC_GROUP_POKEMON << 9) | SPECIES_##mon) #define EC_POKEMON(mon) ((EC_GROUP_POKEMON << 9) | SPECIES_##mon)
#define EC_POKEMON2(mon) ((EC_GROUP_POKEMON_2 << 9) | SPECIES_##mon) #define EC_POKEMON2(mon) ((EC_GROUP_POKEMON_2 << 9) | SPECIES_##mon)
#define EC_MOVE(move) ((EC_GROUP_MOVE_1 << 9) | MOVE_##move) #define EC_MOVE(move) ((EC_GROUP_MOVE_1 << 9) | MOVE_##move)
include/constants/flags.h
+2 -2
View File
@@ -353,8 +353,8 @@
#define FLAG_UNUSED_MYSTERY_GIFT_0x14D 0x14D #define FLAG_UNUSED_MYSTERY_GIFT_0x14D 0x14D
#define FLAG_MIRAGE_TOWER_VISIBLE 0x14E #define FLAG_MIRAGE_TOWER_VISIBLE 0x14E
#define FLAG_CHOSE_CLAW_FOSSIL 0x14F #define FLAG_CHOSE_ROOT_FOSSIL 0x14F
#define FLAG_CHOSE_ROOT_FOSSIL 0x150 #define FLAG_CHOSE_CLAW_FOSSIL 0x150
#define FLAG_RECEIVED_POWDER_JAR 0x151 #define FLAG_RECEIVED_POWDER_JAR 0x151
#define FLAG_CHOSEN_MULTI_BATTLE_NPC_PARTNER 0x152 #define FLAG_CHOSEN_MULTI_BATTLE_NPC_PARTNER 0x152
include/constants/items.h
+11 -2
View File
@@ -465,8 +465,17 @@
#define ITEMS_COUNT 377 #define ITEMS_COUNT 377
#define ITEM_FIELD_ARROW ITEMS_COUNT #define ITEM_FIELD_ARROW ITEMS_COUNT
#define FIRST_BERRY_INDEX ITEM_CHERI_BERRY #define FIRST_BERRY_INDEX ITEM_CHERI_BERRY
#define LAST_BERRY_INDEX ITEM_ENIGMA_BERRY #define LAST_BERRY_INDEX ITEM_ENIGMA_BERRY
#define FIRST_BERRY_MASTER_BERRY ITEM_POMEG_BERRY
#define LAST_BERRY_MASTER_BERRY ITEM_NOMEL_BERRY
#define FIRST_BERRY_MASTER_WIFE_BERRY ITEM_CHERI_BERRY
#define LAST_BERRY_MASTER_WIFE_BERRY ITEM_SITRUS_BERRY
#define NUM_BERRY_MASTER_BERRIES LAST_BERRY_MASTER_BERRY - FIRST_BERRY_MASTER_BERRY + 1
#define NUM_BERRY_MASTER_BERRIES_SKIPPED FIRST_BERRY_MASTER_BERRY - FIRST_BERRY_INDEX
#define NUM_BERRY_MASTER_WIFE_BERRIES LAST_BERRY_MASTER_WIFE_BERRY - FIRST_BERRY_MASTER_WIFE_BERRY + 1
#define ITEM_TO_BERRY(itemId)(((itemId - FIRST_BERRY_INDEX) + 1)) #define ITEM_TO_BERRY(itemId)(((itemId - FIRST_BERRY_INDEX) + 1))
#define NUM_TECHNICAL_MACHINES 50 #define NUM_TECHNICAL_MACHINES 50
src/easy_chat.c
+5 -5
View File
@@ -532,11 +532,11 @@ static const u16 sMysteryGiftPhrase[] = {
}; };
static const u16 sBerryMasterWifePhrases[][2] = { static const u16 sBerryMasterWifePhrases[][2] = {
{EC_WORD_GREAT, EC_WORD_BATTLE}, [PHRASE_GREAT_BATTLE - 1] = {EC_WORD_GREAT, EC_WORD_BATTLE},
{EC_WORD_CHALLENGE, EC_WORD_CONTEST}, [PHRASE_CHALLENGE_CONTEST - 1] = {EC_WORD_CHALLENGE, EC_WORD_CONTEST},
{EC_WORD_OVERWHELMING, EC_POKEMON(LATIAS)}, [PHRASE_OVERWHELMING_LATIAS - 1] = {EC_WORD_OVERWHELMING, EC_POKEMON(LATIAS)},
{EC_WORD_COOL, EC_POKEMON(LATIOS)}, [PHRASE_COOL_LATIOS - 1] = {EC_WORD_COOL, EC_POKEMON(LATIOS)},
{EC_WORD_SUPER, EC_WORD_HUSTLE}, [PHRASE_SUPER_HUSTLE - 1] = {EC_WORD_SUPER, EC_WORD_HUSTLE},
}; };
static const u16 sEasyChatTriangleCursorPalette[] = INCBIN_U16("graphics/easy_chat/triangle_cursor.gbapal"); static const u16 sEasyChatTriangleCursorPalette[] = INCBIN_U16("graphics/easy_chat/triangle_cursor.gbapal");