ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-16 11:37:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

Removed the YESNO MSGBOX on field moves except for dive

Browse Source
This commit is contained in:
Ninjdai 2023-11-13 14:57:34 +01:00
parent 80a0358c1c
commit eb54414adf
15 changed files with 96 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
data/layouts/BudportCity/map.bin
View File

Binary file not shown.

17
data/maps/BudportCity/map.json
View File

@ -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": [

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

@ -122,7 +122,9 @@
"dest_warp_id": "0"
}
],
"coord_events": [],
"coord_events": [
],
"bg_events": [
{
"type": "sign",

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

@ -144,7 +144,9 @@
"dest_warp_id": "0"
}
],
"coord_events": [],
"coord_events": [
],
"bg_events": [
{
"type": "hidden_item",

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

@ -270,7 +270,9 @@
"dest_warp_id": "1"
}
],
"coord_events": [],
"coord_events": [
],
"bg_events": [
{
"type": "sign",

12
data/maps/Route122/map.json
View File

@ -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": [
]
}

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

@ -170,7 +170,9 @@
"dest_warp_id": "0"
}
],
"coord_events": [],
"coord_events": [
],
"bg_events": [
{
"type": "secret_base",

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

@ -148,7 +148,13 @@
"flag": "0"
}
],
"warp_events": [],
"coord_events": [],
"bg_events": []
"warp_events": [
],
"coord_events": [
],
"bg_events": [
]
}

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

@ -179,8 +179,12 @@
"flag": "FLAG_ITEM_ROUTE_127_RARE_CANDY"
}
],
"warp_events": [],
"coord_events": [],
"warp_events": [
],
"coord_events": [
],
"bg_events": [
{
"type": "secret_base",

12
data/maps/Route130/map.json
View File

@ -78,7 +78,13 @@
"flag": "0"
}
],
"warp_events": [],
"coord_events": [],
"bg_events": []
"warp_events": [
],
"coord_events": [
],
"bg_events": [
]
}

8
data/maps/Route131/map.json
View File

@ -139,6 +139,10 @@
"dest_warp_id": "0"
}
],
"coord_events": [],
"bg_events": []
"coord_events": [
],
"bg_events": [
]
}

12
data/maps/Route132/map.json
View File

@ -156,7 +156,13 @@
"flag": "FLAG_ITEM_ROUTE_132_PROTEIN"
}
],
"warp_events": [],
"coord_events": [],
"bg_events": []
"warp_events": [
],
"coord_events": [
],
"bg_events": [
]
}

12
data/maps/Route133/map.json
View File

@ -156,7 +156,13 @@
"flag": "FLAG_ITEM_ROUTE_133_MAX_REVIVE"
}
],
"warp_events": [],
"coord_events": [],
"bg_events": []
"warp_events": [
],
"coord_events": [
],
"bg_events": [
]
}

6
data/maps/SootopolisCity/map.json
View File

@ -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",

16
data/scripts/field_move_scripts.inc
View File

@ -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