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

Fix labels, label more scripts

Browse Source
This commit is contained in:
Fontbane
2019-04-04 19:28:37 -04:00
committed by huderlem
parent 8b88ef3e01
commit 9e74409bb2
36 changed files with 160 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/maps/AbandonedShip_Deck/scripts.inc
+2 -2
View File
@@ -1,8 +1,8 @@
AbandonedShip_Deck_MapScripts:: @ 823799A AbandonedShip_Deck_MapScripts:: @ 823799A
map_script MAP_SCRIPT_ON_TRANSITION, AbandonedShip_Deck_MapScript1_SetLandmark map_script MAP_SCRIPT_ON_TRANSITION, AbandonedShip_Deck_OnTransition
.byte 0 .byte 0
AbandonedShip_Deck_MapScript1_SetLandmark: @ 82379A0 AbandonedShip_Deck_OnTransition: @ 82379A0
setflag FLAG_LANDMARK_ABANDONED_SHIP setflag FLAG_LANDMARK_ABANDONED_SHIP
end end
data/maps/AlteringCave/scripts.inc
+2 -2
View File
@@ -1,8 +1,8 @@
AlteringCave_MapScripts:: @ 823B177 AlteringCave_MapScripts:: @ 823B177
map_script MAP_SCRIPT_ON_TRANSITION, AlteringCave_MapScript1_SetLandmark map_script MAP_SCRIPT_ON_TRANSITION, AlteringCave_OnTransition
.byte 0 .byte 0
AlteringCave_MapScript1_SetLandmark: @ 823B17D AlteringCave_OnTransition: @ 823B17D
setflag FLAG_LANDMARK_ALTERING_CAVE setflag FLAG_LANDMARK_ALTERING_CAVE
end end
data/maps/AncientTomb/scripts.inc
+2 -2
View File
@@ -1,7 +1,7 @@
AncientTomb_MapScripts:: @ 8238FB3 AncientTomb_MapScripts:: @ 8238FB3
map_script MAP_SCRIPT_ON_RESUME, AncientTomb_MapScript1_238FC3 map_script MAP_SCRIPT_ON_RESUME, AncientTomb_MapScript1_238FC3
map_script MAP_SCRIPT_ON_LOAD, AncientTomb_MapScript1_238FF2 map_script MAP_SCRIPT_ON_LOAD, AncientTomb_MapScript1_238FF2
map_script MAP_SCRIPT_ON_TRANSITION, AncientTomb_MapScript1_238FE1 map_script MAP_SCRIPT_ON_TRANSITION, AncientTomb_OnTransition
.byte 0 .byte 0
AncientTomb_MapScript1_238FC3: @ 8238FC3 AncientTomb_MapScript1_238FC3: @ 8238FC3
@@ -15,7 +15,7 @@ AncientTomb_EventScript_238FCD:: @ 8238FCD
removeobject VAR_LAST_TALKED removeobject VAR_LAST_TALKED
return return
AncientTomb_MapScript1_238FE1: @ 8238FE1 AncientTomb_OnTransition: @ 8238FE1
setflag FLAG_LANDMARK_ANCIENT_TOMB setflag FLAG_LANDMARK_ANCIENT_TOMB
call_if_unset FLAG_DEFEATED_REGISTEEL, AncientTomb_EventScript_238FEE call_if_unset FLAG_DEFEATED_REGISTEEL, AncientTomb_EventScript_238FEE
end end
data/maps/ArtisanCave_B1F/scripts.inc
+2 -2
View File
@@ -1,8 +1,8 @@
ArtisanCave_B1F_MapScripts:: @ 823AFAD ArtisanCave_B1F_MapScripts:: @ 823AFAD
map_script MAP_SCRIPT_ON_TRANSITION, ArtisanCave_B1F_MapScript1_SetLandmark map_script MAP_SCRIPT_ON_TRANSITION, ArtisanCave_B1F_OnTransition
.byte 0 .byte 0
ArtisanCave_B1F_MapScript1_SetLandmark: @ 823AFB3 ArtisanCave_B1F_OnTransition: @ 823AFB3
setflag FLAG_LANDMARK_ARTISAN_CAVE setflag FLAG_LANDMARK_ARTISAN_CAVE
end end
data/maps/BattleFrontier_ReceptionGate/scripts.inc
+2 -2
View File
@@ -1,9 +1,9 @@
BattleFrontier_ReceptionGate_MapScripts:: @ 82661DA BattleFrontier_ReceptionGate_MapScripts:: @ 82661DA
map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_ReceptionGate_MapScript2_2661E9 map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_ReceptionGate_MapScript2_2661E9
map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_ReceptionGate_MapScript1_SetLandmark map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_ReceptionGate_OnTransition
.byte 0 .byte 0
BattleFrontier_ReceptionGate_MapScript1_SetLandmark: @ 82661E5 BattleFrontier_ReceptionGate_OnTransition: @ 82661E5
setflag FLAG_LANDMARK_BATTLE_FRONTIER setflag FLAG_LANDMARK_BATTLE_FRONTIER
end end
data/maps/DesertRuins/scripts.inc
+2 -2
View File
@@ -1,7 +1,7 @@
DesertRuins_MapScripts:: @ 822D95B DesertRuins_MapScripts:: @ 822D95B
map_script MAP_SCRIPT_ON_RESUME, DesertRuins_MapScript1_22D96B map_script MAP_SCRIPT_ON_RESUME, DesertRuins_MapScript1_22D96B
map_script MAP_SCRIPT_ON_LOAD, DesertRuins_MapScript1_22D989 map_script MAP_SCRIPT_ON_LOAD, DesertRuins_MapScript1_22D989
map_script MAP_SCRIPT_ON_TRANSITION, DesertRuins_MapScript1_22D9CA map_script MAP_SCRIPT_ON_TRANSITION, DesertRuins_OnTransition
.byte 0 .byte 0
DesertRuins_MapScript1_22D96B: @ 822D96B DesertRuins_MapScript1_22D96B: @ 822D96B
@@ -28,7 +28,7 @@ DesertRuins_EventScript_22D993:: @ 822D993
setmetatile 9, 20, 565, 1 setmetatile 9, 20, 565, 1
return return
DesertRuins_MapScript1_22D9CA: @ 822D9CA DesertRuins_OnTransition: @ 822D9CA
setflag FLAG_LANDMARK_DESERT_RUINS setflag FLAG_LANDMARK_DESERT_RUINS
call_if_unset FLAG_DEFEATED_REGIROCK, DesertRuins_EventScript_22D9D7 call_if_unset FLAG_DEFEATED_REGIROCK, DesertRuins_EventScript_22D9D7
end end
data/maps/DesertUnderpass/scripts.inc
+2 -2
View File
@@ -1,8 +1,8 @@
DesertUnderpass_MapScripts:: @ 823AF37 DesertUnderpass_MapScripts:: @ 823AF37
map_script MAP_SCRIPT_ON_TRANSITION, DesertUnderpass_MapScript1_SetLandmark map_script MAP_SCRIPT_ON_TRANSITION, DesertUnderpass_OnTransition
.byte 0 .byte 0
DesertUnderpass_MapScript1_SetLandmark: @ 823AF3D DesertUnderpass_OnTransition: @ 823AF3D
setflag FLAG_LANDMARK_DESERT_UNDERPASS setflag FLAG_LANDMARK_DESERT_UNDERPASS
end end
data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc
+2 -2
View File
@@ -1,9 +1,9 @@
EverGrandeCity_PokemonLeague_1F_MapScripts:: @ 82295D2 EverGrandeCity_PokemonLeague_1F_MapScripts:: @ 82295D2
map_script MAP_SCRIPT_ON_TRANSITION, EverGrandeCity_PokemonLeague_1F_MapScript1_2295DD map_script MAP_SCRIPT_ON_TRANSITION, EverGrandeCity_PokemonLeague_1F_OnTransition
map_script MAP_SCRIPT_ON_RESUME, EverGrandeCity_PokemonLeague_1F_MapScript1_277C30 map_script MAP_SCRIPT_ON_RESUME, EverGrandeCity_PokemonLeague_1F_MapScript1_277C30
.byte 0 .byte 0
EverGrandeCity_PokemonLeague_1F_MapScript1_2295DD: @ 82295DD EverGrandeCity_PokemonLeague_1F_OnTransition: @ 82295DD
setrespawn HEAL_LOCATION_EVER_GRANDE_CITY_2 setrespawn HEAL_LOCATION_EVER_GRANDE_CITY_2
setflag FLAG_LANDMARK_POKEMON_LEAGUE setflag FLAG_LANDMARK_POKEMON_LEAGUE
call_if_unset FLAG_ENTERED_ELITE_FOUR, EverGrandeCity_PokemonLeague_1F_EventScript_2295ED call_if_unset FLAG_ENTERED_ELITE_FOUR, EverGrandeCity_PokemonLeague_1F_EventScript_2295ED
data/maps/FieryPath/scripts.inc
+2 -2
View File
@@ -1,8 +1,8 @@
FieryPath_MapScripts:: @ 8230F24 FieryPath_MapScripts:: @ 8230F24
map_script MAP_SCRIPT_ON_TRANSITION, FieryPath_MapScript1_230F2A map_script MAP_SCRIPT_ON_TRANSITION, FieryPath_OnTransition
.byte 0 .byte 0
FieryPath_MapScript1_230F2A: @ 8230F2A FieryPath_OnTransition: @ 8230F2A
call_if_unset FLAG_LANDMARK_FIERY_PATH, FieryPath_EventScript_230F37 call_if_unset FLAG_LANDMARK_FIERY_PATH, FieryPath_EventScript_230F37
setflag FLAG_LANDMARK_FIERY_PATH setflag FLAG_LANDMARK_FIERY_PATH
end end
data/maps/IslandCave/scripts.inc
+2 -2
View File
@@ -1,7 +1,7 @@
IslandCave_MapScripts:: @ 8238E2A IslandCave_MapScripts:: @ 8238E2A
map_script MAP_SCRIPT_ON_RESUME, IslandCave_MapScript1_238E3A map_script MAP_SCRIPT_ON_RESUME, IslandCave_MapScript1_238E3A
map_script MAP_SCRIPT_ON_LOAD, IslandCave_MapScript1_238E58 map_script MAP_SCRIPT_ON_LOAD, IslandCave_MapScript1_238E58
map_script MAP_SCRIPT_ON_TRANSITION, IslandCave_MapScript1_238E99 map_script MAP_SCRIPT_ON_TRANSITION, IslandCave_OnTransition
.byte 0 .byte 0
IslandCave_MapScript1_238E3A: @ 8238E3A IslandCave_MapScript1_238E3A: @ 8238E3A
@@ -28,7 +28,7 @@ IslandCave_EventScript_238E62:: @ 8238E62
setmetatile 9, 20, 565, 1 setmetatile 9, 20, 565, 1
return return
IslandCave_MapScript1_238E99: @ 8238E99 IslandCave_OnTransition: @ 8238E99
setflag FLAG_LANDMARK_ISLAND_CAVE setflag FLAG_LANDMARK_ISLAND_CAVE
call IslandCave_EventScript_238F45 call IslandCave_EventScript_238F45
call_if_unset FLAG_DEFEATED_REGICE, IslandCave_EventScript_238EAB call_if_unset FLAG_DEFEATED_REGICE, IslandCave_EventScript_238EAB
data/maps/MirageTower_1F/scripts.inc
+2 -2
View File
@@ -1,8 +1,8 @@
MirageTower_1F_MapScripts:: @ 823AD01 MirageTower_1F_MapScripts:: @ 823AD01
map_script MAP_SCRIPT_ON_TRANSITION, MirageTower_1F_MapScript1_23AD07 map_script MAP_SCRIPT_ON_TRANSITION, MirageTower_1F_OnTransition
.byte 0 .byte 0
MirageTower_1F_MapScript1_23AD07: @ 823AD07 MirageTower_1F_OnTransition: @ 823AD07
setflag FLAG_ENTERED_MIRAGE_TOWER setflag FLAG_ENTERED_MIRAGE_TOWER
setflag FLAG_FORCE_MIRAGE_TOWER_VISIBLE setflag FLAG_FORCE_MIRAGE_TOWER_VISIBLE
setflag FLAG_LANDMARK_MIRAGE_TOWER setflag FLAG_LANDMARK_MIRAGE_TOWER
data/maps/NewMauville_Entrance/scripts.inc
+2 -2
View File
@@ -1,6 +1,6 @@
NewMauville_Entrance_MapScripts:: @ 82372AD NewMauville_Entrance_MapScripts:: @ 82372AD
map_script MAP_SCRIPT_ON_LOAD, NewMauville_Entrance_MapScript1_2372B8 map_script MAP_SCRIPT_ON_LOAD, NewMauville_Entrance_MapScript1_2372B8
map_script MAP_SCRIPT_ON_TRANSITION, NewMauville_Entrance_MapScript1_SetLandmark map_script MAP_SCRIPT_ON_TRANSITION, NewMauville_Entrance_OnTransition
.byte 0 .byte 0
NewMauville_Entrance_MapScript1_2372B8: @ 82372B8 NewMauville_Entrance_MapScript1_2372B8: @ 82372B8
@@ -17,7 +17,7 @@ NewMauville_Entrance_EventScript_2372C4:: @ 82372C4
setmetatile 5, 1, 798, 1 setmetatile 5, 1, 798, 1
return return
NewMauville_Entrance_MapScript1_SetLandmark: @ 82372FB NewMauville_Entrance_OnTransition: @ 82372FB
setflag FLAG_LANDMARK_NEW_MAUVILLE setflag FLAG_LANDMARK_NEW_MAUVILLE
end end
data/maps/Route104_MrBrineysHouse/scripts.inc
+2 -2
View File
@@ -1,8 +1,8 @@
Route104_MrBrineysHouse_MapScripts:: @ 8229D2E Route104_MrBrineysHouse_MapScripts:: @ 8229D2E
map_script MAP_SCRIPT_ON_TRANSITION, Route104_MrBrineysHouse_MapScript1_229D34 map_script MAP_SCRIPT_ON_TRANSITION, Route104_MrBrineysHouse_OnTransition
.byte 0 .byte 0
Route104_MrBrineysHouse_MapScript1_229D34: @ 8229D34 Route104_MrBrineysHouse_OnTransition: @ 8229D34
setflag FLAG_LANDMARK_MR_BRINEY_HOUSE setflag FLAG_LANDMARK_MR_BRINEY_HOUSE
compare VAR_BRINEY_HOUSE_STATE, 1 compare VAR_BRINEY_HOUSE_STATE, 1
call_if_eq Route104_MrBrineysHouse_EventScript_229D50 call_if_eq Route104_MrBrineysHouse_EventScript_229D50
data/maps/Route104_PrettyPetalFlowerShop/scripts.inc
+2 -2
View File
@@ -1,8 +1,8 @@
Route104_PrettyPetalFlowerShop_MapScripts:: @ 822A34C Route104_PrettyPetalFlowerShop_MapScripts:: @ 822A34C
map_script MAP_SCRIPT_ON_TRANSITION, Route104_PrettyPetalFlowerShop_MapScript1_22A352 map_script MAP_SCRIPT_ON_TRANSITION, Route104_PrettyPetalFlowerShop_OnTransition
.byte 0 .byte 0
Route104_PrettyPetalFlowerShop_MapScript1_22A352: @ 822A352 Route104_PrettyPetalFlowerShop_OnTransition: @ 822A352
setflag FLAG_LANDMARK_FLOWER_SHOP setflag FLAG_LANDMARK_FLOWER_SHOP
goto_if_unset FLAG_MET_PRETTY_PETAL_SHOP_OWNER, Route104_PrettyPetalFlowerShop_EventScript_22A36B goto_if_unset FLAG_MET_PRETTY_PETAL_SHOP_OWNER, Route104_PrettyPetalFlowerShop_EventScript_22A36B
goto_if_unset FLAG_BADGE03_GET, Route104_PrettyPetalFlowerShop_EventScript_22A36B goto_if_unset FLAG_BADGE03_GET, Route104_PrettyPetalFlowerShop_EventScript_22A36B
data/maps/Route109_SeashoreHouse/scripts.inc
+2 -2
View File
@@ -1,8 +1,8 @@
Route109_SeashoreHouse_MapScripts:: @ 82693F4 Route109_SeashoreHouse_MapScripts:: @ 82693F4
map_script MAP_SCRIPT_ON_TRANSITION, Route109_SeashoreHouse_MapScript1_SetLandmark map_script MAP_SCRIPT_ON_TRANSITION, Route109_SeashoreHouse_OnTransition
.byte 0 .byte 0
Route109_SeashoreHouse_MapScript1_SetLandmark: @ 82693FA Route109_SeashoreHouse_OnTransition: @ 82693FA
setflag FLAG_LANDMARK_SEASHORE_HOUSE setflag FLAG_LANDMARK_SEASHORE_HOUSE
end end
data/maps/Route110_TrickHouseEntrance/scripts.inc
+2 -2
View File
@@ -1,10 +1,10 @@
Route110_TrickHouseEntrance_MapScripts:: @ 8269A50 Route110_TrickHouseEntrance_MapScripts:: @ 8269A50
map_script MAP_SCRIPT_ON_TRANSITION, Route110_TrickHouseEntrance_MapScript1_269A60 map_script MAP_SCRIPT_ON_TRANSITION, Route110_TrickHouseEntrance_OnTransition
map_script MAP_SCRIPT_ON_FRAME_TABLE, Route110_TrickHouseEntrance_MapScript2_269CEE map_script MAP_SCRIPT_ON_FRAME_TABLE, Route110_TrickHouseEntrance_MapScript2_269CEE
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, Route110_TrickHouseEntrance_MapScript2_269BD3 map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, Route110_TrickHouseEntrance_MapScript2_269BD3
.byte 0 .byte 0
Route110_TrickHouseEntrance_MapScript1_269A60: @ 8269A60 Route110_TrickHouseEntrance_OnTransition: @ 8269A60
setflag FLAG_LANDMARK_TRICK_HOUSE setflag FLAG_LANDMARK_TRICK_HOUSE
compare VAR_TRICK_HOUSE_STATE, 1 compare VAR_TRICK_HOUSE_STATE, 1
goto_if_eq Route110_TrickHouseEntrance_EventScript_269AF3 goto_if_eq Route110_TrickHouseEntrance_EventScript_269AF3
data/maps/Route111_OldLadysRestStop/scripts.inc
+2 -2
View File
@@ -1,8 +1,8 @@
Route111_OldLadysRestStop_MapScripts:: @ 822A916 Route111_OldLadysRestStop_MapScripts:: @ 822A916
map_script MAP_SCRIPT_ON_TRANSITION, Route111_OldLadysRestStop_MapScript1_SetLandmark map_script MAP_SCRIPT_ON_TRANSITION, Route111_OldLadysRestStop_OnTransition
.byte 0 .byte 0
Route111_OldLadysRestStop_MapScript1_SetLandmark: @ 822A91C Route111_OldLadysRestStop_OnTransition: @ 822A91C
setflag FLAG_LANDMARK_OLD_LADY_REST_SHOP setflag FLAG_LANDMARK_OLD_LADY_REST_SHOP
end end
data/maps/Route113_GlassWorkshop/scripts.inc
+2 -2
View File
@@ -1,8 +1,8 @@
Route113_GlassWorkshop_MapScripts:: @ 826ED03 Route113_GlassWorkshop_MapScripts:: @ 826ED03
map_script MAP_SCRIPT_ON_TRANSITION, Route113_GlassWorkshop_MapScript1_26ED09 map_script MAP_SCRIPT_ON_TRANSITION, Route113_GlassWorkshop_OnTransition
.byte 0 .byte 0
Route113_GlassWorkshop_MapScript1_26ED09: @ 826ED09 Route113_GlassWorkshop_OnTransition: @ 826ED09
setflag FLAG_LANDMARK_GLASS_WORKSHOP setflag FLAG_LANDMARK_GLASS_WORKSHOP
compare VAR_GLASS_WORKSHOP_STATE, 1 compare VAR_GLASS_WORKSHOP_STATE, 1
call_if_eq Route113_GlassWorkshop_EventScript_26ED18 call_if_eq Route113_GlassWorkshop_EventScript_26ED18
data/maps/Route114_FossilManiacsHouse/scripts.inc
+2 -2
View File
@@ -1,8 +1,8 @@
Route114_FossilManiacsHouse_MapScripts:: @ 822AD30 Route114_FossilManiacsHouse_MapScripts:: @ 822AD30
map_script MAP_SCRIPT_ON_TRANSITION, Route114_FossilManiacsHouse_MapScript1_SetLandmark map_script MAP_SCRIPT_ON_TRANSITION, Route114_FossilManiacsHouse_OnTransition
.byte 0 .byte 0
Route114_FossilManiacsHouse_MapScript1_SetLandmark: @ 822AD36 Route114_FossilManiacsHouse_OnTransition: @ 822AD36
setflag FLAG_LANDMARK_FOSSIL_MANIACS_HOUSE setflag FLAG_LANDMARK_FOSSIL_MANIACS_HOUSE
end end
data/maps/Route114_LanettesHouse/scripts.inc
+2 -2
View File
@@ -1,8 +1,8 @@
Route114_LanettesHouse_MapScripts:: @ 822B2C8 Route114_LanettesHouse_MapScripts:: @ 822B2C8
map_script MAP_SCRIPT_ON_TRANSITION, Route114_LanettesHouse_MapScript1_SetLandmark map_script MAP_SCRIPT_ON_TRANSITION, Route114_LanettesHouse_OnTransition
.byte 0 .byte 0
Route114_LanettesHouse_MapScript1_SetLandmark: @ 822B2CE Route114_LanettesHouse_OnTransition: @ 822B2CE
setflag FLAG_LANDMARK_LANETTES_HOUSE setflag FLAG_LANDMARK_LANETTES_HOUSE
end end
data/maps/Route116_TunnelersRestHouse/scripts.inc
+2 -2
View File
@@ -1,8 +1,8 @@
Route116_TunnelersRestHouse_MapScripts:: @ 822B850 Route116_TunnelersRestHouse_MapScripts:: @ 822B850
map_script MAP_SCRIPT_ON_TRANSITION, Route116_TunnelersRestHouse_MapScript1_SetLandmark map_script MAP_SCRIPT_ON_TRANSITION, Route116_TunnelersRestHouse_OnTransition
.byte 0 .byte 0
Route116_TunnelersRestHouse_MapScript1_SetLandmark: @ 822B856 Route116_TunnelersRestHouse_OnTransition: @ 822B856
setflag FLAG_LANDMARK_TUNNELERS_REST_HOUSE setflag FLAG_LANDMARK_TUNNELERS_REST_HOUSE
end end
data/maps/Route117_PokemonDayCare/scripts.inc
+2 -2
View File
@@ -1,8 +1,8 @@
Route117_PokemonDayCare_MapScripts:: @ 822BBB1 Route117_PokemonDayCare_MapScripts:: @ 822BBB1
map_script MAP_SCRIPT_ON_TRANSITION, Route117_PokemonDayCare_MapScript1_SetLandmark map_script MAP_SCRIPT_ON_TRANSITION, Route117_PokemonDayCare_OnTransition
.byte 0 .byte 0
Route117_PokemonDayCare_MapScript1_SetLandmark: @ 822BBB7 Route117_PokemonDayCare_OnTransition: @ 822BBB7
setflag FLAG_LANDMARK_POKEMON_DAYCARE setflag FLAG_LANDMARK_POKEMON_DAYCARE
end end
data/maps/Route123_BerryMastersHouse/scripts.inc
+2 -2
View File
@@ -1,8 +1,8 @@
Route123_BerryMastersHouse_MapScripts:: @ 826F83B Route123_BerryMastersHouse_MapScripts:: @ 826F83B
map_script MAP_SCRIPT_ON_TRANSITION, Route123_BerryMastersHouse_MapScript1_SetLandmark map_script MAP_SCRIPT_ON_TRANSITION, Route123_BerryMastersHouse_OnTransition
.byte 0 .byte 0
Route123_BerryMastersHouse_MapScript1_SetLandmark: @ 826F841 Route123_BerryMastersHouse_OnTransition: @ 826F841
setflag FLAG_LANDMARK_BERRY_MASTERS_HOUSE setflag FLAG_LANDMARK_BERRY_MASTERS_HOUSE
end end
data/maps/Route124_DivingTreasureHuntersHouse/scripts.inc
+2 -2
View File
@@ -1,8 +1,8 @@
Route124_DivingTreasureHuntersHouse_MapScripts:: @ 8270A28 Route124_DivingTreasureHuntersHouse_MapScripts:: @ 8270A28
map_script MAP_SCRIPT_ON_TRANSITION, Route124_DivingTreasureHuntersHouse_MapScript1_SetLandmark map_script MAP_SCRIPT_ON_TRANSITION, Route124_DivingTreasureHuntersHouse_OnTransition
.byte 0 .byte 0
Route124_DivingTreasureHuntersHouse_MapScript1_SetLandmark: @ 8270A2E Route124_DivingTreasureHuntersHouse_OnTransition: @ 8270A2E
setflag FLAG_LANDMARK_HUNTERS_HOUSE setflag FLAG_LANDMARK_HUNTERS_HOUSE
end end
data/maps/ScorchedSlab/scripts.inc
+2 -2
View File
@@ -1,8 +1,8 @@
ScorchedSlab_MapScripts:: @ 8239291 ScorchedSlab_MapScripts:: @ 8239291
map_script MAP_SCRIPT_ON_TRANSITION, ScorchedSlab_MapScript1_SetLandmark map_script MAP_SCRIPT_ON_TRANSITION, ScorchedSlab_OnTransition
.byte 0 .byte 0
ScorchedSlab_MapScript1_SetLandmark: @ 8239297 ScorchedSlab_OnTransition: @ 8239297
setflag FLAG_LANDMARK_SCORCHED_SLAB setflag FLAG_LANDMARK_SCORCHED_SLAB
end end
data/maps/SealedChamber_OuterRoom/scripts.inc
+2 -2
View File
@@ -1,6 +1,6 @@
SealedChamber_OuterRoom_MapScripts:: @ 8239106 SealedChamber_OuterRoom_MapScripts:: @ 8239106
map_script MAP_SCRIPT_ON_RESUME, SealedChamber_OuterRoom_MapScript1_239116 map_script MAP_SCRIPT_ON_RESUME, SealedChamber_OuterRoom_MapScript1_239116
map_script MAP_SCRIPT_ON_TRANSITION, SealedChamber_OuterRoom_MapScript1_SetLandmark map_script MAP_SCRIPT_ON_TRANSITION, SealedChamber_OuterRoom_OnTransition
map_script MAP_SCRIPT_ON_LOAD, SealedChamber_OuterRoom_MapScript1_23912B map_script MAP_SCRIPT_ON_LOAD, SealedChamber_OuterRoom_MapScript1_23912B
.byte 0 .byte 0
@@ -9,7 +9,7 @@ SealedChamber_OuterRoom_MapScript1_239116: @ 8239116
setescapewarp MAP_UNDERWATER_SEALED_CHAMBER, 255, 12, 44 setescapewarp MAP_UNDERWATER_SEALED_CHAMBER, 255, 12, 44
end end
SealedChamber_OuterRoom_MapScript1_SetLandmark: @ 8239127 SealedChamber_OuterRoom_OnTransition: @ 8239127
setflag FLAG_LANDMARK_SEALED_CHAMBER setflag FLAG_LANDMARK_SEALED_CHAMBER
end end
data/maps/SkyPillar_Entrance/scripts.inc
+2 -2
View File
@@ -1,8 +1,8 @@
SkyPillar_Entrance_MapScripts:: @ 823929E SkyPillar_Entrance_MapScripts:: @ 823929E
map_script MAP_SCRIPT_ON_TRANSITION, SkyPillar_Entrance_MapScript1_SetLandmark map_script MAP_SCRIPT_ON_TRANSITION, SkyPillar_Entrance_OnTransition
.byte 0 .byte 0
SkyPillar_Entrance_MapScript1_SetLandmark: @ 82392A4 SkyPillar_Entrance_OnTransition: @ 82392A4
setflag FLAG_LANDMARK_SKY_PILLAR setflag FLAG_LANDMARK_SKY_PILLAR
end end
data/maps/SouthernIsland_Exterior/scripts.inc
+2 -2
View File
@@ -1,8 +1,8 @@
SouthernIsland_Exterior_MapScripts:: @ 82429C8 SouthernIsland_Exterior_MapScripts:: @ 82429C8
map_script MAP_SCRIPT_ON_TRANSITION, SouthernIsland_Exterior_MapScript1_SetLandmark map_script MAP_SCRIPT_ON_TRANSITION, SouthernIsland_Exterior_OnTransition
.byte 0 .byte 0
SouthernIsland_Exterior_MapScript1_SetLandmark: @ 82429CE SouthernIsland_Exterior_OnTransition: @ 82429CE
setflag FLAG_LANDMARK_SOUTHERN_ISLAND setflag FLAG_LANDMARK_SOUTHERN_ISLAND
end end
data/maps/TrainerHill_Entrance/scripts.inc
+2 -2
View File
@@ -1,12 +1,12 @@
TrainerHill_Entrance_MapScripts:: @ 82680AC TrainerHill_Entrance_MapScripts:: @ 82680AC
map_script MAP_SCRIPT_ON_RESUME, TrainerHill_Entrance_MapScript1_2680D0 map_script MAP_SCRIPT_ON_RESUME, TrainerHill_Entrance_MapScript1_2680D0
map_script MAP_SCRIPT_ON_RETURN_TO_FIELD, TrainerHill_Entrance_MapScript1_26811B map_script MAP_SCRIPT_ON_RETURN_TO_FIELD, TrainerHill_Entrance_MapScript1_26811B
map_script MAP_SCRIPT_ON_TRANSITION, TrainerHill_Entrance_MapScript1_2680C6 map_script MAP_SCRIPT_ON_TRANSITION, TrainerHill_Entrance_OnTransition
map_script MAP_SCRIPT_ON_LOAD, TrainerHill_Entrance_MapScript1_268128 map_script MAP_SCRIPT_ON_LOAD, TrainerHill_Entrance_MapScript1_268128
map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerHill_Entrance_MapScript2_26813E map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerHill_Entrance_MapScript2_26813E
.byte 0 .byte 0
TrainerHill_Entrance_MapScript1_2680C6: @ 82680C6 TrainerHill_Entrance_OnTransition: @ 82680C6
setflag FLAG_LANDMARK_TRAINER_HILL setflag FLAG_LANDMARK_TRAINER_HILL
getplayerxy VAR_TEMP_D, VAR_RESULT getplayerxy VAR_TEMP_D, VAR_RESULT
end end
data/maps/Underwater_SeafloorCavern/map.json
+4 -4
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": "Underwater_SeafloorCavern_EventScript_2343DC", "script": "Underwater_SeafloorCavern_EventScript_CheckStolenSub",
"flag": "FLAG_HIDE_UNDERWATER_SEA_FLOOR_CAVERN_STOLEN_SUBMARINE" "flag": "FLAG_HIDE_UNDERWATER_SEA_FLOOR_CAVERN_STOLEN_SUBMARINE"
}, },
{ {
@@ -37,7 +37,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": "Underwater_SeafloorCavern_EventScript_2343DC", "script": "Underwater_SeafloorCavern_EventScript_CheckStolenSub",
"flag": "FLAG_HIDE_UNDERWATER_SEA_FLOOR_CAVERN_STOLEN_SUBMARINE" "flag": "FLAG_HIDE_UNDERWATER_SEA_FLOOR_CAVERN_STOLEN_SUBMARINE"
}, },
{ {
@@ -50,7 +50,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": "Underwater_SeafloorCavern_EventScript_2343DC", "script": "Underwater_SeafloorCavern_EventScript_CheckStolenSub",
"flag": "FLAG_HIDE_UNDERWATER_SEA_FLOOR_CAVERN_STOLEN_SUBMARINE" "flag": "FLAG_HIDE_UNDERWATER_SEA_FLOOR_CAVERN_STOLEN_SUBMARINE"
}, },
{ {
@@ -63,7 +63,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": "Underwater_SeafloorCavern_EventScript_2343DC", "script": "Underwater_SeafloorCavern_EventScript_CheckStolenSub",
"flag": "FLAG_HIDE_UNDERWATER_SEA_FLOOR_CAVERN_STOLEN_SUBMARINE" "flag": "FLAG_HIDE_UNDERWATER_SEA_FLOOR_CAVERN_STOLEN_SUBMARINE"
} }
], ],
data/maps/Underwater_SeafloorCavern/scripts.inc
+5 -5
View File
@@ -1,10 +1,10 @@
Underwater_SeafloorCavern_MapScripts:: @ 823433B Underwater_SeafloorCavern_MapScripts:: @ 823433B
map_script MAP_SCRIPT_ON_RESUME, Underwater_SeafloorCavern_MapScript1_2343D3 map_script MAP_SCRIPT_ON_RESUME, Underwater_SeafloorCavern_MapScript1_2343D3
map_script MAP_SCRIPT_ON_TRANSITION, Underwater_SeafloorCavern_MapScript1_23434B map_script MAP_SCRIPT_ON_TRANSITION, Underwater_SeafloorCavern_OnTransition
map_script MAP_SCRIPT_ON_LOAD, Underwater_SeafloorCavern_MapScript1_23435C map_script MAP_SCRIPT_ON_LOAD, Underwater_SeafloorCavern_MapScript1_23435C
.byte 0 .byte 0
Underwater_SeafloorCavern_MapScript1_23434B: @ 823434B Underwater_SeafloorCavern_OnTransition: @ 823434B
setflag FLAG_LANDMARK_SEAFLOOR_CAVERN setflag FLAG_LANDMARK_SEAFLOOR_CAVERN
goto_if_set FLAG_KYOGRE_ESCAPED_SEAFLOOR_CAVERN, Underwater_SeafloorCavern_EventScript_234358 goto_if_set FLAG_KYOGRE_ESCAPED_SEAFLOOR_CAVERN, Underwater_SeafloorCavern_EventScript_234358
end end
@@ -36,11 +36,11 @@ Underwater_SeafloorCavern_MapScript1_2343D3: @ 82343D3
setdivewarp MAP_SEAFLOOR_CAVERN_ENTRANCE, 255, 10, 17 setdivewarp MAP_SEAFLOOR_CAVERN_ENTRANCE, 255, 10, 17
end end
Underwater_SeafloorCavern_EventScript_2343DC:: @ 82343DC Underwater_SeafloorCavern_EventScript_CheckStolenSub:: @ 82343DC
msgbox Underwater_SeafloorCavern_Text_2343E5, MSGBOX_SIGN msgbox Underwater_SeafloorCavern_Text_SubExplorer1, MSGBOX_SIGN
end end
Underwater_SeafloorCavern_Text_2343E5: @ 82343E5 Underwater_SeafloorCavern_Text_SubExplorer1: @ 82343E5
.string "“SUBMARINE EXPLORER 1” is painted\n" .string "“SUBMARINE EXPLORER 1” is painted\n"
.string "on the hull.\p" .string "on the hull.\p"
.string "This is the submarine TEAM AQUA\n" .string "This is the submarine TEAM AQUA\n"
data/scripts/berry_tree.inc
+86 -86
View File
@@ -1,261 +1,261 @@
BerryTreeScript:: @ 82742F9 BerryTreeScript:: @ 82742F9
special EventObjectInteractionGetBerryTreeData special EventObjectInteractionGetBerryTreeData
switch VAR_0x8004 switch VAR_0x8004
case 255, Route102_EventScript_27434F case 255, BerryTree_EventScript_27434F
case 0, Route102_EventScript_CheckSoil case 0, BerryTree_EventScript_CheckSoil
case 1, Route102_EventScript_CheckBerryStage1 case 1, BerryTree_EventScript_CheckBerryStage1
case 2, Route102_EventScript_CheckBerryStage2 case 2, BerryTree_EventScript_CheckBerryStage2
case 3, Route102_EventScript_CheckBerryStage3 case 3, BerryTree_EventScript_CheckBerryStage3
case 4, Route102_EventScript_CheckBerryStage4 case 4, BerryTree_EventScript_CheckBerryStage4
case 5, Route102_EventScript_CheckBerryFullyGrown case 5, BerryTree_EventScript_CheckBerryFullyGrown
end end
Route102_EventScript_27434F:: @ 827434F BerryTree_EventScript_27434F:: @ 827434F
lockall lockall
message Route102_Text_ExclamationPoint message BerryTree_Text_ExclamationPoint
waitmessage waitmessage
waitbuttonpress waitbuttonpress
releaseall releaseall
end end
Route102_EventScript_CheckSoil:: @ 8274359 BerryTree_EventScript_CheckSoil:: @ 8274359
lock lock
faceplayer faceplayer
specialvar VAR_RESULT, PlayerHasBerries specialvar VAR_RESULT, PlayerHasBerries
compare VAR_RESULT, 1 compare VAR_RESULT, 1
goto_if_eq Route102_EventScript_WantToPlant goto_if_eq BerryTree_EventScript_WantToPlant
message Route102_Text_ItsSoftLoamySoil message BerryTree_Text_ItsSoftLoamySoil
waitmessage waitmessage
waitbuttonpress waitbuttonpress
release release
end end
Route102_EventScript_WantToPlant:: @ 8274374 BerryTree_EventScript_WantToPlant:: @ 8274374
msgbox Route102_Text_WantToPlant, MSGBOX_YESNO msgbox BerryTree_Text_WantToPlant, MSGBOX_YESNO
compare VAR_RESULT, 1 compare VAR_RESULT, 1
goto_if_eq Route102_EventScript_ChooseBerryToPlant goto_if_eq BerryTree_EventScript_ChooseBerryToPlant
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_if_eq Route102_EventScript_CancelPlanting goto_if_eq BerryTree_EventScript_CancelPlanting
end end
Route102_EventScript_ChooseBerryToPlant:: @ 8274393 BerryTree_EventScript_ChooseBerryToPlant:: @ 8274393
fadescreen 1 fadescreen 1
closemessage closemessage
special Bag_ChooseBerry special Bag_ChooseBerry
waitstate waitstate
compare VAR_ITEM_ID, 0 compare VAR_ITEM_ID, 0
goto_if_eq Route102_EventScript_CancelPlanting goto_if_eq BerryTree_EventScript_CancelPlanting
takeitem VAR_ITEM_ID, 1 takeitem VAR_ITEM_ID, 1
call Route102_EventScript_PlantBerry call BerryTree_EventScript_PlantBerry
Route102_EventScript_CancelPlanting:: @ 82743AF BerryTree_EventScript_CancelPlanting:: @ 82743AF
release release
end end
Route102_EventScript_CheckBerryStage1:: @ 82743B1 BerryTree_EventScript_CheckBerryStage1:: @ 82743B1
lockall lockall
special EventObjectInteractionGetBerryCountString special EventObjectInteractionGetBerryCountString
message Route102_Text_BerryGrowthStage1 message BerryTree_Text_BerryGrowthStage1
waitmessage waitmessage
waitbuttonpress waitbuttonpress
goto Route102_EventScript_WantToWater goto BerryTree_EventScript_WantToWater
Route102_EventScript_CheckBerryStage2:: @ 82743C1 BerryTree_EventScript_CheckBerryStage2:: @ 82743C1
lockall lockall
special EventObjectInteractionGetBerryName special EventObjectInteractionGetBerryName
message Route102_Text_BerryGrowthStage2 message BerryTree_Text_BerryGrowthStage2
waitmessage waitmessage
waitbuttonpress waitbuttonpress
goto Route102_EventScript_WantToWater goto BerryTree_EventScript_WantToWater
Route102_EventScript_CheckBerryStage3:: @ 82743D1 BerryTree_EventScript_CheckBerryStage3:: @ 82743D1
lockall lockall
special EventObjectInteractionGetBerryName special EventObjectInteractionGetBerryName
message Route102_Text_BerryGrowthStage3 message BerryTree_Text_BerryGrowthStage3
waitmessage waitmessage
waitbuttonpress waitbuttonpress
goto Route102_EventScript_WantToWater goto BerryTree_EventScript_WantToWater
Route102_EventScript_CheckBerryStage4:: @ 82743E1 BerryTree_EventScript_CheckBerryStage4:: @ 82743E1
call Route102_EventScript_GetCareAdverb call BerryTree_EventScript_GetCareAdverb
lockall lockall
special EventObjectInteractionGetBerryName special EventObjectInteractionGetBerryName
message Route102_Text_BerryGrowthStage4 message BerryTree_Text_BerryGrowthStage4
waitmessage waitmessage
waitbuttonpress waitbuttonpress
goto Route102_EventScript_WantToWater goto BerryTree_EventScript_WantToWater
Route102_EventScript_GetCareAdverb:: @ 82743F6 BerryTree_EventScript_GetCareAdverb:: @ 82743F6
compare VAR_0x8005, 0 compare VAR_0x8005, 0
goto_if_eq Route102_EventScript_SetAdverbPoor goto_if_eq BerryTree_EventScript_SetAdverbPoor
compare VAR_0x8005, 4 compare VAR_0x8005, 4
goto_if_eq Route102_EventScript_SetAdverbGreat goto_if_eq BerryTree_EventScript_SetAdverbGreat
bufferstring 1, Route102_Text_CareAdverbGood bufferstring 1, BerryTree_Text_CareAdverbGood
return return
Route102_EventScript_SetAdverbGreat:: @ 8274413 BerryTree_EventScript_SetAdverbGreat:: @ 8274413
bufferstring 1, Route102_Text_CareAdverbGreat bufferstring 1, BerryTree_Text_CareAdverbGreat
return return
Route102_EventScript_SetAdverbPoor:: @ 827441A BerryTree_EventScript_SetAdverbPoor:: @ 827441A
bufferstring 1, Route102_Text_CareAdverbPoor bufferstring 1, BerryTree_Text_CareAdverbPoor
return return
Route102_EventScript_CheckBerryFullyGrown:: @ 8274421 BerryTree_EventScript_CheckBerryFullyGrown:: @ 8274421
buffernumberstring 1, VAR_0x8006 buffernumberstring 1, VAR_0x8006
lock lock
faceplayer faceplayer
special EventObjectInteractionGetBerryCountString special EventObjectInteractionGetBerryCountString
msgbox Route102_Text_WantToPick, MSGBOX_YESNO msgbox BerryTree_Text_WantToPick, MSGBOX_YESNO
compare VAR_RESULT, 1 compare VAR_RESULT, 1
goto_if_eq Route102_EventScript_PickBerry goto_if_eq BerryTree_EventScript_PickBerry
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_if_eq Route102_EventScript_CancelPickingBerry goto_if_eq BerryTree_EventScript_CancelPickingBerry
Route102_EventScript_PickBerry:: @ 8274448 BerryTree_EventScript_PickBerry:: @ 8274448
special EventObjectInteractionPickBerryTree special EventObjectInteractionPickBerryTree
compare VAR_0x8004, 0 compare VAR_0x8004, 0
goto_if_eq Route102_EventScript_BerryPocketFull goto_if_eq BerryTree_EventScript_BerryPocketFull
special sub_80EED34 special sub_80EED34
special EventObjectInteractionRemoveBerryTree special EventObjectInteractionRemoveBerryTree
message Route102_Text_PickedTheBerry message BerryTree_Text_PickedTheBerry
playfanfare MUS_ME_KINOMI playfanfare MUS_ME_KINOMI
waitmessage waitmessage
waitfanfare waitfanfare
waitbuttonpress waitbuttonpress
message Route102_Text_PutAwayBerry message BerryTree_Text_PutAwayBerry
waitmessage waitmessage
waitbuttonpress waitbuttonpress
release release
end end
Route102_EventScript_BerryPocketFull:: @ 8274470 BerryTree_EventScript_BerryPocketFull:: @ 8274470
message Route102_Text_BerryPocketFull message BerryTree_Text_BerryPocketFull
waitmessage waitmessage
waitbuttonpress waitbuttonpress
release release
end end
Route102_EventScript_CancelPickingBerry:: @ 8274479 BerryTree_EventScript_CancelPickingBerry:: @ 8274479
message Route102_Text_BerryLeftUnpicked message BerryTree_Text_BerryLeftUnpicked
waitmessage waitmessage
waitbuttonpress waitbuttonpress
release release
end end
Route102_EventScript_274482:: @ 8274482 BerryTree_EventScript_274482:: @ 8274482
lockall lockall
special EventObjectInteractionGetBerryTreeData special EventObjectInteractionGetBerryTreeData
call Route102_EventScript_PlantBerry call BerryTree_EventScript_PlantBerry
releaseall releaseall
end end
Route102_EventScript_WantToWater:: @ 827448D BerryTree_EventScript_WantToWater:: @ 827448D
checkitem ITEM_WAILMER_PAIL, 1 checkitem ITEM_WAILMER_PAIL, 1
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_if_eq Route102_EventScript_DontWater goto_if_eq BerryTree_EventScript_DontWater
special EventObjectInteractionGetBerryName special EventObjectInteractionGetBerryName
msgbox Route102_Text_WantToWater, MSGBOX_YESNO msgbox BerryTree_Text_WantToWater, MSGBOX_YESNO
compare VAR_RESULT, 1 compare VAR_RESULT, 1
goto_if_eq Route102_EventScript_WaterBerry goto_if_eq BerryTree_EventScript_WaterBerry
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_if_eq Route102_EventScript_DontWater goto_if_eq BerryTree_EventScript_DontWater
Route102_EventScript_DontWater:: @ 82744BE BerryTree_EventScript_DontWater:: @ 82744BE
releaseall releaseall
end end
Route102_EventScript_2744C0:: @ 82744C0 BerryTree_EventScript_2744C0:: @ 82744C0
special EventObjectInteractionGetBerryTreeData special EventObjectInteractionGetBerryTreeData
lockall lockall
Route102_EventScript_WaterBerry:: @ 82744C4 BerryTree_EventScript_WaterBerry:: @ 82744C4
special EventObjectInteractionGetBerryName special EventObjectInteractionGetBerryName
message Route102_Text_WateredTheBerry message BerryTree_Text_WateredTheBerry
waitmessage waitmessage
special EventObjectInteractionWaterBerryTree special EventObjectInteractionWaterBerryTree
special DoWateringBerryTreeAnim special DoWateringBerryTreeAnim
waitstate waitstate
message Route102_Text_PlantIsDelighted message BerryTree_Text_PlantIsDelighted
waitmessage waitmessage
waitbuttonpress waitbuttonpress
releaseall releaseall
end end
Route102_EventScript_PlantBerry:: @ 82744DD BerryTree_EventScript_PlantBerry:: @ 82744DD
special EventObjectInteractionPlantBerryTree special EventObjectInteractionPlantBerryTree
incrementgamestat 3 incrementgamestat 3
special sub_80EED10 special sub_80EED10
special EventObjectInteractionGetBerryCountString special EventObjectInteractionGetBerryCountString
message Route102_Text_PlantedOneBerry message BerryTree_Text_PlantedOneBerry
waitmessage waitmessage
waitbuttonpress waitbuttonpress
return return
Route102_Text_ItsSoftLoamySoil: @ 82744F0 BerryTree_Text_ItsSoftLoamySoil: @ 82744F0
.string "It's soft, loamy soil.$" .string "It's soft, loamy soil.$"
Route102_Text_WantToPlant: @ 8274507 BerryTree_Text_WantToPlant: @ 8274507
.string "It's soft, loamy soil.\n" .string "It's soft, loamy soil.\n"
.string "Want to plant a BERRY?$" .string "Want to plant a BERRY?$"
Route102_Text_PlantedOneBerry: @ 8274535 BerryTree_Text_PlantedOneBerry: @ 8274535
.string "{PLAYER} planted one {STR_VAR_1} in\n" .string "{PLAYER} planted one {STR_VAR_1} in\n"
.string "the soft, loamy soil.$" .string "the soft, loamy soil.$"
Route102_Text_BerryGrowthStage1: @ 8274560 BerryTree_Text_BerryGrowthStage1: @ 8274560
.string "One {STR_VAR_1} was planted here.$" .string "One {STR_VAR_1} was planted here.$"
Route102_Text_BerryGrowthStage2: @ 8274579 BerryTree_Text_BerryGrowthStage2: @ 8274579
.string "{STR_VAR_1} has sprouted.$" .string "{STR_VAR_1} has sprouted.$"
Route102_Text_BerryGrowthStage3: @ 827458A BerryTree_Text_BerryGrowthStage3: @ 827458A
.string "This {STR_VAR_1} plant is growing taller.$" .string "This {STR_VAR_1} plant is growing taller.$"
Route102_Text_BerryGrowthStage4: @ 82745AB BerryTree_Text_BerryGrowthStage4: @ 82745AB
.string "These {STR_VAR_1} flowers are blooming\n" .string "These {STR_VAR_1} flowers are blooming\n"
.string "{STR_VAR_2}.$" .string "{STR_VAR_2}.$"
Route102_Text_CareAdverbGreat: @ 82745CD BerryTree_Text_CareAdverbGreat: @ 82745CD
.string "very beautifully$" .string "very beautifully$"
Route102_Text_CareAdverbPoor: @ 82745DE BerryTree_Text_CareAdverbPoor: @ 82745DE
.string "cutely$" .string "cutely$"
Route102_Text_CareAdverbGood: @ 82745E5 BerryTree_Text_CareAdverbGood: @ 82745E5
.string "prettily$" .string "prettily$"
Route102_Text_WantToPick: @ 82745EE BerryTree_Text_WantToPick: @ 82745EE
.string "You found {STR_VAR_2} {STR_VAR_1}!\p" .string "You found {STR_VAR_2} {STR_VAR_1}!\p"
.string "Do you want to pick the\n" .string "Do you want to pick the\n"
.string "{STR_VAR_1}?$" .string "{STR_VAR_1}?$"
Route102_Text_PickedTheBerry: @ 827461B BerryTree_Text_PickedTheBerry: @ 827461B
.string "{PLAYER} picked the {STR_VAR_2} {STR_VAR_1}.$" .string "{PLAYER} picked the {STR_VAR_2} {STR_VAR_1}.$"
Route102_Text_PutAwayBerry: @ 8274630 BerryTree_Text_PutAwayBerry: @ 8274630
.string "{PLAYER} put away the {STR_VAR_1}\n" .string "{PLAYER} put away the {STR_VAR_1}\n"
.string "in the BAG's BERRIES POCKET.\p" .string "in the BAG's BERRIES POCKET.\p"
.string "The soil returned to its soft and\n" .string "The soil returned to its soft and\n"
.string "loamy state.$" .string "loamy state.$"
Route102_Text_BerryPocketFull: @ 827468F BerryTree_Text_BerryPocketFull: @ 827468F
.string "The BAG's BERRIES POCKET is full.\p" .string "The BAG's BERRIES POCKET is full.\p"
.string "The {STR_VAR_1} couldn't be taken.$" .string "The {STR_VAR_1} couldn't be taken.$"
Route102_Text_BerryLeftUnpicked: @ 82746CB BerryTree_Text_BerryLeftUnpicked: @ 82746CB
.string "{PLAYER} left the {STR_VAR_1}\n" .string "{PLAYER} left the {STR_VAR_1}\n"
.string "unpicked.$" .string "unpicked.$"
Route102_Text_WantToWater: @ 82746E4 BerryTree_Text_WantToWater: @ 82746E4
.string "Want to water the {STR_VAR_1} with the\n" .string "Want to water the {STR_VAR_1} with the\n"
.string "WAILMER PAIL?$" .string "WAILMER PAIL?$"
Route102_Text_WateredTheBerry: @ 8274710 BerryTree_Text_WateredTheBerry: @ 8274710
.string "{PLAYER} watered the {STR_VAR_1}.$" .string "{PLAYER} watered the {STR_VAR_1}.$"
Route102_Text_PlantIsDelighted: @ 8274723 BerryTree_Text_PlantIsDelighted: @ 8274723
.string "The plant seems to be delighted.$" .string "The plant seems to be delighted.$"
Route102_Text_ExclamationPoint: @ 8274744 BerryTree_Text_ExclamationPoint: @ 8274744
.string "!$" .string "!$"
include/bard_music.h
+1 -1
View File
@@ -38,7 +38,7 @@ struct BardSong
// Exported ROM declarations // Exported ROM declarations
extern const u16 gUnknown_085F5490; extern const u16 gNumSpeciesNames;
extern const u16 gUnknown_085FA1D4; extern const u16 gUnknown_085FA1D4;
const struct BardSound *GetWordSounds(u16 word); const struct BardSound *GetWordSounds(u16 word);
void GetWordPhonemes(struct BardSong *song, u16 word); void GetWordPhonemes(struct BardSong *song, u16 word);
src/data/bard_music/pokemon.h
+1 -1
View File
@@ -2,7 +2,7 @@
#define GUARD_DATA_BARD_MUSIC_POKEMON_H #define GUARD_DATA_BARD_MUSIC_POKEMON_H
#include "constants/species.h" #include "constants/species.h"
const u16 gUnknown_085F5490 = NUM_SPECIES; const u16 gNumSpeciesNames = NUM_SPECIES;
const struct BardSound gBardSounds_Pokemon[][6] = { const struct BardSound gBardSounds_Pokemon[][6] = {
{ {
src/easy_chat.c
+1 -1
View File
@@ -4882,7 +4882,7 @@ bool8 ECWord_CheckIfOutsideOfValidRange(u16 easyChatWord)
{ {
case EC_GROUP_POKEMON: case EC_GROUP_POKEMON:
case EC_GROUP_POKEMON_2: case EC_GROUP_POKEMON_2:
numWordsInGroup = gUnknown_085F5490; numWordsInGroup = gNumSpeciesNames;
break; break;
case EC_GROUP_MOVE_1: case EC_GROUP_MOVE_1:
case EC_GROUP_MOVE_2: case EC_GROUP_MOVE_2:
src/item_use.c
+4 -4
View File
@@ -42,8 +42,8 @@
#include "constants/vars.h" #include "constants/vars.h"
#include "event_obj_lock.h" #include "event_obj_lock.h"
extern u8 Route102_EventScript_274482[]; extern u8 BerryTree_EventScript_274482[];
extern u8 Route102_EventScript_2744C0[]; extern u8 BerryTree_EventScript_2744C0[];
extern u8 BattleFrontier_OutsideEast_EventScript_242CFC[]; extern u8 BattleFrontier_OutsideEast_EventScript_242CFC[];
void SetUpItemUseCallback(u8 taskId); void SetUpItemUseCallback(u8 taskId);
@@ -669,7 +669,7 @@ void sub_80FDD74(u8 taskId)
{ {
RemoveBagItem(gSpecialVar_ItemId, 1); RemoveBagItem(gSpecialVar_ItemId, 1);
ScriptContext2_Enable(); ScriptContext2_Enable();
ScriptContext1_SetupScript(Route102_EventScript_274482); ScriptContext1_SetupScript(BerryTree_EventScript_274482);
DestroyTask(taskId); DestroyTask(taskId);
} }
@@ -694,7 +694,7 @@ void ItemUseOutOfBattle_WailmerPail(u8 taskId)
void sub_80FDE08(u8 taskId) void sub_80FDE08(u8 taskId)
{ {
ScriptContext2_Enable(); ScriptContext2_Enable();
ScriptContext1_SetupScript(Route102_EventScript_2744C0); ScriptContext1_SetupScript(BerryTree_EventScript_2744C0);
DestroyTask(taskId); DestroyTask(taskId);
} }