From eb54414adf8ebb97f9a5616f5b1f7d3c68dfd5c6 Mon Sep 17 00:00:00 2001 From: Ninjdai Date: Mon, 13 Nov 2023 14:57:34 +0100 Subject: [PATCH] Removed the YESNO MSGBOX on field moves except for dive --- data/layouts/BudportCity/map.bin | Bin 4000 -> 4000 bytes data/maps/BudportCity/map.json | 17 +++++++++++++++-- data/maps/PacifidlogTown/map.json | 4 +++- data/maps/Route105/map.json | 4 +++- data/maps/Route112/map.json | 4 +++- data/maps/Route122/map.json | 12 +++++++++--- data/maps/Route125/map.json | 4 +++- data/maps/Route126/map.json | 12 +++++++++--- data/maps/Route127/map.json | 8 ++++++-- data/maps/Route130/map.json | 12 +++++++++--- data/maps/Route131/map.json | 8 ++++++-- data/maps/Route132/map.json | 12 +++++++++--- data/maps/Route133/map.json | 12 +++++++++--- data/maps/SootopolisCity/map.json | 6 ++++-- data/scripts/field_move_scripts.inc | 16 ++++++++-------- 15 files changed, 96 insertions(+), 35 deletions(-) diff --git a/data/layouts/BudportCity/map.bin b/data/layouts/BudportCity/map.bin index a7c879d03e7fdd5f8000a22880406657e607d6fb..792a22513b6856f075195ed281ff55292f69ed73 100644 GIT binary patch delta 846 zcmYjP&ubG=5N0=T-X__uCMGHM2d0G`0U^^mHE z(u)__bneoF7rlx9fhT_!6%h|TdQ?w(5kY5mH=FRmc40xAZU|1UW(QyvNB7|Y)SwQbN-NeR-4r41F6ox)L@MU=xvaYm zUJ&KE8>J+sy7zy8)wLr^yFZbNM$cbHMYN%$TA%<*b;TAOPXnjHa z4LqBynb8GZ#!J#mk#$%TpUG=Z>=xwrS@gw&nOr3oDcY82TNkX0Ruq5X__B4SA6Jr% z{c#QE+|>9uSD0W4N0>L3{m^zD?(f&F4$IN$0VVCJ>dzw>@&Jpy$i4{d@O%ExyQ8U^4gMxbqx`m1&0S`GeA@z_( z52Y6`;`ZI82QPXP{{lVvv#5x8=+UEk(u)ZC-fn&rc`(d(=JUR9=DnSqY5C83fSDYc~QcB`90 zNDn2GtI{VOcylvU#a0sI5T-Qjy1gMcWGh5^=%6kd1>Wq?e@VPyH|!SQ3fNE#tpjg* zv}rEr#r$HP<@cHM7JqCbH5&bLYM3a73`LJ)`I3hF#<)T6JI)D#J)>w~Wj4t)oQdJy zkM@sZ<2fzDDCtdpZ04K#t|t0@qOPzJ_!FDX^~(_VQ~laUwPgpM8zXR?Tg-(zU!ck? zYd6iR`$c>bZ^Q@jQIuVH&r1{7$U!$~M^pu;^iJ%l!`$J!L>A1F#1;=oqF~FcTHU#Y z`m5<%vJ+Bmv*5yc;U{sPktaM6S2EILkw%Rl{{MT{96aE7(ro$m+6sDPDEswJ_9Q WcfA01CI?3|2{@TSk7p|x*Z2oJN6F0q diff --git a/data/maps/BudportCity/map.json b/data/maps/BudportCity/map.json index 2d472c797..1fffe7a08 100644 --- a/data/maps/BudportCity/map.json +++ b/data/maps/BudportCity/map.json @@ -56,15 +56,28 @@ { "graphics_id": "OBJ_EVENT_GFX_ANABEL", "x": 26, - "y": 7, + "y": 5, "elevation": 0, - "movement_type": "MOVEMENT_TYPE_NONE", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "BudportCity_EventScript_EVIVMaster", "flag": "0" + }, + { + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", + "x": 26, + "y": 4, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": "TRAINER_TYPE_NONE", + "trainer_sight_or_berry_tree_id": "0", + "script": "EventScript_RockSmash", + "flag": "0" } ], "warp_events": [ diff --git a/data/maps/PacifidlogTown/map.json b/data/maps/PacifidlogTown/map.json index 3c833550d..cd4b441dc 100644 --- a/data/maps/PacifidlogTown/map.json +++ b/data/maps/PacifidlogTown/map.json @@ -122,7 +122,9 @@ "dest_warp_id": "0" } ], - "coord_events": [], + "coord_events": [ + + ], "bg_events": [ { "type": "sign", diff --git a/data/maps/Route105/map.json b/data/maps/Route105/map.json index ae9bb6a5a..88ca381a6 100644 --- a/data/maps/Route105/map.json +++ b/data/maps/Route105/map.json @@ -144,7 +144,9 @@ "dest_warp_id": "0" } ], - "coord_events": [], + "coord_events": [ + + ], "bg_events": [ { "type": "hidden_item", diff --git a/data/maps/Route112/map.json b/data/maps/Route112/map.json index c13d8d736..470c5af43 100644 --- a/data/maps/Route112/map.json +++ b/data/maps/Route112/map.json @@ -270,7 +270,9 @@ "dest_warp_id": "1" } ], - "coord_events": [], + "coord_events": [ + + ], "bg_events": [ { "type": "sign", diff --git a/data/maps/Route122/map.json b/data/maps/Route122/map.json index fe21fe773..4817f3fe8 100644 --- a/data/maps/Route122/map.json +++ b/data/maps/Route122/map.json @@ -24,7 +24,9 @@ "direction": "down" } ], - "object_events": [], + "object_events": [ + + ], "warp_events": [ { "x": 22, @@ -34,6 +36,10 @@ "dest_warp_id": "0" } ], - "coord_events": [], - "bg_events": [] + "coord_events": [ + + ], + "bg_events": [ + + ] } diff --git a/data/maps/Route125/map.json b/data/maps/Route125/map.json index cc8bdf09c..624d06e04 100644 --- a/data/maps/Route125/map.json +++ b/data/maps/Route125/map.json @@ -170,7 +170,9 @@ "dest_warp_id": "0" } ], - "coord_events": [], + "coord_events": [ + + ], "bg_events": [ { "type": "secret_base", diff --git a/data/maps/Route126/map.json b/data/maps/Route126/map.json index 0997e46b1..01ec8fe8e 100644 --- a/data/maps/Route126/map.json +++ b/data/maps/Route126/map.json @@ -148,7 +148,13 @@ "flag": "0" } ], - "warp_events": [], - "coord_events": [], - "bg_events": [] + "warp_events": [ + + ], + "coord_events": [ + + ], + "bg_events": [ + + ] } diff --git a/data/maps/Route127/map.json b/data/maps/Route127/map.json index 30652264e..a7ea4df6a 100644 --- a/data/maps/Route127/map.json +++ b/data/maps/Route127/map.json @@ -179,8 +179,12 @@ "flag": "FLAG_ITEM_ROUTE_127_RARE_CANDY" } ], - "warp_events": [], - "coord_events": [], + "warp_events": [ + + ], + "coord_events": [ + + ], "bg_events": [ { "type": "secret_base", diff --git a/data/maps/Route130/map.json b/data/maps/Route130/map.json index bb79a2bb4..327fb1256 100644 --- a/data/maps/Route130/map.json +++ b/data/maps/Route130/map.json @@ -78,7 +78,13 @@ "flag": "0" } ], - "warp_events": [], - "coord_events": [], - "bg_events": [] + "warp_events": [ + + ], + "coord_events": [ + + ], + "bg_events": [ + + ] } diff --git a/data/maps/Route131/map.json b/data/maps/Route131/map.json index 18cdecc6e..208f0373a 100644 --- a/data/maps/Route131/map.json +++ b/data/maps/Route131/map.json @@ -139,6 +139,10 @@ "dest_warp_id": "0" } ], - "coord_events": [], - "bg_events": [] + "coord_events": [ + + ], + "bg_events": [ + + ] } diff --git a/data/maps/Route132/map.json b/data/maps/Route132/map.json index 698dd050f..43a3227d9 100644 --- a/data/maps/Route132/map.json +++ b/data/maps/Route132/map.json @@ -156,7 +156,13 @@ "flag": "FLAG_ITEM_ROUTE_132_PROTEIN" } ], - "warp_events": [], - "coord_events": [], - "bg_events": [] + "warp_events": [ + + ], + "coord_events": [ + + ], + "bg_events": [ + + ] } diff --git a/data/maps/Route133/map.json b/data/maps/Route133/map.json index 106546ef5..37b6651c1 100644 --- a/data/maps/Route133/map.json +++ b/data/maps/Route133/map.json @@ -156,7 +156,13 @@ "flag": "FLAG_ITEM_ROUTE_133_MAX_REVIVE" } ], - "warp_events": [], - "coord_events": [], - "bg_events": [] + "warp_events": [ + + ], + "coord_events": [ + + ], + "bg_events": [ + + ] } diff --git a/data/maps/SootopolisCity/map.json b/data/maps/SootopolisCity/map.json index 6a19724e7..3d115ea40 100644 --- a/data/maps/SootopolisCity/map.json +++ b/data/maps/SootopolisCity/map.json @@ -12,7 +12,7 @@ "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", - "connections": [], + "connections": 0, "object_events": [ { "graphics_id": "OBJ_EVENT_GFX_EXPERT_M", @@ -368,7 +368,9 @@ "dest_warp_id": "0" } ], - "coord_events": [], + "coord_events": [ + + ], "bg_events": [ { "type": "sign", diff --git a/data/scripts/field_move_scripts.inc b/data/scripts/field_move_scripts.inc index 3e99fc08e..80d02d149 100644 --- a/data/scripts/field_move_scripts.inc +++ b/data/scripts/field_move_scripts.inc @@ -7,8 +7,8 @@ EventScript_CutTree:: setfieldeffectargument 0, VAR_RESULT bufferpartymonnick STR_VAR_1, VAR_RESULT buffermovename STR_VAR_2, MOVE_CUT - msgbox Text_WantToCut, MSGBOX_YESNO - goto_if_eq VAR_RESULT, NO, EventScript_CancelCut + //msgbox Text_WantToCut, MSGBOX_YESNO + //goto_if_eq VAR_RESULT, NO, EventScript_CancelCut msgbox Text_MonUsedFieldMove, MSGBOX_DEFAULT closemessage dofieldeffect FLDEFF_USE_CUT_ON_TREE @@ -66,8 +66,8 @@ EventScript_RockSmash:: setfieldeffectargument 0, VAR_RESULT bufferpartymonnick STR_VAR_1, VAR_RESULT buffermovename STR_VAR_2, MOVE_ROCK_SMASH - msgbox Text_WantToSmash, MSGBOX_YESNO - goto_if_eq VAR_RESULT, NO, EventScript_CancelSmash + //msgbox Text_WantToSmash, MSGBOX_YESNO + //goto_if_eq VAR_RESULT, NO, EventScript_CancelSmash msgbox Text_MonUsedFieldMove, MSGBOX_DEFAULT closemessage dofieldeffect FLDEFF_USE_ROCK_SMASH @@ -128,8 +128,8 @@ EventScript_StrengthBoulder:: checkpartymove MOVE_STRENGTH goto_if_eq VAR_RESULT, PARTY_SIZE, EventScript_CantStrength setfieldeffectargument 0, VAR_RESULT - msgbox Text_WantToStrength, MSGBOX_YESNO - goto_if_eq VAR_RESULT, NO, EventScript_CancelStrength + //msgbox Text_WantToStrength, MSGBOX_YESNO + //goto_if_eq VAR_RESULT, NO, EventScript_CancelStrength closemessage dofieldeffect FLDEFF_USE_STRENGTH waitstate @@ -188,8 +188,8 @@ EventScript_UseWaterfall:: goto_if_eq VAR_RESULT, PARTY_SIZE, EventScript_CantWaterfall bufferpartymonnick STR_VAR_1, VAR_RESULT setfieldeffectargument 0, VAR_RESULT - msgbox Text_WantToWaterfall, MSGBOX_YESNO - goto_if_eq VAR_RESULT, NO, EventScript_EndWaterfall + //msgbox Text_WantToWaterfall, MSGBOX_YESNO + //goto_if_eq VAR_RESULT, NO, EventScript_EndWaterfall msgbox Text_MonUsedWaterfall, MSGBOX_DEFAULT dofieldeffect FLDEFF_USE_WATERFALL goto EventScript_EndWaterfall