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

Merge branch 'master' into doc-factscreen

Browse Source
This commit is contained in:
GriffinR
2020-12-31 00:40:45 -05:00
committed by GitHub
parent 093610b46e 0c74e2097f
commit ec85c01e7c
681 changed files with 30975 additions and 31624 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
data/battle_ai_scripts.s
View File

@@ -2324,14 +2324,18 @@ AI_CV_SemiInvulnerable:
@ BUG: The scripts for checking type-resistance to weather for semi-invulnerable moves are swapped
@ The result is that the AI is encouraged to stall while taking damage from weather
@ To fix, swap _CheckSandstormTypes/_CheckIceType in the below script
AI_CV_SemiInvulnerable2:
if_status AI_TARGET, STATUS1_TOXIC_POISON, AI_CV_SemiInvulnerable_TryEncourage
if_status2 AI_TARGET, STATUS2_CURSED, AI_CV_SemiInvulnerable_TryEncourage
if_status3 AI_TARGET, STATUS3_LEECHSEED, AI_CV_SemiInvulnerable_TryEncourage
get_weather
.ifdef BUGFIX
if_equal AI_WEATHER_HAIL, AI_CV_SemiInvulnerable_CheckIceType
if_equal AI_WEATHER_SANDSTORM, AI_CV_SemiInvulnerable_CheckSandstormTypes
.else
if_equal AI_WEATHER_HAIL, AI_CV_SemiInvulnerable_CheckSandstormTypes
if_equal AI_WEATHER_SANDSTORM, AI_CV_SemiInvulnerable_CheckIceType
.endif
goto AI_CV_SemiInvulnerable5
AI_CV_SemiInvulnerable_CheckSandstormTypes:
@@ -2398,9 +2402,13 @@ AI_CV_Hail_ScoreDown1:
AI_CV_Hail_End:
end
@ BUG: Facade score is increased if the target is statused, but should be if the user is. Replace AI_TARGET with AI_USER
@ BUG: Facade score is increased if the target is statused, but should be if the user is
AI_CV_Facade:
.ifdef BUGFIX
if_not_status AI_USER, STATUS1_POISON | STATUS1_BURN | STATUS1_PARALYSIS | STATUS1_TOXIC_POISON, AI_CV_Facade_End
.else
if_not_status AI_TARGET, STATUS1_POISON | STATUS1_BURN | STATUS1_PARALYSIS | STATUS1_TOXIC_POISON, AI_CV_Facade_End
.endif
score +1
AI_CV_Facade_End:
end

4
data/battle_anim_scripts.s
View File

@@ -416,7 +416,7 @@ gBattleAnims_Special::
.4byte Special_SwitchOutPlayerMon @ B_ANIM_SWITCH_OUT_PLAYER_MON
.4byte Special_SwitchOutOpponentMon @ B_ANIM_SWITCH_OUT_OPPONENT_MON
.4byte Special_BallThrow @ B_ANIM_BALL_THROW
.4byte Special_SafariBallThrow @ B_ANIM_SAFARI_BALL_THROW
.4byte Special_BallThrowWithTrainer @ B_ANIM_BALL_THROW_WITH_TRAINER
.4byte Special_SubstituteToMon @ B_ANIM_SUBSTITUTE_TO_MON
.4byte Special_MonToSubstitute @ B_ANIM_MON_TO_SUBSTITUTE
@@ -10738,7 +10738,7 @@ BallThrowTrainerBlock:
blendoff
goto BallThrowEnd
Special_SafariBallThrow:
Special_BallThrowWithTrainer:
createvisualtask AnimTask_LoadBallGfx, 2
delay 0
createvisualtask AnimTask_ThrowBall_StandingTrainer, 2

14
data/event_scripts.s
View File

@@ -151,13 +151,13 @@ gStdScripts_End:: @ 81DC2CC
.include "data/maps/Route132/scripts.inc"
.include "data/maps/Route133/scripts.inc"
.include "data/maps/Route134/scripts.inc"
.include "data/maps/Underwater1/scripts.inc"
.include "data/maps/Underwater2/scripts.inc"
.include "data/maps/Underwater3/scripts.inc"
.include "data/maps/Underwater4/scripts.inc"
.include "data/maps/Underwater5/scripts.inc"
.include "data/maps/Underwater6/scripts.inc"
.include "data/maps/Underwater7/scripts.inc"
.include "data/maps/Underwater_Route124/scripts.inc"
.include "data/maps/Underwater_Route126/scripts.inc"
.include "data/maps/Underwater_Route127/scripts.inc"
.include "data/maps/Underwater_Route128/scripts.inc"
.include "data/maps/Underwater_Route129/scripts.inc"
.include "data/maps/Underwater_Route105/scripts.inc"
.include "data/maps/Underwater_Route125/scripts.inc"
.include "data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc"
.include "data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc"
.include "data/maps/LittlerootTown_MaysHouse_1F/scripts.inc"

0
data/layouts/Underwater1/border.bin → data/layouts/Underwater_Route105/border.bin
View File

0
data/layouts/Underwater6/map.bin → data/layouts/Underwater_Route105/map.bin
View File

0
data/layouts/Underwater2/border.bin → data/layouts/Underwater_Route124/border.bin
View File

0
data/layouts/Underwater1/map.bin → data/layouts/Underwater_Route124/map.bin
View File

0
data/layouts/Underwater3/border.bin → data/layouts/Underwater_Route125/border.bin
View File

0
data/layouts/Underwater7/map.bin → data/layouts/Underwater_Route125/map.bin
View File

0
data/layouts/Underwater4/border.bin → data/layouts/Underwater_Route126/border.bin
View File

0
data/layouts/Underwater2/map.bin → data/layouts/Underwater_Route126/map.bin
View File

0
data/layouts/Underwater5/border.bin → data/layouts/Underwater_Route127/border.bin
View File

0
data/layouts/Underwater3/map.bin → data/layouts/Underwater_Route127/map.bin
View File

0
data/layouts/Underwater6/border.bin → data/layouts/Underwater_Route128/border.bin
View File

0
data/layouts/Underwater4/map.bin → data/layouts/Underwater_Route128/map.bin
View File

0
data/layouts/Underwater7/border.bin → data/layouts/Underwater_Route129/border.bin
View File

0
data/layouts/Underwater5/map.bin → data/layouts/Underwater_Route129/map.bin
View File

56
data/layouts/layouts.json
View File

@@ -502,34 +502,34 @@
"blockdata_filepath": "data/layouts/Route134/map.bin"
},
{
"id": "LAYOUT_UNDERWATER2",
"name": "Underwater2_Layout",
"id": "LAYOUT_UNDERWATER_ROUTE126",
"name": "Underwater_Route126_Layout",
"width": 80,
"height": 80,
"primary_tileset": "gTileset_General",
"secondary_tileset": "gTileset_Underwater",
"border_filepath": "data/layouts/Underwater2/border.bin",
"blockdata_filepath": "data/layouts/Underwater2/map.bin"
"border_filepath": "data/layouts/Underwater_Route126/border.bin",
"blockdata_filepath": "data/layouts/Underwater_Route126/map.bin"
},
{
"id": "LAYOUT_UNDERWATER3",
"name": "Underwater3_Layout",
"id": "LAYOUT_UNDERWATER_ROUTE127",
"name": "Underwater_Route127_Layout",
"width": 80,
"height": 80,
"primary_tileset": "gTileset_General",
"secondary_tileset": "gTileset_Underwater",
"border_filepath": "data/layouts/Underwater3/border.bin",
"blockdata_filepath": "data/layouts/Underwater3/map.bin"
"border_filepath": "data/layouts/Underwater_Route127/border.bin",
"blockdata_filepath": "data/layouts/Underwater_Route127/map.bin"
},
{
"id": "LAYOUT_UNDERWATER4",
"name": "Underwater4_Layout",
"id": "LAYOUT_UNDERWATER_ROUTE128",
"name": "Underwater_Route128_Layout",
"width": 120,
"height": 40,
"primary_tileset": "gTileset_General",
"secondary_tileset": "gTileset_Underwater",
"border_filepath": "data/layouts/Underwater4/border.bin",
"blockdata_filepath": "data/layouts/Underwater4/map.bin"
"border_filepath": "data/layouts/Underwater_Route128/border.bin",
"blockdata_filepath": "data/layouts/Underwater_Route128/map.bin"
},
{
"id": "LAYOUT_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F",
@@ -2732,14 +2732,14 @@
"blockdata_filepath": "data/layouts/LilycoveCity_DepartmentStoreElevator/map.bin"
},
{
"id": "LAYOUT_UNDERWATER1",
"name": "Underwater1_Layout",
"id": "LAYOUT_UNDERWATER_ROUTE124",
"name": "Underwater_Route124_Layout",
"width": 80,
"height": 80,
"primary_tileset": "gTileset_General",
"secondary_tileset": "gTileset_Underwater",
"border_filepath": "data/layouts/Underwater1/border.bin",
"blockdata_filepath": "data/layouts/Underwater1/map.bin"
"border_filepath": "data/layouts/Underwater_Route124/border.bin",
"blockdata_filepath": "data/layouts/Underwater_Route124/map.bin"
},
{
"id": "LAYOUT_MOSSDEEP_CITY_SPACE_CENTER_1F",
@@ -4092,34 +4092,34 @@
"blockdata_filepath": "data/layouts/TerraCave_End/map.bin"
},
{
"id": "LAYOUT_UNDERWATER6",
"name": "Underwater6_Layout",
"id": "LAYOUT_UNDERWATER_ROUTE105",
"name": "Underwater_Route105_Layout",
"width": 40,
"height": 80,
"primary_tileset": "gTileset_General",
"secondary_tileset": "gTileset_Underwater",
"border_filepath": "data/layouts/Underwater6/border.bin",
"blockdata_filepath": "data/layouts/Underwater6/map.bin"
"border_filepath": "data/layouts/Underwater_Route105/border.bin",
"blockdata_filepath": "data/layouts/Underwater_Route105/map.bin"
},
{
"id": "LAYOUT_UNDERWATER7",
"name": "Underwater7_Layout",
"id": "LAYOUT_UNDERWATER_ROUTE125",
"name": "Underwater_Route125_Layout",
"width": 80,
"height": 40,
"primary_tileset": "gTileset_General",
"secondary_tileset": "gTileset_Underwater",
"border_filepath": "data/layouts/Underwater7/border.bin",
"blockdata_filepath": "data/layouts/Underwater7/map.bin"
"border_filepath": "data/layouts/Underwater_Route125/border.bin",
"blockdata_filepath": "data/layouts/Underwater_Route125/map.bin"
},
{
"id": "LAYOUT_UNDERWATER5",
"name": "Underwater5_Layout",
"id": "LAYOUT_UNDERWATER_ROUTE129",
"name": "Underwater_Route129_Layout",
"width": 80,
"height": 40,
"primary_tileset": "gTileset_General",
"secondary_tileset": "gTileset_Underwater",
"border_filepath": "data/layouts/Underwater5/border.bin",
"blockdata_filepath": "data/layouts/Underwater5/map.bin"
"border_filepath": "data/layouts/Underwater_Route129/border.bin",
"blockdata_filepath": "data/layouts/Underwater_Route129/map.bin"
},
{
"id": "LAYOUT_MARINE_CAVE_END",

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

@@ -443,7 +443,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_WarpToLobbyMultis:: @ 82421F2
end
BattleFrontier_BattleTowerBattleRoom_EventScript_WarpToLobbyLinkMultis:: @ 82421FC
tower_unklink
tower_closelink
warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY, 255, 18, 6
waitstate
end

2
data/maps/FortreeCity/map.json
View File

@@ -104,7 +104,7 @@
"flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_KECLEON_1",
"graphics_id": "OBJ_EVENT_GFX_KECLEON",
"x": 25,
"y": 8,
"elevation": 3,

2
data/maps/LilycoveCity_House1/map.json
View File

@@ -28,7 +28,7 @@
"flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_KECLEON_1",
"graphics_id": "OBJ_EVENT_GFX_KECLEON",
"x": 4,
"y": 4,
"elevation": 3,

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

@@ -247,7 +247,11 @@ MossdeepCity_SpaceCenter_1F_EventScript_Grunt2:: @ 822321F
copyobjectxytoperm LOCALID_STAIR_GRUNT
switch VAR_FACING
case DIR_WEST, MossdeepCity_SpaceCenter_1F_EventScript_MoveGruntFromStairsWest
case DIR_WEST, MossdeepCity_SpaceCenter_1F_EventScript_MoveGruntFromStairsEast @ BUG: This was meant to be case DIR_EAST
#ifdef BUGFIX
case DIR_EAST, MossdeepCity_SpaceCenter_1F_EventScript_MoveGruntFromStairsEast
#else
case DIR_WEST, MossdeepCity_SpaceCenter_1F_EventScript_MoveGruntFromStairsEast
#endif
applymovement LOCALID_STAIR_GRUNT, MossdeepCity_SpaceCenter_1F_Movement_MoveGruntFromStairs
waitmovement 0
setvar VAR_MOSSDEEP_SPACE_CENTER_STAIR_GUARD_STATE, 2

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

@@ -46,7 +46,7 @@ MtChimney_CableCarStation_EventScript_RideCableCar:: @ 822AC6C
applymovement LOCALID_ATTENDANT, MtChimney_CableCarStation_Movement_LeadPlayerToCableCar
applymovement OBJ_EVENT_ID_PLAYER, MtChimney_CableCarStation_Movement_BoardCableCar
waitmovement 0
setvar VAR_0x8004, 1
setvar VAR_0x8004, TRUE @ Going down
setvar VAR_CABLE_CAR_STATION_STATE, 2
incrementgamestat GAME_STAT_RODE_CABLE_CAR
special CableCarWarp

2
data/maps/NewMauville_Inside/map.json
View File

@@ -24,7 +24,7 @@
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "NewMauville_Inside_EventScript_ItemUltraRope",
"script": "NewMauville_Inside_EventScript_ItemUltraBall",
"flag": "FLAG_ITEM_NEW_MAUVILLE_ULTRA_BALL"
},
{

2
data/maps/Route105/map.json
View File

@@ -26,7 +26,7 @@
{
"direction": "dive",
"offset": 0,
"map": "MAP_UNDERWATER6"
"map": "MAP_UNDERWATER_ROUTE105"
}
],
"object_events": [

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

@@ -47,7 +47,7 @@ Route112_CableCarStation_EventScript_RideCableCar:: @ 822AB38
applymovement LOCALID_ATTENDANT, Route112_CableCarStation_Movement_LeadPlayerToCableCar
applymovement OBJ_EVENT_ID_PLAYER, Route112_CableCarStation_Movement_BoardCableCar
waitmovement 0
setvar VAR_0x8004, 0
setvar VAR_0x8004, FALSE @ Going up
setvar VAR_CABLE_CAR_STATION_STATE, 1
incrementgamestat GAME_STAT_RODE_CABLE_CAR
special CableCarWarp

2
data/maps/Route117/map.json
View File

@@ -78,7 +78,7 @@
"flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_KECLEON_1",
"graphics_id": "OBJ_EVENT_GFX_KECLEON",
"x": 39,
"y": 4,
"elevation": 3,

4
data/maps/Route119/map.json
View File

@@ -468,7 +468,7 @@
"flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_KECLEON_1",
"graphics_id": "OBJ_EVENT_GFX_KECLEON",
"x": 31,
"y": 6,
"elevation": 3,
@@ -481,7 +481,7 @@
"flag": "FLAG_HIDE_ROUTE_119_KECLEON_1"
},
{
"graphics_id": "OBJ_EVENT_GFX_KECLEON_1",
"graphics_id": "OBJ_EVENT_GFX_KECLEON",
"x": 25,
"y": 15,
"elevation": 3,

20
data/maps/Route120/map.json
View File

@@ -403,7 +403,7 @@
"flag": "FLAG_ITEM_ROUTE_120_HYPER_POTION"
},
{
"graphics_id": "OBJ_EVENT_GFX_KECLEON_1",
"graphics_id": "OBJ_EVENT_GFX_KECLEON",
"x": 12,
"y": 16,
"elevation": 4,
@@ -412,8 +412,8 @@
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route120_EventScript_InvisibleBridgeKecleon",
"flag": "FLAG_HIDE_ROUTE_120_KECLEON_BRIDGE_INVISIBLE"
"script": "Route120_EventScript_BridgeKecleon",
"flag": "FLAG_HIDE_ROUTE_120_KECLEON_BRIDGE"
},
{
"graphics_id": "OBJ_EVENT_GFX_STEVEN",
@@ -481,7 +481,7 @@
"flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_KECLEON_2",
"graphics_id": "OBJ_EVENT_GFX_KECLEON_BRIDGE_SHADOW",
"x": 12,
"y": 16,
"elevation": 3,
@@ -491,10 +491,10 @@
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "0x0",
"flag": "FLAG_HIDE_ROUTE_120_KECLEON_BRIDGE_VISIBLE"
"flag": "FLAG_HIDE_ROUTE_120_KECLEON_BRIDGE_SHADOW"
},
{
"graphics_id": "OBJ_EVENT_GFX_KECLEON_1",
"graphics_id": "OBJ_EVENT_GFX_KECLEON",
"x": 20,
"y": 11,
"elevation": 3,
@@ -507,7 +507,7 @@
"flag": "FLAG_HIDE_ROUTE_120_KECLEON_1"
},
{
"graphics_id": "OBJ_EVENT_GFX_KECLEON_1",
"graphics_id": "OBJ_EVENT_GFX_KECLEON",
"x": 27,
"y": 2,
"elevation": 3,
@@ -520,7 +520,7 @@
"flag": "FLAG_HIDE_ROUTE_120_KECLEON_2"
},
{
"graphics_id": "OBJ_EVENT_GFX_KECLEON_1",
"graphics_id": "OBJ_EVENT_GFX_KECLEON",
"x": 4,
"y": 77,
"elevation": 3,
@@ -533,7 +533,7 @@
"flag": "FLAG_HIDE_ROUTE_120_KECLEON_3"
},
{
"graphics_id": "OBJ_EVENT_GFX_KECLEON_1",
"graphics_id": "OBJ_EVENT_GFX_KECLEON",
"x": 7,
"y": 51,
"elevation": 3,
@@ -546,7 +546,7 @@
"flag": "FLAG_HIDE_ROUTE_120_KECLEON_5"
},
{
"graphics_id": "OBJ_EVENT_GFX_KECLEON_1",
"graphics_id": "OBJ_EVENT_GFX_KECLEON",
"x": 19,
"y": 48,
"elevation": 3,

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

@@ -1,6 +1,6 @@
.set LOCALID_INVISIBLE_BRIDGE_KECLEON, 30
.set LOCALID_BRIDGE_KECLEON, 30
.set LOCALID_STEVEN, 31
.set LOCALID_VISIBLE_BRIDGE_KECLEON, 36
.set LOCALID_BRIDGE_KECLEON_SHADOW, 36 @ They use a second object which is identical to Kecleon but has a reflection palette tag for the bridge shadow
Route120_MapScripts:: @ 81F53EC
map_script MAP_SCRIPT_ON_RESUME, Route120_OnResume
@@ -31,8 +31,8 @@ Route120_EventScript_RemoveBridgeKecleon:: @ 81F5449
specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, B_OUTCOME_CAUGHT
goto_if_ne Common_EventScript_NopReturn
removeobject LOCALID_INVISIBLE_BRIDGE_KECLEON
removeobject LOCALID_VISIBLE_BRIDGE_KECLEON
removeobject LOCALID_BRIDGE_KECLEON
removeobject LOCALID_BRIDGE_KECLEON_SHADOW
return
Route120_EventScript_RemoveKecleon:: @ 81F5460
@@ -61,7 +61,7 @@ Route120_EventScript_SetBridgeClearMetatiles:: @ 81F54A3
return
Route120_EventScript_SetBridgeKecleonMovement:: @ 81F54C8
setobjectmovementtype LOCALID_VISIBLE_BRIDGE_KECLEON, MOVEMENT_TYPE_FACE_RIGHT
setobjectmovementtype LOCALID_BRIDGE_KECLEON_SHADOW, MOVEMENT_TYPE_FACE_RIGHT
return
Route120_OnTransition: @ 81F54CD
@@ -205,9 +205,9 @@ Route120_EventScript_StevenBattleKecleon:: @ 81F568B
delay 20
msgbox Route120_Text_StevenUsedDevonScope, MSGBOX_DEFAULT
closemessage
applymovement LOCALID_INVISIBLE_BRIDGE_KECLEON, Common_Movement_WalkInPlaceFastestRight
applymovement LOCALID_BRIDGE_KECLEON, Common_Movement_WalkInPlaceFastestRight
waitmovement 0
applymovement LOCALID_INVISIBLE_BRIDGE_KECLEON, Movement_KecleonAppears
applymovement LOCALID_BRIDGE_KECLEON, Movement_KecleonAppears
waitmovement 0
waitse
playmoncry SPECIES_KECLEON, 2
@@ -230,8 +230,8 @@ Route120_EventScript_StevenBattleKecleon:: @ 81F568B
Route120_EventScript_RemoveBridgeKecleonPostBattle:: @ 81F571C
fadescreenswapbuffers FADE_TO_BLACK
removeobject LOCALID_INVISIBLE_BRIDGE_KECLEON
removeobject LOCALID_VISIBLE_BRIDGE_KECLEON
removeobject LOCALID_BRIDGE_KECLEON
removeobject LOCALID_BRIDGE_KECLEON_SHADOW
fadescreenswapbuffers FADE_FROM_BLACK
goto Route120_EventScript_StevenGiveDeconScope
end
@@ -276,7 +276,7 @@ Route120_Movement_ApproachKecleonWest: @ 81F57B9
walk_left
step_end
Route120_EventScript_InvisibleBridgeKecleon:: @ 81F57BC
Route120_EventScript_BridgeKecleon:: @ 81F57BC
msgbox Kecleon_Text_SomethingUnseeable, MSGBOX_NPC
end

2
data/maps/Route124/map.json
View File

@@ -36,7 +36,7 @@
{
"direction": "dive",
"offset": 0,
"map": "MAP_UNDERWATER1"
"map": "MAP_UNDERWATER_ROUTE124"
}
],
"object_events": [

2
data/maps/Route125/map.json
View File

@@ -26,7 +26,7 @@
{
"direction": "dive",
"offset": 0,
"map": "MAP_UNDERWATER7"
"map": "MAP_UNDERWATER_ROUTE125"
}
],
"object_events": [

2
data/maps/Route126/map.json
View File

@@ -26,7 +26,7 @@
{
"direction": "dive",
"offset": 0,
"map": "MAP_UNDERWATER2"
"map": "MAP_UNDERWATER_ROUTE126"
}
],
"object_events": [

2
data/maps/Route127/map.json
View File

@@ -31,7 +31,7 @@
{
"direction": "dive",
"offset": 0,
"map": "MAP_UNDERWATER3"
"map": "MAP_UNDERWATER_ROUTE127"
}
],
"object_events": [

2
data/maps/Route128/map.json
View File

@@ -31,7 +31,7 @@
{
"direction": "dive",
"offset": 0,
"map": "MAP_UNDERWATER4"
"map": "MAP_UNDERWATER_ROUTE128"
}
],
"object_events": [

2
data/maps/Route129/map.json
View File

@@ -26,7 +26,7 @@
{
"direction": "dive",
"offset": 0,
"map": "MAP_UNDERWATER5"
"map": "MAP_UNDERWATER_ROUTE129"
}
],
"object_events": [

2
data/maps/SeafloorCavern_Entrance/map.json
View File

@@ -33,7 +33,7 @@
"x": 10,
"y": 18,
"elevation": 3,
"dest_map": "MAP_UNDERWATER4",
"dest_map": "MAP_UNDERWATER_ROUTE128",
"dest_warp_id": 0
},
{

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

@@ -235,7 +235,7 @@ SootopolisCity_EventScript_LegendariesSceneFromPokeCenter:: @ 81E5946
fadescreenspeed FADE_TO_BLACK, 8
setweather WEATHER_ABNORMAL
doweather
setvar VAR_0x8004, 0
setvar VAR_0x8004, FALSE @ Just do Groudon/Kyogre fight scene
special Script_DoRayquazaScene
waitstate
applymovement LOCALID_KYOGRE, Common_Movement_WalkInPlaceFastestLeft
@@ -335,7 +335,7 @@ SootopolisCity_EventScript_LegendariesSceneFromDive:: @ 81E5A82
fadescreenspeed FADE_TO_BLACK, 8
setweather WEATHER_ABNORMAL
doweather
setvar VAR_0x8004, 0
setvar VAR_0x8004, FALSE @ Just do Groudon/Kyogre fight scene
special Script_DoRayquazaScene
waitstate
applymovement LOCALID_KYOGRE, Common_Movement_WalkInPlaceFastestLeft
@@ -528,7 +528,7 @@ SootopolisCity_EventScript_RayquazaSceneFromPokeCenter:: @ 81E5C1E
removeobject LOCALID_GROUDON
removeobject LOCALID_KYOGRE
addobject LOCALID_RAYQUAZA
setvar VAR_0x8004, 1
setvar VAR_0x8004, TRUE
special Script_DoRayquazaScene
waitstate
playse SE_THUNDER
@@ -581,7 +581,7 @@ SootopolisCity_EventScript_RayquazaSceneFromDive:: @ 81E5CCE
removeobject LOCALID_GROUDON
removeobject LOCALID_KYOGRE
addobject LOCALID_RAYQUAZA
setvar VAR_0x8004, 1
setvar VAR_0x8004, TRUE
special Script_DoRayquazaScene
waitstate
special SpawnCameraObject

2
data/maps/SootopolisCity_House1/map.json
View File

@@ -28,7 +28,7 @@
"flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_KECLEON_1",
"graphics_id": "OBJ_EVENT_GFX_KECLEON",
"x": 2,
"y": 3,
"elevation": 3,

3
data/maps/Underwater1/scripts.inc
View File

@@ -1,3 +0,0 @@
Underwater1_MapScripts:: @ 81F7722
.byte 0

3
data/maps/Underwater2/scripts.inc
View File

@@ -1,3 +0,0 @@
Underwater2_MapScripts:: @ 81F7723
.byte 0

8
data/maps/Underwater3/scripts.inc
View File

@@ -1,8 +0,0 @@
Underwater3_MapScripts:: @ 81F7724
map_script MAP_SCRIPT_ON_RESUME, Underwater3_OnResume
.byte 0
Underwater3_OnResume: @ 81F772A
call AbnormalWeather_Underwater_SetupEscapeWarp
end

3
data/maps/Underwater4/scripts.inc
View File

@@ -1,3 +0,0 @@
Underwater4_MapScripts:: @ 81F7730
.byte 0

8
data/maps/Underwater5/scripts.inc
View File

@@ -1,8 +0,0 @@
Underwater5_MapScripts:: @ 81F7731
map_script MAP_SCRIPT_ON_RESUME, Underwater5_OnResume
.byte 0
Underwater5_OnResume: @ 81F7737
call AbnormalWeather_Underwater_SetupEscapeWarp
end

8
data/maps/Underwater6/scripts.inc
View File

@@ -1,8 +0,0 @@
Underwater6_MapScripts:: @ 81F773D
map_script MAP_SCRIPT_ON_RESUME, Underwater6_OnResume
.byte 0
Underwater6_OnResume: @ 81F7743
call AbnormalWeather_Underwater_SetupEscapeWarp
end

8
data/maps/Underwater7/scripts.inc
View File

@@ -1,8 +0,0 @@
Underwater7_MapScripts:: @ 81F7749
map_script MAP_SCRIPT_ON_RESUME, Underwater7_OnResume
.byte 0
Underwater7_OnResume: @ 81F774F
call AbnormalWeather_Underwater_SetupEscapeWarp
end

8
data/maps/Underwater6/map.json → data/maps/Underwater_Route105/map.json
View File

@@ -1,9 +1,9 @@
{
"id": "MAP_UNDERWATER6",
"name": "Underwater6",
"layout": "LAYOUT_UNDERWATER6",
"id": "MAP_UNDERWATER_ROUTE105",
"name": "Underwater_Route105",
"layout": "LAYOUT_UNDERWATER_ROUTE105",
"music": "MUS_UNDERWATER",
"region_map_section": "MAPSEC_UNDERWATER_TERRA_CAVE",
"region_map_section": "MAPSEC_UNDERWATER_105",
"requires_flash": false,
"weather": "WEATHER_UNDERWATER_BUBBLES",
"map_type": "MAP_TYPE_UNDERWATER",

8
data/maps/Underwater_Route105/scripts.inc Normal file
View File

@@ -0,0 +1,8 @@
Underwater_Route105_MapScripts:: @ 81F773D
map_script MAP_SCRIPT_ON_RESUME, Underwater_Route105_OnResume
.byte 0
Underwater_Route105_OnResume: @ 81F7743
call AbnormalWeather_Underwater_SetupEscapeWarp
end

22
data/maps/Underwater1/map.json → data/maps/Underwater_Route124/map.json
View File

@@ -1,7 +1,7 @@
{
"id": "MAP_UNDERWATER1",
"name": "Underwater1",
"layout": "LAYOUT_UNDERWATER1",
"id": "MAP_UNDERWATER_ROUTE124",
"name": "Underwater_Route124",
"layout": "LAYOUT_UNDERWATER_ROUTE124",
"music": "MUS_UNDERWATER",
"region_map_section": "MAPSEC_UNDERWATER_124",
"requires_flash": false,
@@ -16,7 +16,7 @@
{
"direction": "down",
"offset": 0,
"map": "MAP_UNDERWATER2"
"map": "MAP_UNDERWATER_ROUTE126"
},
{
"direction": "emerge",
@@ -34,7 +34,7 @@
"y": 51,
"elevation": 0,
"item": "ITEM_CARBOS",
"flag": "FLAG_HIDDEN_ITEM_UNDERWATER_1_CARBOS"
"flag": "FLAG_HIDDEN_ITEM_UNDERWATER_124_CARBOS"
},
{
"type": "hidden_item",
@@ -42,7 +42,7 @@
"y": 40,
"elevation": 0,
"item": "ITEM_GREEN_SHARD",
"flag": "FLAG_HIDDEN_ITEM_UNDERWATER_1_GREEN_SHARD"
"flag": "FLAG_HIDDEN_ITEM_UNDERWATER_124_GREEN_SHARD"
},
{
"type": "hidden_item",
@@ -50,7 +50,7 @@
"y": 34,
"elevation": 3,
"item": "ITEM_PEARL",
"flag": "FLAG_HIDDEN_ITEM_UNDERWATER_1_PEARL"
"flag": "FLAG_HIDDEN_ITEM_UNDERWATER_124_PEARL"
},
{
"type": "hidden_item",
@@ -58,7 +58,7 @@
"y": 54,
"elevation": 3,
"item": "ITEM_BIG_PEARL",
"flag": "FLAG_HIDDEN_ITEM_UNDERWATER_1_BIG_PEARL"
"flag": "FLAG_HIDDEN_ITEM_UNDERWATER_124_BIG_PEARL"
},
{
"type": "hidden_item",
@@ -66,7 +66,7 @@
"y": 64,
"elevation": 3,
"item": "ITEM_HEART_SCALE",
"flag": "FLAG_HIDDEN_ITEM_UNDERWATER_1_HEART_SCALE_1"
"flag": "FLAG_HIDDEN_ITEM_UNDERWATER_124_HEART_SCALE_1"
},
{
"type": "hidden_item",
@@ -74,7 +74,7 @@
"y": 5,
"elevation": 3,
"item": "ITEM_CALCIUM",
"flag": "FLAG_HIDDEN_ITEM_UNDERWATER_1_CALCIUM"
"flag": "FLAG_HIDDEN_ITEM_UNDERWATER_124_CALCIUM"
},
{
"type": "hidden_item",
@@ -82,7 +82,7 @@
"y": 36,
"elevation": 3,
"item": "ITEM_HEART_SCALE",
"flag": "FLAG_HIDDEN_ITEM_UNDERWATER_1_HEART_SCALE_2"
"flag": "FLAG_HIDDEN_ITEM_UNDERWATER_124_HEART_SCALE_2"
}
]
}

3
data/maps/Underwater_Route124/scripts.inc Normal file
View File

@@ -0,0 +1,3 @@
Underwater_Route124_MapScripts:: @ 81F7722
.byte 0

8
data/maps/Underwater7/map.json → data/maps/Underwater_Route125/map.json
View File

@@ -1,9 +1,9 @@
{
"id": "MAP_UNDERWATER7",
"name": "Underwater7",
"layout": "LAYOUT_UNDERWATER7",
"id": "MAP_UNDERWATER_ROUTE125",
"name": "Underwater_Route125",
"layout": "LAYOUT_UNDERWATER_ROUTE125",
"music": "MUS_UNDERWATER",
"region_map_section": "MAPSEC_UNDERWATER_UNK1",
"region_map_section": "MAPSEC_UNDERWATER_125",
"requires_flash": false,
"weather": "WEATHER_UNDERWATER_BUBBLES",
"map_type": "MAP_TYPE_UNDERWATER",

8
data/maps/Underwater_Route125/scripts.inc Normal file
View File

@@ -0,0 +1,8 @@
Underwater_Route125_MapScripts:: @ 81F7749
map_script MAP_SCRIPT_ON_RESUME, Underwater_Route125_OnResume
.byte 0
Underwater_Route125_OnResume: @ 81F774F
call AbnormalWeather_Underwater_SetupEscapeWarp
end

28
data/maps/Underwater2/map.json → data/maps/Underwater_Route126/map.json
View File

@@ -1,9 +1,9 @@
{
"id": "MAP_UNDERWATER2",
"name": "Underwater2",
"layout": "LAYOUT_UNDERWATER2",
"id": "MAP_UNDERWATER_ROUTE126",
"name": "Underwater_Route126",
"layout": "LAYOUT_UNDERWATER_ROUTE126",
"music": "MUS_UNDERWATER",
"region_map_section": "MAPSEC_UNDERWATER_125",
"region_map_section": "MAPSEC_UNDERWATER_126",
"requires_flash": false,
"weather": "WEATHER_UNDERWATER_BUBBLES",
"map_type": "MAP_TYPE_UNDERWATER",
@@ -16,12 +16,12 @@
{
"direction": "up",
"offset": 0,
"map": "MAP_UNDERWATER1"
"map": "MAP_UNDERWATER_ROUTE124"
},
{
"direction": "right",
"offset": 0,
"map": "MAP_UNDERWATER3"
"map": "MAP_UNDERWATER_ROUTE127"
},
{
"direction": "emerge",
@@ -47,7 +47,7 @@
"y": 17,
"elevation": 3,
"item": "ITEM_HEART_SCALE",
"flag": "FLAG_HIDDEN_ITEM_UNDERWATER_2_HEART_SCALE"
"flag": "FLAG_HIDDEN_ITEM_UNDERWATER_126_HEART_SCALE"
},
{
"type": "hidden_item",
@@ -55,7 +55,7 @@
"y": 19,
"elevation": 3,
"item": "ITEM_ULTRA_BALL",
"flag": "FLAG_HIDDEN_ITEM_UNDERWATER_2_ULTRA_BALL"
"flag": "FLAG_HIDDEN_ITEM_UNDERWATER_126_ULTRA_BALL"
},
{
"type": "hidden_item",
@@ -63,7 +63,7 @@
"y": 19,
"elevation": 3,
"item": "ITEM_STARDUST",
"flag": "FLAG_HIDDEN_ITEM_UNDERWATER_2_STARDUST"
"flag": "FLAG_HIDDEN_ITEM_UNDERWATER_126_STARDUST"
},
{
"type": "hidden_item",
@@ -71,7 +71,7 @@
"y": 36,
"elevation": 3,
"item": "ITEM_PEARL",
"flag": "FLAG_HIDDEN_ITEM_UNDERWATER_2_PEARL"
"flag": "FLAG_HIDDEN_ITEM_UNDERWATER_126_PEARL"
},
{
"type": "hidden_item",
@@ -79,7 +79,7 @@
"y": 39,
"elevation": 3,
"item": "ITEM_IRON",
"flag": "FLAG_HIDDEN_ITEM_UNDERWATER_2_IRON"
"flag": "FLAG_HIDDEN_ITEM_UNDERWATER_126_IRON"
},
{
"type": "hidden_item",
@@ -87,7 +87,7 @@
"y": 35,
"elevation": 3,
"item": "ITEM_YELLOW_SHARD",
"flag": "FLAG_HIDDEN_ITEM_UNDERWATER_2_YELLOW_SHARD"
"flag": "FLAG_HIDDEN_ITEM_UNDERWATER_126_YELLOW_SHARD"
},
{
"type": "hidden_item",
@@ -95,7 +95,7 @@
"y": 60,
"elevation": 3,
"item": "ITEM_BIG_PEARL",
"flag": "FLAG_HIDDEN_ITEM_UNDERWATER_2_BIG_PEARL"
"flag": "FLAG_HIDDEN_ITEM_UNDERWATER_126_BIG_PEARL"
},
{
"type": "hidden_item",
@@ -103,7 +103,7 @@
"y": 77,
"elevation": 3,
"item": "ITEM_BLUE_SHARD",
"flag": "FLAG_HIDDEN_ITEM_UNDERWATER_2_BLUE_SHARD"
"flag": "FLAG_HIDDEN_ITEM_UNDERWATER_126_BLUE_SHARD"
}
]
}

3
data/maps/Underwater_Route126/scripts.inc Normal file
View File

@@ -0,0 +1,3 @@
Underwater_Route126_MapScripts:: @ 81F7723
.byte 0

20
data/maps/Underwater3/map.json → data/maps/Underwater_Route127/map.json
View File

@@ -1,9 +1,9 @@
{
"id": "MAP_UNDERWATER3",
"name": "Underwater3",
"layout": "LAYOUT_UNDERWATER3",
"id": "MAP_UNDERWATER_ROUTE127",
"name": "Underwater_Route127",
"layout": "LAYOUT_UNDERWATER_ROUTE127",
"music": "MUS_UNDERWATER",
"region_map_section": "MAPSEC_UNDERWATER_126",
"region_map_section": "MAPSEC_UNDERWATER_127",
"requires_flash": false,
"weather": "WEATHER_UNDERWATER_BUBBLES",
"map_type": "MAP_TYPE_UNDERWATER",
@@ -21,12 +21,12 @@
{
"direction": "left",
"offset": 0,
"map": "MAP_UNDERWATER2"
"map": "MAP_UNDERWATER_ROUTE126"
},
{
"direction": "down",
"offset": 0,
"map": "MAP_UNDERWATER4"
"map": "MAP_UNDERWATER_ROUTE128"
}
],
"object_events": [],
@@ -54,7 +54,7 @@
"y": 42,
"elevation": 3,
"item": "ITEM_STAR_PIECE",
"flag": "FLAG_HIDDEN_ITEM_UNDERWATER_3_STAR_PIECE"
"flag": "FLAG_HIDDEN_ITEM_UNDERWATER_127_STAR_PIECE"
},
{
"type": "hidden_item",
@@ -62,7 +62,7 @@
"y": 36,
"elevation": 3,
"item": "ITEM_HP_UP",
"flag": "FLAG_HIDDEN_ITEM_UNDERWATER_3_HP_UP"
"flag": "FLAG_HIDDEN_ITEM_UNDERWATER_127_HP_UP"
},
{
"type": "hidden_item",
@@ -70,7 +70,7 @@
"y": 72,
"elevation": 3,
"item": "ITEM_HEART_SCALE",
"flag": "FLAG_HIDDEN_ITEM_UNDERWATER_3_HEART_SCALE"
"flag": "FLAG_HIDDEN_ITEM_UNDERWATER_127_HEART_SCALE"
},
{
"type": "hidden_item",
@@ -78,7 +78,7 @@
"y": 20,
"elevation": 3,
"item": "ITEM_RED_SHARD",
"flag": "FLAG_HIDDEN_ITEM_UNDERWATER_3_RED_SHARD"
"flag": "FLAG_HIDDEN_ITEM_UNDERWATER_127_RED_SHARD"
}
]
}

8
data/maps/Underwater_Route127/scripts.inc Normal file
View File

@@ -0,0 +1,8 @@
Underwater_Route127_MapScripts:: @ 81F7724
map_script MAP_SCRIPT_ON_RESUME, Underwater_Route127_OnResume
.byte 0
Underwater_Route127_OnResume: @ 81F772A
call AbnormalWeather_Underwater_SetupEscapeWarp
end

14
data/maps/Underwater4/map.json → data/maps/Underwater_Route128/map.json
View File

@@ -1,9 +1,9 @@
{
"id": "MAP_UNDERWATER4",
"name": "Underwater4",
"layout": "LAYOUT_UNDERWATER4",
"id": "MAP_UNDERWATER_ROUTE128",
"name": "Underwater_Route128",
"layout": "LAYOUT_UNDERWATER_ROUTE128",
"music": "MUS_UNDERWATER",
"region_map_section": "MAPSEC_UNDERWATER_127",
"region_map_section": "MAPSEC_UNDERWATER_128",
"requires_flash": false,
"weather": "WEATHER_UNDERWATER_BUBBLES",
"map_type": "MAP_TYPE_UNDERWATER",
@@ -16,7 +16,7 @@
{
"direction": "up",
"offset": 0,
"map": "MAP_UNDERWATER3"
"map": "MAP_UNDERWATER_ROUTE127"
},
{
"direction": "emerge",
@@ -42,7 +42,7 @@
"y": 19,
"elevation": 3,
"item": "ITEM_PROTEIN",
"flag": "FLAG_HIDDEN_ITEM_UNDERWATER_4_PROTEIN"
"flag": "FLAG_HIDDEN_ITEM_UNDERWATER_128_PROTEIN"
},
{
"type": "hidden_item",
@@ -50,7 +50,7 @@
"y": 18,
"elevation": 3,
"item": "ITEM_PEARL",
"flag": "FLAG_HIDDEN_ITEM_UNDERWATER_4_PEARL"
"flag": "FLAG_HIDDEN_ITEM_UNDERWATER_128_PEARL"
}
]
}

3
data/maps/Underwater_Route128/scripts.inc Normal file
View File

@@ -0,0 +1,3 @@
Underwater_Route128_MapScripts:: @ 81F7730
.byte 0

6
data/maps/Underwater5/map.json → data/maps/Underwater_Route129/map.json
View File

@@ -1,7 +1,7 @@
{
"id": "MAP_UNDERWATER5",
"name": "Underwater5",
"layout": "LAYOUT_UNDERWATER5",
"id": "MAP_UNDERWATER_ROUTE129",
"name": "Underwater_Route129",
"layout": "LAYOUT_UNDERWATER_ROUTE129",
"music": "MUS_UNDERWATER",
"region_map_section": "MAPSEC_UNDERWATER_129",
"requires_flash": false,

8
data/maps/Underwater_Route129/scripts.inc Normal file
View File

@@ -0,0 +1,8 @@
Underwater_Route129_MapScripts:: @ 81F7731
map_script MAP_SCRIPT_ON_RESUME, Underwater_Route129_OnResume
.byte 0
Underwater_Route129_OnResume: @ 81F7737
call AbnormalWeather_Underwater_SetupEscapeWarp
end

4
data/maps/Underwater_SeafloorCavern/map.json
View File

@@ -3,7 +3,7 @@
"name": "Underwater_SeafloorCavern",
"layout": "LAYOUT_UNDERWATER_SEAFLOOR_CAVERN",
"music": "MUS_UNDERWATER",
"region_map_section": "MAPSEC_UNDERWATER_128",
"region_map_section": "MAPSEC_UNDERWATER_SEAFLOOR_CAVERN",
"requires_flash": false,
"weather": "WEATHER_UNDERWATER_BUBBLES",
"map_type": "MAP_TYPE_UNDERWATER",
@@ -72,7 +72,7 @@
"x": 6,
"y": 7,
"elevation": 0,
"dest_map": "MAP_UNDERWATER4",
"dest_map": "MAP_UNDERWATER_ROUTE128",
"dest_warp_id": 0
}
],

4
data/maps/Underwater_SootopolisCity/map.json
View File

@@ -19,14 +19,14 @@
"x": 9,
"y": 8,
"elevation": 0,
"dest_map": "MAP_UNDERWATER2",
"dest_map": "MAP_UNDERWATER_ROUTE126",
"dest_warp_id": 0
},
{
"x": 10,
"y": 8,
"elevation": 0,
"dest_map": "MAP_UNDERWATER2",
"dest_map": "MAP_UNDERWATER_ROUTE126",
"dest_warp_id": 0
}
],

28
data/maps/map_groups.json
View File

@@ -86,13 +86,13 @@
"Route132",
"Route133",
"Route134",
"Underwater1",
"Underwater2",
"Underwater3",
"Underwater4",
"Underwater5",
"Underwater6",
"Underwater7"
"Underwater_Route124",
"Underwater_Route126",
"Underwater_Route127",
"Underwater_Route128",
"Underwater_Route129",
"Underwater_Route105",
"Underwater_Route125"
],
"gMapGroup1": [
"LittlerootTown_BrendansHouse_1F",
@@ -672,13 +672,13 @@
"Route132",
"Route133",
"Route134",
"Underwater6",
"Underwater1",
"Underwater7",
"Underwater2",
"Underwater3",
"Underwater4",
"Underwater5",
"Underwater_Route105",
"Underwater_Route124",
"Underwater_Route125",
"Underwater_Route126",
"Underwater_Route127",
"Underwater_Route128",
"Underwater_Route129",
"SafariZone_Northwest",
"SafariZone_North",
"SafariZone_Southwest",

34
data/mystery_event_script_cmd_table.s
View File

@@ -2,21 +2,21 @@
.align 2
gMysteryEventScriptCmdTable:: @ 82DED2C
.4byte MEScrCmd_nop
.4byte MEScrCmd_checkcompat
.4byte MEScrCmd_end
.4byte MEScrCmd_setmsg
.4byte MEScrCmd_setstatus
.4byte MEScrCmd_runscript
.4byte MEScrCmd_initramscript
.4byte MEScrCmd_setenigmaberry
.4byte MEScrCmd_giveribbon
.4byte MEScrCmd_givenationaldex
.4byte MEScrCmd_addrareword
.4byte MEScrCmd_setrecordmixinggift
.4byte MEScrCmd_givepokemon
.4byte MEScrCmd_addtrainer
.4byte MEScrCmd_enableresetrtc
.4byte MEScrCmd_checksum
.4byte MEScrCmd_crc
.4byte MEScrCmd_nop @ 0x00
.4byte MEScrCmd_checkcompat @ 0x01
.4byte MEScrCmd_end @ 0x02
.4byte MEScrCmd_setmsg @ 0x03
.4byte MEScrCmd_setstatus @ 0x04
.4byte MEScrCmd_runscript @ 0x05
.4byte MEScrCmd_initramscript @ 0x06
.4byte MEScrCmd_setenigmaberry @ 0x07
.4byte MEScrCmd_giveribbon @ 0x08
.4byte MEScrCmd_givenationaldex @ 0x09
.4byte MEScrCmd_addrareword @ 0x0a
.4byte MEScrCmd_setrecordmixinggift @ 0x0b
.4byte MEScrCmd_givepokemon @ 0x0c
.4byte MEScrCmd_addtrainer @ 0x0d
.4byte MEScrCmd_enableresetrtc @ 0x0e
.4byte MEScrCmd_checksum @ 0x0f
.4byte MEScrCmd_crc @ 0x10
gMysteryEventScriptCmdTableEnd::

454
data/script_cmd_table.inc
View File

@@ -1,232 +1,232 @@
.align 2
gScriptCmdTable:: @ 81DB67C
.4byte ScrCmd_nop
.4byte ScrCmd_nop1
.4byte ScrCmd_end
.4byte ScrCmd_return
.4byte ScrCmd_call
.4byte ScrCmd_goto
.4byte ScrCmd_goto_if
.4byte ScrCmd_call_if
.4byte ScrCmd_gotostd
.4byte ScrCmd_callstd
.4byte ScrCmd_gotostd_if
.4byte ScrCmd_callstd_if
.4byte ScrCmd_returnram
.4byte ScrCmd_killscript
.4byte ScrCmd_setmysteryeventstatus
.4byte ScrCmd_loadword
.4byte ScrCmd_loadbyte
.4byte ScrCmd_writebytetoaddr
.4byte ScrCmd_loadbytefromaddr
.4byte ScrCmd_setptrbyte
.4byte ScrCmd_copylocal
.4byte ScrCmd_copybyte
.4byte ScrCmd_setvar
.4byte ScrCmd_addvar
.4byte ScrCmd_subvar
.4byte ScrCmd_copyvar
.4byte ScrCmd_setorcopyvar
.4byte ScrCmd_compare_local_to_local
.4byte ScrCmd_compare_local_to_value
.4byte ScrCmd_compare_local_to_addr
.4byte ScrCmd_compare_addr_to_local
.4byte ScrCmd_compare_addr_to_value
.4byte ScrCmd_compare_addr_to_addr
.4byte ScrCmd_compare_var_to_value
.4byte ScrCmd_compare_var_to_var
.4byte ScrCmd_callnative
.4byte ScrCmd_gotonative
.4byte ScrCmd_special
.4byte ScrCmd_specialvar
.4byte ScrCmd_waitstate
.4byte ScrCmd_delay
.4byte ScrCmd_setflag
.4byte ScrCmd_clearflag
.4byte ScrCmd_checkflag
.4byte ScrCmd_initclock
.4byte ScrCmd_dotimebasedevents
.4byte ScrCmd_gettime
.4byte ScrCmd_playse
.4byte ScrCmd_waitse
.4byte ScrCmd_playfanfare
.4byte ScrCmd_waitfanfare
.4byte ScrCmd_playbgm
.4byte ScrCmd_savebgm
.4byte ScrCmd_fadedefaultbgm
.4byte ScrCmd_fadenewbgm
.4byte ScrCmd_fadeoutbgm
.4byte ScrCmd_fadeinbgm
.4byte ScrCmd_warp
.4byte ScrCmd_warpsilent
.4byte ScrCmd_warpdoor
.4byte ScrCmd_warphole
.4byte ScrCmd_warpteleport
.4byte ScrCmd_setwarp
.4byte ScrCmd_setdynamicwarp
.4byte ScrCmd_setdivewarp
.4byte ScrCmd_setholewarp
.4byte ScrCmd_getplayerxy
.4byte ScrCmd_getpartysize
.4byte ScrCmd_additem
.4byte ScrCmd_removeitem
.4byte ScrCmd_checkitemspace
.4byte ScrCmd_checkitem
.4byte ScrCmd_checkitemtype
.4byte ScrCmd_addpcitem
.4byte ScrCmd_checkpcitem
.4byte ScrCmd_adddecoration
.4byte ScrCmd_removedecoration
.4byte ScrCmd_checkdecor
.4byte ScrCmd_checkdecorspace
.4byte ScrCmd_applymovement
.4byte ScrCmd_applymovement_at
.4byte ScrCmd_waitmovement
.4byte ScrCmd_waitmovement_at
.4byte ScrCmd_removeobject
.4byte ScrCmd_removeobject_at
.4byte ScrCmd_addobject
.4byte ScrCmd_addobject_at
.4byte ScrCmd_setobjectxy
.4byte ScrCmd_showobject_at
.4byte ScrCmd_hideobject_at
.4byte ScrCmd_faceplayer
.4byte ScrCmd_turnobject
.4byte ScrCmd_trainerbattle
.4byte ScrCmd_dotrainerbattle
.4byte ScrCmd_gotopostbattlescript
.4byte ScrCmd_gotobeatenscript
.4byte ScrCmd_checktrainerflag
.4byte ScrCmd_settrainerflag
.4byte ScrCmd_cleartrainerflag
.4byte ScrCmd_setobjectxyperm
.4byte ScrCmd_copyobjectxytoperm
.4byte ScrCmd_setobjectmovementtype
.4byte ScrCmd_waitmessage
.4byte ScrCmd_message
.4byte ScrCmd_closemessage
.4byte ScrCmd_lockall
.4byte ScrCmd_lock
.4byte ScrCmd_releaseall
.4byte ScrCmd_release
.4byte ScrCmd_waitbuttonpress
.4byte ScrCmd_yesnobox
.4byte ScrCmd_multichoice
.4byte ScrCmd_multichoicedefault
.4byte ScrCmd_multichoicegrid
.4byte ScrCmd_drawbox
.4byte ScrCmd_erasebox
.4byte ScrCmd_drawboxtext
.4byte ScrCmd_showmonpic
.4byte ScrCmd_hidemonpic
.4byte ScrCmd_showcontestwinner
.4byte ScrCmd_braillemessage
.4byte ScrCmd_givemon
.4byte ScrCmd_giveegg
.4byte ScrCmd_setmonmove
.4byte ScrCmd_checkpartymove
.4byte ScrCmd_bufferspeciesname
.4byte ScrCmd_bufferleadmonspeciesname
.4byte ScrCmd_bufferpartymonnick
.4byte ScrCmd_bufferitemname
.4byte ScrCmd_bufferdecorationname
.4byte ScrCmd_buffermovename
.4byte ScrCmd_buffernumberstring
.4byte ScrCmd_bufferstdstring
.4byte ScrCmd_bufferstring
.4byte ScrCmd_pokemart
.4byte ScrCmd_pokemartdecoration
.4byte ScrCmd_pokemartdecoration2
.4byte ScrCmd_playslotmachine
.4byte ScrCmd_setberrytree
.4byte ScrCmd_choosecontestmon
.4byte ScrCmd_startcontest
.4byte ScrCmd_showcontestresults
.4byte ScrCmd_contestlinktransfer
.4byte ScrCmd_random
.4byte ScrCmd_addmoney
.4byte ScrCmd_removemoney
.4byte ScrCmd_checkmoney
.4byte ScrCmd_showmoneybox
.4byte ScrCmd_hidemoneybox
.4byte ScrCmd_updatemoneybox
.4byte ScrCmd_getpricereduction
.4byte ScrCmd_fadescreen
.4byte ScrCmd_fadescreenspeed
.4byte ScrCmd_setflashradius
.4byte ScrCmd_animateflash
.4byte ScrCmd_messageautoscroll
.4byte ScrCmd_dofieldeffect
.4byte ScrCmd_setfieldeffectarg
.4byte ScrCmd_waitfieldeffect
.4byte ScrCmd_setrespawn
.4byte ScrCmd_checkplayergender
.4byte ScrCmd_playmoncry
.4byte ScrCmd_setmetatile
.4byte ScrCmd_resetweather
.4byte ScrCmd_setweather
.4byte ScrCmd_doweather
.4byte ScrCmd_setstepcallback
.4byte ScrCmd_setmaplayoutindex
.4byte ScrCmd_setobjectpriority
.4byte ScrCmd_resetobjectpriority
.4byte ScrCmd_createvobject
.4byte ScrCmd_turnvobject
.4byte ScrCmd_opendoor
.4byte ScrCmd_closedoor
.4byte ScrCmd_waitdooranim
.4byte ScrCmd_setdooropen
.4byte ScrCmd_setdoorclosed
.4byte ScrCmd_addelevmenuitem
.4byte ScrCmd_showelevmenu
.4byte ScrCmd_checkcoins
.4byte ScrCmd_addcoins
.4byte ScrCmd_removecoins
.4byte ScrCmd_setwildbattle
.4byte ScrCmd_dowildbattle
.4byte ScrCmd_setvaddress
.4byte ScrCmd_vgoto
.4byte ScrCmd_vcall
.4byte ScrCmd_vgoto_if
.4byte ScrCmd_vcall_if
.4byte ScrCmd_vmessage
.4byte ScrCmd_vloadword
.4byte ScrCmd_vbufferstring
.4byte ScrCmd_showcoinsbox
.4byte ScrCmd_hidecoinsbox
.4byte ScrCmd_updatecoinsbox
.4byte ScrCmd_incrementgamestat
.4byte ScrCmd_setescapewarp
.4byte ScrCmd_waitmoncry
.4byte ScrCmd_bufferboxname
.4byte ScrCmd_nop1
.4byte ScrCmd_nop1
.4byte ScrCmd_nop1
.4byte ScrCmd_nop1
.4byte ScrCmd_nop1
.4byte ScrCmd_nop1
.4byte ScrCmd_setmonobedient
.4byte ScrCmd_checkmonobedience
.4byte ScrCmd_gotoram
.4byte ScrCmd_nop1
.4byte ScrCmd_warpD1
.4byte ScrCmd_setmonmetlocation
.4byte ScrCmd_moverotatingtileobjects
.4byte ScrCmd_turnrotatingtileobjects
.4byte ScrCmd_initrotatingtilepuzzle
.4byte ScrCmd_freerotatingtilepuzzle
.4byte ScrCmd_warpmossdeepgym
.4byte ScrCmd_cmdD8
.4byte ScrCmd_cmdD9
.4byte ScrCmd_closebraillemessage
.4byte ScrCmd_cmdDB
.4byte ScrCmd_fadescreenswapbuffers
.4byte ScrCmd_buffertrainerclassname
.4byte ScrCmd_buffertrainername
.4byte ScrCmd_pokenavcall
.4byte ScrCmd_warpsootopolislegend
.4byte ScrCmd_buffercontesttype
.4byte ScrCmd_bufferitemnameplural
.4byte ScrCmd_nop @ 0x00
.4byte ScrCmd_nop1 @ 0x01
.4byte ScrCmd_end @ 0x02
.4byte ScrCmd_return @ 0x03
.4byte ScrCmd_call @ 0x04
.4byte ScrCmd_goto @ 0x05
.4byte ScrCmd_goto_if @ 0x06
.4byte ScrCmd_call_if @ 0x07
.4byte ScrCmd_gotostd @ 0x08
.4byte ScrCmd_callstd @ 0x09
.4byte ScrCmd_gotostd_if @ 0x0a
.4byte ScrCmd_callstd_if @ 0x0b
.4byte ScrCmd_returnram @ 0x0c
.4byte ScrCmd_killscript @ 0x0d
.4byte ScrCmd_setmysteryeventstatus @ 0x0e
.4byte ScrCmd_loadword @ 0x0f
.4byte ScrCmd_loadbyte @ 0x10
.4byte ScrCmd_writebytetoaddr @ 0x11
.4byte ScrCmd_loadbytefromaddr @ 0x12
.4byte ScrCmd_setptrbyte @ 0x13
.4byte ScrCmd_copylocal @ 0x14
.4byte ScrCmd_copybyte @ 0x15
.4byte ScrCmd_setvar @ 0x16
.4byte ScrCmd_addvar @ 0x17
.4byte ScrCmd_subvar @ 0x18
.4byte ScrCmd_copyvar @ 0x19
.4byte ScrCmd_setorcopyvar @ 0x1a
.4byte ScrCmd_compare_local_to_local @ 0x1b
.4byte ScrCmd_compare_local_to_value @ 0x1c
.4byte ScrCmd_compare_local_to_addr @ 0x1d
.4byte ScrCmd_compare_addr_to_local @ 0x1e
.4byte ScrCmd_compare_addr_to_value @ 0x1f
.4byte ScrCmd_compare_addr_to_addr @ 0x20
.4byte ScrCmd_compare_var_to_value @ 0x21
.4byte ScrCmd_compare_var_to_var @ 0x22
.4byte ScrCmd_callnative @ 0x23
.4byte ScrCmd_gotonative @ 0x24
.4byte ScrCmd_special @ 0x25
.4byte ScrCmd_specialvar @ 0x26
.4byte ScrCmd_waitstate @ 0x27
.4byte ScrCmd_delay @ 0x28
.4byte ScrCmd_setflag @ 0x29
.4byte ScrCmd_clearflag @ 0x2a
.4byte ScrCmd_checkflag @ 0x2b
.4byte ScrCmd_initclock @ 0x2c
.4byte ScrCmd_dotimebasedevents @ 0x2d
.4byte ScrCmd_gettime @ 0x2e
.4byte ScrCmd_playse @ 0x2f
.4byte ScrCmd_waitse @ 0x30
.4byte ScrCmd_playfanfare @ 0x31
.4byte ScrCmd_waitfanfare @ 0x32
.4byte ScrCmd_playbgm @ 0x33
.4byte ScrCmd_savebgm @ 0x34
.4byte ScrCmd_fadedefaultbgm @ 0x35
.4byte ScrCmd_fadenewbgm @ 0x36
.4byte ScrCmd_fadeoutbgm @ 0x37
.4byte ScrCmd_fadeinbgm @ 0x38
.4byte ScrCmd_warp @ 0x39
.4byte ScrCmd_warpsilent @ 0x3a
.4byte ScrCmd_warpdoor @ 0x3b
.4byte ScrCmd_warphole @ 0x3c
.4byte ScrCmd_warpteleport @ 0x3d
.4byte ScrCmd_setwarp @ 0x3e
.4byte ScrCmd_setdynamicwarp @ 0x3f
.4byte ScrCmd_setdivewarp @ 0x40
.4byte ScrCmd_setholewarp @ 0x41
.4byte ScrCmd_getplayerxy @ 0x42
.4byte ScrCmd_getpartysize @ 0x43
.4byte ScrCmd_additem @ 0x44
.4byte ScrCmd_removeitem @ 0x45
.4byte ScrCmd_checkitemspace @ 0x46
.4byte ScrCmd_checkitem @ 0x47
.4byte ScrCmd_checkitemtype @ 0x48
.4byte ScrCmd_addpcitem @ 0x49
.4byte ScrCmd_checkpcitem @ 0x4a
.4byte ScrCmd_adddecoration @ 0x4b
.4byte ScrCmd_removedecoration @ 0x4c
.4byte ScrCmd_checkdecor @ 0x4d
.4byte ScrCmd_checkdecorspace @ 0x4e
.4byte ScrCmd_applymovement @ 0x4f
.4byte ScrCmd_applymovement_at @ 0x50
.4byte ScrCmd_waitmovement @ 0x51
.4byte ScrCmd_waitmovement_at @ 0x52
.4byte ScrCmd_removeobject @ 0x53
.4byte ScrCmd_removeobject_at @ 0x54
.4byte ScrCmd_addobject @ 0x55
.4byte ScrCmd_addobject_at @ 0x56
.4byte ScrCmd_setobjectxy @ 0x57
.4byte ScrCmd_showobject_at @ 0x58
.4byte ScrCmd_hideobject_at @ 0x59
.4byte ScrCmd_faceplayer @ 0x5a
.4byte ScrCmd_turnobject @ 0x5b
.4byte ScrCmd_trainerbattle @ 0x5c
.4byte ScrCmd_dotrainerbattle @ 0x5d
.4byte ScrCmd_gotopostbattlescript @ 0x5e
.4byte ScrCmd_gotobeatenscript @ 0x5f
.4byte ScrCmd_checktrainerflag @ 0x60
.4byte ScrCmd_settrainerflag @ 0x61
.4byte ScrCmd_cleartrainerflag @ 0x62
.4byte ScrCmd_setobjectxyperm @ 0x63
.4byte ScrCmd_copyobjectxytoperm @ 0x64
.4byte ScrCmd_setobjectmovementtype @ 0x65
.4byte ScrCmd_waitmessage @ 0x66
.4byte ScrCmd_message @ 0x67
.4byte ScrCmd_closemessage @ 0x68
.4byte ScrCmd_lockall @ 0x69
.4byte ScrCmd_lock @ 0x6a
.4byte ScrCmd_releaseall @ 0x6b
.4byte ScrCmd_release @ 0x6c
.4byte ScrCmd_waitbuttonpress @ 0x6d
.4byte ScrCmd_yesnobox @ 0x6e
.4byte ScrCmd_multichoice @ 0x6f
.4byte ScrCmd_multichoicedefault @ 0x70
.4byte ScrCmd_multichoicegrid @ 0x71
.4byte ScrCmd_drawbox @ 0x72
.4byte ScrCmd_erasebox @ 0x73
.4byte ScrCmd_drawboxtext @ 0x74
.4byte ScrCmd_showmonpic @ 0x75
.4byte ScrCmd_hidemonpic @ 0x76
.4byte ScrCmd_showcontestwinner @ 0x77
.4byte ScrCmd_braillemessage @ 0x78
.4byte ScrCmd_givemon @ 0x79
.4byte ScrCmd_giveegg @ 0x7a
.4byte ScrCmd_setmonmove @ 0x7b
.4byte ScrCmd_checkpartymove @ 0x7c
.4byte ScrCmd_bufferspeciesname @ 0x7d
.4byte ScrCmd_bufferleadmonspeciesname @ 0x7e
.4byte ScrCmd_bufferpartymonnick @ 0x7f
.4byte ScrCmd_bufferitemname @ 0x80
.4byte ScrCmd_bufferdecorationname @ 0x81
.4byte ScrCmd_buffermovename @ 0x82
.4byte ScrCmd_buffernumberstring @ 0x83
.4byte ScrCmd_bufferstdstring @ 0x84
.4byte ScrCmd_bufferstring @ 0x85
.4byte ScrCmd_pokemart @ 0x86
.4byte ScrCmd_pokemartdecoration @ 0x87
.4byte ScrCmd_pokemartdecoration2 @ 0x88
.4byte ScrCmd_playslotmachine @ 0x89
.4byte ScrCmd_setberrytree @ 0x8a
.4byte ScrCmd_choosecontestmon @ 0x8b
.4byte ScrCmd_startcontest @ 0x8c
.4byte ScrCmd_showcontestresults @ 0x8d
.4byte ScrCmd_contestlinktransfer @ 0x8e
.4byte ScrCmd_random @ 0x8f
.4byte ScrCmd_addmoney @ 0x90
.4byte ScrCmd_removemoney @ 0x91
.4byte ScrCmd_checkmoney @ 0x92
.4byte ScrCmd_showmoneybox @ 0x93
.4byte ScrCmd_hidemoneybox @ 0x94
.4byte ScrCmd_updatemoneybox @ 0x95
.4byte ScrCmd_getpricereduction @ 0x96
.4byte ScrCmd_fadescreen @ 0x97
.4byte ScrCmd_fadescreenspeed @ 0x98
.4byte ScrCmd_setflashradius @ 0x99
.4byte ScrCmd_animateflash @ 0x9a
.4byte ScrCmd_messageautoscroll @ 0x9b
.4byte ScrCmd_dofieldeffect @ 0x9c
.4byte ScrCmd_setfieldeffectarg @ 0x9d
.4byte ScrCmd_waitfieldeffect @ 0x9e
.4byte ScrCmd_setrespawn @ 0x9f
.4byte ScrCmd_checkplayergender @ 0xa0
.4byte ScrCmd_playmoncry @ 0xa1
.4byte ScrCmd_setmetatile @ 0xa2
.4byte ScrCmd_resetweather @ 0xa3
.4byte ScrCmd_setweather @ 0xa4
.4byte ScrCmd_doweather @ 0xa5
.4byte ScrCmd_setstepcallback @ 0xa6
.4byte ScrCmd_setmaplayoutindex @ 0xa7
.4byte ScrCmd_setobjectpriority @ 0xa8
.4byte ScrCmd_resetobjectpriority @ 0xa9
.4byte ScrCmd_createvobject @ 0xaa
.4byte ScrCmd_turnvobject @ 0xab
.4byte ScrCmd_opendoor @ 0xac
.4byte ScrCmd_closedoor @ 0xad
.4byte ScrCmd_waitdooranim @ 0xae
.4byte ScrCmd_setdooropen @ 0xaf
.4byte ScrCmd_setdoorclosed @ 0xb0
.4byte ScrCmd_addelevmenuitem @ 0xb1
.4byte ScrCmd_showelevmenu @ 0xb2
.4byte ScrCmd_checkcoins @ 0xb3
.4byte ScrCmd_addcoins @ 0xb4
.4byte ScrCmd_removecoins @ 0xb5
.4byte ScrCmd_setwildbattle @ 0xb6
.4byte ScrCmd_dowildbattle @ 0xb7
.4byte ScrCmd_setvaddress @ 0xb8
.4byte ScrCmd_vgoto @ 0xb9
.4byte ScrCmd_vcall @ 0xba
.4byte ScrCmd_vgoto_if @ 0xbb
.4byte ScrCmd_vcall_if @ 0xbc
.4byte ScrCmd_vmessage @ 0xbd
.4byte ScrCmd_vloadword @ 0xbe
.4byte ScrCmd_vbufferstring @ 0xbf
.4byte ScrCmd_showcoinsbox @ 0xc0
.4byte ScrCmd_hidecoinsbox @ 0xc1
.4byte ScrCmd_updatecoinsbox @ 0xc2
.4byte ScrCmd_incrementgamestat @ 0xc3
.4byte ScrCmd_setescapewarp @ 0xc4
.4byte ScrCmd_waitmoncry @ 0xc5
.4byte ScrCmd_bufferboxname @ 0xc6
.4byte ScrCmd_nop1 @ 0xc7
.4byte ScrCmd_nop1 @ 0xc8
.4byte ScrCmd_nop1 @ 0xc9
.4byte ScrCmd_nop1 @ 0xca
.4byte ScrCmd_nop1 @ 0xcb
.4byte ScrCmd_nop1 @ 0xcc
.4byte ScrCmd_setmonobedient @ 0xcd
.4byte ScrCmd_checkmonobedience @ 0xce
.4byte ScrCmd_gotoram @ 0xcf
.4byte ScrCmd_nop1 @ 0xd0
.4byte ScrCmd_warpD1 @ 0xd1
.4byte ScrCmd_setmonmetlocation @ 0xd2
.4byte ScrCmd_moverotatingtileobjects @ 0xd3
.4byte ScrCmd_turnrotatingtileobjects @ 0xd4
.4byte ScrCmd_initrotatingtilepuzzle @ 0xd5
.4byte ScrCmd_freerotatingtilepuzzle @ 0xd6
.4byte ScrCmd_warpmossdeepgym @ 0xd7
.4byte ScrCmd_cmdD8 @ 0xd8
.4byte ScrCmd_cmdD9 @ 0xd9
.4byte ScrCmd_closebraillemessage @ 0xda
.4byte ScrCmd_cmdDB @ 0xdb
.4byte ScrCmd_fadescreenswapbuffers @ 0xdc
.4byte ScrCmd_buffertrainerclassname @ 0xdd
.4byte ScrCmd_buffertrainername @ 0xde
.4byte ScrCmd_pokenavcall @ 0xdf
.4byte ScrCmd_warpsootopolislegend @ 0xe0
.4byte ScrCmd_buffercontesttype @ 0xe1
.4byte ScrCmd_bufferitemnameplural @ 0xe2
gScriptCmdTableEnd:: @ 81DBA08
.4byte ScrCmd_nop

2
data/scripts/item_ball_scripts.inc
View File

@@ -398,7 +398,7 @@ MeteorFalls_B1F_2R_EventScript_ItemTM02:: @ 82911DF
finditem ITEM_TM02
end
NewMauville_Inside_EventScript_ItemUltraRope:: @ 82911EC
NewMauville_Inside_EventScript_ItemUltraBall:: @ 82911EC
finditem ITEM_ULTRA_BALL
end

31
data/scripts/new_game.inc
View File

@@ -1,43 +1,66 @@
EventScript_ResetAllBerries:: @ 827149D
@ Route 102
setberrytree 2, ITEM_TO_BERRY(ITEM_ORAN_BERRY), BERRY_STAGE_BERRIES
setberrytree 1, ITEM_TO_BERRY(ITEM_PECHA_BERRY), BERRY_STAGE_BERRIES
@ Route 104
setberrytree 11, ITEM_TO_BERRY(ITEM_ORAN_BERRY), BERRY_STAGE_BERRIES
setberrytree 13, ITEM_TO_BERRY(ITEM_PECHA_BERRY), BERRY_STAGE_BERRIES
setberrytree 4, ITEM_TO_BERRY(ITEM_ORAN_BERRY), BERRY_STAGE_BERRIES
setberrytree 76, ITEM_TO_BERRY(ITEM_CHERI_BERRY), BERRY_STAGE_BERRIES
setberrytree 8, ITEM_TO_BERRY(ITEM_CHERI_BERRY), BERRY_STAGE_BERRIES
setberrytree 10, ITEM_TO_BERRY(ITEM_LEPPA_BERRY), BERRY_STAGE_BERRIES
@ Route 116
setberrytree 25, ITEM_TO_BERRY(ITEM_PINAP_BERRY), BERRY_STAGE_BERRIES
setberrytree 26, ITEM_TO_BERRY(ITEM_CHESTO_BERRY), BERRY_STAGE_BERRIES
setberrytree 66, ITEM_TO_BERRY(ITEM_CHESTO_BERRY), BERRY_STAGE_BERRIES
setberrytree 67, ITEM_TO_BERRY(ITEM_PINAP_BERRY), BERRY_STAGE_BERRIES
@ Route 115
setberrytree 69, ITEM_TO_BERRY(ITEM_KELPSY_BERRY), BERRY_STAGE_BERRIES
setberrytree 70, ITEM_TO_BERRY(ITEM_KELPSY_BERRY), BERRY_STAGE_BERRIES
setberrytree 71, ITEM_TO_BERRY(ITEM_KELPSY_BERRY), BERRY_STAGE_BERRIES
setberrytree 55, ITEM_TO_BERRY(ITEM_BLUK_BERRY), BERRY_STAGE_BERRIES
setberrytree 56, ITEM_TO_BERRY(ITEM_BLUK_BERRY), BERRY_STAGE_BERRIES
@ Route 103
setberrytree 5, ITEM_TO_BERRY(ITEM_CHERI_BERRY), BERRY_STAGE_BERRIES
setberrytree 6, ITEM_TO_BERRY(ITEM_LEPPA_BERRY), BERRY_STAGE_BERRIES
setberrytree 7, ITEM_TO_BERRY(ITEM_CHERI_BERRY), BERRY_STAGE_BERRIES
@ Route 110
setberrytree 16, ITEM_TO_BERRY(ITEM_NANAB_BERRY), BERRY_STAGE_BERRIES
setberrytree 17, ITEM_TO_BERRY(ITEM_NANAB_BERRY), BERRY_STAGE_BERRIES
setberrytree 18, ITEM_TO_BERRY(ITEM_NANAB_BERRY), BERRY_STAGE_BERRIES
@ Route 117
setberrytree 29, ITEM_TO_BERRY(ITEM_WEPEAR_BERRY), BERRY_STAGE_BERRIES
setberrytree 28, ITEM_TO_BERRY(ITEM_WEPEAR_BERRY), BERRY_STAGE_BERRIES
setberrytree 27, ITEM_TO_BERRY(ITEM_WEPEAR_BERRY), BERRY_STAGE_BERRIES
@ Route 112
setberrytree 24, ITEM_TO_BERRY(ITEM_RAWST_BERRY), BERRY_STAGE_BERRIES
setberrytree 23, ITEM_TO_BERRY(ITEM_PECHA_BERRY), BERRY_STAGE_BERRIES
setberrytree 22, ITEM_TO_BERRY(ITEM_PECHA_BERRY), BERRY_STAGE_BERRIES
setberrytree 21, ITEM_TO_BERRY(ITEM_RAWST_BERRY), BERRY_STAGE_BERRIES
@ Route 111
setberrytree 19, ITEM_TO_BERRY(ITEM_RAZZ_BERRY), BERRY_STAGE_BERRIES
setberrytree 20, ITEM_TO_BERRY(ITEM_RAZZ_BERRY), BERRY_STAGE_BERRIES
setberrytree 80, ITEM_TO_BERRY(ITEM_ORAN_BERRY), BERRY_STAGE_BERRIES
setberrytree 81, ITEM_TO_BERRY(ITEM_ORAN_BERRY), BERRY_STAGE_BERRIES
@ Route 114
setberrytree 77, ITEM_TO_BERRY(ITEM_PERSIM_BERRY), BERRY_STAGE_BERRIES
setberrytree 78, ITEM_TO_BERRY(ITEM_PERSIM_BERRY), BERRY_STAGE_BERRIES
setberrytree 68, ITEM_TO_BERRY(ITEM_PERSIM_BERRY), BERRY_STAGE_BERRIES
@ Route 118
setberrytree 31, ITEM_TO_BERRY(ITEM_SITRUS_BERRY), BERRY_STAGE_BERRIES
setberrytree 33, ITEM_TO_BERRY(ITEM_SITRUS_BERRY), BERRY_STAGE_BERRIES
@ Route 119
setberrytree 34, ITEM_TO_BERRY(ITEM_POMEG_BERRY), BERRY_STAGE_BERRIES
setberrytree 35, ITEM_TO_BERRY(ITEM_POMEG_BERRY), BERRY_STAGE_BERRIES
setberrytree 36, ITEM_TO_BERRY(ITEM_POMEG_BERRY), BERRY_STAGE_BERRIES
@@ -45,6 +68,8 @@ EventScript_ResetAllBerries:: @ 827149D
setberrytree 84, ITEM_TO_BERRY(ITEM_HONDEW_BERRY), BERRY_STAGE_BERRIES
setberrytree 85, ITEM_TO_BERRY(ITEM_SITRUS_BERRY), BERRY_STAGE_BERRIES
setberrytree 86, ITEM_TO_BERRY(ITEM_LEPPA_BERRY), BERRY_STAGE_BERRIES
@ Route 120
setberrytree 37, ITEM_TO_BERRY(ITEM_ASPEAR_BERRY), BERRY_STAGE_BERRIES
setberrytree 38, ITEM_TO_BERRY(ITEM_ASPEAR_BERRY), BERRY_STAGE_BERRIES
setberrytree 39, ITEM_TO_BERRY(ITEM_ASPEAR_BERRY), BERRY_STAGE_BERRIES
@@ -55,12 +80,16 @@ EventScript_ResetAllBerries:: @ 827149D
setberrytree 45, ITEM_TO_BERRY(ITEM_PINAP_BERRY), BERRY_STAGE_BERRIES
setberrytree 44, ITEM_TO_BERRY(ITEM_NANAB_BERRY), BERRY_STAGE_BERRIES
setberrytree 43, ITEM_TO_BERRY(ITEM_RAZZ_BERRY), BERRY_STAGE_BERRIES
@ Route 121
setberrytree 47, ITEM_TO_BERRY(ITEM_PERSIM_BERRY), BERRY_STAGE_BERRIES
setberrytree 48, ITEM_TO_BERRY(ITEM_ASPEAR_BERRY), BERRY_STAGE_BERRIES
setberrytree 49, ITEM_TO_BERRY(ITEM_RAWST_BERRY), BERRY_STAGE_BERRIES
setberrytree 50, ITEM_TO_BERRY(ITEM_CHESTO_BERRY), BERRY_STAGE_BERRIES
setberrytree 52, ITEM_TO_BERRY(ITEM_NANAB_BERRY), BERRY_STAGE_BERRIES
setberrytree 53, ITEM_TO_BERRY(ITEM_NANAB_BERRY), BERRY_STAGE_BERRIES
@ Route 123
setberrytree 62, ITEM_TO_BERRY(ITEM_LEPPA_BERRY), BERRY_STAGE_BERRIES
setberrytree 64, ITEM_TO_BERRY(ITEM_LEPPA_BERRY), BERRY_STAGE_BERRIES
setberrytree 58, ITEM_TO_BERRY(ITEM_POMEG_BERRY), BERRY_STAGE_BERRIES
@@ -78,6 +107,8 @@ EventScript_ResetAllBerries:: @ 827149D
setberrytree 87, ITEM_TO_BERRY(ITEM_PECHA_BERRY), BERRY_STAGE_BERRIES
setberrytree 88, ITEM_TO_BERRY(ITEM_SITRUS_BERRY), BERRY_STAGE_BERRIES
setberrytree 89, ITEM_TO_BERRY(ITEM_RAWST_BERRY), BERRY_STAGE_BERRIES
@ Mirage Island
setberrytree 82, ITEM_TO_BERRY(ITEM_LIECHI_BERRY), BERRY_STAGE_BERRIES
return

2
data/scripts/secret_base.inc
View File

@@ -308,7 +308,7 @@ SecretBase_EventScript_PutAwayDecorationLoop:: @ 8275D39
compare VAR_0x8005, 0
goto_if_eq SecretBase_EventScript_PutAwayDecorationLoop
removeobject VAR_0x8006
setflag VAR_0x8005 @ UB: GF likely meant setvar here; setflag 0x8005 is out of bounds
setflag VAR_0x8005 @ UB: VAR_0x8005 is set to a flag by PutAwayDecorationIteration, but ScrCmd_setflag doesn't use VarGet
goto SecretBase_EventScript_PutAwayDecorationLoop
end

4
data/scripts/set_gym_trainers.inc
View File

@@ -1,6 +1,6 @@
Common_EventScript_SetGymTrainers:: @ 8271F43
switch VAR_0x8008
case 1, RusboroCity_Gym_SetGymTrainers
case 1, RustboroCity_Gym_SetGymTrainers
case 2, DewfordTown_Gym_SetGymTrainers
case 3, MauvilleCity_Gym_SetGymTrainers
case 4, LavaridgeTown_Gym_SetGymTrainers
@@ -10,7 +10,7 @@ Common_EventScript_SetGymTrainers:: @ 8271F43
case 8, SootopolisCity_Gym_SetGymTrainers
end
RusboroCity_Gym_SetGymTrainers:: @ 8271FA1
RustboroCity_Gym_SetGymTrainers:: @ 8271FA1
settrainerflag TRAINER_JOSH
settrainerflag TRAINER_TOMMY
settrainerflag TRAINER_MARC