From 95ea0e92e7e24de9ad77dfa0a3224718cd1564c3 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Tue, 25 Aug 2020 17:49:42 -0400 Subject: Start documenting rayquaza_scene --- data/maps/SootopolisCity/scripts.inc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'data') diff --git a/data/maps/SootopolisCity/scripts.inc b/data/maps/SootopolisCity/scripts.inc index 2979f104d..97081c250 100644 --- a/data/maps/SootopolisCity/scripts.inc +++ b/data/maps/SootopolisCity/scripts.inc @@ -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_T_KAMI @@ -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 -- cgit v1.2.3 From 71a066f9457416581a22ddc82d81984e45d06dca Mon Sep 17 00:00:00 2001 From: GriffinR Date: Fri, 28 Aug 2020 03:49:15 -0400 Subject: Document cable car --- data/maps/MtChimney_CableCarStation/scripts.inc | 2 +- data/maps/Route112_CableCarStation/scripts.inc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'data') diff --git a/data/maps/MtChimney_CableCarStation/scripts.inc b/data/maps/MtChimney_CableCarStation/scripts.inc index 6ce84933f..5eebdb767 100644 --- a/data/maps/MtChimney_CableCarStation/scripts.inc +++ b/data/maps/MtChimney_CableCarStation/scripts.inc @@ -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 diff --git a/data/maps/Route112_CableCarStation/scripts.inc b/data/maps/Route112_CableCarStation/scripts.inc index b1da3e3cb..6781b154c 100644 --- a/data/maps/Route112_CableCarStation/scripts.inc +++ b/data/maps/Route112_CableCarStation/scripts.inc @@ -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 -- cgit v1.2.3 From afb3472282c52746aaac52d1e361d0c9bdf31de3 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Sun, 30 Aug 2020 15:11:44 -0400 Subject: Minor battle_anim_throw cleanup --- data/battle_anim_scripts.s | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'data') diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s index f7aac71e8..b4bb33993 100644 --- a/data/battle_anim_scripts.s +++ b/data/battle_anim_scripts.s @@ -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 -- cgit v1.2.3 From f5495d12200adf2e1ec2b5d7979997f0aa1ec893 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Tue, 1 Sep 2020 03:03:14 -0400 Subject: Give proper names to underwater maps --- data/event_scripts.s | 14 ++-- data/layouts/Underwater1/border.bin | 1 - data/layouts/Underwater1/map.bin | 17 ----- data/layouts/Underwater2/border.bin | 1 - data/layouts/Underwater2/map.bin | 35 --------- data/layouts/Underwater3/border.bin | 1 - data/layouts/Underwater3/map.bin | 1 - data/layouts/Underwater4/border.bin | 1 - data/layouts/Underwater4/map.bin | 1 - data/layouts/Underwater5/border.bin | 1 - data/layouts/Underwater5/map.bin | 1 - data/layouts/Underwater6/border.bin | 1 - data/layouts/Underwater6/map.bin | 1 - data/layouts/Underwater7/border.bin | 1 - data/layouts/Underwater7/map.bin | 1 - data/layouts/Underwater_Route105/border.bin | 1 + data/layouts/Underwater_Route105/map.bin | 1 + data/layouts/Underwater_Route124/border.bin | 1 + data/layouts/Underwater_Route124/map.bin | 17 +++++ data/layouts/Underwater_Route125/border.bin | 1 + data/layouts/Underwater_Route125/map.bin | 1 + data/layouts/Underwater_Route126/border.bin | 1 + data/layouts/Underwater_Route126/map.bin | 35 +++++++++ data/layouts/Underwater_Route127/border.bin | 1 + data/layouts/Underwater_Route127/map.bin | 1 + data/layouts/Underwater_Route128/border.bin | 1 + data/layouts/Underwater_Route128/map.bin | 1 + data/layouts/Underwater_Route129/border.bin | 1 + data/layouts/Underwater_Route129/map.bin | 1 + data/layouts/layouts.json | 56 +++++++------- data/maps/Route105/map.json | 2 +- data/maps/Route124/map.json | 2 +- data/maps/Route125/map.json | 2 +- data/maps/Route126/map.json | 2 +- data/maps/Route127/map.json | 2 +- data/maps/Route128/map.json | 2 +- data/maps/Route129/map.json | 2 +- data/maps/SeafloorCavern_Entrance/map.json | 2 +- data/maps/Underwater1/map.json | 88 --------------------- data/maps/Underwater1/scripts.inc | 3 - data/maps/Underwater2/map.json | 109 --------------------------- data/maps/Underwater2/scripts.inc | 3 - data/maps/Underwater3/map.json | 84 --------------------- data/maps/Underwater3/scripts.inc | 8 -- data/maps/Underwater4/map.json | 56 -------------- data/maps/Underwater4/scripts.inc | 3 - data/maps/Underwater5/map.json | 41 ---------- data/maps/Underwater5/scripts.inc | 8 -- data/maps/Underwater6/map.json | 41 ---------- data/maps/Underwater6/scripts.inc | 8 -- data/maps/Underwater7/map.json | 41 ---------- data/maps/Underwater7/scripts.inc | 8 -- data/maps/Underwater_Route105/map.json | 41 ++++++++++ data/maps/Underwater_Route105/scripts.inc | 8 ++ data/maps/Underwater_Route124/map.json | 88 +++++++++++++++++++++ data/maps/Underwater_Route124/scripts.inc | 3 + data/maps/Underwater_Route125/map.json | 41 ++++++++++ data/maps/Underwater_Route125/scripts.inc | 8 ++ data/maps/Underwater_Route126/map.json | 109 +++++++++++++++++++++++++++ data/maps/Underwater_Route126/scripts.inc | 3 + data/maps/Underwater_Route127/map.json | 84 +++++++++++++++++++++ data/maps/Underwater_Route127/scripts.inc | 8 ++ data/maps/Underwater_Route128/map.json | 56 ++++++++++++++ data/maps/Underwater_Route128/scripts.inc | 3 + data/maps/Underwater_Route129/map.json | 41 ++++++++++ data/maps/Underwater_Route129/scripts.inc | 8 ++ data/maps/Underwater_SeafloorCavern/map.json | 4 +- data/maps/Underwater_SootopolisCity/map.json | 4 +- data/maps/map_groups.json | 28 +++---- 69 files changed, 626 insertions(+), 626 deletions(-) delete mode 100644 data/layouts/Underwater1/border.bin delete mode 100644 data/layouts/Underwater1/map.bin delete mode 100644 data/layouts/Underwater2/border.bin delete mode 100644 data/layouts/Underwater2/map.bin delete mode 100644 data/layouts/Underwater3/border.bin delete mode 100644 data/layouts/Underwater3/map.bin delete mode 100644 data/layouts/Underwater4/border.bin delete mode 100644 data/layouts/Underwater4/map.bin delete mode 100644 data/layouts/Underwater5/border.bin delete mode 100644 data/layouts/Underwater5/map.bin delete mode 100644 data/layouts/Underwater6/border.bin delete mode 100644 data/layouts/Underwater6/map.bin delete mode 100644 data/layouts/Underwater7/border.bin delete mode 100644 data/layouts/Underwater7/map.bin create mode 100644 data/layouts/Underwater_Route105/border.bin create mode 100644 data/layouts/Underwater_Route105/map.bin create mode 100644 data/layouts/Underwater_Route124/border.bin create mode 100644 data/layouts/Underwater_Route124/map.bin create mode 100644 data/layouts/Underwater_Route125/border.bin create mode 100644 data/layouts/Underwater_Route125/map.bin create mode 100644 data/layouts/Underwater_Route126/border.bin create mode 100644 data/layouts/Underwater_Route126/map.bin create mode 100644 data/layouts/Underwater_Route127/border.bin create mode 100644 data/layouts/Underwater_Route127/map.bin create mode 100644 data/layouts/Underwater_Route128/border.bin create mode 100644 data/layouts/Underwater_Route128/map.bin create mode 100644 data/layouts/Underwater_Route129/border.bin create mode 100644 data/layouts/Underwater_Route129/map.bin delete mode 100644 data/maps/Underwater1/map.json delete mode 100644 data/maps/Underwater1/scripts.inc delete mode 100644 data/maps/Underwater2/map.json delete mode 100644 data/maps/Underwater2/scripts.inc delete mode 100644 data/maps/Underwater3/map.json delete mode 100644 data/maps/Underwater3/scripts.inc delete mode 100644 data/maps/Underwater4/map.json delete mode 100644 data/maps/Underwater4/scripts.inc delete mode 100644 data/maps/Underwater5/map.json delete mode 100644 data/maps/Underwater5/scripts.inc delete mode 100644 data/maps/Underwater6/map.json delete mode 100644 data/maps/Underwater6/scripts.inc delete mode 100644 data/maps/Underwater7/map.json delete mode 100644 data/maps/Underwater7/scripts.inc create mode 100644 data/maps/Underwater_Route105/map.json create mode 100644 data/maps/Underwater_Route105/scripts.inc create mode 100644 data/maps/Underwater_Route124/map.json create mode 100644 data/maps/Underwater_Route124/scripts.inc create mode 100644 data/maps/Underwater_Route125/map.json create mode 100644 data/maps/Underwater_Route125/scripts.inc create mode 100644 data/maps/Underwater_Route126/map.json create mode 100644 data/maps/Underwater_Route126/scripts.inc create mode 100644 data/maps/Underwater_Route127/map.json create mode 100644 data/maps/Underwater_Route127/scripts.inc create mode 100644 data/maps/Underwater_Route128/map.json create mode 100644 data/maps/Underwater_Route128/scripts.inc create mode 100644 data/maps/Underwater_Route129/map.json create mode 100644 data/maps/Underwater_Route129/scripts.inc (limited to 'data') diff --git a/data/event_scripts.s b/data/event_scripts.s index f8348d0b0..8039be687 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -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" diff --git a/data/layouts/Underwater1/border.bin b/data/layouts/Underwater1/border.bin deleted file mode 100644 index b15c94f96..000000000 --- a/data/layouts/Underwater1/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/layouts/Underwater1/map.bin b/data/layouts/Underwater1/map.bin deleted file mode 100644 index 230e3dcd2..000000000 --- a/data/layouts/Underwater1/map.bin +++ /dev/null @@ -1,17 +0,0 @@ -2222222222222222222222222222222222222222222222222222222222222222222222# 22 -"##~222222222222222222222222222222222#  "#####~22222222222}####### 22 -||~22###~22222222#  "22######~2222222222222222222222222222222222222222222222222222}|||| 22 -"22222222222#  "22222222222222222222222222222222222222222222222222#|~222222222222222222#~2222#||~2222222222222222222#|||||||||||~222#~22222#~2222222222222#~2222222222#|||# 22 -"22#  "222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222# 22 -"22}"2222222222222222222y2y222222222222y2y222222222222222# 22 -""~22222222222222222222222#  "222222222222}|"22222222222222222222222222# 22 -|||"2222222222222222222#  "2222"~222222222}|"222# 22 -""|~22222}|"22}|#  ""|||||"22222222222222222222222222222222222222222222222222}||~2222222222222222}"22222222# 22 -"2222"~2222222#  "222222}""|~}"2222222}""|||||22222222222222# 22 -"2222#  "222222"~22222222"~222222222"~22z222 -"22222222222222y2y22222222222222222#~22# 22 -"||||~222222222222#  "#|~2222222222222222222222222222222#|~2222222222222# 22 -"||||||# 22 -"222#  "#  "22222222}"222222222222222 - "# 22 -"#  " \ No newline at end of file diff --git a/data/layouts/Underwater2/border.bin b/data/layouts/Underwater2/border.bin deleted file mode 100644 index b15c94f96..000000000 --- a/data/layouts/Underwater2/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/layouts/Underwater2/map.bin b/data/layouts/Underwater2/map.bin deleted file mode 100644 index 0c6377c30..000000000 --- a/data/layouts/Underwater2/map.bin +++ /dev/null @@ -1,35 +0,0 @@ -2222222222222222222222222222222222222222222222222222222z222x2#~6y2y222}||||||||||||||##||||#2222222222222222222222222#       22222222222/# 222222222222222222 -    222222222222222222222#  22222222222222222222222# 22222222222222222222222222# 2222222222222222222222222222222222222222222222222 -    22222222222222222222222222222222 -" #  222/2222222 222222222222222222222 "#/#   "# 22222 -"222222222222222222222##     " "2222222222222222222222/ "222222 -  222222222222222222 -  22222222222222222/  2222222222/2222222222222/#  22222# 222222222222222222222222 -"#22/2222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222 -"2222222222222222222222222222222222222222222222222# 22222222222222222 -   2222222222222222222222222222222222222222 -   "#     22222222222222222222222222222222222 - " /#           22222222222222/2222222222 -"/ " #/#  22222222/2222222222222 - " " "# /#/# 2222222222222222222 - " "/ "#/#/# 2222222222222222222 -" "/ "#/## 2222222222 -"222222 -" " "#/#/# 22222# 222/2222222 "/ "### 22222#/222222222 -" "##22222222222222 " "#/# 2222222222222## 2222## 2 -"22222 -  "/2222/# "/222222 "##2222#22222222222#2222222/### 2222/2222222//622222/222222 - 22222222222/22222#222222/222222222222/222222#2222222222222//2222222222222 -"22222222222222222222//62222222/# 2222222/2222222/ "2222222/2222222 -"## 2222222/222222 -" "22222222222222/222222222/222222 -"/ "# 222222222/22222222222222222//2222222 "222222222222//2222222 -"#/# 22222222222222efg2222222222/ "##   222222222222222222mno2222222222222222222 #  222222222222222222222222222222222222222222 -" "222222 /#  222222222222222222222222222222222222222 -"2222222##    22222222222222222222222222222222 -  " "6222222222/# 222222222222222222222222222222 -"/62222z222x22##  2222222222222222222222222 -  " "622}~2y2y22} #   22222222222222222222 - "622 |||| ##   222222222222222 - "/ "622/#  2222222 -     "622##       "/ "62222// "6222222#"222222|~22222 ||||   \ No newline at end of file diff --git a/data/layouts/Underwater3/border.bin b/data/layouts/Underwater3/border.bin deleted file mode 100644 index b15c94f96..000000000 --- a/data/layouts/Underwater3/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/layouts/Underwater3/map.bin b/data/layouts/Underwater3/map.bin deleted file mode 100644 index fc5c331a5..000000000 --- a/data/layouts/Underwater3/map.bin +++ /dev/null @@ -1 +0,0 @@ -66666666666666666666666666666666666666666666666666666666666666&666666666666.66666666666662222;2;2666666666666662222;2;2;2;2666666666662222@2C2C2A26666666666222222<2P2Q2:266666666666222222<2T2R:266666666666222222<2T2R:26666666666662z222x22@2G2T2R2:266666666666@2A222y2y22}#@2G2P2\2R2B2A266666666666@2D2B2A2#######<2P2\2V2Z2Q2:266666666666?2P2Q2B2:2<2K2L2V2V2R2B2A266666666666?2W2]2Q2:23242T2V2V2R2S2:266666666666?2W2S2U2:2# ?2K2L2V2Z2Q2:266666666666?2W2S2U2:23242T2V2V2R2:26666666666?2Y2O2U2B2A2## ?2K2K2L2R2:26666666666I242W2U2S2:2#32422L2R2:26666666666  ?2W2]2Q2:2## 422L2R2:26666666666?2Y2O2U2:2#3242L2R2:2666666666I242W2U2B2A2## 42T2R2:26666666666  ?2W2U2S2:2#42T2R2:2666666666?2W2]2Q2:242T2R20 66666666?2W2S2U2:2;242T2R2866666666?2Y2O2U2B2A242T2R28 "666666666   I242W2U2S2:2;242T2R28 "666666666  ?2W2]2Q2:2@2C2A222###!a6`"  666666666?2W2S2U2:2?2S2:22222###" "666666666?2W2S2U2B2A2?2S2:2222222 66666666?2W2S2U2S2:2?2S2B2A2222222 "66666666?2W2S2U2S2:23242S2:2#~z222x2}# "66666666?2W2S2U2S2:2@2A2# ?2S2B2A22y2y22 "# "66666666?2W2S2]2Q2:2?2B2A2?2S2S2:22222##666666666?2W2P2Q2U2:2?2S2:2?22S2:2#~222666666666?2W2T2R2U2:2?2S2:2?2S2S2:2   #~22&#"666666666@2A2?2W2T2R2U2:2?2S2B2A2?2S2S2:2#~2.# "666666666<2:2?2W2T2R2U2:2@2D2P2Q2:2?2S2S2:2222222#  666666666@22B2A2?2W2T2R2U2:2?2P2_2U2:2@2D2S2S2:2#~2222}##"666666666@2222:2?2W2T2R2U2:2?2W2S2U2:2?2S2S22232#######666666666<2222B2A2?2W2T2R2U2:2;2?2W2S2U2:2?2S2S2:2" "666666666<2222S2:2;2?2W2T2R2U2B2A2?2W2S2U2:2;2?2S2S2:266666666I242T2Z2Q2:2@2G2W2T2R2U2S2:2?2W2S2U2B2A2@2D2S2S2:2#"66666666# ?2Y2L2R2B2A2?2S2W2T2R2]2Q2:2?2K2O2U2S2:2?2S2S2S2:266666666I242T2Z2Q2:2?2P2_2T2Z2Q2U2:23242T2U2S2:2?2S2S22232226666666 6# ?2Y2L2R2:2?2W2S2T2V2R2U2:2  ?2T2U22232?2S2S2:2"  222266666666I242T2R2:2?2W2P2\2V2R2U2:2;2?2T2U2:2 ?2S22232  22222266 66666# ?2T2R2B2A2?2W2T2V2V2R2U2B2A2?2T2U2:2@2D2S2:2"22222266666666?2T2Z2Q2:2?2W2T2V2V2R2U2S2:2?2T2U2:2?2S2S2:2  222222266666#?2Y2L2R2:2?2W2T2V2V2R2]2Q2:2?2T2U2:2@2D2S22232222z222x2266666#66I242T2R2B2A2>2?2T2Y2L2V2Z2Q2U2:2>2?2T2U2:2?2S2S2:2"  2222y2y22}#666666666# ?2T2R2S2:2>2?2Y2O2T2V2V2R2U2:2>2>2@2D2T2U2:2@2D2S2S2:2  22222226666666?2T2Z2Q2:2>2?2S2W2Y2L2V2R2U2B2A2>2<22_2U2:2?2S2S22232  2222222}#666666#66#6?2T2V2R2:2>2?2S2Y2O2T2V2R2]2Q2B2C2D2T2M2K2:2?2S2S2:2" "2222222}#666666666?2T2V2R2:2>2I242S2W2T2V2Z2Q2U2S2S22_2U22232?2S22232 "222222266666#6666#?2Y2L2R2:2>2>2?2S2W2T2V2V2R2U2S2S2T2S2U2:2"?2S2:2"#6#~z222x22}|6666666#I242T2R2:2>2>2?2S2W2T2V2V2R2]2^2^2_2S2U2:2?2S2:2 """2y2y2226666#666#66# ?2T2R2:2# >2I242W2Y2L2V2Z2Q2S2S2S2M2K2:2?2S20" #~22}|#666666666?2T2R20" >2>2?2Y2O2T2V2V2Z2Q2S2M2K2S2:2#!!"  #622666666666##1T2R28 " >2>2I242W2Y2L2V2V2R2S2U2S22232 "#6#~}|666666669T2R28 ">2>2>2?2Y2O2T2V2V2R2M2K22232"   "66666666#6##9T2R28# >2>2?2S2W2T2V2V2R2U2S2:2>2 "  #6##6666666669T2R28#>2>2I242W2T2V2V2R2U2S2:2" "  666666669T2R28>2>2>2?2W2Y2L2V2R2U2S2:2 " "666666#6669T2R28## >2>2?2Y2O2T2V2R2U22232 " "#6666666666##)) ## >2I242W2T2V2R2U2:2>2#666666666#  >2>2?2W2T2J2K2U2:2"#666666#6666# " "### >2?2W2T2R2S2U2:2 "  666666666# ">2?2W2T2R2S2U2:2 "#6#666666666 "##>2?2W2T2R2S2U2:2 " "#666#6666666#">2?2W2T2R22U2:2666666666#>2?2W2T2R2S2U2:2666666666>2?2W2T2R2S2U2:2666666666>2?2W2T2R2S2U2:2666666666>2?2W2T2Z22U2:26666666#66 ">2?2W2T2V2R2U2:2666666666>2?2W2T2V2R2U2:2#6666666666>2?2W2T2V2R2U2:2#6#6#6#6 \ No newline at end of file diff --git a/data/layouts/Underwater4/border.bin b/data/layouts/Underwater4/border.bin deleted file mode 100644 index b15c94f96..000000000 --- a/data/layouts/Underwater4/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/layouts/Underwater4/map.bin b/data/layouts/Underwater4/map.bin deleted file mode 100644 index 23f987681..000000000 --- a/data/layouts/Underwater4/map.bin +++ /dev/null @@ -1 +0,0 @@ -666666666  >2?2W2T2V2R2U2:2666666666>2?2W2T2V2R2U2:2666666666>2?2W2K2L2R2U2:2666666666# ?2K2O2T2R2U2:2666666666 3242W2T2R2U2:2666666666 "# ?2W2T2R2U2:2 66666666#?2W2T2R2U2:2#666666666 "?2W2T2R2U2B2A2 666 666666?2W2T2R2]2Q2B2C2C2C2A2 # #6666666666?2W2T2Z2Q2]2[2[2[2Q2B2C2C2C2A2 #   #6666666666#)aV2V2Z2[2[2[2Q2]2[2[2[2Q2:2;2;2;2  666666666 6 6aV2V2V2V2V2Z2[2[2[2Q2U2B2A2@2C2C2C2C2C2C2C2C2C28 666666666##))))))aV2V2R2]2Q2B2C2A2@2C2C2D2P2[2[2[2[2[2[2[2[28666666666 #)))a]2[2Q2B2C2C2C2C2D2P2[2[2_2P2[2[2[2[2[2[2`#666666 66666666 "#a[2]2[2[2[2[2[2[2_2P2[2[2\2V2V2V2V2`)"66666666666666##a[2[2[2[2[2[2[2[2\2V2V2`))))"66666666666666#aV2V2V2V2V2V2V2V2`)"66666666666d2V2V2V2V2V2`)"@2C2A2 6666 6666666666@2C2C2A2<2L2V2V2V2`" @2D22B2C2A26666666 6666666<222:2<2T2L2V2b28 " #<2P2[2[2Q2B2C2C2C2C2C2A26666666666666@2A2## 12:2@2D2T2T2J20 #1W2P2Q2]2[2[2[2[2[2Q2B2C2A2666666666666666@2D2B2A2" !""<2P2_2T2R28#aT2Z2[2[2[2[2[2Q2]2[2Q2B2C26666 66666666666<2P2Q2:2<2T2P2V2R28#aV2V2V2V2V2V2Z2[2[2]2[2`"666666666666666<2T2R2:2<2T2T2V2R28#)aV2V2V2V2`))))"666666666666666#1T2R2B2A2@2D2T2T2V2R28#))))"666666666666666#aZ2Q2B2C2A2efg@2C2D2P2_2T2V2R28  6666666666666666#aZ2[2Q2B2C2A2mn2o@2D2P2[2_2P2V2`)"# 6666666666666666#aQ2]2[2Q2B2C2C2C2A2;2;2;2;2;2<2P2_2P2[2`)" # "#6666666666666666#)aQ2]2[2[2[2Q2B2C2C2C2C2C2D2T2P2V2` "6666666666666666#))a[2Q2]2[2[2[2[2[2[2[2_2T2` "6666666666666666 #aZ2[2[2[2[2[2[2[2[2[2b2 6666666666666666 "##)aV2V2V2V2V2V2V2J2:2 " "666666666666666 d2V2V2V2V2V2J2U2:2 " "6666666666666666@2D2L2V2V2V2V2R2U2B2A2 " "6666666 666666666#<2P2_2L2V2V2V2R2]2Q2B2C2C2C2C2C2C2C2C2A2 6666666666666666#<2T2P2\2V2`)))a[2[2[2[2[2[2[2[2Q2:26666666666666666#@2D2T2`))"#))a[2[2[2[2`))"6666666666666666# @2C2C2D2P2`" #))))" "66666666666666666""# )))))" "#66666666666666666#"#" \ No newline at end of file diff --git a/data/layouts/Underwater5/border.bin b/data/layouts/Underwater5/border.bin deleted file mode 100644 index b15c94f96..000000000 --- a/data/layouts/Underwater5/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/layouts/Underwater5/map.bin b/data/layouts/Underwater5/map.bin deleted file mode 100644 index 902f0dbdc..000000000 --- a/data/layouts/Underwater5/map.bin +++ /dev/null @@ -1 +0,0 @@ -& . 2222222 #222}#~2 #222222}#2 "22}#222222222}#222222}#222222222}#22}"##22222}#222222222222}"#222222222222#222222222222}"# """#222z222x2222}"# ""222222y2y22222 ""2222############222222 ""&222222.2222222#22222222222z222x22222222222222y2y22}"##""""""""""""""""#  # " " "  "############ \ No newline at end of file diff --git a/data/layouts/Underwater6/border.bin b/data/layouts/Underwater6/border.bin deleted file mode 100644 index b15c94f96..000000000 --- a/data/layouts/Underwater6/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/layouts/Underwater6/map.bin b/data/layouts/Underwater6/map.bin deleted file mode 100644 index 92bd56031..000000000 --- a/data/layouts/Underwater6/map.bin +++ /dev/null @@ -1 +0,0 @@ -&/.222/2222222222222/22222222}##222222222}##2222222222222222}##2222/#~222222#~22#2222222222222222222222222222222222#~2222222/###222222222222222z222x222222222y2y2222222222222222222####"""##########"""""""""""""""                                # ##   22222 222222 222222 ## ##222222   #~z222x22 #~y2y222#~222 ~22 ~22  #222   222 2}## &2 .2 2222222  #~222222 #~22222#~2222 ####"""    #  ##  # #  # ######"" \ No newline at end of file diff --git a/data/layouts/Underwater7/border.bin b/data/layouts/Underwater7/border.bin deleted file mode 100644 index b15c94f96..000000000 --- a/data/layouts/Underwater7/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/layouts/Underwater7/map.bin b/data/layouts/Underwater7/map.bin deleted file mode 100644 index 660f585ae..000000000 --- a/data/layouts/Underwater7/map.bin +++ /dev/null @@ -1 +0,0 @@ -9<?WTVVVVVVV9<?WTVVVVVVV9<?WTVVVVVVV9<?WTVVVVVVV9<?WTVVVVVVV9<?WTVVVVVVV9<?WTVVVVVVV9<?WTVVVVVVV9<?WTVVVVVVV&9<?WTVVVVVVV.9<?WTVVVVVVV22222222229<?WTVVVVVVV222222222222222229<?WTVVVVVVV222222222222222229<?WTVVVVVVV22222222222222222229<?WTVVVVVVV22222222222222222229<?WTVVVVVVV222222222222222222}#9<?WTVVVVVVV2222222222222222}"#2222229<?WTVVVVVVV22222222222222222222229<?WTVVVVVVV2z222x222}#########2222229<?WTVVVVVVV22y2y22222222229<?WTVVVVVVV#########2z222x229<?WTVVVVVVV22y2y2229<?WTVVVVVVV #2222229<?WTVVVVVVV 2222229<?WTVVVVVVV#2222229<?WTVVVVVVV2}~2229<?WTVVVVVVV2222229<?WTVVVVVVV#22222}~2229<?WTVVVVVVV "&222222229<?WTVVVVVVV#.22222222229<?WTVVVVVVV #222222222222222229<?WTVVVVVVV222222222222222229<?WTVVVVVVV   ##""""""""""""""""""9<?WTVVVVVVV 9<?WTVVVVVVV "# # 9<?WTVVVVVVV# #9<?WTVVVVVVV## # ##9<?WTVVVVVVV# ##9<?WTVVVVVVV9<?WTVVVVVVV \ No newline at end of file diff --git a/data/layouts/Underwater_Route105/border.bin b/data/layouts/Underwater_Route105/border.bin new file mode 100644 index 000000000..b15c94f96 --- /dev/null +++ b/data/layouts/Underwater_Route105/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/Underwater_Route105/map.bin b/data/layouts/Underwater_Route105/map.bin new file mode 100644 index 000000000..92bd56031 --- /dev/null +++ b/data/layouts/Underwater_Route105/map.bin @@ -0,0 +1 @@ +&/.222/2222222222222/22222222}##222222222}##2222222222222222}##2222/#~222222#~22#2222222222222222222222222222222222#~2222222/###222222222222222z222x222222222y2y2222222222222222222####"""##########"""""""""""""""                                # ##   22222 222222 222222 ## ##222222   #~z222x22 #~y2y222#~222 ~22 ~22  #222   222 2}## &2 .2 2222222  #~222222 #~22222#~2222 ####"""    #  ##  # #  # ######"" \ No newline at end of file diff --git a/data/layouts/Underwater_Route124/border.bin b/data/layouts/Underwater_Route124/border.bin new file mode 100644 index 000000000..b15c94f96 --- /dev/null +++ b/data/layouts/Underwater_Route124/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/Underwater_Route124/map.bin b/data/layouts/Underwater_Route124/map.bin new file mode 100644 index 000000000..230e3dcd2 --- /dev/null +++ b/data/layouts/Underwater_Route124/map.bin @@ -0,0 +1,17 @@ +2222222222222222222222222222222222222222222222222222222222222222222222# 22 +"##~222222222222222222222222222222222#  "#####~22222222222}####### 22 +||~22###~22222222#  "22######~2222222222222222222222222222222222222222222222222222}|||| 22 +"22222222222#  "22222222222222222222222222222222222222222222222222#|~222222222222222222#~2222#||~2222222222222222222#|||||||||||~222#~22222#~2222222222222#~2222222222#|||# 22 +"22#  "222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222# 22 +"22}"2222222222222222222y2y222222222222y2y222222222222222# 22 +""~22222222222222222222222#  "222222222222}|"22222222222222222222222222# 22 +|||"2222222222222222222#  "2222"~222222222}|"222# 22 +""|~22222}|"22}|#  ""|||||"22222222222222222222222222222222222222222222222222}||~2222222222222222}"22222222# 22 +"2222"~2222222#  "222222}""|~}"2222222}""|||||22222222222222# 22 +"2222#  "222222"~22222222"~222222222"~22z222 +"22222222222222y2y22222222222222222#~22# 22 +"||||~222222222222#  "#|~2222222222222222222222222222222#|~2222222222222# 22 +"||||||# 22 +"222#  "#  "22222222}"222222222222222 + "# 22 +"#  " \ No newline at end of file diff --git a/data/layouts/Underwater_Route125/border.bin b/data/layouts/Underwater_Route125/border.bin new file mode 100644 index 000000000..b15c94f96 --- /dev/null +++ b/data/layouts/Underwater_Route125/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/Underwater_Route125/map.bin b/data/layouts/Underwater_Route125/map.bin new file mode 100644 index 000000000..660f585ae --- /dev/null +++ b/data/layouts/Underwater_Route125/map.bin @@ -0,0 +1 @@ +9<?WTVVVVVVV9<?WTVVVVVVV9<?WTVVVVVVV9<?WTVVVVVVV9<?WTVVVVVVV9<?WTVVVVVVV9<?WTVVVVVVV9<?WTVVVVVVV9<?WTVVVVVVV&9<?WTVVVVVVV.9<?WTVVVVVVV22222222229<?WTVVVVVVV222222222222222229<?WTVVVVVVV222222222222222229<?WTVVVVVVV22222222222222222229<?WTVVVVVVV22222222222222222229<?WTVVVVVVV222222222222222222}#9<?WTVVVVVVV2222222222222222}"#2222229<?WTVVVVVVV22222222222222222222229<?WTVVVVVVV2z222x222}#########2222229<?WTVVVVVVV22y2y22222222229<?WTVVVVVVV#########2z222x229<?WTVVVVVVV22y2y2229<?WTVVVVVVV #2222229<?WTVVVVVVV 2222229<?WTVVVVVVV#2222229<?WTVVVVVVV2}~2229<?WTVVVVVVV2222229<?WTVVVVVVV#22222}~2229<?WTVVVVVVV "&222222229<?WTVVVVVVV#.22222222229<?WTVVVVVVV #222222222222222229<?WTVVVVVVV222222222222222229<?WTVVVVVVV   ##""""""""""""""""""9<?WTVVVVVVV 9<?WTVVVVVVV "# # 9<?WTVVVVVVV# #9<?WTVVVVVVV## # ##9<?WTVVVVVVV# ##9<?WTVVVVVVV9<?WTVVVVVVV \ No newline at end of file diff --git a/data/layouts/Underwater_Route126/border.bin b/data/layouts/Underwater_Route126/border.bin new file mode 100644 index 000000000..b15c94f96 --- /dev/null +++ b/data/layouts/Underwater_Route126/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/Underwater_Route126/map.bin b/data/layouts/Underwater_Route126/map.bin new file mode 100644 index 000000000..0c6377c30 --- /dev/null +++ b/data/layouts/Underwater_Route126/map.bin @@ -0,0 +1,35 @@ +2222222222222222222222222222222222222222222222222222222z222x2#~6y2y222}||||||||||||||##||||#2222222222222222222222222#       22222222222/# 222222222222222222 +    222222222222222222222#  22222222222222222222222# 22222222222222222222222222# 2222222222222222222222222222222222222222222222222 +    22222222222222222222222222222222 +" #  222/2222222 222222222222222222222 "#/#   "# 22222 +"222222222222222222222##     " "2222222222222222222222/ "222222 +  222222222222222222 +  22222222222222222/  2222222222/2222222222222/#  22222# 222222222222222222222222 +"#22/2222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222 +"2222222222222222222222222222222222222222222222222# 22222222222222222 +   2222222222222222222222222222222222222222 +   "#     22222222222222222222222222222222222 + " /#           22222222222222/2222222222 +"/ " #/#  22222222/2222222222222 + " " "# /#/# 2222222222222222222 + " "/ "#/#/# 2222222222222222222 +" "/ "#/## 2222222222 +"222222 +" " "#/#/# 22222# 222/2222222 "/ "### 22222#/222222222 +" "##22222222222222 " "#/# 2222222222222## 2222## 2 +"22222 +  "/2222/# "/222222 "##2222#22222222222#2222222/### 2222/2222222//622222/222222 + 22222222222/22222#222222/222222222222/222222#2222222222222//2222222222222 +"22222222222222222222//62222222/# 2222222/2222222/ "2222222/2222222 +"## 2222222/222222 +" "22222222222222/222222222/222222 +"/ "# 222222222/22222222222222222//2222222 "222222222222//2222222 +"#/# 22222222222222efg2222222222/ "##   222222222222222222mno2222222222222222222 #  222222222222222222222222222222222222222222 +" "222222 /#  222222222222222222222222222222222222222 +"2222222##    22222222222222222222222222222222 +  " "6222222222/# 222222222222222222222222222222 +"/62222z222x22##  2222222222222222222222222 +  " "622}~2y2y22} #   22222222222222222222 + "622 |||| ##   222222222222222 + "/ "622/#  2222222 +     "622##       "/ "62222// "6222222#"222222|~22222 ||||   \ No newline at end of file diff --git a/data/layouts/Underwater_Route127/border.bin b/data/layouts/Underwater_Route127/border.bin new file mode 100644 index 000000000..b15c94f96 --- /dev/null +++ b/data/layouts/Underwater_Route127/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/Underwater_Route127/map.bin b/data/layouts/Underwater_Route127/map.bin new file mode 100644 index 000000000..fc5c331a5 --- /dev/null +++ b/data/layouts/Underwater_Route127/map.bin @@ -0,0 +1 @@ +66666666666666666666666666666666666666666666666666666666666666&666666666666.66666666666662222;2;2666666666666662222;2;2;2;2666666666662222@2C2C2A26666666666222222<2P2Q2:266666666666222222<2T2R:266666666666222222<2T2R:26666666666662z222x22@2G2T2R2:266666666666@2A222y2y22}#@2G2P2\2R2B2A266666666666@2D2B2A2#######<2P2\2V2Z2Q2:266666666666?2P2Q2B2:2<2K2L2V2V2R2B2A266666666666?2W2]2Q2:23242T2V2V2R2S2:266666666666?2W2S2U2:2# ?2K2L2V2Z2Q2:266666666666?2W2S2U2:23242T2V2V2R2:26666666666?2Y2O2U2B2A2## ?2K2K2L2R2:26666666666I242W2U2S2:2#32422L2R2:26666666666  ?2W2]2Q2:2## 422L2R2:26666666666?2Y2O2U2:2#3242L2R2:2666666666I242W2U2B2A2## 42T2R2:26666666666  ?2W2U2S2:2#42T2R2:2666666666?2W2]2Q2:242T2R20 66666666?2W2S2U2:2;242T2R2866666666?2Y2O2U2B2A242T2R28 "666666666   I242W2U2S2:2;242T2R28 "666666666  ?2W2]2Q2:2@2C2A222###!a6`"  666666666?2W2S2U2:2?2S2:22222###" "666666666?2W2S2U2B2A2?2S2:2222222 66666666?2W2S2U2S2:2?2S2B2A2222222 "66666666?2W2S2U2S2:23242S2:2#~z222x2}# "66666666?2W2S2U2S2:2@2A2# ?2S2B2A22y2y22 "# "66666666?2W2S2]2Q2:2?2B2A2?2S2S2:22222##666666666?2W2P2Q2U2:2?2S2:2?22S2:2#~222666666666?2W2T2R2U2:2?2S2:2?2S2S2:2   #~22&#"666666666@2A2?2W2T2R2U2:2?2S2B2A2?2S2S2:2#~2.# "666666666<2:2?2W2T2R2U2:2@2D2P2Q2:2?2S2S2:2222222#  666666666@22B2A2?2W2T2R2U2:2?2P2_2U2:2@2D2S2S2:2#~2222}##"666666666@2222:2?2W2T2R2U2:2?2W2S2U2:2?2S2S22232#######666666666<2222B2A2?2W2T2R2U2:2;2?2W2S2U2:2?2S2S2:2" "666666666<2222S2:2;2?2W2T2R2U2B2A2?2W2S2U2:2;2?2S2S2:266666666I242T2Z2Q2:2@2G2W2T2R2U2S2:2?2W2S2U2B2A2@2D2S2S2:2#"66666666# ?2Y2L2R2B2A2?2S2W2T2R2]2Q2:2?2K2O2U2S2:2?2S2S2S2:266666666I242T2Z2Q2:2?2P2_2T2Z2Q2U2:23242T2U2S2:2?2S2S22232226666666 6# ?2Y2L2R2:2?2W2S2T2V2R2U2:2  ?2T2U22232?2S2S2:2"  222266666666I242T2R2:2?2W2P2\2V2R2U2:2;2?2T2U2:2 ?2S22232  22222266 66666# ?2T2R2B2A2?2W2T2V2V2R2U2B2A2?2T2U2:2@2D2S2:2"22222266666666?2T2Z2Q2:2?2W2T2V2V2R2U2S2:2?2T2U2:2?2S2S2:2  222222266666#?2Y2L2R2:2?2W2T2V2V2R2]2Q2:2?2T2U2:2@2D2S22232222z222x2266666#66I242T2R2B2A2>2?2T2Y2L2V2Z2Q2U2:2>2?2T2U2:2?2S2S2:2"  2222y2y22}#666666666# ?2T2R2S2:2>2?2Y2O2T2V2V2R2U2:2>2>2@2D2T2U2:2@2D2S2S2:2  22222226666666?2T2Z2Q2:2>2?2S2W2Y2L2V2R2U2B2A2>2<22_2U2:2?2S2S22232  2222222}#666666#66#6?2T2V2R2:2>2?2S2Y2O2T2V2R2]2Q2B2C2D2T2M2K2:2?2S2S2:2" "2222222}#666666666?2T2V2R2:2>2I242S2W2T2V2Z2Q2U2S2S22_2U22232?2S22232 "222222266666#6666#?2Y2L2R2:2>2>2?2S2W2T2V2V2R2U2S2S2T2S2U2:2"?2S2:2"#6#~z222x22}|6666666#I242T2R2:2>2>2?2S2W2T2V2V2R2]2^2^2_2S2U2:2?2S2:2 """2y2y2226666#666#66# ?2T2R2:2# >2I242W2Y2L2V2Z2Q2S2S2S2M2K2:2?2S20" #~22}|#666666666?2T2R20" >2>2?2Y2O2T2V2V2Z2Q2S2M2K2S2:2#!!"  #622666666666##1T2R28 " >2>2I242W2Y2L2V2V2R2S2U2S22232 "#6#~}|666666669T2R28 ">2>2>2?2Y2O2T2V2V2R2M2K22232"   "66666666#6##9T2R28# >2>2?2S2W2T2V2V2R2U2S2:2>2 "  #6##6666666669T2R28#>2>2I242W2T2V2V2R2U2S2:2" "  666666669T2R28>2>2>2?2W2Y2L2V2R2U2S2:2 " "666666#6669T2R28## >2>2?2Y2O2T2V2R2U22232 " "#6666666666##)) ## >2I242W2T2V2R2U2:2>2#666666666#  >2>2?2W2T2J2K2U2:2"#666666#6666# " "### >2?2W2T2R2S2U2:2 "  666666666# ">2?2W2T2R2S2U2:2 "#6#666666666 "##>2?2W2T2R2S2U2:2 " "#666#6666666#">2?2W2T2R22U2:2666666666#>2?2W2T2R2S2U2:2666666666>2?2W2T2R2S2U2:2666666666>2?2W2T2R2S2U2:2666666666>2?2W2T2Z22U2:26666666#66 ">2?2W2T2V2R2U2:2666666666>2?2W2T2V2R2U2:2#6666666666>2?2W2T2V2R2U2:2#6#6#6#6 \ No newline at end of file diff --git a/data/layouts/Underwater_Route128/border.bin b/data/layouts/Underwater_Route128/border.bin new file mode 100644 index 000000000..b15c94f96 --- /dev/null +++ b/data/layouts/Underwater_Route128/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/Underwater_Route128/map.bin b/data/layouts/Underwater_Route128/map.bin new file mode 100644 index 000000000..23f987681 --- /dev/null +++ b/data/layouts/Underwater_Route128/map.bin @@ -0,0 +1 @@ +666666666  >2?2W2T2V2R2U2:2666666666>2?2W2T2V2R2U2:2666666666>2?2W2K2L2R2U2:2666666666# ?2K2O2T2R2U2:2666666666 3242W2T2R2U2:2666666666 "# ?2W2T2R2U2:2 66666666#?2W2T2R2U2:2#666666666 "?2W2T2R2U2B2A2 666 666666?2W2T2R2]2Q2B2C2C2C2A2 # #6666666666?2W2T2Z2Q2]2[2[2[2Q2B2C2C2C2A2 #   #6666666666#)aV2V2Z2[2[2[2Q2]2[2[2[2Q2:2;2;2;2  666666666 6 6aV2V2V2V2V2Z2[2[2[2Q2U2B2A2@2C2C2C2C2C2C2C2C2C28 666666666##))))))aV2V2R2]2Q2B2C2A2@2C2C2D2P2[2[2[2[2[2[2[2[28666666666 #)))a]2[2Q2B2C2C2C2C2D2P2[2[2_2P2[2[2[2[2[2[2`#666666 66666666 "#a[2]2[2[2[2[2[2[2_2P2[2[2\2V2V2V2V2`)"66666666666666##a[2[2[2[2[2[2[2[2\2V2V2`))))"66666666666666#aV2V2V2V2V2V2V2V2`)"66666666666d2V2V2V2V2V2`)"@2C2A2 6666 6666666666@2C2C2A2<2L2V2V2V2`" @2D22B2C2A26666666 6666666<222:2<2T2L2V2b28 " #<2P2[2[2Q2B2C2C2C2C2C2A26666666666666@2A2## 12:2@2D2T2T2J20 #1W2P2Q2]2[2[2[2[2[2Q2B2C2A2666666666666666@2D2B2A2" !""<2P2_2T2R28#aT2Z2[2[2[2[2[2Q2]2[2Q2B2C26666 66666666666<2P2Q2:2<2T2P2V2R28#aV2V2V2V2V2V2Z2[2[2]2[2`"666666666666666<2T2R2:2<2T2T2V2R28#)aV2V2V2V2`))))"666666666666666#1T2R2B2A2@2D2T2T2V2R28#))))"666666666666666#aZ2Q2B2C2A2efg@2C2D2P2_2T2V2R28  6666666666666666#aZ2[2Q2B2C2A2mn2o@2D2P2[2_2P2V2`)"# 6666666666666666#aQ2]2[2Q2B2C2C2C2A2;2;2;2;2;2<2P2_2P2[2`)" # "#6666666666666666#)aQ2]2[2[2[2Q2B2C2C2C2C2C2D2T2P2V2` "6666666666666666#))a[2Q2]2[2[2[2[2[2[2[2_2T2` "6666666666666666 #aZ2[2[2[2[2[2[2[2[2[2b2 6666666666666666 "##)aV2V2V2V2V2V2V2J2:2 " "666666666666666 d2V2V2V2V2V2J2U2:2 " "6666666666666666@2D2L2V2V2V2V2R2U2B2A2 " "6666666 666666666#<2P2_2L2V2V2V2R2]2Q2B2C2C2C2C2C2C2C2C2A2 6666666666666666#<2T2P2\2V2`)))a[2[2[2[2[2[2[2[2Q2:26666666666666666#@2D2T2`))"#))a[2[2[2[2`))"6666666666666666# @2C2C2D2P2`" #))))" "66666666666666666""# )))))" "#66666666666666666#"#" \ No newline at end of file diff --git a/data/layouts/Underwater_Route129/border.bin b/data/layouts/Underwater_Route129/border.bin new file mode 100644 index 000000000..b15c94f96 --- /dev/null +++ b/data/layouts/Underwater_Route129/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/Underwater_Route129/map.bin b/data/layouts/Underwater_Route129/map.bin new file mode 100644 index 000000000..902f0dbdc --- /dev/null +++ b/data/layouts/Underwater_Route129/map.bin @@ -0,0 +1 @@ +& . 2222222 #222}#~2 #222222}#2 "22}#222222222}#222222}#222222222}#22}"##22222}#222222222222}"#222222222222#222222222222}"# """#222z222x2222}"# ""222222y2y22222 ""2222############222222 ""&222222.2222222#22222222222z222x22222222222222y2y22}"##""""""""""""""""#  # " " "  "############ \ No newline at end of file diff --git a/data/layouts/layouts.json b/data/layouts/layouts.json index b2ebeb5c6..9292e10af 100644 --- a/data/layouts/layouts.json +++ b/data/layouts/layouts.json @@ -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", diff --git a/data/maps/Route105/map.json b/data/maps/Route105/map.json index bb6c7a653..bd951f62c 100644 --- a/data/maps/Route105/map.json +++ b/data/maps/Route105/map.json @@ -26,7 +26,7 @@ { "direction": "dive", "offset": 0, - "map": "MAP_UNDERWATER6" + "map": "MAP_UNDERWATER_ROUTE105" } ], "object_events": [ diff --git a/data/maps/Route124/map.json b/data/maps/Route124/map.json index cb075d29a..370a5f4e4 100644 --- a/data/maps/Route124/map.json +++ b/data/maps/Route124/map.json @@ -36,7 +36,7 @@ { "direction": "dive", "offset": 0, - "map": "MAP_UNDERWATER1" + "map": "MAP_UNDERWATER_ROUTE124" } ], "object_events": [ diff --git a/data/maps/Route125/map.json b/data/maps/Route125/map.json index 984a554e4..719e6b699 100644 --- a/data/maps/Route125/map.json +++ b/data/maps/Route125/map.json @@ -26,7 +26,7 @@ { "direction": "dive", "offset": 0, - "map": "MAP_UNDERWATER7" + "map": "MAP_UNDERWATER_ROUTE125" } ], "object_events": [ diff --git a/data/maps/Route126/map.json b/data/maps/Route126/map.json index 60b439066..bf7d7027c 100644 --- a/data/maps/Route126/map.json +++ b/data/maps/Route126/map.json @@ -26,7 +26,7 @@ { "direction": "dive", "offset": 0, - "map": "MAP_UNDERWATER2" + "map": "MAP_UNDERWATER_ROUTE126" } ], "object_events": [ diff --git a/data/maps/Route127/map.json b/data/maps/Route127/map.json index 0e6d78da7..6ef7022f4 100644 --- a/data/maps/Route127/map.json +++ b/data/maps/Route127/map.json @@ -31,7 +31,7 @@ { "direction": "dive", "offset": 0, - "map": "MAP_UNDERWATER3" + "map": "MAP_UNDERWATER_ROUTE127" } ], "object_events": [ diff --git a/data/maps/Route128/map.json b/data/maps/Route128/map.json index d8fbb249a..0bed932d5 100644 --- a/data/maps/Route128/map.json +++ b/data/maps/Route128/map.json @@ -31,7 +31,7 @@ { "direction": "dive", "offset": 0, - "map": "MAP_UNDERWATER4" + "map": "MAP_UNDERWATER_ROUTE128" } ], "object_events": [ diff --git a/data/maps/Route129/map.json b/data/maps/Route129/map.json index ca814b465..d5383eb50 100644 --- a/data/maps/Route129/map.json +++ b/data/maps/Route129/map.json @@ -26,7 +26,7 @@ { "direction": "dive", "offset": 0, - "map": "MAP_UNDERWATER5" + "map": "MAP_UNDERWATER_ROUTE129" } ], "object_events": [ diff --git a/data/maps/SeafloorCavern_Entrance/map.json b/data/maps/SeafloorCavern_Entrance/map.json index a80fce6c1..1f7095def 100644 --- a/data/maps/SeafloorCavern_Entrance/map.json +++ b/data/maps/SeafloorCavern_Entrance/map.json @@ -33,7 +33,7 @@ "x": 10, "y": 18, "elevation": 3, - "dest_map": "MAP_UNDERWATER4", + "dest_map": "MAP_UNDERWATER_ROUTE128", "dest_warp_id": 0 }, { diff --git a/data/maps/Underwater1/map.json b/data/maps/Underwater1/map.json deleted file mode 100644 index 71752745d..000000000 --- a/data/maps/Underwater1/map.json +++ /dev/null @@ -1,88 +0,0 @@ -{ - "id": "MAP_UNDERWATER1", - "name": "Underwater1", - "layout": "LAYOUT_UNDERWATER1", - "music": "MUS_UNDERWATER", - "region_map_section": "MAPSEC_UNDERWATER_124", - "requires_flash": false, - "weather": "WEATHER_UNDERWATER_BUBBLES", - "map_type": "MAP_TYPE_UNDERWATER", - "allow_cycling": true, - "allow_escaping": false, - "allow_running": true, - "show_map_name": true, - "battle_scene": "MAP_BATTLE_SCENE_NORMAL", - "connections": [ - { - "direction": "down", - "offset": 0, - "map": "MAP_UNDERWATER2" - }, - { - "direction": "emerge", - "offset": 0, - "map": "MAP_ROUTE124" - } - ], - "object_events": [], - "warp_events": [], - "coord_events": [], - "bg_events": [ - { - "type": "hidden_item", - "x": 42, - "y": 51, - "elevation": 0, - "item": "ITEM_CARBOS", - "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_1_CARBOS" - }, - { - "type": "hidden_item", - "x": 14, - "y": 40, - "elevation": 0, - "item": "ITEM_GREEN_SHARD", - "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_1_GREEN_SHARD" - }, - { - "type": "hidden_item", - "x": 66, - "y": 34, - "elevation": 3, - "item": "ITEM_PEARL", - "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_1_PEARL" - }, - { - "type": "hidden_item", - "x": 64, - "y": 54, - "elevation": 3, - "item": "ITEM_BIG_PEARL", - "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_1_BIG_PEARL" - }, - { - "type": "hidden_item", - "x": 70, - "y": 64, - "elevation": 3, - "item": "ITEM_HEART_SCALE", - "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_1_HEART_SCALE_1" - }, - { - "type": "hidden_item", - "x": 42, - "y": 5, - "elevation": 3, - "item": "ITEM_CALCIUM", - "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_1_CALCIUM" - }, - { - "type": "hidden_item", - "x": 45, - "y": 36, - "elevation": 3, - "item": "ITEM_HEART_SCALE", - "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_1_HEART_SCALE_2" - } - ] -} diff --git a/data/maps/Underwater1/scripts.inc b/data/maps/Underwater1/scripts.inc deleted file mode 100644 index 107a038a8..000000000 --- a/data/maps/Underwater1/scripts.inc +++ /dev/null @@ -1,3 +0,0 @@ -Underwater1_MapScripts:: @ 81F7722 - .byte 0 - diff --git a/data/maps/Underwater2/map.json b/data/maps/Underwater2/map.json deleted file mode 100644 index 5ecdc402a..000000000 --- a/data/maps/Underwater2/map.json +++ /dev/null @@ -1,109 +0,0 @@ -{ - "id": "MAP_UNDERWATER2", - "name": "Underwater2", - "layout": "LAYOUT_UNDERWATER2", - "music": "MUS_UNDERWATER", - "region_map_section": "MAPSEC_UNDERWATER_125", - "requires_flash": false, - "weather": "WEATHER_UNDERWATER_BUBBLES", - "map_type": "MAP_TYPE_UNDERWATER", - "allow_cycling": true, - "allow_escaping": false, - "allow_running": true, - "show_map_name": true, - "battle_scene": "MAP_BATTLE_SCENE_NORMAL", - "connections": [ - { - "direction": "up", - "offset": 0, - "map": "MAP_UNDERWATER1" - }, - { - "direction": "right", - "offset": 0, - "map": "MAP_UNDERWATER3" - }, - { - "direction": "emerge", - "offset": 0, - "map": "MAP_ROUTE126" - } - ], - "object_events": [], - "warp_events": [ - { - "x": 45, - "y": 65, - "elevation": 0, - "dest_map": "MAP_UNDERWATER_SOOTOPOLIS_CITY", - "dest_warp_id": 0 - } - ], - "coord_events": [], - "bg_events": [ - { - "type": "hidden_item", - "x": 30, - "y": 17, - "elevation": 3, - "item": "ITEM_HEART_SCALE", - "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_2_HEART_SCALE" - }, - { - "type": "hidden_item", - "x": 41, - "y": 19, - "elevation": 3, - "item": "ITEM_ULTRA_BALL", - "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_2_ULTRA_BALL" - }, - { - "type": "hidden_item", - "x": 63, - "y": 19, - "elevation": 3, - "item": "ITEM_STARDUST", - "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_2_STARDUST" - }, - { - "type": "hidden_item", - "x": 10, - "y": 36, - "elevation": 3, - "item": "ITEM_PEARL", - "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_2_PEARL" - }, - { - "type": "hidden_item", - "x": 11, - "y": 39, - "elevation": 3, - "item": "ITEM_IRON", - "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_2_IRON" - }, - { - "type": "hidden_item", - "x": 12, - "y": 35, - "elevation": 3, - "item": "ITEM_YELLOW_SHARD", - "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_2_YELLOW_SHARD" - }, - { - "type": "hidden_item", - "x": 65, - "y": 60, - "elevation": 3, - "item": "ITEM_BIG_PEARL", - "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_2_BIG_PEARL" - }, - { - "type": "hidden_item", - "x": 9, - "y": 77, - "elevation": 3, - "item": "ITEM_BLUE_SHARD", - "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_2_BLUE_SHARD" - } - ] -} diff --git a/data/maps/Underwater2/scripts.inc b/data/maps/Underwater2/scripts.inc deleted file mode 100644 index 80c854c63..000000000 --- a/data/maps/Underwater2/scripts.inc +++ /dev/null @@ -1,3 +0,0 @@ -Underwater2_MapScripts:: @ 81F7723 - .byte 0 - diff --git a/data/maps/Underwater3/map.json b/data/maps/Underwater3/map.json deleted file mode 100644 index 43df933a0..000000000 --- a/data/maps/Underwater3/map.json +++ /dev/null @@ -1,84 +0,0 @@ -{ - "id": "MAP_UNDERWATER3", - "name": "Underwater3", - "layout": "LAYOUT_UNDERWATER3", - "music": "MUS_UNDERWATER", - "region_map_section": "MAPSEC_UNDERWATER_126", - "requires_flash": false, - "weather": "WEATHER_UNDERWATER_BUBBLES", - "map_type": "MAP_TYPE_UNDERWATER", - "allow_cycling": true, - "allow_escaping": false, - "allow_running": true, - "show_map_name": true, - "battle_scene": "MAP_BATTLE_SCENE_NORMAL", - "connections": [ - { - "direction": "emerge", - "offset": 0, - "map": "MAP_ROUTE127" - }, - { - "direction": "left", - "offset": 0, - "map": "MAP_UNDERWATER2" - }, - { - "direction": "down", - "offset": 0, - "map": "MAP_UNDERWATER4" - } - ], - "object_events": [], - "warp_events": [ - { - "x": 57, - "y": 5, - "elevation": 0, - "dest_map": "MAP_UNDERWATER_MARINE_CAVE", - "dest_warp_id": 0 - }, - { - "x": 67, - "y": 38, - "elevation": 0, - "dest_map": "MAP_UNDERWATER_MARINE_CAVE", - "dest_warp_id": 0 - } - ], - "coord_events": [], - "bg_events": [ - { - "type": "hidden_item", - "x": 12, - "y": 42, - "elevation": 3, - "item": "ITEM_STAR_PIECE", - "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_3_STAR_PIECE" - }, - { - "type": "hidden_item", - "x": 50, - "y": 36, - "elevation": 3, - "item": "ITEM_HP_UP", - "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_3_HP_UP" - }, - { - "type": "hidden_item", - "x": 34, - "y": 72, - "elevation": 3, - "item": "ITEM_HEART_SCALE", - "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_3_HEART_SCALE" - }, - { - "type": "hidden_item", - "x": 72, - "y": 20, - "elevation": 3, - "item": "ITEM_RED_SHARD", - "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_3_RED_SHARD" - } - ] -} diff --git a/data/maps/Underwater3/scripts.inc b/data/maps/Underwater3/scripts.inc deleted file mode 100644 index e75acd635..000000000 --- a/data/maps/Underwater3/scripts.inc +++ /dev/null @@ -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 - diff --git a/data/maps/Underwater4/map.json b/data/maps/Underwater4/map.json deleted file mode 100644 index 4b0fc6d3b..000000000 --- a/data/maps/Underwater4/map.json +++ /dev/null @@ -1,56 +0,0 @@ -{ - "id": "MAP_UNDERWATER4", - "name": "Underwater4", - "layout": "LAYOUT_UNDERWATER4", - "music": "MUS_UNDERWATER", - "region_map_section": "MAPSEC_UNDERWATER_127", - "requires_flash": false, - "weather": "WEATHER_UNDERWATER_BUBBLES", - "map_type": "MAP_TYPE_UNDERWATER", - "allow_cycling": true, - "allow_escaping": false, - "allow_running": true, - "show_map_name": true, - "battle_scene": "MAP_BATTLE_SCENE_NORMAL", - "connections": [ - { - "direction": "up", - "offset": 0, - "map": "MAP_UNDERWATER3" - }, - { - "direction": "emerge", - "offset": 0, - "map": "MAP_ROUTE128" - } - ], - "object_events": [], - "warp_events": [ - { - "x": 38, - "y": 26, - "elevation": 3, - "dest_map": "MAP_UNDERWATER_SEAFLOOR_CAVERN", - "dest_warp_id": 0 - } - ], - "coord_events": [], - "bg_events": [ - { - "type": "hidden_item", - "x": 38, - "y": 19, - "elevation": 3, - "item": "ITEM_PROTEIN", - "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_4_PROTEIN" - }, - { - "type": "hidden_item", - "x": 69, - "y": 18, - "elevation": 3, - "item": "ITEM_PEARL", - "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_4_PEARL" - } - ] -} diff --git a/data/maps/Underwater4/scripts.inc b/data/maps/Underwater4/scripts.inc deleted file mode 100644 index 295c27356..000000000 --- a/data/maps/Underwater4/scripts.inc +++ /dev/null @@ -1,3 +0,0 @@ -Underwater4_MapScripts:: @ 81F7730 - .byte 0 - diff --git a/data/maps/Underwater5/map.json b/data/maps/Underwater5/map.json deleted file mode 100644 index 909591f11..000000000 --- a/data/maps/Underwater5/map.json +++ /dev/null @@ -1,41 +0,0 @@ -{ - "id": "MAP_UNDERWATER5", - "name": "Underwater5", - "layout": "LAYOUT_UNDERWATER5", - "music": "MUS_UNDERWATER", - "region_map_section": "MAPSEC_UNDERWATER_129", - "requires_flash": false, - "weather": "WEATHER_UNDERWATER_BUBBLES", - "map_type": "MAP_TYPE_UNDERWATER", - "allow_cycling": true, - "allow_escaping": false, - "allow_running": true, - "show_map_name": true, - "battle_scene": "MAP_BATTLE_SCENE_NORMAL", - "connections": [ - { - "direction": "emerge", - "offset": 0, - "map": "MAP_ROUTE129" - } - ], - "object_events": [], - "warp_events": [ - { - "x": 26, - "y": 3, - "elevation": 0, - "dest_map": "MAP_UNDERWATER_MARINE_CAVE", - "dest_warp_id": 0 - }, - { - "x": 32, - "y": 21, - "elevation": 0, - "dest_map": "MAP_UNDERWATER_MARINE_CAVE", - "dest_warp_id": 0 - } - ], - "coord_events": [], - "bg_events": [] -} diff --git a/data/maps/Underwater5/scripts.inc b/data/maps/Underwater5/scripts.inc deleted file mode 100644 index 235d25aba..000000000 --- a/data/maps/Underwater5/scripts.inc +++ /dev/null @@ -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 - diff --git a/data/maps/Underwater6/map.json b/data/maps/Underwater6/map.json deleted file mode 100644 index 2a021f77f..000000000 --- a/data/maps/Underwater6/map.json +++ /dev/null @@ -1,41 +0,0 @@ -{ - "id": "MAP_UNDERWATER6", - "name": "Underwater6", - "layout": "LAYOUT_UNDERWATER6", - "music": "MUS_UNDERWATER", - "region_map_section": "MAPSEC_UNDERWATER_TERRA_CAVE", - "requires_flash": false, - "weather": "WEATHER_UNDERWATER_BUBBLES", - "map_type": "MAP_TYPE_UNDERWATER", - "allow_cycling": true, - "allow_escaping": false, - "allow_running": true, - "show_map_name": true, - "battle_scene": "MAP_BATTLE_SCENE_NORMAL", - "connections": [ - { - "direction": "emerge", - "offset": 0, - "map": "MAP_ROUTE105" - } - ], - "object_events": [], - "warp_events": [ - { - "x": 13, - "y": 4, - "elevation": 0, - "dest_map": "MAP_UNDERWATER_MARINE_CAVE", - "dest_warp_id": 0 - }, - { - "x": 17, - "y": 66, - "elevation": 0, - "dest_map": "MAP_UNDERWATER_MARINE_CAVE", - "dest_warp_id": 0 - } - ], - "coord_events": [], - "bg_events": [] -} diff --git a/data/maps/Underwater6/scripts.inc b/data/maps/Underwater6/scripts.inc deleted file mode 100644 index 21b639cd8..000000000 --- a/data/maps/Underwater6/scripts.inc +++ /dev/null @@ -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 - diff --git a/data/maps/Underwater7/map.json b/data/maps/Underwater7/map.json deleted file mode 100644 index 5155fc6ba..000000000 --- a/data/maps/Underwater7/map.json +++ /dev/null @@ -1,41 +0,0 @@ -{ - "id": "MAP_UNDERWATER7", - "name": "Underwater7", - "layout": "LAYOUT_UNDERWATER7", - "music": "MUS_UNDERWATER", - "region_map_section": "MAPSEC_UNDERWATER_UNK1", - "requires_flash": false, - "weather": "WEATHER_UNDERWATER_BUBBLES", - "map_type": "MAP_TYPE_UNDERWATER", - "allow_cycling": true, - "allow_escaping": false, - "allow_running": true, - "show_map_name": true, - "battle_scene": "MAP_BATTLE_SCENE_NORMAL", - "connections": [ - { - "direction": "emerge", - "offset": 0, - "map": "MAP_ROUTE125" - } - ], - "object_events": [], - "warp_events": [ - { - "x": 22, - "y": 10, - "elevation": 0, - "dest_map": "MAP_UNDERWATER_MARINE_CAVE", - "dest_warp_id": 0 - }, - { - "x": 45, - "y": 30, - "elevation": 0, - "dest_map": "MAP_UNDERWATER_MARINE_CAVE", - "dest_warp_id": 0 - } - ], - "coord_events": [], - "bg_events": [] -} diff --git a/data/maps/Underwater7/scripts.inc b/data/maps/Underwater7/scripts.inc deleted file mode 100644 index 4215dced9..000000000 --- a/data/maps/Underwater7/scripts.inc +++ /dev/null @@ -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 - diff --git a/data/maps/Underwater_Route105/map.json b/data/maps/Underwater_Route105/map.json new file mode 100644 index 000000000..890ccb2a8 --- /dev/null +++ b/data/maps/Underwater_Route105/map.json @@ -0,0 +1,41 @@ +{ + "id": "MAP_UNDERWATER_ROUTE105", + "name": "Underwater_Route105", + "layout": "LAYOUT_UNDERWATER_ROUTE105", + "music": "MUS_UNDERWATER", + "region_map_section": "MAPSEC_UNDERWATER_105", + "requires_flash": false, + "weather": "WEATHER_UNDERWATER_BUBBLES", + "map_type": "MAP_TYPE_UNDERWATER", + "allow_cycling": true, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "emerge", + "offset": 0, + "map": "MAP_ROUTE105" + } + ], + "object_events": [], + "warp_events": [ + { + "x": 13, + "y": 4, + "elevation": 0, + "dest_map": "MAP_UNDERWATER_MARINE_CAVE", + "dest_warp_id": 0 + }, + { + "x": 17, + "y": 66, + "elevation": 0, + "dest_map": "MAP_UNDERWATER_MARINE_CAVE", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} diff --git a/data/maps/Underwater_Route105/scripts.inc b/data/maps/Underwater_Route105/scripts.inc new file mode 100644 index 000000000..41cd8bfbe --- /dev/null +++ b/data/maps/Underwater_Route105/scripts.inc @@ -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 + diff --git a/data/maps/Underwater_Route124/map.json b/data/maps/Underwater_Route124/map.json new file mode 100644 index 000000000..46bc141a8 --- /dev/null +++ b/data/maps/Underwater_Route124/map.json @@ -0,0 +1,88 @@ +{ + "id": "MAP_UNDERWATER_ROUTE124", + "name": "Underwater_Route124", + "layout": "LAYOUT_UNDERWATER_ROUTE124", + "music": "MUS_UNDERWATER", + "region_map_section": "MAPSEC_UNDERWATER_124", + "requires_flash": false, + "weather": "WEATHER_UNDERWATER_BUBBLES", + "map_type": "MAP_TYPE_UNDERWATER", + "allow_cycling": true, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "down", + "offset": 0, + "map": "MAP_UNDERWATER_ROUTE126" + }, + { + "direction": "emerge", + "offset": 0, + "map": "MAP_ROUTE124" + } + ], + "object_events": [], + "warp_events": [], + "coord_events": [], + "bg_events": [ + { + "type": "hidden_item", + "x": 42, + "y": 51, + "elevation": 0, + "item": "ITEM_CARBOS", + "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_124_CARBOS" + }, + { + "type": "hidden_item", + "x": 14, + "y": 40, + "elevation": 0, + "item": "ITEM_GREEN_SHARD", + "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_124_GREEN_SHARD" + }, + { + "type": "hidden_item", + "x": 66, + "y": 34, + "elevation": 3, + "item": "ITEM_PEARL", + "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_124_PEARL" + }, + { + "type": "hidden_item", + "x": 64, + "y": 54, + "elevation": 3, + "item": "ITEM_BIG_PEARL", + "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_124_BIG_PEARL" + }, + { + "type": "hidden_item", + "x": 70, + "y": 64, + "elevation": 3, + "item": "ITEM_HEART_SCALE", + "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_124_HEART_SCALE_1" + }, + { + "type": "hidden_item", + "x": 42, + "y": 5, + "elevation": 3, + "item": "ITEM_CALCIUM", + "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_124_CALCIUM" + }, + { + "type": "hidden_item", + "x": 45, + "y": 36, + "elevation": 3, + "item": "ITEM_HEART_SCALE", + "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_124_HEART_SCALE_2" + } + ] +} diff --git a/data/maps/Underwater_Route124/scripts.inc b/data/maps/Underwater_Route124/scripts.inc new file mode 100644 index 000000000..2a72dfb11 --- /dev/null +++ b/data/maps/Underwater_Route124/scripts.inc @@ -0,0 +1,3 @@ +Underwater_Route124_MapScripts:: @ 81F7722 + .byte 0 + diff --git a/data/maps/Underwater_Route125/map.json b/data/maps/Underwater_Route125/map.json new file mode 100644 index 000000000..c32bb57e8 --- /dev/null +++ b/data/maps/Underwater_Route125/map.json @@ -0,0 +1,41 @@ +{ + "id": "MAP_UNDERWATER_ROUTE125", + "name": "Underwater_Route125", + "layout": "LAYOUT_UNDERWATER_ROUTE125", + "music": "MUS_UNDERWATER", + "region_map_section": "MAPSEC_UNDERWATER_125", + "requires_flash": false, + "weather": "WEATHER_UNDERWATER_BUBBLES", + "map_type": "MAP_TYPE_UNDERWATER", + "allow_cycling": true, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "emerge", + "offset": 0, + "map": "MAP_ROUTE125" + } + ], + "object_events": [], + "warp_events": [ + { + "x": 22, + "y": 10, + "elevation": 0, + "dest_map": "MAP_UNDERWATER_MARINE_CAVE", + "dest_warp_id": 0 + }, + { + "x": 45, + "y": 30, + "elevation": 0, + "dest_map": "MAP_UNDERWATER_MARINE_CAVE", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} diff --git a/data/maps/Underwater_Route125/scripts.inc b/data/maps/Underwater_Route125/scripts.inc new file mode 100644 index 000000000..662120e5e --- /dev/null +++ b/data/maps/Underwater_Route125/scripts.inc @@ -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 + diff --git a/data/maps/Underwater_Route126/map.json b/data/maps/Underwater_Route126/map.json new file mode 100644 index 000000000..993bb7907 --- /dev/null +++ b/data/maps/Underwater_Route126/map.json @@ -0,0 +1,109 @@ +{ + "id": "MAP_UNDERWATER_ROUTE126", + "name": "Underwater_Route126", + "layout": "LAYOUT_UNDERWATER_ROUTE126", + "music": "MUS_UNDERWATER", + "region_map_section": "MAPSEC_UNDERWATER_126", + "requires_flash": false, + "weather": "WEATHER_UNDERWATER_BUBBLES", + "map_type": "MAP_TYPE_UNDERWATER", + "allow_cycling": true, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "up", + "offset": 0, + "map": "MAP_UNDERWATER_ROUTE124" + }, + { + "direction": "right", + "offset": 0, + "map": "MAP_UNDERWATER_ROUTE127" + }, + { + "direction": "emerge", + "offset": 0, + "map": "MAP_ROUTE126" + } + ], + "object_events": [], + "warp_events": [ + { + "x": 45, + "y": 65, + "elevation": 0, + "dest_map": "MAP_UNDERWATER_SOOTOPOLIS_CITY", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "hidden_item", + "x": 30, + "y": 17, + "elevation": 3, + "item": "ITEM_HEART_SCALE", + "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_126_HEART_SCALE" + }, + { + "type": "hidden_item", + "x": 41, + "y": 19, + "elevation": 3, + "item": "ITEM_ULTRA_BALL", + "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_126_ULTRA_BALL" + }, + { + "type": "hidden_item", + "x": 63, + "y": 19, + "elevation": 3, + "item": "ITEM_STARDUST", + "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_126_STARDUST" + }, + { + "type": "hidden_item", + "x": 10, + "y": 36, + "elevation": 3, + "item": "ITEM_PEARL", + "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_126_PEARL" + }, + { + "type": "hidden_item", + "x": 11, + "y": 39, + "elevation": 3, + "item": "ITEM_IRON", + "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_126_IRON" + }, + { + "type": "hidden_item", + "x": 12, + "y": 35, + "elevation": 3, + "item": "ITEM_YELLOW_SHARD", + "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_126_YELLOW_SHARD" + }, + { + "type": "hidden_item", + "x": 65, + "y": 60, + "elevation": 3, + "item": "ITEM_BIG_PEARL", + "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_126_BIG_PEARL" + }, + { + "type": "hidden_item", + "x": 9, + "y": 77, + "elevation": 3, + "item": "ITEM_BLUE_SHARD", + "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_126_BLUE_SHARD" + } + ] +} diff --git a/data/maps/Underwater_Route126/scripts.inc b/data/maps/Underwater_Route126/scripts.inc new file mode 100644 index 000000000..71d43e141 --- /dev/null +++ b/data/maps/Underwater_Route126/scripts.inc @@ -0,0 +1,3 @@ +Underwater_Route126_MapScripts:: @ 81F7723 + .byte 0 + diff --git a/data/maps/Underwater_Route127/map.json b/data/maps/Underwater_Route127/map.json new file mode 100644 index 000000000..b96f79c5d --- /dev/null +++ b/data/maps/Underwater_Route127/map.json @@ -0,0 +1,84 @@ +{ + "id": "MAP_UNDERWATER_ROUTE127", + "name": "Underwater_Route127", + "layout": "LAYOUT_UNDERWATER_ROUTE127", + "music": "MUS_UNDERWATER", + "region_map_section": "MAPSEC_UNDERWATER_127", + "requires_flash": false, + "weather": "WEATHER_UNDERWATER_BUBBLES", + "map_type": "MAP_TYPE_UNDERWATER", + "allow_cycling": true, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "emerge", + "offset": 0, + "map": "MAP_ROUTE127" + }, + { + "direction": "left", + "offset": 0, + "map": "MAP_UNDERWATER_ROUTE126" + }, + { + "direction": "down", + "offset": 0, + "map": "MAP_UNDERWATER_ROUTE128" + } + ], + "object_events": [], + "warp_events": [ + { + "x": 57, + "y": 5, + "elevation": 0, + "dest_map": "MAP_UNDERWATER_MARINE_CAVE", + "dest_warp_id": 0 + }, + { + "x": 67, + "y": 38, + "elevation": 0, + "dest_map": "MAP_UNDERWATER_MARINE_CAVE", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "hidden_item", + "x": 12, + "y": 42, + "elevation": 3, + "item": "ITEM_STAR_PIECE", + "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_127_STAR_PIECE" + }, + { + "type": "hidden_item", + "x": 50, + "y": 36, + "elevation": 3, + "item": "ITEM_HP_UP", + "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_127_HP_UP" + }, + { + "type": "hidden_item", + "x": 34, + "y": 72, + "elevation": 3, + "item": "ITEM_HEART_SCALE", + "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_127_HEART_SCALE" + }, + { + "type": "hidden_item", + "x": 72, + "y": 20, + "elevation": 3, + "item": "ITEM_RED_SHARD", + "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_127_RED_SHARD" + } + ] +} diff --git a/data/maps/Underwater_Route127/scripts.inc b/data/maps/Underwater_Route127/scripts.inc new file mode 100644 index 000000000..552b9aab8 --- /dev/null +++ b/data/maps/Underwater_Route127/scripts.inc @@ -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 + diff --git a/data/maps/Underwater_Route128/map.json b/data/maps/Underwater_Route128/map.json new file mode 100644 index 000000000..f80cf41a6 --- /dev/null +++ b/data/maps/Underwater_Route128/map.json @@ -0,0 +1,56 @@ +{ + "id": "MAP_UNDERWATER_ROUTE128", + "name": "Underwater_Route128", + "layout": "LAYOUT_UNDERWATER_ROUTE128", + "music": "MUS_UNDERWATER", + "region_map_section": "MAPSEC_UNDERWATER_128", + "requires_flash": false, + "weather": "WEATHER_UNDERWATER_BUBBLES", + "map_type": "MAP_TYPE_UNDERWATER", + "allow_cycling": true, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "up", + "offset": 0, + "map": "MAP_UNDERWATER_ROUTE127" + }, + { + "direction": "emerge", + "offset": 0, + "map": "MAP_ROUTE128" + } + ], + "object_events": [], + "warp_events": [ + { + "x": 38, + "y": 26, + "elevation": 3, + "dest_map": "MAP_UNDERWATER_SEAFLOOR_CAVERN", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "hidden_item", + "x": 38, + "y": 19, + "elevation": 3, + "item": "ITEM_PROTEIN", + "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_128_PROTEIN" + }, + { + "type": "hidden_item", + "x": 69, + "y": 18, + "elevation": 3, + "item": "ITEM_PEARL", + "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_128_PEARL" + } + ] +} diff --git a/data/maps/Underwater_Route128/scripts.inc b/data/maps/Underwater_Route128/scripts.inc new file mode 100644 index 000000000..a050afd93 --- /dev/null +++ b/data/maps/Underwater_Route128/scripts.inc @@ -0,0 +1,3 @@ +Underwater_Route128_MapScripts:: @ 81F7730 + .byte 0 + diff --git a/data/maps/Underwater_Route129/map.json b/data/maps/Underwater_Route129/map.json new file mode 100644 index 000000000..45775bd6b --- /dev/null +++ b/data/maps/Underwater_Route129/map.json @@ -0,0 +1,41 @@ +{ + "id": "MAP_UNDERWATER_ROUTE129", + "name": "Underwater_Route129", + "layout": "LAYOUT_UNDERWATER_ROUTE129", + "music": "MUS_UNDERWATER", + "region_map_section": "MAPSEC_UNDERWATER_129", + "requires_flash": false, + "weather": "WEATHER_UNDERWATER_BUBBLES", + "map_type": "MAP_TYPE_UNDERWATER", + "allow_cycling": true, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "emerge", + "offset": 0, + "map": "MAP_ROUTE129" + } + ], + "object_events": [], + "warp_events": [ + { + "x": 26, + "y": 3, + "elevation": 0, + "dest_map": "MAP_UNDERWATER_MARINE_CAVE", + "dest_warp_id": 0 + }, + { + "x": 32, + "y": 21, + "elevation": 0, + "dest_map": "MAP_UNDERWATER_MARINE_CAVE", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} diff --git a/data/maps/Underwater_Route129/scripts.inc b/data/maps/Underwater_Route129/scripts.inc new file mode 100644 index 000000000..f9f84841e --- /dev/null +++ b/data/maps/Underwater_Route129/scripts.inc @@ -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 + diff --git a/data/maps/Underwater_SeafloorCavern/map.json b/data/maps/Underwater_SeafloorCavern/map.json index efcb3c291..d25a3600d 100644 --- a/data/maps/Underwater_SeafloorCavern/map.json +++ b/data/maps/Underwater_SeafloorCavern/map.json @@ -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 } ], diff --git a/data/maps/Underwater_SootopolisCity/map.json b/data/maps/Underwater_SootopolisCity/map.json index 90e5e97fc..0d1363ff6 100644 --- a/data/maps/Underwater_SootopolisCity/map.json +++ b/data/maps/Underwater_SootopolisCity/map.json @@ -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 } ], diff --git a/data/maps/map_groups.json b/data/maps/map_groups.json index 2821ad20f..4201e814f 100644 --- a/data/maps/map_groups.json +++ b/data/maps/map_groups.json @@ -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", -- cgit v1.2.3 From 921f389e4e036768faada597bd07e44290a1eb43 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Fri, 11 Sep 2020 14:47:47 -0400 Subject: Fix Rusboro and Lavarige typos --- data/scripts/set_gym_trainers.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'data') diff --git a/data/scripts/set_gym_trainers.inc b/data/scripts/set_gym_trainers.inc index 1f5535805..c263e42d4 100644 --- a/data/scripts/set_gym_trainers.inc +++ b/data/scripts/set_gym_trainers.inc @@ -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 -- cgit v1.2.3 From 46ccb911556dc6c92b4ed6d85d72d99f536a1294 Mon Sep 17 00:00:00 2001 From: Eduardo Quezada Date: Sun, 13 Sep 2020 11:35:05 -0300 Subject: Fixed "Ultra Rope" name. --- data/maps/NewMauville_Inside/map.json | 2 +- data/scripts/item_ball_scripts.inc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'data') diff --git a/data/maps/NewMauville_Inside/map.json b/data/maps/NewMauville_Inside/map.json index eea119068..ae1654d8b 100644 --- a/data/maps/NewMauville_Inside/map.json +++ b/data/maps/NewMauville_Inside/map.json @@ -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" }, { diff --git a/data/scripts/item_ball_scripts.inc b/data/scripts/item_ball_scripts.inc index 2876e9e8c..82633f77c 100644 --- a/data/scripts/item_ball_scripts.inc +++ b/data/scripts/item_ball_scripts.inc @@ -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 -- cgit v1.2.3 From e7340ca0e1dc095d72a83416fc3f78673b876c1c Mon Sep 17 00:00:00 2001 From: ExpoSeed <> Date: Fri, 25 Sep 2020 13:25:36 -0500 Subject: Add byte comments to script command table --- data/script_cmd_table.inc | 454 +++++++++++++++++++++++----------------------- 1 file changed, 227 insertions(+), 227 deletions(-) (limited to 'data') diff --git a/data/script_cmd_table.inc b/data/script_cmd_table.inc index 2cde7190f..9712da893 100644 --- a/data/script_cmd_table.inc +++ b/data/script_cmd_table.inc @@ -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 -- cgit v1.2.3 From 31d12383b1f5bb152e5c8c4d6fcd14c84cae6115 Mon Sep 17 00:00:00 2001 From: ExpoSeed <> Date: Fri, 25 Sep 2020 13:27:15 -0500 Subject: Add byte comments to mystery event script command table --- data/mystery_event_script_cmd_table.s | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) (limited to 'data') diff --git a/data/mystery_event_script_cmd_table.s b/data/mystery_event_script_cmd_table.s index 867b05e07..352c36e6a 100644 --- a/data/mystery_event_script_cmd_table.s +++ b/data/mystery_event_script_cmd_table.s @@ -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:: -- cgit v1.2.3 From 032669e2ab1bd9658bfb6b3b205324e3dc0dde8d Mon Sep 17 00:00:00 2001 From: ExpoSeed <> Date: Fri, 25 Sep 2020 14:04:50 -0500 Subject: Change script command table comment alignment from tabs to spaces --- data/mystery_event_script_cmd_table.s | 34 +-- data/script_cmd_table.inc | 454 +++++++++++++++++----------------- 2 files changed, 244 insertions(+), 244 deletions(-) (limited to 'data') diff --git a/data/mystery_event_script_cmd_table.s b/data/mystery_event_script_cmd_table.s index 352c36e6a..6ebc7e962 100644 --- a/data/mystery_event_script_cmd_table.s +++ b/data/mystery_event_script_cmd_table.s @@ -2,21 +2,21 @@ .align 2 gMysteryEventScriptCmdTable:: @ 82DED2C - .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 + .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:: diff --git a/data/script_cmd_table.inc b/data/script_cmd_table.inc index 9712da893..0971358a1 100644 --- a/data/script_cmd_table.inc +++ b/data/script_cmd_table.inc @@ -1,232 +1,232 @@ .align 2 gScriptCmdTable:: @ 81DB67C - .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 + .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 -- cgit v1.2.3 From 96e4b43ce5eeedfd0142e68103e9637c973e01e0 Mon Sep 17 00:00:00 2001 From: Eduardo Quezada Date: Sat, 3 Oct 2020 21:52:09 -0300 Subject: Documenting where each of the berries are generated in new_game.inc --- data/scripts/new_game.inc | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) (limited to 'data') diff --git a/data/scripts/new_game.inc b/data/scripts/new_game.inc index f72337972..77102a001 100644 --- a/data/scripts/new_game.inc +++ b/data/scripts/new_game.inc @@ -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 -- cgit v1.2.3 From 1472111c5d158e72f4cf80c075a221e98d814250 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Sun, 11 Oct 2020 19:02:10 -0400 Subject: Fix PutAwayDecorationLoop UB comment --- data/scripts/secret_base.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data') diff --git a/data/scripts/secret_base.inc b/data/scripts/secret_base.inc index 132bdd19c..4a20de9a6 100644 --- a/data/scripts/secret_base.inc +++ b/data/scripts/secret_base.inc @@ -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 -- cgit v1.2.3 From 513c7c5f45b3c79e710ea1e48298d8a7bf9bb591 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Mon, 23 Nov 2020 14:41:22 -0500 Subject: Clarify Kecleon objects --- data/maps/FortreeCity/map.json | 2 +- data/maps/LilycoveCity_House1/map.json | 2 +- data/maps/Route117/map.json | 2 +- data/maps/Route119/map.json | 4 ++-- data/maps/Route120/map.json | 20 ++++++++++---------- data/maps/Route120/scripts.inc | 20 ++++++++++---------- data/maps/SootopolisCity_House1/map.json | 2 +- 7 files changed, 26 insertions(+), 26 deletions(-) (limited to 'data') diff --git a/data/maps/FortreeCity/map.json b/data/maps/FortreeCity/map.json index 86d43693a..fd23e6ffd 100644 --- a/data/maps/FortreeCity/map.json +++ b/data/maps/FortreeCity/map.json @@ -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, diff --git a/data/maps/LilycoveCity_House1/map.json b/data/maps/LilycoveCity_House1/map.json index bd6850f5a..cbd7cdbdf 100644 --- a/data/maps/LilycoveCity_House1/map.json +++ b/data/maps/LilycoveCity_House1/map.json @@ -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, diff --git a/data/maps/Route117/map.json b/data/maps/Route117/map.json index d2f45e256..dd923a7cd 100644 --- a/data/maps/Route117/map.json +++ b/data/maps/Route117/map.json @@ -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, diff --git a/data/maps/Route119/map.json b/data/maps/Route119/map.json index fa6391a34..8d78d1065 100644 --- a/data/maps/Route119/map.json +++ b/data/maps/Route119/map.json @@ -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, diff --git a/data/maps/Route120/map.json b/data/maps/Route120/map.json index 8a7e56ddc..787f51361 100644 --- a/data/maps/Route120/map.json +++ b/data/maps/Route120/map.json @@ -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, diff --git a/data/maps/Route120/scripts.inc b/data/maps/Route120/scripts.inc index 7ec3e1221..0056acbd7 100644 --- a/data/maps/Route120/scripts.inc +++ b/data/maps/Route120/scripts.inc @@ -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 diff --git a/data/maps/SootopolisCity_House1/map.json b/data/maps/SootopolisCity_House1/map.json index 26c47c432..29162b867 100644 --- a/data/maps/SootopolisCity_House1/map.json +++ b/data/maps/SootopolisCity_House1/map.json @@ -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, -- cgit v1.2.3 From 81d95b9325ed2526ce638744408f453a8169abb4 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Sat, 12 Dec 2020 23:28:01 -0500 Subject: Use BUGFIX for some inline fixes --- data/battle_ai_scripts.s | 12 ++++++++++-- data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc | 6 +++++- 2 files changed, 15 insertions(+), 3 deletions(-) (limited to 'data') diff --git a/data/battle_ai_scripts.s b/data/battle_ai_scripts.s index 1c7bff51c..d1dd1caed 100644 --- a/data/battle_ai_scripts.s +++ b/data/battle_ai_scripts.s @@ -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 diff --git a/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc b/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc index 667f44114..eb081dbbb 100644 --- a/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc +++ b/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc @@ -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 -- cgit v1.2.3 From 769ddf22c266c2bf41d3353c5972bca8fa49c085 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Thu, 24 Dec 2020 16:18:47 -0500 Subject: Label remaining subs in battle_tower.c --- data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data') diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc index 493588b4d..cc623e216 100644 --- a/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc @@ -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 -- cgit v1.2.3