diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-04-23 17:20:34 -0400 |
|---|---|---|
| committer | GriffinR <griffin.g.richards@gmail.com> | 2020-04-23 17:59:25 -0400 |
| commit | 71094356313801bf20191f3db1efa0decd3c3dcb (patch) | |
| tree | 18c501d04a21f88c5f4d59f764883e326710ca39 | |
| parent | 3bd2094141da60be175f237fa34889469f77f187 (diff) | |
Sync event macros
176 files changed, 1751 insertions, 1660 deletions
diff --git a/data-de/event_scripts.s b/data-de/event_scripts.s index 0c6034410..15c304c37 100644 --- a/data-de/event_scripts.s +++ b/data-de/event_scripts.s @@ -13,6 +13,7 @@ #include "constants/heal_locations.h" #include "constants/vars.h" #include "constants/metatile_labels.h" +#include "constants/battle_setup.h" .include "include/macros.inc" .include "include/macros/event.inc" .include "constants/constants.inc" @@ -1496,7 +1497,7 @@ OldaleTown_PokemonCenter_1F_Movement_19FDF4:: @ 819FDF4 end_movement Std_ObtainItem: @ 819FDF7 - giveitem VAR_0x8000, VAR_0x8001 + additem VAR_0x8000, VAR_0x8001 copyvar VAR_0x8007, VAR_RESULT call Std_ObtainItem_ return @@ -1571,7 +1572,7 @@ PlayGetTMHMFanfare: return Std_ObtainDecoration: @ 819FEDA - givedecoration VAR_0x8000 + adddecoration VAR_0x8000 copyvar VAR_0x8007, VAR_RESULT call Std_ObtainDecoration_ return @@ -1601,7 +1602,7 @@ Std_FindItem: @ 819FF21 lock faceplayer waitse - giveitem VAR_0x8000, VAR_0x8001 + additem VAR_0x8000, VAR_0x8001 copyvar VAR_0x8007, VAR_RESULT bufferitemname 1, VAR_0x8000 checkitemtype VAR_0x8000 @@ -1630,7 +1631,7 @@ Std_FindItem_Fail: @ 819FF65 HiddenItemScript:: @ 819FF7B lockall waitse - giveitem VAR_0x8005, 1 + additem VAR_0x8005 copyvar VAR_0x8007, VAR_RESULT bufferitemname 0x1, VAR_0x8005 checkitemtype VAR_0x8005 @@ -1801,7 +1802,7 @@ RustboroCity_Gym_EventScript_1A00FB:: @ 81A00FB DewfordTown_EventScript_1A0102:: @ 81A0102 DewfordTown_Hall_EventScript_1A0102:: @ 81A0102 - dodailyevents + dotimebasedevents setvar VAR_0x8004, 0 special BufferTrendyPhraseString return @@ -2545,7 +2546,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_1A067F:: @ 81A067F message FallarborTown_House1_Text_1A1498 waitmessage waitfanfare - takeitem VAR_0x8004, 1 + removeitem VAR_0x8004, 1 return EverGrandeCity_DrakesRoom_EventScript_1A0693:: @ 81A0693 diff --git a/data/debug_mystery_event_scripts.s b/data/debug_mystery_event_scripts.s index 6fa509c34..a64f8351d 100644 --- a/data/debug_mystery_event_scripts.s +++ b/data/debug_mystery_event_scripts.s @@ -175,7 +175,7 @@ _0845E329: getpartysize compare VAR_RESULT, 0x6 vgoto_if 0x1, _0845E34C - givemon SPECIES_LUVDISC, 15, ITEM_BERRY_JUICE, 0x0, 0x0, 0x0 + givemon SPECIES_LUVDISC, 15, ITEM_BERRY_JUICE setmysteryeventstatus 0x2 end @@ -333,7 +333,7 @@ _0845E730: _0845E736: setvaddress _0845E736 bufferdecorationname 0x0, DECOR_REGISTEEL_DOLL - givedecoration DECOR_REGISTEEL_DOLL + adddecoration DECOR_REGISTEEL_DOLL compare VAR_RESULT, 0x0 vgoto_if 0x1, _0845E755 vloadptr _0845E75D diff --git a/data/event_scripts.s b/data/event_scripts.s index ac5507d51..361173f75 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -13,6 +13,7 @@ #include "constants/heal_locations.h" #include "constants/vars.h" #include "constants/metatile_labels.h" +#include "constants/battle_setup.h" .include "include/macros.inc" .include "include/macros/event.inc" .include "constants/constants.inc" @@ -1490,7 +1491,7 @@ OldaleTown_PokemonCenter_1F_Movement_19FDF4:: @ 819FDF4 end_movement Std_ObtainItem: @ 819FDF7 - giveitem VAR_0x8000, VAR_0x8001 + additem VAR_0x8000, VAR_0x8001 copyvar VAR_0x8007, VAR_RESULT call Std_ObtainItem_ return @@ -1565,7 +1566,7 @@ PlayGetTMHMFanfare: return Std_ObtainDecoration: @ 819FEDA - givedecoration VAR_0x8000 + adddecoration VAR_0x8000 copyvar VAR_0x8007, VAR_RESULT call Std_ObtainDecoration_ return @@ -1595,7 +1596,7 @@ Std_FindItem: @ 819FF21 lock faceplayer waitse - giveitem VAR_0x8000, VAR_0x8001 + additem VAR_0x8000, VAR_0x8001 copyvar VAR_0x8007, VAR_RESULT bufferitemname 1, VAR_0x8000 checkitemtype VAR_0x8000 @@ -1624,7 +1625,7 @@ Std_FindItem_Fail: @ 819FF65 HiddenItemScript:: @ 819FF7B lockall waitse - giveitem VAR_0x8005, 1 + additem VAR_0x8005 copyvar VAR_0x8007, VAR_RESULT bufferitemname 0x1, VAR_0x8005 checkitemtype VAR_0x8005 @@ -1795,7 +1796,7 @@ RustboroCity_Gym_EventScript_1A00FB:: @ 81A00FB DewfordTown_EventScript_1A0102:: @ 81A0102 DewfordTown_Hall_EventScript_1A0102:: @ 81A0102 - dodailyevents + dotimebasedevents setvar VAR_0x8004, 0 special BufferTrendyPhraseString return @@ -2539,7 +2540,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_1A067F:: @ 81A067F message FallarborTown_House1_Text_1A1498 waitmessage waitfanfare - takeitem VAR_0x8004, 1 + removeitem VAR_0x8004, 1 return EverGrandeCity_DrakesRoom_EventScript_1A0693:: @ 81A0693 diff --git a/data/item_ball_scripts.inc b/data/item_ball_scripts.inc index 02acdeca4..4e8f253e4 100644 --- a/data/item_ball_scripts.inc +++ b/data/item_ball_scripts.inc @@ -1,539 +1,539 @@ Route102_EventScript_1B1439:: @ 81B1439 - giveitem_std ITEM_POTION, 1, 1 + finditem ITEM_POTION end Route103_EventScript_1B1446:: @ 81B1446 - giveitem_std ITEM_GUARD_SPEC, 1, 1 + finditem ITEM_GUARD_SPEC end Route104_EventScript_1B1453:: @ 81B1453 - giveitem_std ITEM_PP_UP, 1, 1 + finditem ITEM_PP_UP end Route104_EventScript_1B1460:: @ 81B1460 - giveitem_std ITEM_POKE_BALL, 1, 1 + finditem ITEM_POKE_BALL end Route104_EventScript_1B146D:: @ 81B146D - giveitem_std ITEM_X_ACCURACY, 1, 1 + finditem ITEM_X_ACCURACY end Route104_EventScript_1B147A:: @ 81B147A - giveitem_std ITEM_POTION, 1, 1 + finditem ITEM_POTION end Route105_EventScript_1B1487:: @ 81B1487 - giveitem_std ITEM_IRON, 1, 1 + finditem ITEM_IRON end Route106_EventScript_1B1494:: @ 81B1494 - giveitem_std ITEM_PROTEIN, 1, 1 + finditem ITEM_PROTEIN end Route109_EventScript_1B14A1:: @ 81B14A1 - giveitem_std ITEM_PP_UP, 1, 1 + finditem ITEM_PP_UP end Route110_EventScript_1B14AE:: @ 81B14AE - giveitem_std ITEM_RARE_CANDY, 1, 1 + finditem ITEM_RARE_CANDY end Route110_EventScript_1B14BB:: @ 81B14BB - giveitem_std ITEM_DIRE_HIT, 1, 1 + finditem ITEM_DIRE_HIT end Route111_EventScript_1B14C8:: @ 81B14C8 - giveitem_std ITEM_TM37_SANDSTORM, 1, 1 + finditem ITEM_TM37_SANDSTORM end Route111_EventScript_1B14D5:: @ 81B14D5 - giveitem_std ITEM_STARDUST, 1, 1 + finditem ITEM_STARDUST end Route111_EventScript_1B14E2:: @ 81B14E2 - giveitem_std ITEM_HP_UP, 1, 1 + finditem ITEM_HP_UP end Route112_EventScript_1B14EF:: @ 81B14EF - giveitem_std ITEM_NUGGET, 1, 1 + finditem ITEM_NUGGET end Route113_EventScript_1B14FC:: @ 81B14FC - giveitem_std ITEM_MAX_ETHER, 1, 1 + finditem ITEM_MAX_ETHER end Route113_EventScript_1B1509:: @ 81B1509 - giveitem_std ITEM_SUPER_REPEL, 1, 1 + finditem ITEM_SUPER_REPEL end Route114_EventScript_1B1516:: @ 81B1516 - giveitem_std ITEM_RARE_CANDY, 1, 1 + finditem ITEM_RARE_CANDY end Route114_EventScript_1B1523:: @ 81B1523 - giveitem_std ITEM_PROTEIN, 1, 1 + finditem ITEM_PROTEIN end Route115_EventScript_1B1530:: @ 81B1530 - giveitem_std ITEM_SUPER_POTION, 1, 1 + finditem ITEM_SUPER_POTION end Route115_EventScript_1B153D:: @ 81B153D - giveitem_std ITEM_TM01_FOCUS_PUNCH, 1, 1 + finditem ITEM_TM01_FOCUS_PUNCH end Route115_EventScript_1B154A:: @ 81B154A - giveitem_std ITEM_IRON, 1, 1 + finditem ITEM_IRON end Route115_EventScript_1B1557:: @ 81B1557 - giveitem_std ITEM_GREAT_BALL, 1, 1 + finditem ITEM_GREAT_BALL end Route116_EventScript_1B1564:: @ 81B1564 - giveitem_std ITEM_X_SPECIAL, 1, 1 + finditem ITEM_X_SPECIAL end Route116_EventScript_1B1571:: @ 81B1571 - giveitem_std ITEM_ETHER, 1, 1 + finditem ITEM_ETHER end Route116_EventScript_1B157E:: @ 81B157E - giveitem_std ITEM_REPEL, 1, 1 + finditem ITEM_REPEL end Route116_EventScript_1B158B:: @ 81B158B - giveitem_std ITEM_HP_UP, 1, 1 + finditem ITEM_HP_UP end Route117_EventScript_1B1598:: @ 81B1598 - giveitem_std ITEM_GREAT_BALL, 1, 1 + finditem ITEM_GREAT_BALL end Route117_EventScript_1B15A5:: @ 81B15A5 - giveitem_std ITEM_REVIVE, 1, 1 + finditem ITEM_REVIVE end Route118_EventScript_1B15B2:: @ 81B15B2 - giveitem_std ITEM_HYPER_POTION, 1, 1 + finditem ITEM_HYPER_POTION end Route119_EventScript_1B15BF:: @ 81B15BF - giveitem_std ITEM_SUPER_REPEL, 1, 1 + finditem ITEM_SUPER_REPEL end Route119_EventScript_1B15CC:: @ 81B15CC - giveitem_std ITEM_ZINC, 1, 1 + finditem ITEM_ZINC end Route119_EventScript_1B15D9:: @ 81B15D9 - giveitem_std ITEM_ELIXIR, 1, 1 + finditem ITEM_ELIXIR end Route119_EventScript_1B15E6:: @ 81B15E6 - giveitem_std ITEM_LEAF_STONE, 1, 1 + finditem ITEM_LEAF_STONE end Route119_EventScript_1B15F3:: @ 81B15F3 - giveitem_std ITEM_RARE_CANDY, 1, 1 + finditem ITEM_RARE_CANDY end Route119_EventScript_1B1600:: @ 81B1600 - giveitem_std ITEM_HYPER_POTION, 1, 1 + finditem ITEM_HYPER_POTION end Route119_EventScript_1B160D:: @ 81B160D - giveitem_std ITEM_HYPER_POTION, 1, 1 + finditem ITEM_HYPER_POTION end Route120_EventScript_1B161A:: @ 81B161A - giveitem_std ITEM_NUGGET, 1, 1 + finditem ITEM_NUGGET end Route120_EventScript_1B1627:: @ 81B1627 - giveitem_std ITEM_FULL_HEAL, 1, 1 + finditem ITEM_FULL_HEAL end Route120_EventScript_1B1634:: @ 81B1634 - giveitem_std ITEM_HYPER_POTION, 1, 1 + finditem ITEM_HYPER_POTION end Route120_EventScript_1B1641:: @ 81B1641 - giveitem_std ITEM_NEST_BALL, 1, 1 + finditem ITEM_NEST_BALL end Route121_EventScript_1B164E:: @ 81B164E - giveitem_std ITEM_CARBOS, 1, 1 + finditem ITEM_CARBOS end Route123_EventScript_1B165B:: @ 81B165B - giveitem_std ITEM_CALCIUM, 1, 1 + finditem ITEM_CALCIUM end Route123_EventScript_1B1668:: @ 81B1668 - giveitem_std ITEM_RARE_CANDY, 1, 1 + finditem ITEM_RARE_CANDY end Route123_EventScript_1B1675:: @ 81B1675 - giveitem_std ITEM_ULTRA_BALL, 1, 1 + finditem ITEM_ULTRA_BALL end Route123_EventScript_1B1682:: @ 81B1682 - giveitem_std ITEM_ELIXIR, 1, 1 + finditem ITEM_ELIXIR end Route124_EventScript_1B168F:: @ 81B168F - giveitem_std ITEM_RED_SHARD, 1, 1 + finditem ITEM_RED_SHARD end Route124_EventScript_1B169C:: @ 81B169C - giveitem_std ITEM_BLUE_SHARD, 1, 1 + finditem ITEM_BLUE_SHARD end Route124_EventScript_1B16A9:: @ 81B16A9 - giveitem_std ITEM_YELLOW_SHARD, 1, 1 + finditem ITEM_YELLOW_SHARD end Route126_EventScript_1B16B6:: @ 81B16B6 - giveitem_std ITEM_GREEN_SHARD, 1, 1 + finditem ITEM_GREEN_SHARD end Route127_EventScript_1B16C3:: @ 81B16C3 - giveitem_std ITEM_ZINC, 1, 1 + finditem ITEM_ZINC end Route127_EventScript_1B16D0:: @ 81B16D0 - giveitem_std ITEM_CARBOS, 1, 1 + finditem ITEM_CARBOS end Route132_EventScript_1B16DD:: @ 81B16DD - giveitem_std ITEM_RARE_CANDY, 1, 1 + finditem ITEM_RARE_CANDY end Route133_EventScript_1B16EA:: @ 81B16EA - giveitem_std ITEM_BIG_PEARL, 1, 1 + finditem ITEM_BIG_PEARL end Route133_EventScript_1B16F7:: @ 81B16F7 - giveitem_std ITEM_STAR_PIECE, 1, 1 + finditem ITEM_STAR_PIECE end PetalburgCity_EventScript_1B1704:: @ 81B1704 - giveitem_std ITEM_MAX_REVIVE, 1, 1 + finditem ITEM_MAX_REVIVE end PetalburgCity_EventScript_1B1711:: @ 81B1711 - giveitem_std ITEM_ETHER, 1, 1 + finditem ITEM_ETHER end MauvilleCity_EventScript_1B171E:: @ 81B171E - giveitem_std ITEM_X_SPEED, 1, 1 + finditem ITEM_X_SPEED end RustboroCity_EventScript_1B172B:: @ 81B172B - giveitem_std ITEM_X_DEFEND, 1, 1 + finditem ITEM_X_DEFEND end LilycoveCity_EventScript_1B1738:: @ 81B1738 - giveitem_std ITEM_MAX_REPEL, 1, 1 + finditem ITEM_MAX_REPEL end MossdeepCity_EventScript_1B1745:: @ 81B1745 - giveitem_std ITEM_NET_BALL, 1, 1 + finditem ITEM_NET_BALL end PetalburgWoods_EventScript_1B1752:: @ 81B1752 - giveitem_std ITEM_X_ATTACK, 1, 1 + finditem ITEM_X_ATTACK end PetalburgWoods_EventScript_1B175F:: @ 81B175F - giveitem_std ITEM_GREAT_BALL, 1, 1 + finditem ITEM_GREAT_BALL end PetalburgWoods_EventScript_1B176C:: @ 81B176C - giveitem_std ITEM_ETHER, 1, 1 + finditem ITEM_ETHER end PetalburgWoods_EventScript_1B1779:: @ 81B1779 - giveitem_std ITEM_PARALYZE_HEAL, 1, 1 + finditem ITEM_PARALYZE_HEAL end RusturfTunnel_EventScript_1B1786:: @ 81B1786 - giveitem_std ITEM_POKE_BALL, 1, 1 + finditem ITEM_POKE_BALL end RusturfTunnel_EventScript_1B1793:: @ 81B1793 - giveitem_std ITEM_MAX_ETHER, 1, 1 + finditem ITEM_MAX_ETHER end GraniteCave_1F_EventScript_1B17A0:: @ 81B17A0 - giveitem_std ITEM_ESCAPE_ROPE, 1, 1 + finditem ITEM_ESCAPE_ROPE end GraniteCave_B1F_EventScript_1B17AD:: @ 81B17AD - giveitem_std ITEM_POKE_BALL, 1, 1 + finditem ITEM_POKE_BALL end GraniteCave_B2F_EventScript_1B17BA:: @ 81B17BA - giveitem_std ITEM_REPEL, 1, 1 + finditem ITEM_REPEL end GraniteCave_B2F_EventScript_1B17C7:: @ 81B17C7 - giveitem_std ITEM_RARE_CANDY, 1, 1 + finditem ITEM_RARE_CANDY end JaggedPass_EventScript_1B17D4:: @ 81B17D4 - giveitem_std ITEM_BURN_HEAL, 1, 1 + finditem ITEM_BURN_HEAL end FieryPath_EventScript_1B17E1:: @ 81B17E1 - giveitem_std ITEM_FIRE_STONE, 1, 1 + finditem ITEM_FIRE_STONE end FieryPath_EventScript_1B17EE:: @ 81B17EE - giveitem_std ITEM_TM06_TOXIC, 1, 1 + finditem ITEM_TM06_TOXIC end MeteorFalls_1F_1R_EventScript_1B17FB:: @ 81B17FB - giveitem_std ITEM_TM23_IRON_TAIL, 1, 1 + finditem ITEM_TM23_IRON_TAIL end MeteorFalls_1F_1R_EventScript_1B1808:: @ 81B1808 - giveitem_std ITEM_FULL_HEAL, 1, 1 + finditem ITEM_FULL_HEAL end MeteorFalls_1F_1R_EventScript_1B1815:: @ 81B1815 - giveitem_std ITEM_MOON_STONE, 1, 1 + finditem ITEM_MOON_STONE end MeteorFalls_1F_1R_EventScript_1B1822:: @ 81B1822 - giveitem_std ITEM_PP_UP, 1, 1 + finditem ITEM_PP_UP end MeteorFalls_B1F_2R_EventScript_1B182F:: @ 81B182F - giveitem_std ITEM_TM02_DRAGON_CLAW, 1, 1 + finditem ITEM_TM02_DRAGON_CLAW end NewMauville_Inside_EventScript_1B183C:: @ 81B183C - giveitem_std ITEM_ULTRA_BALL, 1, 1 + finditem ITEM_ULTRA_BALL end NewMauville_Inside_EventScript_1B1849:: @ 81B1849 - giveitem_std ITEM_ESCAPE_ROPE, 1, 1 + finditem ITEM_ESCAPE_ROPE end NewMauville_Inside_EventScript_1B1856:: @ 81B1856 - giveitem_std ITEM_THUNDER_STONE, 1, 1 + finditem ITEM_THUNDER_STONE end NewMauville_Inside_EventScript_1B1863:: @ 81B1863 - giveitem_std ITEM_FULL_HEAL, 1, 1 + finditem ITEM_FULL_HEAL end NewMauville_Inside_EventScript_1B1870:: @ 81B1870 - giveitem_std ITEM_PARALYZE_HEAL, 1, 1 + finditem ITEM_PARALYZE_HEAL end AbandonedShip_Rooms_1F_EventScript_1B187D:: @ 81B187D - giveitem_std ITEM_HARBOR_MAIL, 1, 1 + finditem ITEM_HARBOR_MAIL end AbandonedShip_Rooms_B1F_EventScript_1B188A:: @ 81B188A - giveitem_std ITEM_ESCAPE_ROPE, 1, 1 + finditem ITEM_ESCAPE_ROPE end AbandonedShip_Rooms2_B1F_EventScript_1B1897:: @ 81B1897 - giveitem_std ITEM_DIVE_BALL, 1, 1 + finditem ITEM_DIVE_BALL end AbandonedShip_Room_B1F_EventScript_1B18A4:: @ 81B18A4 - giveitem_std ITEM_TM13_ICE_BEAM, 1, 1 + finditem ITEM_TM13_ICE_BEAM end AbandonedShip_Rooms2_1F_EventScript_1B18B1:: @ 81B18B1 - giveitem_std ITEM_REVIVE, 1, 1 + finditem ITEM_REVIVE end AbandonedShip_CaptainsOffice_EventScript_1B18BE:: @ 81B18BE - giveitem_std ITEM_STORAGE_KEY, 1, 1 + finditem ITEM_STORAGE_KEY end AbandonedShip_HiddenFloorRooms_EventScript_1B18CB:: @ 81B18CB - giveitem_std ITEM_LUXURY_BALL, 1, 1 + finditem ITEM_LUXURY_BALL end AbandonedShip_HiddenFloorRooms_EventScript_1B18D8:: @ 81B18D8 - giveitem_std ITEM_SCANNER, 1, 1 + finditem ITEM_SCANNER end AbandonedShip_HiddenFloorRooms_EventScript_1B18E5:: @ 81B18E5 - giveitem_std ITEM_WATER_STONE, 1, 1 + finditem ITEM_WATER_STONE end AbandonedShip_HiddenFloorRooms_EventScript_1B18F2:: @ 81B18F2 - giveitem_std ITEM_TM18_RAIN_DANCE, 1, 1 + finditem ITEM_TM18_RAIN_DANCE end ScorchedSlab_EventScript_1B18FF:: @ 81B18FF - giveitem_std ITEM_TM11_SUNNY_DAY, 1, 1 + finditem ITEM_TM11_SUNNY_DAY end SafariZone_Northwest_EventScript_1B190C:: @ 81B190C - giveitem_std ITEM_TM22_SOLARBEAM, 1, 1 + finditem ITEM_TM22_SOLARBEAM end SafariZone_Northeast_EventScript_1B1919:: @ 81B1919 - giveitem_std ITEM_CALCIUM, 1, 1 + finditem ITEM_CALCIUM end SafariZone_Southwest_EventScript_1B1926:: @ 81B1926 - giveitem_std ITEM_MAX_REVIVE, 1, 1 + finditem ITEM_MAX_REVIVE end MtPyre_2F_EventScript_1B1933:: @ 81B1933 - giveitem_std ITEM_ULTRA_BALL, 1, 1 + finditem ITEM_ULTRA_BALL end MtPyre_3F_EventScript_1B1940:: @ 81B1940 - giveitem_std ITEM_SUPER_REPEL, 1, 1 + finditem ITEM_SUPER_REPEL end MtPyre_4F_EventScript_1B194D:: @ 81B194D - giveitem_std ITEM_SEA_INCENSE, 1, 1 + finditem ITEM_SEA_INCENSE end MtPyre_5F_EventScript_1B195A:: @ 81B195A - giveitem_std ITEM_LAX_INCENSE, 1, 1 + finditem ITEM_LAX_INCENSE end MtPyre_6F_EventScript_1B1967:: @ 81B1967 - giveitem_std ITEM_TM30_SHADOW_BALL, 1, 1 + finditem ITEM_TM30_SHADOW_BALL end MtPyre_Exterior_EventScript_1B1974:: @ 81B1974 - giveitem_std ITEM_MAX_POTION, 1, 1 + finditem ITEM_MAX_POTION end MtPyre_Exterior_EventScript_1B1981:: @ 81B1981 - giveitem_std ITEM_TM48_SKILL_SWAP, 1, 1 + finditem ITEM_TM48_SKILL_SWAP end AquaHideout_B1F_EventScript_1B198E:: @ 81B198E - giveitem_std ITEM_MASTER_BALL, 1, 1 + finditem ITEM_MASTER_BALL end AquaHideout_B1F_EventScript_1B199B:: @ 81B199B - giveitem_std ITEM_NUGGET, 1, 1 + finditem ITEM_NUGGET end AquaHideout_B1F_EventScript_1B19A8:: @ 81B19A8 - giveitem_std ITEM_MAX_ELIXIR, 1, 1 + finditem ITEM_MAX_ELIXIR end AquaHideout_B2F_EventScript_1B19B5:: @ 81B19B5 - giveitem_std ITEM_NEST_BALL, 1, 1 + finditem ITEM_NEST_BALL end MagmaHideout_B1F_EventScript_1B19C2:: @ 81B19C2 - giveitem_std ITEM_MASTER_BALL, 1, 1 + finditem ITEM_MASTER_BALL end MagmaHideout_B1F_EventScript_1B19CF:: @ 81B19CF - giveitem_std ITEM_NUGGET, 1, 1 + finditem ITEM_NUGGET end MagmaHideout_B1F_EventScript_1B19DC:: @ 81B19DC - giveitem_std ITEM_MAX_ELIXIR, 1, 1 + finditem ITEM_MAX_ELIXIR end MagmaHideout_B2F_EventScript_1B19E9:: @ 81B19E9 - giveitem_std ITEM_NEST_BALL, 1, 1 + finditem ITEM_NEST_BALL end ShoalCave_LowTideEntranceRoom_EventScript_1B19F6:: @ 81B19F6 - giveitem_std ITEM_BIG_PEARL, 1, 1 + finditem ITEM_BIG_PEARL end ShoalCave_LowTideInnerRoom_EventScript_1B1A03:: @ 81B1A03 - giveitem_std ITEM_RARE_CANDY, 1, 1 + finditem ITEM_RARE_CANDY end ShoalCave_LowTideStairsRoom_EventScript_1B1A10:: @ 81B1A10 - giveitem_std ITEM_ICE_HEAL, 1, 1 + finditem ITEM_ICE_HEAL end ShoalCave_LowTideIceRoom_EventScript_1B1A1D:: @ 81B1A1D - giveitem_std ITEM_TM07_HAIL, 1, 1 + finditem ITEM_TM07_HAIL end ShoalCave_LowTideIceRoom_EventScript_1B1A2A:: @ 81B1A2A - giveitem_std ITEM_NEVER_MELT_ICE, 1, 1 + finditem ITEM_NEVER_MELT_ICE end SeafloorCavern_Room9_EventScript_1B1A37:: @ 81B1A37 - giveitem_std ITEM_TM26_EARTHQUAKE, 1, 1 + finditem ITEM_TM26_EARTHQUAKE end CaveOfOrigin_B3F_EventScript_1B1A44:: @ 81B1A44 - giveitem_std ITEM_HM07_WATERFALL, 1, 1 + finditem ITEM_HM07_WATERFALL end Route110_TrickHousePuzzle1_EventScript_1B1A51:: @ 81B1A51 - giveitem_std ITEM_ORANGE_MAIL, 1, 1 + finditem ITEM_ORANGE_MAIL end Route110_TrickHousePuzzle2_EventScript_1B1A5E:: @ 81B1A5E - giveitem_std ITEM_HARBOR_MAIL, 1, 1 + finditem ITEM_HARBOR_MAIL end Route110_TrickHousePuzzle2_EventScript_1B1A6B:: @ 81B1A6B - giveitem_std ITEM_WAVE_MAIL, 1, 1 + finditem ITEM_WAVE_MAIL end Route110_TrickHousePuzzle3_EventScript_1B1A78:: @ 81B1A78 - giveitem_std ITEM_SHADOW_MAIL, 1, 1 + finditem ITEM_SHADOW_MAIL end Route110_TrickHousePuzzle3_EventScript_1B1A85:: @ 81B1A85 - giveitem_std ITEM_WOOD_MAIL, 1, 1 + finditem ITEM_WOOD_MAIL end Route110_TrickHousePuzzle4_EventScript_1B1A92:: @ 81B1A92 - giveitem_std ITEM_MECH_MAIL, 1, 1 + finditem ITEM_MECH_MAIL end Route110_TrickHousePuzzle6_EventScript_1B1A9F:: @ 81B1A9F - giveitem_std ITEM_GLITTER_MAIL, 1, 1 + finditem ITEM_GLITTER_MAIL end Route110_TrickHousePuzzle7_EventScript_1B1AAC:: @ 81B1AAC - giveitem_std ITEM_TROPIC_MAIL, 1, 1 + finditem ITEM_TROPIC_MAIL end Route110_TrickHousePuzzle8_EventScript_1B1AB9:: @ 81B1AB9 - giveitem_std ITEM_BEAD_MAIL, 1, 1 + finditem ITEM_BEAD_MAIL end VictoryRoad_1F_EventScript_1B1AC6:: @ 81B1AC6 - giveitem_std ITEM_MAX_ELIXIR, 1, 1 + finditem ITEM_MAX_ELIXIR end VictoryRoad_1F_EventScript_1B1AD3:: @ 81B1AD3 - giveitem_std ITEM_PP_UP, 1, 1 + finditem ITEM_PP_UP end VictoryRoad_B1F_EventScript_1B1AE0:: @ 81B1AE0 - giveitem_std ITEM_TM29_PSYCHIC, 1, 1 + finditem ITEM_TM29_PSYCHIC end VictoryRoad_B1F_EventScript_1B1AED:: @ 81B1AED - giveitem_std ITEM_FULL_RESTORE, 1, 1 + finditem ITEM_FULL_RESTORE end VictoryRoad_B2F_EventScript_1B1AFA:: @ 81B1AFA - giveitem_std ITEM_FULL_HEAL, 1, 1 + finditem ITEM_FULL_HEAL end @ 81B1B07 - giveitem_std ITEM_HM08_DIVE, 1, 1 + finditem ITEM_HM08_DIVE end diff --git a/data/maps/AbandonedShip_Corridors_1F/scripts.inc b/data/maps/AbandonedShip_Corridors_1F/scripts.inc index f2636fd31..c82a598b7 100644 --- a/data/maps/AbandonedShip_Corridors_1F/scripts.inc +++ b/data/maps/AbandonedShip_Corridors_1F/scripts.inc @@ -6,6 +6,6 @@ AbandonedShip_Corridors_1F_EventScript_15E965:: @ 815E965 end AbandonedShip_Corridors_1F_EventScript_15E96E:: @ 815E96E - trainerbattle 0, TRAINER_CHARLIE, 0, AbandonedShip_Corridors_1F_Text_19843D, AbandonedShip_Corridors_1F_Text_198479 + trainerbattle_single TRAINER_CHARLIE, AbandonedShip_Corridors_1F_Text_19843D, AbandonedShip_Corridors_1F_Text_198479 msgbox AbandonedShip_Corridors_1F_Text_198493, 6 end diff --git a/data/maps/AbandonedShip_Corridors_B1F/scripts.inc b/data/maps/AbandonedShip_Corridors_B1F/scripts.inc index cdf430e27..854368639 100644 --- a/data/maps/AbandonedShip_Corridors_B1F/scripts.inc +++ b/data/maps/AbandonedShip_Corridors_B1F/scripts.inc @@ -32,7 +32,7 @@ AbandonedShip_Corridors_B1F_EventScript_15E9D3:: @ 815E9D3 goto_if_eq AbandonedShip_Corridors_B1F_EventScript_15EA0A msgbox AbandonedShip_Corridors_B1F_Text_198692, 4 playse SE_PIN - takeitem ITEM_STORAGE_KEY, 1 + removeitem ITEM_STORAGE_KEY, 1 setflag FLAG_USED_STORAGE_KEY call AbandonedShip_Corridors_B1F_EventScript_15E9C0 special DrawWholeMapView @@ -50,6 +50,6 @@ AbandonedShip_Corridors_B1F_EventScript_15EA14:: @ 815EA14 end AbandonedShip_Corridors_B1F_EventScript_15EA1E:: @ 815EA1E - trainerbattle 0, TRAINER_DUNCAN, 0, AbandonedShip_Corridors_B1F_Text_19856F, AbandonedShip_Corridors_B1F_Text_1985C5 + trainerbattle_single TRAINER_DUNCAN, AbandonedShip_Corridors_B1F_Text_19856F, AbandonedShip_Corridors_B1F_Text_1985C5 msgbox AbandonedShip_Corridors_B1F_Text_1985D7, 6 end diff --git a/data/maps/AbandonedShip_HiddenFloorCorridors/scripts.inc b/data/maps/AbandonedShip_HiddenFloorCorridors/scripts.inc index 6639e6b6e..0dcc72cfe 100644 --- a/data/maps/AbandonedShip_HiddenFloorCorridors/scripts.inc +++ b/data/maps/AbandonedShip_HiddenFloorCorridors/scripts.inc @@ -58,7 +58,7 @@ AbandonedShip_HiddenFloorCorridors_EventScript_15EBF3:: @ 815EBF3 goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECCF msgbox AbandonedShip_HiddenFloorCorridors_Text_198E90, 4 playse SE_PIN - takeitem ITEM_ROOM_1_KEY, 1 + removeitem ITEM_ROOM_1_KEY setflag FLAG_USED_ROOM_1_KEY call AbandonedShip_HiddenFloorCorridors_EventScript_15EBA3 special DrawWholeMapView @@ -73,7 +73,7 @@ AbandonedShip_HiddenFloorCorridors_EventScript_15EC2A:: @ 815EC2A goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECD9 msgbox AbandonedShip_HiddenFloorCorridors_Text_198E90, 4 playse SE_PIN - takeitem ITEM_ROOM_2_KEY, 1 + removeitem ITEM_ROOM_2_KEY setflag FLAG_USED_ROOM_2_KEY call AbandonedShip_HiddenFloorCorridors_EventScript_15EBAD special DrawWholeMapView @@ -88,7 +88,7 @@ AbandonedShip_HiddenFloorCorridors_EventScript_15EC61:: @ 815EC61 goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECE3 msgbox AbandonedShip_HiddenFloorCorridors_Text_198E90, 4 playse SE_PIN - takeitem ITEM_ROOM_4_KEY, 1 + removeitem ITEM_ROOM_4_KEY setflag FLAG_USED_ROOM_4_KEY call AbandonedShip_HiddenFloorCorridors_EventScript_15EBB7 special DrawWholeMapView @@ -103,7 +103,7 @@ AbandonedShip_HiddenFloorCorridors_EventScript_15EC98:: @ 815EC98 goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECED msgbox AbandonedShip_HiddenFloorCorridors_Text_198E90, 4 playse SE_PIN - takeitem ITEM_ROOM_6_KEY, 1 + removeitem ITEM_ROOM_6_KEY setflag FLAG_USED_ROOM_6_KEY call AbandonedShip_HiddenFloorCorridors_EventScript_15EBC1 special DrawWholeMapView diff --git a/data/maps/AbandonedShip_Rooms2_1F/scripts.inc b/data/maps/AbandonedShip_Rooms2_1F/scripts.inc index 089893aa2..08fd6520c 100644 --- a/data/maps/AbandonedShip_Rooms2_1F/scripts.inc +++ b/data/maps/AbandonedShip_Rooms2_1F/scripts.inc @@ -2,7 +2,7 @@ AbandonedShip_Rooms2_1F_MapScripts:: @ 815EA67 .byte 0 AbandonedShip_Rooms2_1F_EventScript_15EA68:: @ 815EA68 - trainerbattle 4, TRAINER_LOIS_AND_HAL_1, 0, AbandonedShip_Rooms2_1F_Text_1987C1, AbandonedShip_Rooms2_1F_Text_1987FE, AbandonedShip_Rooms2_1F_Text_19887F + trainerbattle_double TRAINER_LOIS_AND_HAL_1, AbandonedShip_Rooms2_1F_Text_1987C1, AbandonedShip_Rooms2_1F_Text_1987FE, AbandonedShip_Rooms2_1F_Text_19887F specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if_eq AbandonedShip_Rooms2_1F_EventScript_15EA93 @@ -10,12 +10,12 @@ AbandonedShip_Rooms2_1F_EventScript_15EA68:: @ 815EA68 end AbandonedShip_Rooms2_1F_EventScript_15EA93:: @ 815EA93 - trainerbattle 7, TRAINER_LOIS_AND_HAL_1, 0, AbandonedShip_Rooms2_1F_Text_1989DF, AbandonedShip_Rooms2_1F_Text_198A53, AbandonedShip_Rooms2_1F_Text_198AEE + trainerbattle_rematch_double TRAINER_LOIS_AND_HAL_1, AbandonedShip_Rooms2_1F_Text_1989DF, AbandonedShip_Rooms2_1F_Text_198A53, AbandonedShip_Rooms2_1F_Text_198AEE msgbox AbandonedShip_Rooms2_1F_Text_198A70, 6 end AbandonedShip_Rooms2_1F_EventScript_15EAAE:: @ 815EAAE - trainerbattle 4, TRAINER_LOIS_AND_HAL_1, 0, AbandonedShip_Rooms2_1F_Text_1988CC, AbandonedShip_Rooms2_1F_Text_198916, AbandonedShip_Rooms2_1F_Text_19899A + trainerbattle_double TRAINER_LOIS_AND_HAL_1, AbandonedShip_Rooms2_1F_Text_1988CC, AbandonedShip_Rooms2_1F_Text_198916, AbandonedShip_Rooms2_1F_Text_19899A specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if_eq AbandonedShip_Rooms2_1F_EventScript_15EAD9 @@ -23,6 +23,6 @@ AbandonedShip_Rooms2_1F_EventScript_15EAAE:: @ 815EAAE end AbandonedShip_Rooms2_1F_EventScript_15EAD9:: @ 815EAD9 - trainerbattle 7, TRAINER_LOIS_AND_HAL_1, 0, AbandonedShip_Rooms2_1F_Text_198B3B, AbandonedShip_Rooms2_1F_Text_198BCF, AbandonedShip_Rooms2_1F_Text_198C40 + trainerbattle_rematch_double TRAINER_LOIS_AND_HAL_1, AbandonedShip_Rooms2_1F_Text_198B3B, AbandonedShip_Rooms2_1F_Text_198BCF, AbandonedShip_Rooms2_1F_Text_198C40 msgbox AbandonedShip_Rooms2_1F_Text_198BEA, 6 end diff --git a/data/maps/AquaHideout_1F/scripts.inc b/data/maps/AquaHideout_1F/scripts.inc index e92e83cc8..628293e9d 100644 --- a/data/maps/AquaHideout_1F/scripts.inc +++ b/data/maps/AquaHideout_1F/scripts.inc @@ -36,7 +36,7 @@ AquaHideout_1F_EventScript_15D802:: @ 815D802 AquaHideout_1F_EventScript_15D80C:: @ 815D80C MagmaHideout_1F_EventScript_15D80C:: @ 815D80C - trainerbattle 2, TRAINER_HIDEOUT_1F_GRUNT, 0, AquaHideout_1F_Text_196E01, AquaHideout_1F_Text_196E28, AquaHideout_1F_EventScript_15D827 + trainerbattle_single TRAINER_HIDEOUT_1F_GRUNT, AquaHideout_1F_Text_196E01, AquaHideout_1F_Text_196E28, AquaHideout_1F_EventScript_15D827 msgbox AquaHideout_1F_Text_196E3D, 6 end diff --git a/data/maps/AquaHideout_B1F/scripts.inc b/data/maps/AquaHideout_B1F/scripts.inc index a5268d031..705abec2a 100644 --- a/data/maps/AquaHideout_B1F/scripts.inc +++ b/data/maps/AquaHideout_B1F/scripts.inc @@ -17,7 +17,7 @@ AquaHideout_B1F_MapScript1_15D84A:: @ 815D84A AquaHideout_B1F_EventScript_15D850:: @ 815D850 MagmaHideout_B1F_EventScript_15D850:: @ 815D850 - trainerbattle 2, TRAINER_HIDEOUT_B1F_GRUNT_1, 0, AquaHideout_B1F_Text_196E6F, AquaHideout_B1F_Text_196EB6, AquaHideout_B1F_EventScript_15D86B + trainerbattle_single TRAINER_HIDEOUT_B1F_GRUNT_1, AquaHideout_B1F_Text_196E6F, AquaHideout_B1F_Text_196EB6, AquaHideout_B1F_EventScript_15D86B msgbox AquaHideout_B1F_Text_196ECC, 6 end @@ -28,7 +28,7 @@ AquaHideout_B1F_EventScript_15D86B:: @ 815D86B AquaHideout_B1F_EventScript_15D875:: @ 815D875 MagmaHideout_B1F_EventScript_15D875:: @ 815D875 - trainerbattle 2, TRAINER_HIDEOUT_B1F_GRUNT_2, 0, AquaHideout_B1F_Text_196F39, AquaHideout_B1F_Text_196F9B, AquaHideout_B1F_EventScript_15D890 + trainerbattle_single TRAINER_HIDEOUT_B1F_GRUNT_2, AquaHideout_B1F_Text_196F39, AquaHideout_B1F_Text_196F9B, AquaHideout_B1F_EventScript_15D890 msgbox AquaHideout_B1F_Text_196FB5, 6 end @@ -39,6 +39,6 @@ AquaHideout_B1F_EventScript_15D890:: @ 815D890 AquaHideout_B1F_EventScript_15D89A:: @ 815D89A MagmaHideout_B1F_EventScript_15D89A:: @ 815D89A - trainerbattle 0, TRAINER_HIDEOUT_B1F_GRUNT_3, 0, AquaHideout_B1F_Text_196FFD, AquaHideout_B1F_Text_197040 + trainerbattle_single TRAINER_HIDEOUT_B1F_GRUNT_3, AquaHideout_B1F_Text_196FFD, AquaHideout_B1F_Text_197040 msgbox AquaHideout_B1F_Text_197056, 6 end diff --git a/data/maps/AquaHideout_B2F/scripts.inc b/data/maps/AquaHideout_B2F/scripts.inc index 519c799fc..5d924bf61 100644 --- a/data/maps/AquaHideout_B2F/scripts.inc +++ b/data/maps/AquaHideout_B2F/scripts.inc @@ -25,7 +25,7 @@ MagmaHideout_B2F_EventScript_15D8BD:: @ 815D8BD AquaHideout_B2F_EventScript_15D8E1:: @ 815D8E1 MagmaHideout_B2F_EventScript_15D8E1:: @ 815D8E1 - trainerbattle 2, TRAINER_HIDEOUT_B2F_GRUNT_1, 0, AquaHideout_B2F_Text_197093, AquaHideout_B2F_Text_197145, AquaHideout_B2F_EventScript_15D8FD + trainerbattle_single TRAINER_HIDEOUT_B2F_GRUNT_1, AquaHideout_B2F_Text_197093, AquaHideout_B2F_Text_197145, AquaHideout_B2F_EventScript_15D8FD msgbox AquaHideout_B2F_Text_1971AE, 4 release end @@ -85,7 +85,7 @@ AquaHideout_B2F_Movement_15D95D:: @ 815D95D AquaHideout_B2F_EventScript_15D962:: @ 815D962 MagmaHideout_B2F_EventScript_15D962:: @ 815D962 - trainerbattle 2, TRAINER_HIDEOUT_B2F_GRUNT_2, 0, AquaHideout_B2F_Text_197270, AquaHideout_B2F_Text_1972AC, AquaHideout_B2F_EventScript_15D97D + trainerbattle_single TRAINER_HIDEOUT_B2F_GRUNT_2, AquaHideout_B2F_Text_197270, AquaHideout_B2F_Text_1972AC, AquaHideout_B2F_EventScript_15D97D msgbox AquaHideout_B2F_Text_1972D2, 6 end @@ -96,6 +96,6 @@ AquaHideout_B2F_EventScript_15D97D:: @ 815D97D AquaHideout_B2F_EventScript_15D987:: @ 815D987 MagmaHideout_B2F_EventScript_15D987:: @ 815D987 - trainerbattle 0, TRAINER_HIDEOUT_B2F_GRUNT_3, 0, AquaHideout_B2F_Text_1972EF, AquaHideout_B2F_Text_197390 + trainerbattle_single TRAINER_HIDEOUT_B2F_GRUNT_3, AquaHideout_B2F_Text_1972EF, AquaHideout_B2F_Text_197390 msgbox AquaHideout_B2F_Text_1973C0, 6 end diff --git a/data/maps/BattleTower_Lobby/scripts.inc b/data/maps/BattleTower_Lobby/scripts.inc index bac2dff05..3fc44a626 100644 --- a/data/maps/BattleTower_Lobby/scripts.inc +++ b/data/maps/BattleTower_Lobby/scripts.inc @@ -389,7 +389,7 @@ BattleTower_Lobby_EventScript_160733:: @ 8160733 goto_if_set FLAG_RECEIVED_SILVER_SHIELD, BattleTower_Lobby_EventScript_160773 msgbox BattleTower_Lobby_Text_19A9EE, 4 setvar VAR_0x8008, DECOR_SILVER_SHIELD - givedecoration_std DECOR_SILVER_SHIELD + givedecoration DECOR_SILVER_SHIELD compare VAR_RESULT, 0 goto_if_eq BattleTower_Lobby_EventScript_1607AF setflag FLAG_RECEIVED_SILVER_SHIELD @@ -403,7 +403,7 @@ BattleTower_Lobby_EventScript_160773:: @ 8160773 goto_if_lt BattleTower_Lobby_EventScript_1607C5 msgbox BattleTower_Lobby_Text_19AAC4, 4 setvar VAR_0x8008, DECOR_GOLD_SHIELD - givedecoration_std DECOR_GOLD_SHIELD + givedecoration DECOR_GOLD_SHIELD compare VAR_RESULT, 0 goto_if_eq BattleTower_Lobby_EventScript_1607AF setflag FLAG_RECEIVED_GOLD_SHIELD diff --git a/data/maps/DewfordTown/scripts.inc b/data/maps/DewfordTown/scripts.inc index dec181f27..6edcebc0d 100644 --- a/data/maps/DewfordTown/scripts.inc +++ b/data/maps/DewfordTown/scripts.inc @@ -83,7 +83,7 @@ DewfordTown_EventScript_14E0C6:: @ 814E0C6 DewfordTown_EventScript_14E0F0:: @ 814E0F0 msgbox DewfordTown_Text_16B6A8, 4 - giveitem_std ITEM_OLD_ROD + giveitem ITEM_OLD_ROD setflag FLAG_RECEIVED_OLD_ROD msgbox DewfordTown_Text_16B6F9, 4 release diff --git a/data/maps/DewfordTown_Gym/scripts.inc b/data/maps/DewfordTown_Gym/scripts.inc index 476880f68..5ed358647 100644 --- a/data/maps/DewfordTown_Gym/scripts.inc +++ b/data/maps/DewfordTown_Gym/scripts.inc @@ -7,7 +7,7 @@ DewfordTown_Gym_MapScript1_15306B:: @ 815306B end DewfordTown_Gym_EventScript_153071:: @ 8153071 - goto_if_trainer_defeated TRAINER_BRAWLY, DewfordTown_Gym_EventScript_1530AA + goto_if_defeated TRAINER_BRAWLY, DewfordTown_Gym_EventScript_1530AA call DewfordTown_Gym_EventScript_153122 copyvar VAR_0x8001, VAR_0x8000 compare VAR_0x8000, 0 @@ -80,22 +80,22 @@ DewfordTown_Gym_EventScript_153117:: @ 8153117 DewfordTown_Gym_EventScript_153122:: @ 8153122 setvar VAR_0x8000, 0 - goto_if_trainer_not_defeated TRAINER_HIDEKI, DewfordTown_Gym_EventScript_153135 + goto_if_not_defeated TRAINER_HIDEKI, DewfordTown_Gym_EventScript_153135 addvar VAR_0x8000, 1 DewfordTown_Gym_EventScript_153135:: @ 8153135 - goto_if_trainer_not_defeated TRAINER_TESSA, DewfordTown_Gym_EventScript_153143 + goto_if_not_defeated TRAINER_TESSA, DewfordTown_Gym_EventScript_153143 addvar VAR_0x8000, 1 DewfordTown_Gym_EventScript_153143:: @ 8153143 - goto_if_trainer_not_defeated TRAINER_LAURA, DewfordTown_Gym_EventScript_153151 + goto_if_not_defeated TRAINER_LAURA, DewfordTown_Gym_EventScript_153151 addvar VAR_0x8000, 1 DewfordTown_Gym_EventScript_153151:: @ 8153151 return DewfordTown_Gym_EventScript_153152:: @ 8153152 - trainerbattle 1, TRAINER_BRAWLY, 0, DewfordTown_Gym_Text_175182, DewfordTown_Gym_Text_175246, DewfordTown_Gym_EventScript_153177 + trainerbattle_single TRAINER_BRAWLY, DewfordTown_Gym_Text_175182, DewfordTown_Gym_Text_175246, DewfordTown_Gym_EventScript_153177, NO_MUSIC goto_if_unset FLAG_RECEIVED_TM08, DewfordTown_Gym_EventScript_1531B5 msgbox DewfordTown_Gym_Text_175412, 4 release @@ -118,7 +118,7 @@ DewfordTown_Gym_EventScript_153177:: @ 8153177 end DewfordTown_Gym_EventScript_1531B5:: @ 81531B5 - giveitem_std ITEM_TM08_BULK_UP + giveitem ITEM_TM08_BULK_UP compare VAR_RESULT, 0 goto_if_eq DewfordTown_Gym_EventScript_1A029B msgbox DewfordTown_Gym_Text_1753BF, 4 @@ -127,7 +127,7 @@ DewfordTown_Gym_EventScript_1531B5:: @ 81531B5 end DewfordTown_Gym_EventScript_1531D9:: @ 81531D9 - trainerbattle 2, TRAINER_HIDEKI, 0, DewfordTown_Gym_Text_174F61, DewfordTown_Gym_Text_174F7A, DewfordTown_Gym_EventScript_1531F4 + trainerbattle_single TRAINER_HIDEKI, DewfordTown_Gym_Text_174F61, DewfordTown_Gym_Text_174F7A, DewfordTown_Gym_EventScript_1531F4 msgbox DewfordTown_Gym_Text_174F8E, 6 end @@ -137,7 +137,7 @@ DewfordTown_Gym_EventScript_1531F4:: @ 81531F4 end DewfordTown_Gym_EventScript_1531FB:: @ 81531FB - trainerbattle 2, TRAINER_TESSA, 0, DewfordTown_Gym_Text_174FCE, DewfordTown_Gym_Text_175009, DewfordTown_Gym_EventScript_153216 + trainerbattle_single TRAINER_TESSA, DewfordTown_Gym_Text_174FCE, DewfordTown_Gym_Text_175009, DewfordTown_Gym_EventScript_153216 msgbox DewfordTown_Gym_Text_175031, 6 end @@ -147,7 +147,7 @@ DewfordTown_Gym_EventScript_153216:: @ 8153216 end DewfordTown_Gym_EventScript_15321D:: @ 815321D - trainerbattle 2, TRAINER_LAURA, 0, DewfordTown_Gym_Text_1750C9, DewfordTown_Gym_Text_175104, DewfordTown_Gym_EventScript_153238 + trainerbattle_single TRAINER_LAURA, DewfordTown_Gym_Text_1750C9, DewfordTown_Gym_Text_175104, DewfordTown_Gym_EventScript_153238 msgbox DewfordTown_Gym_Text_175117, 6 end diff --git a/data/maps/DewfordTown_Hall/scripts.inc b/data/maps/DewfordTown_Hall/scripts.inc index 65e16a78a..580d2275f 100644 --- a/data/maps/DewfordTown_Hall/scripts.inc +++ b/data/maps/DewfordTown_Hall/scripts.inc @@ -254,7 +254,7 @@ DewfordTown_Hall_EventScript_15359D:: @ 815359D call DewfordTown_Hall_EventScript_1A0102 goto_if_set FLAG_RECEIVED_TM36, DewfordTown_Hall_EventScript_1535D1 msgbox DewfordTown_Hall_Text_175E13, 4 - giveitem_std ITEM_TM36_SLUDGE_BOMB + giveitem ITEM_TM36_SLUDGE_BOMB compare VAR_RESULT, 0 goto_if_eq DewfordTown_Hall_EventScript_1A029B setflag FLAG_RECEIVED_TM36 diff --git a/data/maps/DewfordTown_House2/scripts.inc b/data/maps/DewfordTown_House2/scripts.inc index 307e33033..e5a4820cc 100644 --- a/data/maps/DewfordTown_House2/scripts.inc +++ b/data/maps/DewfordTown_House2/scripts.inc @@ -6,7 +6,7 @@ DewfordTown_House2_EventScript_1535DC:: @ 81535DC faceplayer goto_if_set FLAG_RECEIVED_SILK_SCARF, DewfordTown_House2_EventScript_153615 msgbox DewfordTown_House2_Text_175EFE, 4 - giveitem_std ITEM_SILK_SCARF + giveitem ITEM_SILK_SCARF compare VAR_RESULT, 0 goto_if_eq DewfordTown_House2_EventScript_15360B setflag FLAG_RECEIVED_SILK_SCARF diff --git a/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc b/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc index abb8e4121..677f50997 100644 --- a/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc +++ b/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc @@ -40,7 +40,7 @@ EverGrandeCity_ChampionsRoom_Movement_15B802:: @ 815B802 EverGrandeCity_ChampionsRoom_EventScript_15B805:: @ 815B805 playbgm MUS_DAIGO, FALSE msgbox EverGrandeCity_ChampionsRoom_Text_190F9C, 4 - trainerbattle 3, TRAINER_STEVEN, 0, EverGrandeCity_ChampionsRoom_Text_1910A0 + trainerbattle_no_intro TRAINER_STEVEN, EverGrandeCity_ChampionsRoom_Text_1910A0 goto EverGrandeCity_ChampionsRoom_EventScript_15B821 end diff --git a/data/maps/EverGrandeCity_DrakesRoom/scripts.inc b/data/maps/EverGrandeCity_DrakesRoom/scripts.inc index a90523822..a3661751c 100644 --- a/data/maps/EverGrandeCity_DrakesRoom/scripts.inc +++ b/data/maps/EverGrandeCity_DrakesRoom/scripts.inc @@ -43,7 +43,7 @@ EverGrandeCity_DrakesRoom_EventScript_15B764:: @ 815B764 goto_if_set FLAG_DEFEATED_ELITE_4_DRAKE, EverGrandeCity_DrakesRoom_EventScript_15B78B playbgm MUS_SITENNOU, FALSE msgbox EverGrandeCity_DrakesRoom_Text_190CEB, 4 - trainerbattle 3, TRAINER_DRAKE, 0, EverGrandeCity_DrakesRoom_Text_190E42 + trainerbattle_no_intro TRAINER_DRAKE, EverGrandeCity_DrakesRoom_Text_190E42 goto EverGrandeCity_DrakesRoom_EventScript_15B795 end diff --git a/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc b/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc index ede08e504..572617e5c 100644 --- a/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc +++ b/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc @@ -43,7 +43,7 @@ EverGrandeCity_GlaciasRoom_EventScript_15B6CA:: @ 815B6CA goto_if_set FLAG_DEFEATED_ELITE_4_GLACIA, EverGrandeCity_GlaciasRoom_EventScript_15B6F1 playbgm MUS_SITENNOU, FALSE msgbox EverGrandeCity_GlaciasRoom_Text_190AF9, 4 - trainerbattle 3, TRAINER_GLACIA, 0, EverGrandeCity_GlaciasRoom_Text_190C01 + trainerbattle_no_intro TRAINER_GLACIA, EverGrandeCity_GlaciasRoom_Text_190C01 goto EverGrandeCity_GlaciasRoom_EventScript_15B6FB end diff --git a/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc b/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc index db30bcfa7..a833bbeb9 100644 --- a/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc +++ b/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc @@ -43,7 +43,7 @@ EverGrandeCity_PhoebesRoom_EventScript_15B630:: @ 815B630 goto_if_set FLAG_DEFEATED_ELITE_4_PHOEBE, EverGrandeCity_PhoebesRoom_EventScript_15B657 playbgm MUS_SITENNOU, FALSE msgbox EverGrandeCity_PhoebesRoom_Text_1908F5, 4 - trainerbattle 3, TRAINER_PHOEBE, 0, EverGrandeCity_PhoebesRoom_Text_190A0C + trainerbattle_no_intro TRAINER_PHOEBE, EverGrandeCity_PhoebesRoom_Text_190A0C goto EverGrandeCity_PhoebesRoom_EventScript_15B661 end diff --git a/data/maps/EverGrandeCity_SidneysRoom/scripts.inc b/data/maps/EverGrandeCity_SidneysRoom/scripts.inc index b2b731004..5af0e7dcd 100644 --- a/data/maps/EverGrandeCity_SidneysRoom/scripts.inc +++ b/data/maps/EverGrandeCity_SidneysRoom/scripts.inc @@ -44,7 +44,7 @@ EverGrandeCity_SidneysRoom_EventScript_15B596:: @ 815B596 goto_if_set FLAG_DEFEATED_ELITE_4_SYDNEY, EverGrandeCity_SidneysRoom_EventScript_15B5BD playbgm MUS_SITENNOU, FALSE msgbox EverGrandeCity_SidneysRoom_Text_190728, 4 - trainerbattle 3, TRAINER_SIDNEY, 0, EverGrandeCity_SidneysRoom_Text_190823 + trainerbattle_no_intro TRAINER_SIDNEY, EverGrandeCity_SidneysRoom_Text_190823 goto EverGrandeCity_SidneysRoom_EventScript_15B5C7 end diff --git a/data/maps/FallarborTown_ContestLobby/scripts.inc b/data/maps/FallarborTown_ContestLobby/scripts.inc index f594d397d..2f71a6f3b 100644 --- a/data/maps/FallarborTown_ContestLobby/scripts.inc +++ b/data/maps/FallarborTown_ContestLobby/scripts.inc @@ -107,7 +107,7 @@ FallarborTown_ContestLobby_EventScript_153AB2:: @ 8153AB2 FallarborTown_ContestLobby_EventScript_153ABB:: @ 8153ABB lockall fadescreen 1 - drawcontestwinner 2 + showcontestwinner 2 releaseall end diff --git a/data/maps/FallarborTown_House1/scripts.inc b/data/maps/FallarborTown_House1/scripts.inc index 23e47d780..c2d1b5af7 100644 --- a/data/maps/FallarborTown_House1/scripts.inc +++ b/data/maps/FallarborTown_House1/scripts.inc @@ -22,7 +22,7 @@ FallarborTown_House1_EventScript_153BDA:: @ 8153BDA compare VAR_RESULT, NO goto_if_eq FallarborTown_House1_EventScript_153C47 msgbox FallarborTown_House1_Text_1778C4, 4 - giveitem_std ITEM_TM27_RETURN + giveitem ITEM_TM27_RETURN compare VAR_RESULT, 0 goto_if_eq FallarborTown_House1_EventScript_1A029B setvar VAR_0x8004, 280 diff --git a/data/maps/FallarborTown_House2/scripts.inc b/data/maps/FallarborTown_House2/scripts.inc index 67eb4fac1..d6281293c 100644 --- a/data/maps/FallarborTown_House2/scripts.inc +++ b/data/maps/FallarborTown_House2/scripts.inc @@ -42,7 +42,7 @@ FallarborTown_House2_EventScript_153D1A:: @ 8153D1A compare VAR_0x8004, 0 goto_if_eq FallarborTown_House2_EventScript_153CE4 msgbox FallarborTown_House2_Text_177CC3, 4 - takeitem ITEM_HEART_SCALE, 1 + removeitem ITEM_HEART_SCALE goto FallarborTown_House2_EventScript_153D60 end diff --git a/data/maps/FortreeCity_Gym/scripts.inc b/data/maps/FortreeCity_Gym/scripts.inc index 3902fc815..fc5197325 100644 --- a/data/maps/FortreeCity_Gym/scripts.inc +++ b/data/maps/FortreeCity_Gym/scripts.inc @@ -16,7 +16,7 @@ FortreeCity_Gym_EventScript_157EEC:: @ 8157EEC end FortreeCity_Gym_EventScript_157EF0:: @ 8157EF0 - trainerbattle 1, TRAINER_WINONA, 0, FortreeCity_Gym_Text_185CCB, FortreeCity_Gym_Text_185DBA, FortreeCity_Gym_EventScript_157F15 + trainerbattle_single TRAINER_WINONA, FortreeCity_Gym_Text_185CCB, FortreeCity_Gym_Text_185DBA, FortreeCity_Gym_EventScript_157F15, NO_MUSIC goto_if_unset FLAG_RECEIVED_TM40, FortreeCity_Gym_EventScript_157F3E msgbox FortreeCity_Gym_Text_185F98, 4 release @@ -35,7 +35,7 @@ FortreeCity_Gym_EventScript_157F15:: @ 8157F15 end FortreeCity_Gym_EventScript_157F3E:: @ 8157F3E - giveitem_std ITEM_TM40_AERIAL_ACE + giveitem ITEM_TM40_AERIAL_ACE compare VAR_RESULT, 0 goto_if_eq FortreeCity_Gym_EventScript_1A029B msgbox FortreeCity_Gym_Text_185F4A, 4 @@ -44,22 +44,22 @@ FortreeCity_Gym_EventScript_157F3E:: @ 8157F3E end FortreeCity_Gym_EventScript_157F62:: @ 8157F62 - trainerbattle 0, TRAINER_JARED, 0, FortreeCity_Gym_Text_1859B9, FortreeCity_Gym_Text_1859EA + trainerbattle_single TRAINER_JARED, FortreeCity_Gym_Text_1859B9, FortreeCity_Gym_Text_1859EA msgbox FortreeCity_Gym_Text_185A02, 6 end FortreeCity_Gym_EventScript_157F79:: @ 8157F79 - trainerbattle 0, TRAINER_WILL, 0, FortreeCity_Gym_Text_185A7F, FortreeCity_Gym_Text_185AEC + trainerbattle_single TRAINER_WILL, FortreeCity_Gym_Text_185A7F, FortreeCity_Gym_Text_185AEC msgbox FortreeCity_Gym_Text_185B18, 6 end FortreeCity_Gym_EventScript_157F90:: @ 8157F90 - trainerbattle 0, TRAINER_TERRELL, 0, FortreeCity_Gym_Text_185B8D, FortreeCity_Gym_Text_185BEB + trainerbattle_single TRAINER_TERRELL, FortreeCity_Gym_Text_185B8D, FortreeCity_Gym_Text_185BEB msgbox FortreeCity_Gym_Text_185C00, 6 end FortreeCity_Gym_EventScript_157FA7:: @ 8157FA7 - trainerbattle 0, TRAINER_KYLEE, 0, FortreeCity_Gym_Text_185C45, FortreeCity_Gym_Text_185C7C + trainerbattle_single TRAINER_KYLEE, FortreeCity_Gym_Text_185C45, FortreeCity_Gym_Text_185C7C msgbox FortreeCity_Gym_Text_185C8C, 6 end diff --git a/data/maps/FortreeCity_House2/scripts.inc b/data/maps/FortreeCity_House2/scripts.inc index 5535a8d49..f66f6189c 100644 --- a/data/maps/FortreeCity_House2/scripts.inc +++ b/data/maps/FortreeCity_House2/scripts.inc @@ -19,7 +19,7 @@ FortreeCity_House2_EventScript_1580B4:: @ 81580B4 switch VAR_RESULT case 0, FortreeCity_House2_EventScript_158161 msgbox FortreeCity_House2_Text_1864C6, 4 - giveitem_std ITEM_TM10_HIDDEN_POWER + giveitem ITEM_TM10_HIDDEN_POWER compare VAR_RESULT, 0 goto_if_eq FortreeCity_House2_EventScript_1A029B setflag FLAG_RECEIVED_TM10 diff --git a/data/maps/FortreeCity_House4/scripts.inc b/data/maps/FortreeCity_House4/scripts.inc index 36e339fa8..47c0ce0b5 100644 --- a/data/maps/FortreeCity_House4/scripts.inc +++ b/data/maps/FortreeCity_House4/scripts.inc @@ -31,7 +31,7 @@ FortreeCity_House4_EventScript_1581D6:: @ 81581D6 applymovement VAR_LAST_TALKED, FortreeCity_House4_Movement_1A0839 waitmovement 0 msgbox FortreeCity_House4_Text_186881, 4 - giveitem_std ITEM_MENTAL_HERB + giveitem ITEM_MENTAL_HERB compare VAR_RESULT, 0 goto_if_eq FortreeCity_House4_EventScript_1A029B setflag FLAG_RECEIVED_MENTAL_HERB diff --git a/data/maps/GraniteCave_1F/scripts.inc b/data/maps/GraniteCave_1F/scripts.inc index b9d89f93c..18a96635c 100644 --- a/data/maps/GraniteCave_1F/scripts.inc +++ b/data/maps/GraniteCave_1F/scripts.inc @@ -6,7 +6,7 @@ GraniteCave_1F_EventScript_15CBA7:: @ 815CBA7 faceplayer goto_if_set FLAG_RECEIVED_HM05, GraniteCave_1F_EventScript_15CBD3 msgbox GraniteCave_1F_Text_194917, 4 - giveitem_std ITEM_HM05_FLASH + giveitem ITEM_HM05_FLASH setflag FLAG_RECEIVED_HM05 msgbox GraniteCave_1F_Text_194A3E, 4 release diff --git a/data/maps/GraniteCave_StevensRoom/scripts.inc b/data/maps/GraniteCave_StevensRoom/scripts.inc index 46ec0f8d1..489fb640b 100644 --- a/data/maps/GraniteCave_StevensRoom/scripts.inc +++ b/data/maps/GraniteCave_StevensRoom/scripts.inc @@ -9,7 +9,7 @@ GraniteCave_StevensRoom_EventScript_15CBFA:: @ 815CBFA call GraniteCave_StevensRoom_EventScript_1A067F setflag FLAG_DELIVERED_STEVEN_LETTER msgbox GraniteCave_StevensRoom_Text_194BDD, 4 - giveitem_std ITEM_TM47_STEEL_WING + giveitem ITEM_TM47_STEEL_WING compare VAR_RESULT, 0 call_if_eq GraniteCave_StevensRoom_EventScript_15CC83 msgbox GraniteCave_StevensRoom_Text_194C8D, 4 diff --git a/data/maps/JaggedPass/scripts.inc b/data/maps/JaggedPass/scripts.inc index 151da14d1..c6d150fd8 100644 --- a/data/maps/JaggedPass/scripts.inc +++ b/data/maps/JaggedPass/scripts.inc @@ -18,12 +18,12 @@ JaggedPass_EventScript_15D280:: @ 815D280 return JaggedPass_EventScript_15D285:: @ 815D285 - trainerbattle 0, TRAINER_ERIC, 0, JaggedPass_Text_195DAC, JaggedPass_Text_195E27 + trainerbattle_single TRAINER_ERIC, JaggedPass_Text_195DAC, JaggedPass_Text_195E27 msgbox JaggedPass_Text_195E3E, 6 end JaggedPass_EventScript_15D29C:: @ 815D29C - trainerbattle 0, TRAINER_DIANA_1, 0, JaggedPass_Text_195E9E, JaggedPass_Text_195EDF + trainerbattle_single TRAINER_DIANA_1, JaggedPass_Text_195E9E, JaggedPass_Text_195EDF specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if_eq JaggedPass_EventScript_15D2C3 @@ -31,12 +31,12 @@ JaggedPass_EventScript_15D29C:: @ 815D29C end JaggedPass_EventScript_15D2C3:: @ 815D2C3 - trainerbattle 5, TRAINER_DIANA_1, 0, JaggedPass_Text_195F58, JaggedPass_Text_195F8C + trainerbattle_rematch TRAINER_DIANA_1, JaggedPass_Text_195F58, JaggedPass_Text_195F8C msgbox JaggedPass_Text_195FB9, 6 end JaggedPass_EventScript_15D2DA:: @ 815D2DA - trainerbattle 0, TRAINER_ETHAN_1, 0, JaggedPass_Text_195FF2, JaggedPass_Text_196032 + trainerbattle_single TRAINER_ETHAN_1, JaggedPass_Text_195FF2, JaggedPass_Text_196032 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if_eq JaggedPass_EventScript_15D301 @@ -44,6 +44,6 @@ JaggedPass_EventScript_15D2DA:: @ 815D2DA end JaggedPass_EventScript_15D301:: @ 815D301 - trainerbattle 5, TRAINER_ETHAN_1, 0, JaggedPass_Text_1960AA, JaggedPass_Text_1960E2 + trainerbattle_rematch TRAINER_ETHAN_1, JaggedPass_Text_1960AA, JaggedPass_Text_1960E2 msgbox JaggedPass_Text_196118, 6 end diff --git a/data/maps/LavaridgeTown/scripts.inc b/data/maps/LavaridgeTown/scripts.inc index 6c4b66e4b..4e737d91d 100644 --- a/data/maps/LavaridgeTown/scripts.inc +++ b/data/maps/LavaridgeTown/scripts.inc @@ -82,7 +82,7 @@ LavaridgeTown_EventScript_14E575:: @ 814E575 LavaridgeTown_EventScript_14E5AB:: @ 814E5AB msgbox LavaridgeTown_Text_16BDA4, 4 - giveitem_std ITEM_GO_GOGGLES + giveitem ITEM_GO_GOGGLES setflag FLAG_RECEIVED_GO_GOGGLES msgbox LavaridgeTown_Text_16BE7D, 4 goto LavaridgeTown_EventScript_14E5F5 @@ -90,7 +90,7 @@ LavaridgeTown_EventScript_14E5AB:: @ 814E5AB LavaridgeTown_EventScript_14E5D0:: @ 814E5D0 msgbox LavaridgeTown_Text_16BF92, 4 - giveitem_std ITEM_GO_GOGGLES + giveitem ITEM_GO_GOGGLES setflag FLAG_RECEIVED_GO_GOGGLES msgbox LavaridgeTown_Text_16C020, 4 goto LavaridgeTown_EventScript_14E5F5 diff --git a/data/maps/LavaridgeTown_Gym_1F/scripts.inc b/data/maps/LavaridgeTown_Gym_1F/scripts.inc index 16c4e2031..3cf8fa111 100644 --- a/data/maps/LavaridgeTown_Gym_1F/scripts.inc +++ b/data/maps/LavaridgeTown_Gym_1F/scripts.inc @@ -13,53 +13,53 @@ LavaridgeTown_Gym_1F_EventScript_15369F:: @ 815369F setvar VAR_TEMP_D, 0 setvar VAR_TEMP_E, 0 setvar VAR_TEMP_F, 0 - goto_if_trainer_defeated TRAINER_COLE, LavaridgeTown_Gym_1F_EventScript_1536C6 + goto_if_defeated TRAINER_COLE, LavaridgeTown_Gym_1F_EventScript_1536C6 setvar VAR_TEMP_B, 1 LavaridgeTown_Gym_1F_EventScript_1536C6:: @ 81536C6 - goto_if_trainer_defeated TRAINER_ZANE, LavaridgeTown_Gym_1F_EventScript_1536D4 + goto_if_defeated TRAINER_ZANE, LavaridgeTown_Gym_1F_EventScript_1536D4 setvar VAR_TEMP_C, 1 LavaridgeTown_Gym_1F_EventScript_1536D4:: @ 81536D4 - goto_if_trainer_defeated TRAINER_AXLE, LavaridgeTown_Gym_1F_EventScript_1536E2 + goto_if_defeated TRAINER_AXLE, LavaridgeTown_Gym_1F_EventScript_1536E2 setvar VAR_TEMP_D, 1 LavaridgeTown_Gym_1F_EventScript_1536E2:: @ 81536E2 - goto_if_trainer_defeated TRAINER_SADIE, LavaridgeTown_Gym_1F_EventScript_1536F0 + goto_if_defeated TRAINER_SADIE, LavaridgeTown_Gym_1F_EventScript_1536F0 setvar VAR_TEMP_E, 1 LavaridgeTown_Gym_1F_EventScript_1536F0:: @ 81536F0 - goto_if_trainer_defeated TRAINER_ANDY, LavaridgeTown_Gym_1F_EventScript_1536FE + goto_if_defeated TRAINER_ANDY, LavaridgeTown_Gym_1F_EventScript_1536FE setvar VAR_TEMP_F, 1 LavaridgeTown_Gym_1F_EventScript_1536FE:: @ 81536FE return LavaridgeTown_Gym_1F_EventScript_1536FF:: @ 81536FF - goto_if_trainer_defeated TRAINER_COLE, LavaridgeTown_Gym_1F_EventScript_15370C + goto_if_defeated TRAINER_COLE, LavaridgeTown_Gym_1F_EventScript_15370C setobjectmovementtype 2, 63 LavaridgeTown_Gym_1F_EventScript_15370C:: @ 815370C - goto_if_trainer_defeated TRAINER_ZANE, LavaridgeTown_Gym_1F_EventScript_153719 + goto_if_defeated TRAINER_ZANE, LavaridgeTown_Gym_1F_EventScript_153719 setobjectmovementtype 3, 63 LavaridgeTown_Gym_1F_EventScript_153719:: @ 8153719 - goto_if_trainer_defeated TRAINER_AXLE, LavaridgeTown_Gym_1F_EventScript_153726 + goto_if_defeated TRAINER_AXLE, LavaridgeTown_Gym_1F_EventScript_153726 setobjectmovementtype 4, 63 LavaridgeTown_Gym_1F_EventScript_153726:: @ 8153726 - goto_if_trainer_defeated TRAINER_SADIE, LavaridgeTown_Gym_1F_EventScript_153733 + goto_if_defeated TRAINER_SADIE, LavaridgeTown_Gym_1F_EventScript_153733 setobjectmovementtype 5, 63 LavaridgeTown_Gym_1F_EventScript_153733:: @ 8153733 - goto_if_trainer_defeated TRAINER_ANDY, LavaridgeTown_Gym_1F_EventScript_153740 + goto_if_defeated TRAINER_ANDY, LavaridgeTown_Gym_1F_EventScript_153740 setobjectmovementtype 7, 63 LavaridgeTown_Gym_1F_EventScript_153740:: @ 8153740 return LavaridgeTown_Gym_1F_EventScript_153741:: @ 8153741 - trainerbattle 1, TRAINER_FLANNERY, 0, LavaridgeTown_Gym_1F_Text_176801, LavaridgeTown_Gym_1F_Text_176960, LavaridgeTown_Gym_1F_EventScript_153766 + trainerbattle_single TRAINER_FLANNERY, LavaridgeTown_Gym_1F_Text_176801, LavaridgeTown_Gym_1F_Text_176960, LavaridgeTown_Gym_1F_EventScript_153766, NO_MUSIC goto_if_unset FLAG_RECEIVED_TM50, LavaridgeTown_Gym_1F_EventScript_1537A7 msgbox LavaridgeTown_Gym_1F_Text_176C4A, 4 release @@ -83,7 +83,7 @@ LavaridgeTown_Gym_1F_EventScript_153766:: @ 8153766 end LavaridgeTown_Gym_1F_EventScript_1537A7:: @ 81537A7 - giveitem_std ITEM_TM50_OVERHEAT + giveitem ITEM_TM50_OVERHEAT compare VAR_RESULT, 0 goto_if_eq LavaridgeTown_Gym_1F_EventScript_1A029B msgbox LavaridgeTown_Gym_1F_Text_176B8F, 4 @@ -92,7 +92,7 @@ LavaridgeTown_Gym_1F_EventScript_1537A7:: @ 81537A7 end LavaridgeTown_Gym_1F_EventScript_1537CB:: @ 81537CB - trainerbattle 2, TRAINER_COLE, 2, LavaridgeTown_Gym_1F_Text_176432, LavaridgeTown_Gym_1F_Text_17644F, LavaridgeTown_Gym_1F_EventScript_1537E6 + trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_COLE, 2, LavaridgeTown_Gym_1F_Text_176432, LavaridgeTown_Gym_1F_Text_17644F, LavaridgeTown_Gym_1F_EventScript_1537E6 msgbox LavaridgeTown_Gym_1F_Text_176472, 6 end @@ -102,22 +102,22 @@ LavaridgeTown_Gym_1F_EventScript_1537E6:: @ 81537E6 end LavaridgeTown_Gym_1F_EventScript_1537ED:: @ 81537ED - trainerbattle 2, TRAINER_AXLE, 4, LavaridgeTown_Gym_1F_Text_1764D1, LavaridgeTown_Gym_1F_Text_176516, LavaridgeTown_Gym_1F_EventScript_1537E6 + trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_AXLE, 4, LavaridgeTown_Gym_1F_Text_1764D1, LavaridgeTown_Gym_1F_Text_176516, LavaridgeTown_Gym_1F_EventScript_1537E6 msgbox LavaridgeTown_Gym_1F_Text_176537, 6 end LavaridgeTown_Gym_1F_EventScript_153808:: @ 8153808 - trainerbattle 2, TRAINER_ANDY, 7, LavaridgeTown_Gym_1F_Text_17658D, LavaridgeTown_Gym_1F_Text_17663F, LavaridgeTown_Gym_1F_EventScript_1537E6 + trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_ANDY, 7, LavaridgeTown_Gym_1F_Text_17658D, LavaridgeTown_Gym_1F_Text_17663F, LavaridgeTown_Gym_1F_EventScript_1537E6 msgbox LavaridgeTown_Gym_1F_Text_176660, 6 end LavaridgeTown_Gym_1F_EventScript_153823:: @ 8153823 - trainerbattle 2, TRAINER_SADIE, 5, LavaridgeTown_Gym_1F_Text_176784, LavaridgeTown_Gym_1F_Text_1767A6, LavaridgeTown_Gym_1F_EventScript_1537E6 + trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_SADIE, 5, LavaridgeTown_Gym_1F_Text_176784, LavaridgeTown_Gym_1F_Text_1767A6, LavaridgeTown_Gym_1F_EventScript_1537E6 msgbox LavaridgeTown_Gym_1F_Text_1767C1, 6 end LavaridgeTown_Gym_1F_EventScript_15383E:: @ 815383E - trainerbattle 2, TRAINER_ZANE, 3, LavaridgeTown_Gym_1F_Text_1766D2, LavaridgeTown_Gym_1F_Text_1766FE, LavaridgeTown_Gym_1F_EventScript_1537E6 + trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_ZANE, 3, LavaridgeTown_Gym_1F_Text_1766D2, LavaridgeTown_Gym_1F_Text_1766FE, LavaridgeTown_Gym_1F_EventScript_1537E6 msgbox LavaridgeTown_Gym_1F_Text_17671D, 6 end diff --git a/data/maps/LavaridgeTown_HerbShop/scripts.inc b/data/maps/LavaridgeTown_HerbShop/scripts.inc index 5da9d19ad..6add8afd7 100644 --- a/data/maps/LavaridgeTown_HerbShop/scripts.inc +++ b/data/maps/LavaridgeTown_HerbShop/scripts.inc @@ -30,7 +30,7 @@ LavaridgeTown_HerbShop_EventScript_153655:: @ 8153655 faceplayer goto_if_set FLAG_RECEIVED_CHARCOAL, LavaridgeTown_HerbShop_EventScript_153684 msgbox LavaridgeTown_HerbShop_Text_1761A2, 4 - giveitem_std ITEM_CHARCOAL + giveitem ITEM_CHARCOAL compare VAR_RESULT, 0 goto_if_eq LavaridgeTown_HerbShop_EventScript_1A029B setflag FLAG_RECEIVED_CHARCOAL diff --git a/data/maps/LilycoveCity/scripts.inc b/data/maps/LilycoveCity/scripts.inc index 8951fe606..f53efbf94 100644 --- a/data/maps/LilycoveCity/scripts.inc +++ b/data/maps/LilycoveCity/scripts.inc @@ -60,12 +60,12 @@ LilycoveCity_EventScript_14CB2B:: @ 814CB2B LilycoveCity_EventScript_14CB74:: @ 814CB74 lock faceplayer - dodailyevents + dotimebasedevents goto_if_set FLAG_DAILY_RECEIVED_BERRY_LILYCOVE, LilycoveCity_EventScript_14CBB4 msgbox LilycoveCity_Text_1C5A7A, 4 random 10 addvar VAR_RESULT, ITEM_CHERI_BERRY - giveitem_std VAR_RESULT + giveitem VAR_RESULT compare VAR_RESULT, 0 goto_if_eq LilycoveCity_EventScript_1A029B setflag FLAG_DAILY_RECEIVED_BERRY_LILYCOVE @@ -303,32 +303,32 @@ LilycoveCity_EventScript_14CE35:: @ 814CE35 end LilycoveCity_EventScript_14CE46:: @ 814CE46 - trainerbattle 3, TRAINER_MAY_11, 0, LilycoveCity_Text_167BD5 + trainerbattle_no_intro TRAINER_MAY_11, LilycoveCity_Text_167BD5 goto LilycoveCity_EventScript_14CEA6 end LilycoveCity_EventScript_14CE56:: @ 814CE56 - trainerbattle 3, TRAINER_MAY_12, 0, LilycoveCity_Text_167BD5 + trainerbattle_no_intro TRAINER_MAY_12, LilycoveCity_Text_167BD5 goto LilycoveCity_EventScript_14CEA6 end LilycoveCity_EventScript_14CE66:: @ 814CE66 - trainerbattle 3, TRAINER_MAY_10, 0, LilycoveCity_Text_167BD5 + trainerbattle_no_intro TRAINER_MAY_10, LilycoveCity_Text_167BD5 goto LilycoveCity_EventScript_14CEA6 end LilycoveCity_EventScript_14CE76:: @ 814CE76 - trainerbattle 3, TRAINER_BRENDAN_11, 0, LilycoveCity_Text_1680E4 + trainerbattle_no_intro TRAINER_BRENDAN_11, LilycoveCity_Text_1680E4 goto LilycoveCity_EventScript_14CF12 end LilycoveCity_EventScript_14CE86:: @ 814CE86 - trainerbattle 3, TRAINER_BRENDAN_12, 0, LilycoveCity_Text_1680E4 + trainerbattle_no_intro TRAINER_BRENDAN_12, LilycoveCity_Text_1680E4 goto LilycoveCity_EventScript_14CF12 end LilycoveCity_EventScript_14CE96:: @ 814CE96 - trainerbattle 3, TRAINER_BRENDAN_10, 0, LilycoveCity_Text_1680E4 + trainerbattle_no_intro TRAINER_BRENDAN_10, LilycoveCity_Text_1680E4 goto LilycoveCity_EventScript_14CF12 end diff --git a/data/maps/LilycoveCity_ContestLobby/scripts.inc b/data/maps/LilycoveCity_ContestLobby/scripts.inc index e96a356ce..eb559f3fe 100644 --- a/data/maps/LilycoveCity_ContestLobby/scripts.inc +++ b/data/maps/LilycoveCity_ContestLobby/scripts.inc @@ -27,7 +27,7 @@ LilycoveCity_ContestLobby_EventScript_158898:: @ 8158898 msgbox LilycoveCity_ContestLobby_Text_18890F, 4 lockall fadescreen 1 - drawcontestwinner 0 + showcontestwinner 0 lockall msgbox LilycoveCity_ContestLobby_Text_1889FD, MSGBOX_YESNO compare VAR_RESULT, YES @@ -201,7 +201,7 @@ LilycoveCity_ContestLobby_EventScript_158A6A:: @ 8158A6A msgbox LilycoveCity_ContestLobby_Text_18890F, 4 lockall fadescreen 1 - drawcontestwinner 0 + showcontestwinner 0 msgbox LilycoveCity_ContestLobby_Text_1889FD, MSGBOX_YESNO compare VAR_RESULT, YES goto_if_eq LilycoveCity_ContestLobby_EventScript_158AAE @@ -581,7 +581,7 @@ LilycoveCity_ContestLobby_EventScript_158EB0:: @ 8158EB0 LilycoveCity_ContestLobby_EventScript_158EE8:: @ 8158EE8 setflag FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR copyvar VAR_LILYCOVE_MUSEUM_2F_STATE, 0x1 - giveitem ITEM_CONTEST_PASS, 1 + additem ITEM_CONTEST_PASS setvar VAR_0x800B, 8 setvar VAR_CONTEST_RANK, 3 setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 1 @@ -730,21 +730,21 @@ LilycoveCity_ContestLobby_EventScript_15905D:: @ 815905D LilycoveCity_ContestLobby_EventScript_159066:: @ 8159066 lockall fadescreen 1 - drawcontestwinner 6 + showcontestwinner 6 releaseall end LilycoveCity_ContestLobby_EventScript_15906D:: @ 815906D lockall fadescreen 1 - drawcontestwinner 7 + showcontestwinner 7 releaseall end LilycoveCity_ContestLobby_EventScript_159074:: @ 8159074 lockall fadescreen 1 - drawcontestwinner 8 + showcontestwinner 8 releaseall end diff --git a/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc b/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc index 9ed0262ea..a21fcffd6 100644 --- a/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc +++ b/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc @@ -103,27 +103,27 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A232:: @ 815A232 end LilycoveCity_DepartmentStoreRooftop_EventScript_15A23D:: @ 815A23D - checkmoney 0xc8, 0 + checkmoney 200, 0 return LilycoveCity_DepartmentStoreRooftop_EventScript_15A244:: @ 815A244 - checkmoney 0x12c, 0 + checkmoney 300, 0 return LilycoveCity_DepartmentStoreRooftop_EventScript_15A24B:: @ 815A24B - checkmoney 0x15e, 0 + checkmoney 350, 0 return LilycoveCity_DepartmentStoreRooftop_EventScript_15A252:: @ 815A252 - takemoney 0xc8, 0 + removemoney 200, 0 return LilycoveCity_DepartmentStoreRooftop_EventScript_15A259:: @ 815A259 - takemoney 0x12c, 0 + removemoney 300, 0 return LilycoveCity_DepartmentStoreRooftop_EventScript_15A260:: @ 815A260 - takemoney 0x15e, 0 + removemoney 350, 0 return LilycoveCity_DepartmentStoreRooftop_EventScript_15A267:: @ 815A267 @@ -149,7 +149,7 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A267:: @ 815A267 bufferitemname 0, VAR_TEMP_0 playse SE_JIHANKI msgbox LilycoveCity_DepartmentStoreRooftop_Text_18C75F, 4 - giveitem VAR_TEMP_0, 1 + additem VAR_TEMP_0 bufferitemname 1, VAR_TEMP_0 bufferstdstring 2, 14 msgbox LilycoveCity_DepartmentStoreRooftop_Text_1A0C8C, 4 @@ -161,7 +161,7 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A267:: @ 815A267 goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A388 playse SE_JIHANKI msgbox LilycoveCity_DepartmentStoreRooftop_Text_18C780, 4 - giveitem VAR_TEMP_0, 1 + additem VAR_TEMP_0 bufferitemname 1, VAR_TEMP_0 bufferstdstring 2, 14 msgbox LilycoveCity_DepartmentStoreRooftop_Text_1A0C8C, 4 @@ -173,7 +173,7 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A267:: @ 815A267 goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A388 playse SE_JIHANKI msgbox LilycoveCity_DepartmentStoreRooftop_Text_18C780, 4 - giveitem VAR_TEMP_0, 1 + additem VAR_TEMP_0 bufferitemname 1, VAR_TEMP_0 bufferstdstring 2, 14 msgbox LilycoveCity_DepartmentStoreRooftop_Text_1A0C8C, 4 diff --git a/data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc b/data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc index ad2c6aad1..cb38c0043 100644 --- a/data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc +++ b/data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc @@ -8,7 +8,7 @@ LilycoveCity_DepartmentStore_1F_EventScript_159D55:: @ 8159D55 LilycoveCity_DepartmentStore_1F_EventScript_159D5E:: @ 8159D5E lock faceplayer - dodailyevents + dotimebasedevents compare VAR_LOTTERY_PRIZE, 0 goto_if_ne LilycoveCity_DepartmentStore_1F_EventScript_159EB1 goto_if_set FLAG_DAILY_PICKED_LOTTO_TICKET, LilycoveCity_DepartmentStore_1F_EventScript_159E4C @@ -48,7 +48,7 @@ LilycoveCity_DepartmentStore_1F_EventScript_159D5E:: @ 8159D5E call_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159E8A compare VAR_0x8004, 4 call_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159E93 - giveitem_std VAR_0x8005 + giveitem VAR_0x8005 compare VAR_RESULT, 0 goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159E9C goto LilycoveCity_DepartmentStore_1F_EventScript_159E6E @@ -110,7 +110,7 @@ LilycoveCity_DepartmentStore_1F_EventScript_159EA7:: @ 8159EA7 LilycoveCity_DepartmentStore_1F_EventScript_159EB1:: @ 8159EB1 msgbox LilycoveCity_DepartmentStore_1F_Text_1C4FCC, 4 - giveitem_std VAR_LOTTERY_PRIZE + giveitem VAR_LOTTERY_PRIZE compare VAR_RESULT, 0 goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159EA7 setvar VAR_LOTTERY_PRIZE, 0 diff --git a/data/maps/LilycoveCity_House2/scripts.inc b/data/maps/LilycoveCity_House2/scripts.inc index 123e3a79d..6816b9847 100644 --- a/data/maps/LilycoveCity_House2/scripts.inc +++ b/data/maps/LilycoveCity_House2/scripts.inc @@ -6,7 +6,7 @@ LilycoveCity_House2_EventScript_159BA3:: @ 8159BA3 faceplayer goto_if_set FLAG_RECEIVED_TM44, LilycoveCity_House2_EventScript_159BDA msgbox LilycoveCity_House2_Text_18B83C, 4 - giveitem_std ITEM_TM44_REST + giveitem ITEM_TM44_REST compare VAR_RESULT, 0 goto_if_eq LilycoveCity_House2_EventScript_1A029B setflag FLAG_RECEIVED_TM44 diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc b/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc index c6090a5a9..0a9aba9dc 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc +++ b/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc @@ -118,7 +118,7 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_158735:: @ 8158735 LilycoveCity_LilycoveMuseum_2F_EventScript_15875C:: @ 815875C applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_1A0839 msgbox LilycoveCity_LilycoveMuseum_2F_Text_188120, 4 - givedecoration_std DECOR_GLASS_ORNAMENT + givedecoration DECOR_GLASS_ORNAMENT compare VAR_RESULT, 0 goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_158783 setflag FLAG_RECEIVED_GLASS_ORNAMENT @@ -187,34 +187,34 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_158817:: @ 8158817 LilycoveCity_LilycoveMuseum_2F_EventScript_158820:: @ 8158820 msgbox LilycoveCity_LilycoveMuseum_2F_Text_18831A, 3 fadescreen 1 - drawcontestwinner 9 + showcontestwinner 9 releaseall end LilycoveCity_LilycoveMuseum_2F_EventScript_15882E:: @ 815882E msgbox LilycoveCity_LilycoveMuseum_2F_Text_18831A, 3 fadescreen 1 - drawcontestwinner 10 + showcontestwinner 10 releaseall end LilycoveCity_LilycoveMuseum_2F_EventScript_15883C:: @ 815883C msgbox LilycoveCity_LilycoveMuseum_2F_Text_18831A, 3 fadescreen 1 - drawcontestwinner 11 + showcontestwinner 11 releaseall end LilycoveCity_LilycoveMuseum_2F_EventScript_15884A:: @ 815884A msgbox LilycoveCity_LilycoveMuseum_2F_Text_18831A, 3 fadescreen 1 - drawcontestwinner 12 + showcontestwinner 12 releaseall end LilycoveCity_LilycoveMuseum_2F_EventScript_158858:: @ 8158858 msgbox LilycoveCity_LilycoveMuseum_2F_Text_18831A, 3 fadescreen 1 - drawcontestwinner 13 + showcontestwinner 13 releaseall end diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc index 620cddd0b..89a24e1b2 100644 --- a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc +++ b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc @@ -136,7 +136,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152DBA:: @ 8152DBA LittlerootTown_ProfessorBirchsLab_EventScript_152E13:: @ 8152E13 msgbox LittlerootTown_ProfessorBirchsLab_Text_1743D4, 4 - giveitem_std ITEM_POKE_BALL, 5 + giveitem ITEM_POKE_BALL, 5 compare VAR_RESULT, 0 call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152E85 msgbox LittlerootTown_ProfessorBirchsLab_Text_17443D, 4 @@ -145,7 +145,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152E13:: @ 8152E13 LittlerootTown_ProfessorBirchsLab_EventScript_152E40:: @ 8152E40 msgbox LittlerootTown_ProfessorBirchsLab_Text_17453C, 4 - giveitem_std ITEM_POKE_BALL, 5 + giveitem ITEM_POKE_BALL, 5 compare VAR_RESULT, 0 call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152E8E msgbox LittlerootTown_ProfessorBirchsLab_Text_17458C, 4 diff --git a/data/maps/MauvilleCity/scripts.inc b/data/maps/MauvilleCity/scripts.inc index c3c6834e4..0c81ec2ae 100644 --- a/data/maps/MauvilleCity/scripts.inc +++ b/data/maps/MauvilleCity/scripts.inc @@ -160,7 +160,7 @@ MauvilleCity_EventScript_14C22B:: @ 814C22B MauvilleCity_EventScript_14C23C:: @ 814C23C msgbox MauvilleCity_Text_165F0D, 4 - trainerbattle 3, TRAINER_WALLY_2, 0, MauvilleCity_Text_165F38 + trainerbattle_no_intro TRAINER_WALLY_2, MauvilleCity_Text_165F38 applymovement 6, MauvilleCity_Movement_1A0843 waitmovement 0 msgbox MauvilleCity_Text_165F85, 4 @@ -285,7 +285,7 @@ MauvilleCity_EventScript_14C2F2:: @ 814C2F2 goto_if_eq MauvilleCity_EventScript_14C33C goto_if_set FLAG_RECEIVED_BASEMENT_KEY, MauvilleCity_EventScript_14C332 msgbox MauvilleCity_Text_1661C1, 4 - giveitem_std ITEM_BASEMENT_KEY + giveitem ITEM_BASEMENT_KEY setflag FLAG_RECEIVED_BASEMENT_KEY msgbox MauvilleCity_Text_166331, 4 release @@ -298,7 +298,7 @@ MauvilleCity_EventScript_14C332:: @ 814C332 MauvilleCity_EventScript_14C33C:: @ 814C33C msgbox MauvilleCity_Text_1663EB, 4 - giveitem_std ITEM_TM24_THUNDERBOLT + giveitem ITEM_TM24_THUNDERBOLT compare VAR_RESULT, 0 goto_if_eq MauvilleCity_EventScript_1A029B setflag FLAG_RECEIVED_TM24 diff --git a/data/maps/MauvilleCity_BikeShop/scripts.inc b/data/maps/MauvilleCity_BikeShop/scripts.inc index c0dd433a3..b34d4ea93 100644 --- a/data/maps/MauvilleCity_BikeShop/scripts.inc +++ b/data/maps/MauvilleCity_BikeShop/scripts.inc @@ -44,13 +44,13 @@ MauvilleCity_BikeShop_EventScript_156824:: @ 8156824 MauvilleCity_BikeShop_EventScript_15682D:: @ 815682D msgbox MauvilleCity_BikeShop_Text_181332, 4 - giveitem_std ITEM_MACH_BIKE + giveitem ITEM_MACH_BIKE goto MauvilleCity_BikeShop_EventScript_156861 end MauvilleCity_BikeShop_EventScript_156847:: @ 8156847 msgbox MauvilleCity_BikeShop_Text_18134A, 4 - giveitem_std ITEM_ACRO_BIKE + giveitem ITEM_ACRO_BIKE goto MauvilleCity_BikeShop_EventScript_156861 end @@ -88,16 +88,16 @@ MauvilleCity_BikeShop_EventScript_1568BF:: @ 81568BF MauvilleCity_BikeShop_EventScript_1568C9:: @ 81568C9 incrementgamestat GAME_STAT_TRADED_BIKES msgbox MauvilleCity_BikeShop_Text_181439, 4 - takeitem ITEM_ACRO_BIKE, 1 - giveitem_std ITEM_MACH_BIKE + removeitem ITEM_ACRO_BIKE + giveitem ITEM_MACH_BIKE goto MauvilleCity_BikeShop_EventScript_156861 end MauvilleCity_BikeShop_EventScript_1568EA:: @ 81568EA incrementgamestat GAME_STAT_TRADED_BIKES msgbox MauvilleCity_BikeShop_Text_181408, 4 - takeitem ITEM_MACH_BIKE, 1 - giveitem_std ITEM_ACRO_BIKE + removeitem ITEM_MACH_BIKE + giveitem ITEM_ACRO_BIKE goto MauvilleCity_BikeShop_EventScript_156861 end diff --git a/data/maps/MauvilleCity_GameCorner/scripts.inc b/data/maps/MauvilleCity_GameCorner/scripts.inc index 8026e3b08..091620c91 100644 --- a/data/maps/MauvilleCity_GameCorner/scripts.inc +++ b/data/maps/MauvilleCity_GameCorner/scripts.inc @@ -35,11 +35,11 @@ MauvilleCity_GameCorner_EventScript_156AAE:: @ 8156AAE checkcoins VAR_TEMP_1 compare VAR_TEMP_1, 9950 goto_if_ge MauvilleCity_GameCorner_EventScript_156B5C - checkmoney 0x3e8, 0 + checkmoney 1000, 0 compare VAR_RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156B3C - givecoins 50 - takemoney 0x3e8, 0 + addcoins 50 + removemoney 1000, 0 updatemoneybox 0, 0 nop updatecoinsbox 0, 5 @@ -54,11 +54,11 @@ MauvilleCity_GameCorner_EventScript_156AF0:: @ 8156AF0 checkcoins VAR_TEMP_1 compare VAR_TEMP_1, 9500 goto_if_ge MauvilleCity_GameCorner_EventScript_156B5C - checkmoney 0x2710, 0 + checkmoney 10000, 0 compare VAR_RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156B3C - givecoins 500 - takemoney 0x2710, 0 + addcoins 500 + removemoney 10000, 0 updatemoneybox 0, 0 nop updatecoinsbox 0, 5 @@ -160,8 +160,8 @@ MauvilleCity_GameCorner_EventScript_156C46:: @ 8156C46 checkdecorspace DECOR_TREECKO_DOLL compare VAR_RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156D02 - takecoins 1000 - givedecoration DECOR_TREECKO_DOLL + removecoins 1000 + adddecoration DECOR_TREECKO_DOLL updatecoinsbox 0, 0 playse SE_REGI msgbox MauvilleCity_GameCorner_Text_181E49, 4 @@ -176,8 +176,8 @@ MauvilleCity_GameCorner_EventScript_156C80:: @ 8156C80 checkdecorspace DECOR_TORCHIC_DOLL compare VAR_RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156D02 - takecoins 1000 - givedecoration DECOR_TORCHIC_DOLL + removecoins 1000 + adddecoration DECOR_TORCHIC_DOLL updatecoinsbox 0, 0 playse SE_REGI msgbox MauvilleCity_GameCorner_Text_181E49, 4 @@ -192,8 +192,8 @@ MauvilleCity_GameCorner_EventScript_156CBA:: @ 8156CBA checkdecorspace DECOR_MUDKIP_DOLL compare VAR_RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156D02 - takecoins 1000 - givedecoration DECOR_MUDKIP_DOLL + removecoins 1000 + adddecoration DECOR_MUDKIP_DOLL updatecoinsbox 0, 0 playse SE_REGI msgbox MauvilleCity_GameCorner_Text_181E49, 4 @@ -294,8 +294,8 @@ MauvilleCity_GameCorner_EventScript_156E3C:: @ 8156E3C checkitemspace ITEM_TM32_DOUBLE_TEAM, 1 compare VAR_RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156F6C - takecoins 1500 - giveitem ITEM_TM32_DOUBLE_TEAM, 1 + removecoins 1500 + additem ITEM_TM32_DOUBLE_TEAM updatecoinsbox 0, 0 playse SE_REGI msgbox MauvilleCity_GameCorner_Text_181F08, 4 @@ -309,8 +309,8 @@ MauvilleCity_GameCorner_EventScript_156E76:: @ 8156E76 checkitemspace ITEM_TM29_PSYCHIC, 1 compare VAR_RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156F6C - takecoins 3500 - giveitem ITEM_TM29_PSYCHIC, 1 + removecoins 3500 + additem ITEM_TM29_PSYCHIC updatecoinsbox 0, 0 playse SE_REGI msgbox MauvilleCity_GameCorner_Text_181F08, 4 @@ -324,8 +324,8 @@ MauvilleCity_GameCorner_EventScript_156EB0:: @ 8156EB0 checkitemspace ITEM_TM35_FLAMETHROWER, 1 compare VAR_RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156F6C - takecoins 4000 - giveitem ITEM_TM35_FLAMETHROWER, 1 + removecoins 4000 + additem ITEM_TM35_FLAMETHROWER updatecoinsbox 0, 0 playse SE_REGI msgbox MauvilleCity_GameCorner_Text_181F08, 4 @@ -339,8 +339,8 @@ MauvilleCity_GameCorner_EventScript_156EEA:: @ 8156EEA checkitemspace ITEM_TM24_THUNDERBOLT, 1 compare VAR_RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156F6C - takecoins 4000 - giveitem ITEM_TM24_THUNDERBOLT, 1 + removecoins 4000 + additem ITEM_TM24_THUNDERBOLT updatecoinsbox 0, 0 playse SE_REGI msgbox MauvilleCity_GameCorner_Text_181F08, 4 @@ -354,8 +354,8 @@ MauvilleCity_GameCorner_EventScript_156F24:: @ 8156F24 checkitemspace ITEM_TM13_ICE_BEAM, 1 compare VAR_RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156F6C - takecoins 4000 - giveitem ITEM_TM13_ICE_BEAM, 1 + removecoins 4000 + additem ITEM_TM13_ICE_BEAM updatecoinsbox 0, 0 playse SE_REGI msgbox MauvilleCity_GameCorner_Text_181F08, 4 @@ -405,7 +405,7 @@ MauvilleCity_GameCorner_EventScript_156FDB:: @ 8156FDB compare VAR_RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_157059 msgbox MauvilleCity_GameCorner_Text_181F89, 4 - givedecoration_std DECOR_TREECKO_DOLL + givedecoration DECOR_TREECKO_DOLL setflag FLAG_RECEIVED_STARTER_DOLL goto MauvilleCity_GameCorner_EventScript_157072 end @@ -416,7 +416,7 @@ MauvilleCity_GameCorner_EventScript_157005:: @ 8157005 compare VAR_RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_157059 msgbox MauvilleCity_GameCorner_Text_181F89, 4 - givedecoration_std DECOR_TORCHIC_DOLL + givedecoration DECOR_TORCHIC_DOLL setflag FLAG_RECEIVED_STARTER_DOLL goto MauvilleCity_GameCorner_EventScript_157072 end @@ -427,7 +427,7 @@ MauvilleCity_GameCorner_EventScript_15702F:: @ 815702F compare VAR_RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_157059 msgbox MauvilleCity_GameCorner_Text_181F89, 4 - givedecoration_std DECOR_MUDKIP_DOLL + givedecoration DECOR_MUDKIP_DOLL setflag FLAG_RECEIVED_STARTER_DOLL goto MauvilleCity_GameCorner_EventScript_157072 end @@ -464,7 +464,7 @@ MauvilleCity_GameCorner_EventScript_15709C:: @ 815709C compare VAR_TEMP_1, 1 goto_if_ge MauvilleCity_GameCorner_EventScript_1570CA setflag FLAG_RECEIVED_20_COINS - givecoins 20 + addcoins 20 msgbox MauvilleCity_GameCorner_Text_18208E, 4 playse SE_REGI goto MauvilleCity_GameCorner_EventScript_1570CA diff --git a/data/maps/MauvilleCity_Gym/scripts.inc b/data/maps/MauvilleCity_Gym/scripts.inc index 62f5303ec..1c0e417fe 100644 --- a/data/maps/MauvilleCity_Gym/scripts.inc +++ b/data/maps/MauvilleCity_Gym/scripts.inc @@ -66,7 +66,7 @@ MauvilleCity_Gym_EventScript_1565A7:: @ 81565A7 end MauvilleCity_Gym_EventScript_1565AB:: @ 81565AB - trainerbattle 1, TRAINER_WATTSON, 0, MauvilleCity_Gym_Text_180C32, MauvilleCity_Gym_Text_180D64, MauvilleCity_Gym_EventScript_1565DB + trainerbattle_single TRAINER_WATTSON, MauvilleCity_Gym_Text_180C32, MauvilleCity_Gym_Text_180D64, MauvilleCity_Gym_EventScript_1565DB, NO_MUSIC goto_if_unset FLAG_RECEIVED_TM34, MauvilleCity_Gym_EventScript_15661D compare VAR_NEW_MAUVILLE_STATE, 2 goto_if_eq MauvilleCity_Gym_EventScript_156641 @@ -93,7 +93,7 @@ MauvilleCity_Gym_EventScript_1565DB:: @ 81565DB end MauvilleCity_Gym_EventScript_15661D:: @ 815661D - giveitem_std ITEM_TM34_SHOCK_WAVE + giveitem ITEM_TM34_SHOCK_WAVE compare VAR_RESULT, 0 goto_if_eq MauvilleCity_Gym_EventScript_1A029B msgbox MauvilleCity_Gym_Text_180E76, 4 @@ -161,22 +161,22 @@ MauvilleCity_Gym_EventScript_1566E1:: @ 81566E1 end MauvilleCity_Gym_EventScript_1566E6:: @ 81566E6 - trainerbattle 0, TRAINER_KIRK, 0, MauvilleCity_Gym_Text_180956, MauvilleCity_Gym_Text_180997 + trainerbattle_single TRAINER_KIRK, MauvilleCity_Gym_Text_180956, MauvilleCity_Gym_Text_180997 msgbox MauvilleCity_Gym_Text_1809D1, 6 end MauvilleCity_Gym_EventScript_1566FD:: @ 81566FD - trainerbattle 0, TRAINER_SHAWN, 0, MauvilleCity_Gym_Text_180A05, MauvilleCity_Gym_Text_180A42 + trainerbattle_single TRAINER_SHAWN, MauvilleCity_Gym_Text_180A05, MauvilleCity_Gym_Text_180A42 msgbox MauvilleCity_Gym_Text_180A5E, 6 end MauvilleCity_Gym_EventScript_156714:: @ 8156714 - trainerbattle 0, TRAINER_BEN, 0, MauvilleCity_Gym_Text_180AE0, MauvilleCity_Gym_Text_180B06 + trainerbattle_single TRAINER_BEN, MauvilleCity_Gym_Text_180AE0, MauvilleCity_Gym_Text_180B06 msgbox MauvilleCity_Gym_Text_180B1D, 6 end MauvilleCity_Gym_EventScript_15672B:: @ 815672B - trainerbattle 0, TRAINER_VIVIAN, 0, MauvilleCity_Gym_Text_180B5A, MauvilleCity_Gym_Text_180B93 + trainerbattle_single TRAINER_VIVIAN, MauvilleCity_Gym_Text_180B5A, MauvilleCity_Gym_Text_180B93 msgbox MauvilleCity_Gym_Text_180BAE, 6 end diff --git a/data/maps/MauvilleCity_House1/scripts.inc b/data/maps/MauvilleCity_House1/scripts.inc index 4caaef545..ac251e64c 100644 --- a/data/maps/MauvilleCity_House1/scripts.inc +++ b/data/maps/MauvilleCity_House1/scripts.inc @@ -6,7 +6,7 @@ MauvilleCity_House1_EventScript_1569FD:: @ 81569FD faceplayer goto_if_set FLAG_RECEIVED_HM06, MauvilleCity_House1_EventScript_156A29 msgbox MauvilleCity_House1_Text_181B1A, 4 - giveitem_std ITEM_HM06_ROCK_SMASH + giveitem ITEM_HM06_ROCK_SMASH setflag FLAG_RECEIVED_HM06 msgbox MauvilleCity_House1_Text_181B64, 4 release diff --git a/data/maps/MauvilleCity_House2/scripts.inc b/data/maps/MauvilleCity_House2/scripts.inc index 321905148..ec2a1dc0a 100644 --- a/data/maps/MauvilleCity_House2/scripts.inc +++ b/data/maps/MauvilleCity_House2/scripts.inc @@ -27,8 +27,8 @@ MauvilleCity_House2_EventScript_1572E5:: @ 81572E5 MauvilleCity_House2_EventScript_15731B:: @ 815731B msgbox MauvilleCity_House2_Text_182515, 4 - takeitem ITEM_HARBOR_MAIL, 1 - giveitem_std ITEM_COIN_CASE + removeitem ITEM_HARBOR_MAIL + giveitem ITEM_COIN_CASE setflag FLAG_RECEIVED_COIN_CASE goto MauvilleCity_House2_EventScript_15733D end diff --git a/data/maps/MeteorFalls_1F_2R/scripts.inc b/data/maps/MeteorFalls_1F_2R/scripts.inc index 971b9c285..2b9b813ce 100644 --- a/data/maps/MeteorFalls_1F_2R/scripts.inc +++ b/data/maps/MeteorFalls_1F_2R/scripts.inc @@ -2,7 +2,7 @@ MeteorFalls_1F_2R_MapScripts:: @ 815C678 .byte 0 MeteorFalls_1F_2R_EventScript_15C679:: @ 815C679 - trainerbattle 0, TRAINER_NICOLAS_1, 0, MeteorFalls_1F_2R_Text_1939C5, MeteorFalls_1F_2R_Text_193A35 + trainerbattle_single TRAINER_NICOLAS_1, MeteorFalls_1F_2R_Text_1939C5, MeteorFalls_1F_2R_Text_193A35 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if_eq MeteorFalls_1F_2R_EventScript_15C6A0 @@ -10,12 +10,12 @@ MeteorFalls_1F_2R_EventScript_15C679:: @ 815C679 end MeteorFalls_1F_2R_EventScript_15C6A0:: @ 815C6A0 - trainerbattle 5, TRAINER_NICOLAS_1, 0, MeteorFalls_1F_2R_Text_193AB3, MeteorFalls_1F_2R_Text_193B21 + trainerbattle_rematch TRAINER_NICOLAS_1, MeteorFalls_1F_2R_Text_193AB3, MeteorFalls_1F_2R_Text_193B21 msgbox MeteorFalls_1F_2R_Text_193B4C, 6 end MeteorFalls_1F_2R_EventScript_15C6B7:: @ 815C6B7 - trainerbattle 4, TRAINER_JOHN_AND_JAY_1, 0, MeteorFalls_1F_2R_Text_193BB7, MeteorFalls_1F_2R_Text_193C10, MeteorFalls_1F_2R_Text_193C9F + trainerbattle_double TRAINER_JOHN_AND_JAY_1, MeteorFalls_1F_2R_Text_193BB7, MeteorFalls_1F_2R_Text_193C10, MeteorFalls_1F_2R_Text_193C9F specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if_eq MeteorFalls_1F_2R_EventScript_15C6E2 @@ -23,12 +23,12 @@ MeteorFalls_1F_2R_EventScript_15C6B7:: @ 815C6B7 end MeteorFalls_1F_2R_EventScript_15C6E2:: @ 815C6E2 - trainerbattle 7, TRAINER_JOHN_AND_JAY_1, 0, MeteorFalls_1F_2R_Text_193E75, MeteorFalls_1F_2R_Text_193ECE, MeteorFalls_1F_2R_Text_193F59 + trainerbattle_rematch_double TRAINER_JOHN_AND_JAY_1, MeteorFalls_1F_2R_Text_193E75, MeteorFalls_1F_2R_Text_193ECE, MeteorFalls_1F_2R_Text_193F59 msgbox MeteorFalls_1F_2R_Text_193EF3, 6 end MeteorFalls_1F_2R_EventScript_15C6FD:: @ 815C6FD - trainerbattle 4, TRAINER_JOHN_AND_JAY_1, 0, MeteorFalls_1F_2R_Text_193D10, MeteorFalls_1F_2R_Text_193D6E, MeteorFalls_1F_2R_Text_193DFB + trainerbattle_double TRAINER_JOHN_AND_JAY_1, MeteorFalls_1F_2R_Text_193D10, MeteorFalls_1F_2R_Text_193D6E, MeteorFalls_1F_2R_Text_193DFB specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if_eq MeteorFalls_1F_2R_EventScript_15C728 @@ -36,6 +36,6 @@ MeteorFalls_1F_2R_EventScript_15C6FD:: @ 815C6FD end MeteorFalls_1F_2R_EventScript_15C728:: @ 815C728 - trainerbattle 7, TRAINER_JOHN_AND_JAY_1, 0, MeteorFalls_1F_2R_Text_193FCA, MeteorFalls_1F_2R_Text_19403A, MeteorFalls_1F_2R_Text_1940DF + trainerbattle_rematch_double TRAINER_JOHN_AND_JAY_1, MeteorFalls_1F_2R_Text_193FCA, MeteorFalls_1F_2R_Text_19403A, MeteorFalls_1F_2R_Text_1940DF msgbox MeteorFalls_1F_2R_Text_194066, 6 end diff --git a/data/maps/MossdeepCity/scripts.inc b/data/maps/MossdeepCity/scripts.inc index d34944bb6..82b8e65d8 100644 --- a/data/maps/MossdeepCity/scripts.inc +++ b/data/maps/MossdeepCity/scripts.inc @@ -72,7 +72,7 @@ MossdeepCity_EventScript_14D027:: @ 814D027 compare VAR_RESULT, NO goto_if_eq MossdeepCity_EventScript_14D073 msgbox MossdeepCity_Text_169117, 4 - giveitem_std ITEM_KINGS_ROCK + giveitem ITEM_KINGS_ROCK compare VAR_RESULT, 0 goto_if_eq MossdeepCity_EventScript_1A029B setflag FLAG_RECEIVED_KINGS_ROCK diff --git a/data/maps/MossdeepCity_Gym/scripts.inc b/data/maps/MossdeepCity_Gym/scripts.inc index 695953c38..efbd35d79 100644 --- a/data/maps/MossdeepCity_Gym/scripts.inc +++ b/data/maps/MossdeepCity_Gym/scripts.inc @@ -45,7 +45,7 @@ MossdeepCity_Gym_EventScript_15A558:: @ 815A558 end MossdeepCity_Gym_EventScript_15A56B:: @ 815A56B - trainerbattle 8, TRAINER_TATE_AND_LIZA, 0, MossdeepCity_Gym_Text_18CF02, MossdeepCity_Gym_Text_18D077, MossdeepCity_Gym_Text_18D324, MossdeepCity_Gym_EventScript_15A594 + trainerbattle_double TRAINER_TATE_AND_LIZA, MossdeepCity_Gym_Text_18CF02, MossdeepCity_Gym_Text_18D077, MossdeepCity_Gym_Text_18D324, MossdeepCity_Gym_EventScript_15A594, NO_MUSIC goto_if_unset FLAG_RECEIVED_TM04, MossdeepCity_Gym_EventScript_15A5C6 msgbox MossdeepCity_Gym_Text_18D273, 4 release @@ -67,7 +67,7 @@ MossdeepCity_Gym_EventScript_15A594:: @ 815A594 end MossdeepCity_Gym_EventScript_15A5C6:: @ 815A5C6 - giveitem_std ITEM_TM04_CALM_MIND + giveitem ITEM_TM04_CALM_MIND compare VAR_RESULT, 0 goto_if_eq MossdeepCity_Gym_EventScript_1A029B msgbox MossdeepCity_Gym_Text_18D1CF, 4 @@ -169,32 +169,32 @@ MossdeepCity_Gym_EventScript_15A742:: @ 815A742 end MossdeepCity_Gym_EventScript_15A74E:: @ 815A74E - trainerbattle 0, TRAINER_PRESTON, 0, MossdeepCity_Gym_Text_18C96A, MossdeepCity_Gym_Text_18C9BA + trainerbattle_single TRAINER_PRESTON, MossdeepCity_Gym_Text_18C96A, MossdeepCity_Gym_Text_18C9BA msgbox MossdeepCity_Gym_Text_18C9E1, 6 end MossdeepCity_Gym_EventScript_15A765:: @ 815A765 - trainerbattle 0, TRAINER_VIRGIL, 0, MossdeepCity_Gym_Text_18CA10, MossdeepCity_Gym_Text_18CA28 + trainerbattle_single TRAINER_VIRGIL, MossdeepCity_Gym_Text_18CA10, MossdeepCity_Gym_Text_18CA28 msgbox MossdeepCity_Gym_Text_18CA48, 6 end MossdeepCity_Gym_EventScript_15A77C:: @ 815A77C - trainerbattle 0, TRAINER_FRITZ, 0, MossdeepCity_Gym_Text_18CAC0, MossdeepCity_Gym_Text_18CB46 + trainerbattle_single TRAINER_FRITZ, MossdeepCity_Gym_Text_18CAC0, MossdeepCity_Gym_Text_18CB46 msgbox MossdeepCity_Gym_Text_18CB77, 6 end MossdeepCity_Gym_EventScript_15A793:: @ 815A793 - trainerbattle 0, TRAINER_HANNAH, 0, MossdeepCity_Gym_Text_18CC1E, MossdeepCity_Gym_Text_18CC83 + trainerbattle_single TRAINER_HANNAH, MossdeepCity_Gym_Text_18CC1E, MossdeepCity_Gym_Text_18CC83 msgbox MossdeepCity_Gym_Text_18CC9B, 6 end MossdeepCity_Gym_EventScript_15A7AA:: @ 815A7AA - trainerbattle 0, TRAINER_SAMANTHA, 0, MossdeepCity_Gym_Text_18CD14, MossdeepCity_Gym_Text_18CD66 + trainerbattle_single TRAINER_SAMANTHA, MossdeepCity_Gym_Text_18CD14, MossdeepCity_Gym_Text_18CD66 msgbox MossdeepCity_Gym_Text_18CD73, 6 end MossdeepCity_Gym_EventScript_15A7C1:: @ 815A7C1 - trainerbattle 0, TRAINER_MAURA, 0, MossdeepCity_Gym_Text_18CDE0, MossdeepCity_Gym_Text_18CE47 + trainerbattle_single TRAINER_MAURA, MossdeepCity_Gym_Text_18CDE0, MossdeepCity_Gym_Text_18CE47 msgbox MossdeepCity_Gym_Text_18CE6C, 6 end diff --git a/data/maps/MossdeepCity_House3/scripts.inc b/data/maps/MossdeepCity_House3/scripts.inc index ead159df5..70e37c927 100644 --- a/data/maps/MossdeepCity_House3/scripts.inc +++ b/data/maps/MossdeepCity_House3/scripts.inc @@ -9,7 +9,7 @@ MossdeepCity_House3_EventScript_15A972:: @ 815A972 compare VAR_RESULT, NO goto_if_eq MossdeepCity_House3_EventScript_15A9BB msgbox MossdeepCity_House3_Text_18D9A9, 4 - giveitem_std ITEM_SUPER_ROD + giveitem ITEM_SUPER_ROD setflag FLAG_RECEIVED_SUPER_ROD msgbox MossdeepCity_House3_Text_18D9E3, 4 release diff --git a/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc b/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc index 7ac7d5f4d..aa6195738 100644 --- a/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc +++ b/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc @@ -4,7 +4,7 @@ MossdeepCity_SpaceCenter_1F_MapScripts:: @ 815AB8A MossdeepCity_SpaceCenter_1F_EventScript_15AB8B:: @ 815AB8B lock faceplayer - dodailyevents + dotimebasedevents specialvar VAR_RESULT, GetWeekCount buffernumberstring 0, VAR_RESULT compare VAR_RESULT, 0 @@ -34,7 +34,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_15ABD5:: @ 815ABD5 faceplayer goto_if_set FLAG_RECEIVED_SUN_STONE_MOSSDEEP, MossdeepCity_SpaceCenter_1F_EventScript_15AC0C msgbox MossdeepCity_SpaceCenter_1F_Text_18E335, 4 - giveitem_std ITEM_SUN_STONE + giveitem ITEM_SUN_STONE compare VAR_RESULT, 0 goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_1A029B setflag FLAG_RECEIVED_SUN_STONE_MOSSDEEP diff --git a/data/maps/MossdeepCity_StevensHouse/scripts.inc b/data/maps/MossdeepCity_StevensHouse/scripts.inc index 6025a6b6b..ed58ddd3a 100644 --- a/data/maps/MossdeepCity_StevensHouse/scripts.inc +++ b/data/maps/MossdeepCity_StevensHouse/scripts.inc @@ -38,7 +38,7 @@ MossdeepCity_StevensHouse_EventScript_15AA0B:: @ 815AA0B applymovement 1, MossdeepCity_StevensHouse_Movement_15AA6E waitmovement 0 msgbox MossdeepCity_StevensHouse_Text_18DA77, 4 - giveitem_std ITEM_HM08_DIVE + giveitem ITEM_HM08_DIVE setflag FLAG_RECEIVED_HM08 setflag FLAG_OMIT_DIVE_FROM_STEVEN_LETTER msgbox MossdeepCity_StevensHouse_Text_18DB22, 4 @@ -82,7 +82,7 @@ MossdeepCity_StevensHouse_EventScript_15AA7C:: @ 815AA7C message MossdeepCity_StevensHouse_Text_18DD61 waitfanfare waitmessage - givemon SPECIES_BELDUM, 5, ITEM_NONE, 0x0, 0x0, 0 + givemon SPECIES_BELDUM, 5, ITEM_NONE bufferspeciesname 1, SPECIES_BELDUM msgbox MossdeepCity_StevensHouse_Text_1A1102, MSGBOX_YESNO compare VAR_RESULT, YES @@ -123,6 +123,6 @@ MossdeepCity_StevensHouse_EventScript_15AB16:: @ 815AB16 end MossdeepCity_StevensHouse_EventScript_15AB20:: @ 815AB20 - giveitem_std ITEM_HM08_DIVE, 1, 1 + finditem ITEM_HM08_DIVE setflag FLAG_RECEIVED_HM08 end diff --git a/data/maps/MtChimney/scripts.inc b/data/maps/MtChimney/scripts.inc index e06433dfa..f967f9f2f 100644 --- a/data/maps/MtChimney/scripts.inc +++ b/data/maps/MtChimney/scripts.inc @@ -27,7 +27,7 @@ MtChimney_EventScript_15CF95:: @ 815CF95 checkitemspace ITEM_LAVA_COOKIE, 1 compare VAR_RESULT, 1 call_if_eq MtChimney_EventScript_15D000 - giveitem_std ITEM_LAVA_COOKIE + giveitem ITEM_LAVA_COOKIE compare VAR_RESULT, 0 goto_if_eq MtChimney_EventScript_15CFF3 hidemoneybox 0, 0 @@ -41,7 +41,7 @@ MtChimney_EventScript_15CFF3:: @ 815CFF3 end MtChimney_EventScript_15D000:: @ 815D000 - takemoney 0xc8, 0 + removemoney 200, 0 updatemoneybox 0, 0 nop return @@ -330,20 +330,20 @@ MtChimney_EventScript_15D107:: @ 815D107 MtChimney_EventScript_15D110:: @ 815D110 .ifdef SAPPHIRE - trainerbattle 0, TRAINER_MT_CHIMNEY_GRUNT_1, 0, MtChimney_Text_1B3168, MtChimney_Text_1B31EA + trainerbattle_single TRAINER_MT_CHIMNEY_GRUNT_1, MtChimney_Text_1B3168, MtChimney_Text_1B31EA msgbox MtChimney_Text_1B3239, 6 .else - trainerbattle 0, TRAINER_MT_CHIMNEY_GRUNT_1, 0, MtChimney_Text_1B3B36, MtChimney_Text_1B3BB8 + trainerbattle_single TRAINER_MT_CHIMNEY_GRUNT_1, MtChimney_Text_1B3B36, MtChimney_Text_1B3BB8 msgbox MtChimney_Text_1B3C07, 6 .endif end MtChimney_EventScript_15D127:: @ 815D127 .ifdef SAPPHIRE - trainerbattle 0, TRAINER_MT_CHIMNEY_GRUNT_2, 0, MtChimney_Text_1B32C8, MtChimney_Text_1B336E + trainerbattle_single TRAINER_MT_CHIMNEY_GRUNT_2, MtChimney_Text_1B32C8, MtChimney_Text_1B336E msgbox MtChimney_Text_1B338D, 6 .else - trainerbattle 0, TRAINER_MT_CHIMNEY_GRUNT_2, 0, MtChimney_Text_1B3C96, MtChimney_Text_1B3D1E + trainerbattle_single TRAINER_MT_CHIMNEY_GRUNT_2, MtChimney_Text_1B3C96, MtChimney_Text_1B3D1E msgbox MtChimney_Text_1B3D3D, 6 .endif end @@ -412,7 +412,7 @@ MtChimney_EventScript_15D17D:: @ 815D17D compare VAR_RESULT, NO goto_if_eq MtChimney_EventScript_15D1BC msgbox MtChimney_Text_1958C6, 4 - giveitem_std ITEM_METEORITE + giveitem ITEM_METEORITE setflag FLAG_RECEIVED_METEORITE releaseall end @@ -437,7 +437,7 @@ MtChimney_EventScript_15D1DA:: @ 815D1DA end MtChimney_EventScript_15D1E3:: @ 815D1E3 - trainerbattle 0, TRAINER_SHELBY_1, 0, MtChimney_Text_19597F, MtChimney_Text_1959D8 + trainerbattle_single TRAINER_SHELBY_1, MtChimney_Text_19597F, MtChimney_Text_1959D8 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if_eq MtChimney_EventScript_15D20A @@ -445,21 +445,21 @@ MtChimney_EventScript_15D1E3:: @ 815D1E3 end MtChimney_EventScript_15D20A:: @ 815D20A - trainerbattle 5, TRAINER_SHELBY_1, 0, MtChimney_Text_195A45, MtChimney_Text_195AAD + trainerbattle_rematch TRAINER_SHELBY_1, MtChimney_Text_195A45, MtChimney_Text_195AAD msgbox MtChimney_Text_195AD9, 6 end MtChimney_EventScript_15D221:: @ 815D221 - trainerbattle 0, TRAINER_MELISSA, 0, MtChimney_Text_195B1C, MtChimney_Text_195B5F + trainerbattle_single TRAINER_MELISSA, MtChimney_Text_195B1C, MtChimney_Text_195B5F msgbox MtChimney_Text_195B84, 6 end MtChimney_EventScript_15D238:: @ 815D238 - trainerbattle 0, TRAINER_SHEILA, 0, MtChimney_Text_195BB2, MtChimney_Text_195BF9 + trainerbattle_single TRAINER_SHEILA, MtChimney_Text_195BB2, MtChimney_Text_195BF9 msgbox MtChimney_Text_195C31, 6 end MtChimney_EventScript_15D24F:: @ 815D24F - trainerbattle 0, TRAINER_SHIRLEY, 0, MtChimney_Text_195CD8, MtChimney_Text_195D2F + trainerbattle_single TRAINER_SHIRLEY, MtChimney_Text_195CD8, MtChimney_Text_195D2F msgbox MtChimney_Text_195D5C, 6 end diff --git a/data/maps/MtPyre_1F/scripts.inc b/data/maps/MtPyre_1F/scripts.inc index 3629c375f..1b65ebc35 100644 --- a/data/maps/MtPyre_1F/scripts.inc +++ b/data/maps/MtPyre_1F/scripts.inc @@ -6,7 +6,7 @@ MtPyre_1F_EventScript_15D323:: @ 815D323 faceplayer goto_if_set FLAG_RECEIVED_CLEANSE_TAG, MtPyre_1F_EventScript_15D352 msgbox MtPyre_1F_Text_196151, 4 - giveitem_std ITEM_CLEANSE_TAG + giveitem ITEM_CLEANSE_TAG compare VAR_RESULT, 0 goto_if_eq MtPyre_1F_EventScript_1A029B setflag FLAG_RECEIVED_CLEANSE_TAG diff --git a/data/maps/MtPyre_2F/scripts.inc b/data/maps/MtPyre_2F/scripts.inc index d2ef2894e..956962251 100644 --- a/data/maps/MtPyre_2F/scripts.inc +++ b/data/maps/MtPyre_2F/scripts.inc @@ -18,16 +18,16 @@ MtPyre_2F_EventScript_15D392:: @ 815D392 end MtPyre_2F_EventScript_15D39B:: @ 815D39B - trainerbattle 0, TRAINER_MARK, 0, MtPyre_2F_Text_196674, MtPyre_2F_Text_1966BE + trainerbattle_single TRAINER_MARK, MtPyre_2F_Text_196674, MtPyre_2F_Text_1966BE msgbox MtPyre_2F_Text_1966E7, 6 end MtPyre_2F_EventScript_15D3B2:: @ 815D3B2 - trainerbattle 4, TRAINER_DEZ_AND_LUKE, 0, MtPyre_2F_Text_1962C6, MtPyre_2F_Text_196358, MtPyre_2F_Text_1963CB + trainerbattle_double TRAINER_DEZ_AND_LUKE, MtPyre_2F_Text_1962C6, MtPyre_2F_Text_196358, MtPyre_2F_Text_1963CB msgbox MtPyre_2F_Text_196368, 6 end MtPyre_2F_EventScript_15D3CD:: @ 815D3CD - trainerbattle 4, TRAINER_DEZ_AND_LUKE, 0, MtPyre_2F_Text_196449, MtPyre_2F_Text_1964EB, MtPyre_2F_Text_196539 + trainerbattle_double TRAINER_DEZ_AND_LUKE, MtPyre_2F_Text_196449, MtPyre_2F_Text_1964EB, MtPyre_2F_Text_196539 msgbox MtPyre_2F_Text_196504, 6 end diff --git a/data/maps/MtPyre_3F/scripts.inc b/data/maps/MtPyre_3F/scripts.inc index 69a57df19..260a672e8 100644 --- a/data/maps/MtPyre_3F/scripts.inc +++ b/data/maps/MtPyre_3F/scripts.inc @@ -2,11 +2,11 @@ MtPyre_3F_MapScripts:: @ 815D3E8 .byte 0 MtPyre_3F_EventScript_15D3E9:: @ 815D3E9 - trainerbattle 0, TRAINER_WILLIAM, 0, MtPyre_3F_Text_19672B, MtPyre_3F_Text_19679D + trainerbattle_single TRAINER_WILLIAM, MtPyre_3F_Text_19672B, MtPyre_3F_Text_19679D msgbox MtPyre_3F_Text_1967B5, 6 end MtPyre_3F_EventScript_15D400:: @ 815D400 - trainerbattle 0, TRAINER_KAYLA, 0, MtPyre_3F_Text_1967EF, MtPyre_3F_Text_19682B + trainerbattle_single TRAINER_KAYLA, MtPyre_3F_Text_1967EF, MtPyre_3F_Text_19682B msgbox MtPyre_3F_Text_196842, 6 end diff --git a/data/maps/MtPyre_4F/scripts.inc b/data/maps/MtPyre_4F/scripts.inc index 3910d6f45..50f9ddf01 100644 --- a/data/maps/MtPyre_4F/scripts.inc +++ b/data/maps/MtPyre_4F/scripts.inc @@ -2,6 +2,6 @@ MtPyre_4F_MapScripts:: @ 815D417 .byte 0 MtPyre_4F_EventScript_15D418:: @ 815D418 - trainerbattle 0, TRAINER_ATSUSHI, 0, MtPyre_4F_Text_1968A6, MtPyre_4F_Text_1968D0 + trainerbattle_single TRAINER_ATSUSHI, MtPyre_4F_Text_1968A6, MtPyre_4F_Text_1968D0 msgbox MtPyre_4F_Text_1968EE, 6 end diff --git a/data/maps/MtPyre_5F/scripts.inc b/data/maps/MtPyre_5F/scripts.inc index 8cec3a32f..2b9a6665a 100644 --- a/data/maps/MtPyre_5F/scripts.inc +++ b/data/maps/MtPyre_5F/scripts.inc @@ -2,6 +2,6 @@ MtPyre_5F_MapScripts:: @ 815D42F .byte 0 MtPyre_5F_EventScript_15D430:: @ 815D430 - trainerbattle 0, TRAINER_TASHA, 0, MtPyre_5F_Text_196939, MtPyre_5F_Text_196997 + trainerbattle_single TRAINER_TASHA, MtPyre_5F_Text_196939, MtPyre_5F_Text_196997 msgbox MtPyre_5F_Text_1969AC, 6 end diff --git a/data/maps/MtPyre_6F/scripts.inc b/data/maps/MtPyre_6F/scripts.inc index 5bf36092b..39e322ffb 100644 --- a/data/maps/MtPyre_6F/scripts.inc +++ b/data/maps/MtPyre_6F/scripts.inc @@ -2,7 +2,7 @@ MtPyre_6F_MapScripts:: @ 815D447 .byte 0 MtPyre_6F_EventScript_15D448:: @ 815D448 - trainerbattle 0, TRAINER_VALERIE_1, 0, MtPyre_6F_Text_1969FE, MtPyre_6F_Text_196A30 + trainerbattle_single TRAINER_VALERIE_1, MtPyre_6F_Text_1969FE, MtPyre_6F_Text_196A30 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if_eq MtPyre_6F_EventScript_15D46F @@ -10,6 +10,6 @@ MtPyre_6F_EventScript_15D448:: @ 815D448 end MtPyre_6F_EventScript_15D46F:: @ 815D46F - trainerbattle 5, TRAINER_VALERIE_1, 0, MtPyre_6F_Text_196A95, MtPyre_6F_Text_196AB1 + trainerbattle_rematch TRAINER_VALERIE_1, MtPyre_6F_Text_196A95, MtPyre_6F_Text_196AB1 msgbox MtPyre_6F_Text_196AC9, 6 end diff --git a/data/maps/MtPyre_Summit/scripts.inc b/data/maps/MtPyre_Summit/scripts.inc index 90e41c233..872e87136 100644 --- a/data/maps/MtPyre_Summit/scripts.inc +++ b/data/maps/MtPyre_Summit/scripts.inc @@ -63,7 +63,7 @@ MtPyre_Summit_EventScript_15D4E1:: @ 815D4E1 .else msgbox MtPyre_Summit_Text_1B5FE6, 4 .endif - giveitem_std ITEM_RED_OR_BLUE_ORB + giveitem ITEM_RED_OR_BLUE_ORB setflag FLAG_RECEIVED_RED_OR_BLUE_ORB releaseall end diff --git a/data/maps/OldaleTown/scripts.inc b/data/maps/OldaleTown/scripts.inc index ad30b2014..e531342b5 100644 --- a/data/maps/OldaleTown/scripts.inc +++ b/data/maps/OldaleTown/scripts.inc @@ -70,7 +70,7 @@ OldaleTown_EventScript_14DE35:: @ 814DE35 OldaleTown_EventScript_14DE4C:: @ 814DE4C msgbox OldaleTown_Text_16AF2F, 4 - giveitem_std ITEM_POTION + giveitem ITEM_POTION compare VAR_RESULT, 0 goto_if_eq OldaleTown_EventScript_14DE83 msgbox OldaleTown_Text_16AFE1, 4 diff --git a/data/maps/PacifidlogTown_House2/scripts.inc b/data/maps/PacifidlogTown_House2/scripts.inc index 5798680bd..b546caa60 100644 --- a/data/maps/PacifidlogTown_House2/scripts.inc +++ b/data/maps/PacifidlogTown_House2/scripts.inc @@ -4,7 +4,7 @@ PacifidlogTown_House2_MapScripts:: @ 8154167 PacifidlogTown_House2_EventScript_154168:: @ 8154168 lock faceplayer - dodailyevents + dotimebasedevents call PacifidlogTown_House2_EventScript_1541B4 goto_if_set FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK, PacifidlogTown_House2_EventScript_154254 call_if_set FLAG_MET_FANCLUB_YOUNGER_BROTHER, PacifidlogTown_House2_EventScript_1541CE @@ -41,7 +41,7 @@ PacifidlogTown_House2_EventScript_1541E8:: @ 81541E8 PacifidlogTown_House2_EventScript_1541EC:: @ 81541EC msgbox PacifidlogTown_House2_Text_179169, 4 - giveitem_std ITEM_TM27_RETURN + giveitem ITEM_TM27_RETURN compare VAR_RESULT, 0 goto_if_eq PacifidlogTown_House2_EventScript_1A029B setflag FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK @@ -57,7 +57,7 @@ PacifidlogTown_House2_EventScript_15421B:: @ 815421B PacifidlogTown_House2_EventScript_154225:: @ 8154225 msgbox PacifidlogTown_House2_Text_17922D, 4 - giveitem_std ITEM_TM21_FRUSTRATION + giveitem ITEM_TM21_FRUSTRATION compare VAR_RESULT, 0 goto_if_eq PacifidlogTown_House2_EventScript_1A029B setflag FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK diff --git a/data/maps/PetalburgCity/scripts.inc b/data/maps/PetalburgCity/scripts.inc index fee198977..1c69280c7 100644 --- a/data/maps/PetalburgCity/scripts.inc +++ b/data/maps/PetalburgCity/scripts.inc @@ -35,8 +35,9 @@ PetalburgCity_EventScript_14B747:: @ 814B747 special ScrSpecial_StartWallyTutorialBattle waitstate msgbox PetalburgCity_Text_16D3DE, 4 - applymovement 2, PetalburgCity_Movement_1A083F, 0, 0 - waitmovement 0, 0, 2 + applymovement 2, PetalburgCity_Movement_1A083F, MAP_PETALBURG_CITY + @ Local id and map num were swapped here (0, 0, 2 vs 2, 0, 0). Fixed to waitmovement 2, MAP_PETALBURG_CITY in Emerald + waitmovement 0, MAP_MAUVILLE_CITY msgbox PetalburgCity_Text_16D408, 4 closemessage clearflag FLAG_SPECIAL_FLAG_0 diff --git a/data/maps/PetalburgCity_Gym/scripts.inc b/data/maps/PetalburgCity_Gym/scripts.inc index 09d969ec8..897725c42 100644 --- a/data/maps/PetalburgCity_Gym/scripts.inc +++ b/data/maps/PetalburgCity_Gym/scripts.inc @@ -15,13 +15,13 @@ PetalburgCity_Gym_MapScript1_15448C:: @ 815448C PetalburgCity_Gym_EventScript_1544A3:: @ 81544A3 setvar VAR_0x8005, 1 call PetalburgCity_Gym_EventScript_154F9A - call_if_trainer_defeated TRAINER_RANDALL, PetalburgCity_Gym_EventScript_154FBB - call_if_trainer_defeated TRAINER_MARY, PetalburgCity_Gym_EventScript_154FDC - call_if_trainer_defeated TRAINER_PARKER, PetalburgCity_Gym_EventScript_154FFD - call_if_trainer_defeated TRAINER_LORI, PetalburgCity_Gym_EventScript_15501E - call_if_trainer_defeated TRAINER_GEORGE, PetalburgCity_Gym_EventScript_15503F - call_if_trainer_defeated TRAINER_JODY, PetalburgCity_Gym_EventScript_155060 - call_if_trainer_defeated TRAINER_BERKE, PetalburgCity_Gym_EventScript_155081 + call_if_defeated TRAINER_RANDALL, PetalburgCity_Gym_EventScript_154FBB + call_if_defeated TRAINER_MARY, PetalburgCity_Gym_EventScript_154FDC + call_if_defeated TRAINER_PARKER, PetalburgCity_Gym_EventScript_154FFD + call_if_defeated TRAINER_LORI, PetalburgCity_Gym_EventScript_15501E + call_if_defeated TRAINER_GEORGE, PetalburgCity_Gym_EventScript_15503F + call_if_defeated TRAINER_JODY, PetalburgCity_Gym_EventScript_155060 + call_if_defeated TRAINER_BERKE, PetalburgCity_Gym_EventScript_155081 end PetalburgCity_Gym_EventScript_1544ED:: @ 81544ED @@ -373,7 +373,7 @@ PetalburgCity_Gym_EventScript_1549B2:: @ 81549B2 return PetalburgCity_Gym_EventScript_1549B8:: @ 81549B8 - giveitem_std ITEM_ENIGMA_BERRY + giveitem ITEM_ENIGMA_BERRY compare VAR_RESULT, 0 goto_if_eq PetalburgCity_Gym_EventScript_1A029B setvar VAR_ENIGMA_BERRY_AVAILABLE, 0 @@ -382,7 +382,7 @@ PetalburgCity_Gym_EventScript_1549B8:: @ 81549B8 PetalburgCity_Gym_EventScript_1549D6:: @ 81549D6 msgbox PetalburgCity_Gym_Text_17A653, 4 - trainerbattle 3, TRAINER_NORMAN, 0, PetalburgCity_Gym_Text_17A77A + trainerbattle_no_intro TRAINER_NORMAN, PetalburgCity_Gym_Text_17A77A message PetalburgCity_Gym_Text_17A7DD waitmessage call PetalburgCity_Gym_EventScript_1A02C5 @@ -402,7 +402,7 @@ PetalburgCity_Gym_EventScript_1549D6:: @ 81549D6 end PetalburgCity_Gym_EventScript_154A2C:: @ 8154A2C - giveitem_std ITEM_TM42_FACADE + giveitem ITEM_TM42_FACADE compare VAR_RESULT, 0 goto_if_eq PetalburgCity_Gym_EventScript_1A029B setflag FLAG_RECEIVED_TM42 @@ -625,7 +625,7 @@ PetalburgCity_Gym_EventScript_154BC3:: @ 8154BC3 PetalburgCity_Gym_EventScript_154BF8:: @ 8154BF8 lockall - goto_if_trainer_not_defeated TRAINER_RANDALL, PetalburgCity_Gym_EventScript_154BB9 + goto_if_not_defeated TRAINER_RANDALL, PetalburgCity_Gym_EventScript_154BB9 setvar VAR_0x8008, 7 setvar VAR_0x8009, 46 msgbox PetalburgCity_Gym_Text_17B90F, MSGBOX_YESNO @@ -637,7 +637,7 @@ PetalburgCity_Gym_EventScript_154BF8:: @ 8154BF8 PetalburgCity_Gym_EventScript_154C2B:: @ 8154C2B lockall - goto_if_trainer_not_defeated TRAINER_RANDALL, PetalburgCity_Gym_EventScript_154BB9 + goto_if_not_defeated TRAINER_RANDALL, PetalburgCity_Gym_EventScript_154BB9 setvar VAR_0x8008, 1 setvar VAR_0x8009, 59 msgbox PetalburgCity_Gym_Text_17B950, MSGBOX_YESNO @@ -649,7 +649,7 @@ PetalburgCity_Gym_EventScript_154C2B:: @ 8154C2B PetalburgCity_Gym_EventScript_154C5E:: @ 8154C5E lockall - goto_if_trainer_not_defeated TRAINER_MARY, PetalburgCity_Gym_EventScript_154BB9 + goto_if_not_defeated TRAINER_MARY, PetalburgCity_Gym_EventScript_154BB9 setvar VAR_0x8008, 7 setvar VAR_0x8009, 59 msgbox PetalburgCity_Gym_Text_17B950, MSGBOX_YESNO @@ -661,7 +661,7 @@ PetalburgCity_Gym_EventScript_154C5E:: @ 8154C5E PetalburgCity_Gym_EventScript_154C91:: @ 8154C91 lockall - goto_if_trainer_not_defeated TRAINER_MARY, PetalburgCity_Gym_EventScript_154BB9 + goto_if_not_defeated TRAINER_MARY, PetalburgCity_Gym_EventScript_154BB9 setvar VAR_0x8008, 1 setvar VAR_0x8009, 72 msgbox PetalburgCity_Gym_Text_17B98A, MSGBOX_YESNO @@ -673,7 +673,7 @@ PetalburgCity_Gym_EventScript_154C91:: @ 8154C91 PetalburgCity_Gym_EventScript_154CC4:: @ 8154CC4 lockall - goto_if_trainer_not_defeated TRAINER_PARKER, PetalburgCity_Gym_EventScript_154BB9 + goto_if_not_defeated TRAINER_PARKER, PetalburgCity_Gym_EventScript_154BB9 setvar VAR_0x8008, 1 setvar VAR_0x8009, 20 msgbox PetalburgCity_Gym_Text_17B9C5, MSGBOX_YESNO @@ -685,7 +685,7 @@ PetalburgCity_Gym_EventScript_154CC4:: @ 8154CC4 PetalburgCity_Gym_EventScript_154CF7:: @ 8154CF7 lockall - goto_if_trainer_not_defeated TRAINER_LORI, PetalburgCity_Gym_EventScript_154BB9 + goto_if_not_defeated TRAINER_LORI, PetalburgCity_Gym_EventScript_154BB9 setvar VAR_0x8008, 7 setvar VAR_0x8009, 20 msgbox PetalburgCity_Gym_Text_17B9C5, MSGBOX_YESNO @@ -697,7 +697,7 @@ PetalburgCity_Gym_EventScript_154CF7:: @ 8154CF7 PetalburgCity_Gym_EventScript_154D2A:: @ 8154D2A lockall - goto_if_trainer_not_defeated TRAINER_LORI, PetalburgCity_Gym_EventScript_154BB9 + goto_if_not_defeated TRAINER_LORI, PetalburgCity_Gym_EventScript_154BB9 setvar VAR_0x8008, 1 setvar VAR_0x8009, 33 msgbox PetalburgCity_Gym_Text_17BA00, MSGBOX_YESNO @@ -709,7 +709,7 @@ PetalburgCity_Gym_EventScript_154D2A:: @ 8154D2A PetalburgCity_Gym_EventScript_154D5D:: @ 8154D5D lockall - goto_if_trainer_not_defeated TRAINER_GEORGE, PetalburgCity_Gym_EventScript_154BB9 + goto_if_not_defeated TRAINER_GEORGE, PetalburgCity_Gym_EventScript_154BB9 setvar VAR_0x8008, 7 setvar VAR_0x8009, 33 msgbox PetalburgCity_Gym_Text_17BA00, MSGBOX_YESNO @@ -721,7 +721,7 @@ PetalburgCity_Gym_EventScript_154D5D:: @ 8154D5D PetalburgCity_Gym_EventScript_154D90:: @ 8154D90 lockall - goto_if_trainer_not_defeated TRAINER_JODY, PetalburgCity_Gym_EventScript_154BB9 + goto_if_not_defeated TRAINER_JODY, PetalburgCity_Gym_EventScript_154BB9 setvar VAR_0x8008, 1 setvar VAR_0x8009, 7 msgbox PetalburgCity_Gym_Text_17BA3D, MSGBOX_YESNO @@ -733,7 +733,7 @@ PetalburgCity_Gym_EventScript_154D90:: @ 8154D90 PetalburgCity_Gym_EventScript_154DC3:: @ 8154DC3 lockall - goto_if_trainer_not_defeated TRAINER_BERKE, PetalburgCity_Gym_EventScript_154BB9 + goto_if_not_defeated TRAINER_BERKE, PetalburgCity_Gym_EventScript_154BB9 setvar VAR_0x8008, 7 setvar VAR_0x8009, 7 msgbox PetalburgCity_Gym_Text_17BA3D, MSGBOX_YESNO @@ -744,7 +744,7 @@ PetalburgCity_Gym_EventScript_154DC3:: @ 8154DC3 end PetalburgCity_Gym_EventScript_154DF6:: @ 8154DF6 - trainerbattle 2, TRAINER_RANDALL, 0, PetalburgCity_Gym_Text_17ADA5, PetalburgCity_Gym_Text_17AE11, PetalburgCity_Gym_EventScript_154E1A + trainerbattle_single TRAINER_RANDALL, PetalburgCity_Gym_Text_17ADA5, PetalburgCity_Gym_Text_17AE11, PetalburgCity_Gym_EventScript_154E1A goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_154E29 msgbox PetalburgCity_Gym_Text_17AE30, 6 end @@ -761,7 +761,7 @@ PetalburgCity_Gym_EventScript_154E29:: @ 8154E29 end PetalburgCity_Gym_EventScript_154E32:: @ 8154E32 - trainerbattle 2, TRAINER_PARKER, 0, PetalburgCity_Gym_Text_17AF5A, PetalburgCity_Gym_Text_17AF98, PetalburgCity_Gym_EventScript_154E56 + trainerbattle_single TRAINER_PARKER, PetalburgCity_Gym_Text_17AF5A, PetalburgCity_Gym_Text_17AF98, PetalburgCity_Gym_EventScript_154E56 goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_154E65 msgbox PetalburgCity_Gym_Text_17AFD3, 6 end @@ -778,7 +778,7 @@ PetalburgCity_Gym_EventScript_154E65:: @ 8154E65 end PetalburgCity_Gym_EventScript_154E6E:: @ 8154E6E - trainerbattle 2, TRAINER_GEORGE, 0, PetalburgCity_Gym_Text_17B058, PetalburgCity_Gym_Text_17B0F7, PetalburgCity_Gym_EventScript_154E92 + trainerbattle_single TRAINER_GEORGE, PetalburgCity_Gym_Text_17B058, PetalburgCity_Gym_Text_17B0F7, PetalburgCity_Gym_EventScript_154E92 goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_154EA1 msgbox PetalburgCity_Gym_Text_17B12C, 6 end @@ -795,7 +795,7 @@ PetalburgCity_Gym_EventScript_154EA1:: @ 8154EA1 end PetalburgCity_Gym_EventScript_154EAA:: @ 8154EAA - trainerbattle 2, TRAINER_BERKE, 0, PetalburgCity_Gym_Text_17B237, PetalburgCity_Gym_Text_17B2C0, PetalburgCity_Gym_EventScript_154ECE + trainerbattle_single TRAINER_BERKE, PetalburgCity_Gym_Text_17B237, PetalburgCity_Gym_Text_17B2C0, PetalburgCity_Gym_EventScript_154ECE goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_154EDD msgbox PetalburgCity_Gym_Text_17B2E4, 6 end @@ -812,7 +812,7 @@ PetalburgCity_Gym_EventScript_154EDD:: @ 8154EDD end PetalburgCity_Gym_EventScript_154EE6:: @ 8154EE6 - trainerbattle 2, TRAINER_MARY, 0, PetalburgCity_Gym_Text_17B3F7, PetalburgCity_Gym_Text_17B454, PetalburgCity_Gym_EventScript_154F0A + trainerbattle_single TRAINER_MARY, PetalburgCity_Gym_Text_17B3F7, PetalburgCity_Gym_Text_17B454, PetalburgCity_Gym_EventScript_154F0A goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_154F19 msgbox PetalburgCity_Gym_Text_17B46F, 6 end @@ -829,7 +829,7 @@ PetalburgCity_Gym_EventScript_154F19:: @ 8154F19 end PetalburgCity_Gym_EventScript_154F22:: @ 8154F22 - trainerbattle 2, TRAINER_LORI, 0, PetalburgCity_Gym_Text_17B58D, PetalburgCity_Gym_Text_17B5CB, PetalburgCity_Gym_EventScript_154F46 + trainerbattle_single TRAINER_LORI, PetalburgCity_Gym_Text_17B58D, PetalburgCity_Gym_Text_17B5CB, PetalburgCity_Gym_EventScript_154F46 goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_154F55 msgbox PetalburgCity_Gym_Text_17B5EA, 6 end @@ -846,7 +846,7 @@ PetalburgCity_Gym_EventScript_154F55:: @ 8154F55 end PetalburgCity_Gym_EventScript_154F5E:: @ 8154F5E - trainerbattle 2, TRAINER_JODY, 0, PetalburgCity_Gym_Text_17B6D4, PetalburgCity_Gym_Text_17B732, PetalburgCity_Gym_EventScript_154F82 + trainerbattle_single TRAINER_JODY, PetalburgCity_Gym_Text_17B6D4, PetalburgCity_Gym_Text_17B732, PetalburgCity_Gym_EventScript_154F82 goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_154F91 msgbox PetalburgCity_Gym_Text_17B749, 6 end diff --git a/data/maps/PetalburgCity_WallysHouse/scripts.inc b/data/maps/PetalburgCity_WallysHouse/scripts.inc index 1a1605817..399787135 100644 --- a/data/maps/PetalburgCity_WallysHouse/scripts.inc +++ b/data/maps/PetalburgCity_WallysHouse/scripts.inc @@ -20,7 +20,7 @@ PetalburgCity_WallysHouse_EventScript_1543F7:: @ 81543F7 PetalburgCity_WallysHouse_EventScript_154406:: @ 8154406 msgbox PetalburgCity_WallysHouse_Text_179996, 4 - giveitem_std ITEM_HM03_SURF + giveitem ITEM_HM03_SURF setflag FLAG_RECEIVED_HM03 msgbox PetalburgCity_WallysHouse_Text_179B14, 4 release diff --git a/data/maps/PetalburgWoods/scripts.inc b/data/maps/PetalburgWoods/scripts.inc index 57e4d1478..c93886f13 100644 --- a/data/maps/PetalburgWoods/scripts.inc +++ b/data/maps/PetalburgWoods/scripts.inc @@ -30,7 +30,7 @@ PetalburgWoods_EventScript_15CCA8:: @ 815CCA8 applymovement 3, PetalburgWoods_Movement_15CEC8 waitmovement 0 msgbox PetalburgWoods_Text_194EE8, 4 - trainerbattle 3, TRAINER_PETALBURG_WOODS_GRUNT, 0, PetalburgWoods_Text_194F83 + trainerbattle_no_intro TRAINER_PETALBURG_WOODS_GRUNT, PetalburgWoods_Text_194F83 applymovement 3, PetalburgWoods_Movement_15CEB3 waitmovement 0 call PetalburgWoods_EventScript_15CDFA @@ -65,7 +65,7 @@ PetalburgWoods_EventScript_15CD42:: @ 815CD42 applymovement 255, PetalburgWoods_Movement_1A0841 waitmovement 0 msgbox PetalburgWoods_Text_194EE8, 4 - trainerbattle 3, TRAINER_PETALBURG_WOODS_GRUNT, 0, PetalburgWoods_Text_194F83 + trainerbattle_no_intro TRAINER_PETALBURG_WOODS_GRUNT, PetalburgWoods_Text_194F83 applymovement 3, PetalburgWoods_Movement_15CEB3 waitmovement 0 call PetalburgWoods_EventScript_15CDFA @@ -90,7 +90,7 @@ PetalburgWoods_EventScript_15CDFA:: @ 815CDFA applymovement 255, PetalburgWoods_Movement_1A0845 waitmovement 0 msgbox PetalburgWoods_Text_19507E, 4 - giveitem_std ITEM_GREAT_BALL + giveitem ITEM_GREAT_BALL compare VAR_RESULT, 0 goto_if_eq PetalburgWoods_EventScript_15CE3F goto PetalburgWoods_EventScript_15CE4D @@ -243,7 +243,7 @@ PetalburgWoods_EventScript_15CEDC:: @ 815CEDC faceplayer goto_if_set FLAG_RECEIVED_MIRACLE_SEED, PetalburgWoods_EventScript_15CF0B msgbox PetalburgWoods_Text_19549E, 4 - giveitem_std ITEM_MIRACLE_SEED + giveitem ITEM_MIRACLE_SEED compare VAR_RESULT, 0 goto_if_eq PetalburgWoods_EventScript_1A029B setflag FLAG_RECEIVED_MIRACLE_SEED @@ -264,12 +264,12 @@ PetalburgWoods_EventScript_15CF1E:: @ 815CF1E end PetalburgWoods_EventScript_15CF27:: @ 815CF27 - trainerbattle 0, TRAINER_LYLE, 0, PetalburgWoods_Text_1951BE, PetalburgWoods_Text_195202 + trainerbattle_single TRAINER_LYLE, PetalburgWoods_Text_1951BE, PetalburgWoods_Text_195202 msgbox PetalburgWoods_Text_195232, 6 end PetalburgWoods_EventScript_15CF3E:: @ 815CF3E - trainerbattle 0, TRAINER_JAMES_1, 0, PetalburgWoods_Text_19526A, PetalburgWoods_Text_1952AE + trainerbattle_single TRAINER_JAMES_1, PetalburgWoods_Text_19526A, PetalburgWoods_Text_1952AE specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if_eq PetalburgWoods_EventScript_15CF65 @@ -277,6 +277,6 @@ PetalburgWoods_EventScript_15CF3E:: @ 815CF3E end PetalburgWoods_EventScript_15CF65:: @ 815CF65 - trainerbattle 5, TRAINER_JAMES_1, 0, PetalburgWoods_Text_195306, PetalburgWoods_Text_195338 + trainerbattle_rematch TRAINER_JAMES_1, PetalburgWoods_Text_195306, PetalburgWoods_Text_195338 msgbox PetalburgWoods_Text_195356, 6 end diff --git a/data/maps/Route102/scripts.inc b/data/maps/Route102/scripts.inc index bdc1803c2..d83db818a 100644 --- a/data/maps/Route102/scripts.inc +++ b/data/maps/Route102/scripts.inc @@ -18,7 +18,7 @@ Route102_EventScript_14EAF5:: @ 814EAF5 end Route102_EventScript_14EAFE:: @ 814EAFE - trainerbattle 0, TRAINER_CALVIN_1, 0, Route102_Text_1B79C3, Route102_Text_1B7A2C + trainerbattle_single TRAINER_CALVIN_1, Route102_Text_1B79C3, Route102_Text_1B7A2C specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if_eq Route102_EventScript_14EB25 @@ -26,21 +26,21 @@ Route102_EventScript_14EAFE:: @ 814EAFE end Route102_EventScript_14EB25:: @ 814EB25 - trainerbattle 5, TRAINER_CALVIN_1, 0, Route102_Text_1B7A9F, Route102_Text_1B7AFD + trainerbattle_rematch TRAINER_CALVIN_1, Route102_Text_1B7A9F, Route102_Text_1B7AFD msgbox Route102_Text_1B7B2F, 6 end Route102_EventScript_14EB3C:: @ 814EB3C - trainerbattle 0, TRAINER_RICK, 0, Route102_Text_1B7C05, Route102_Text_1B7C40 + trainerbattle_single TRAINER_RICK, Route102_Text_1B7C05, Route102_Text_1B7C40 msgbox Route102_Text_1B7C52, 6 end Route102_EventScript_14EB53:: @ 814EB53 - trainerbattle 0, TRAINER_TIANA, 0, Route102_Text_1B7C97, Route102_Text_1B7CEC + trainerbattle_single TRAINER_TIANA, Route102_Text_1B7C97, Route102_Text_1B7CEC msgbox Route102_Text_1B7D11, 6 end Route102_EventScript_14EB6A:: @ 814EB6A - trainerbattle 0, TRAINER_ALLEN, 0, Route102_Text_1B7B68, Route102_Text_1B7B9D + trainerbattle_single TRAINER_ALLEN, Route102_Text_1B7B68, Route102_Text_1B7B9D msgbox Route102_Text_1B7BD0, 6 end diff --git a/data/maps/Route103/scripts.inc b/data/maps/Route103/scripts.inc index ec9ae2420..a5c0ae0c4 100644 --- a/data/maps/Route103/scripts.inc +++ b/data/maps/Route103/scripts.inc @@ -49,32 +49,32 @@ Route103_EventScript_14EC04:: @ 814EC04 end Route103_EventScript_14EC5D:: @ 814EC5D - trainerbattle 3, TRAINER_MAY_4, 0, Route103_Text_16D65B + trainerbattle_no_intro TRAINER_MAY_4, Route103_Text_16D65B goto Route103_EventScript_14ECBD end Route103_EventScript_14EC6D:: @ 814EC6D - trainerbattle 3, TRAINER_MAY_7, 0, Route103_Text_16D65B + trainerbattle_no_intro TRAINER_MAY_7, Route103_Text_16D65B goto Route103_EventScript_14ECBD end Route103_EventScript_14EC7D:: @ 814EC7D - trainerbattle 3, TRAINER_MAY_1, 0, Route103_Text_16D65B + trainerbattle_no_intro TRAINER_MAY_1, Route103_Text_16D65B goto Route103_EventScript_14ECBD end Route103_EventScript_14EC8D:: @ 814EC8D - trainerbattle 3, TRAINER_BRENDAN_4, 0, Route103_Text_16D836 + trainerbattle_no_intro TRAINER_BRENDAN_4, Route103_Text_16D836 goto Route103_EventScript_14ECCB end Route103_EventScript_14EC9D:: @ 814EC9D - trainerbattle 3, TRAINER_BRENDAN_7, 0, Route103_Text_16D836 + trainerbattle_no_intro TRAINER_BRENDAN_7, Route103_Text_16D836 goto Route103_EventScript_14ECCB end Route103_EventScript_14ECAD:: @ 814ECAD - trainerbattle 3, TRAINER_BRENDAN_1, 0, Route103_Text_16D836 + trainerbattle_no_intro TRAINER_BRENDAN_1, Route103_Text_16D836 goto Route103_EventScript_14ECCB end @@ -167,12 +167,12 @@ Route103_EventScript_14ED8B:: @ 814ED8B end Route103_EventScript_14ED94:: @ 814ED94 - trainerbattle 0, TRAINER_DAISY, 0, Route103_Text_1B7D55, Route103_Text_1B7D8B + trainerbattle_single TRAINER_DAISY, Route103_Text_1B7D55, Route103_Text_1B7D8B msgbox Route103_Text_1B7DB2, 6 end Route103_EventScript_14EDAB:: @ 814EDAB - trainerbattle 4, TRAINER_AMY_AND_LIV_1, 0, Route103_Text_1B7DF7, Route103_Text_1B7E3B, Route103_Text_1B7EAC + trainerbattle_double TRAINER_AMY_AND_LIV_1, Route103_Text_1B7DF7, Route103_Text_1B7E3B, Route103_Text_1B7EAC specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if_eq Route103_EventScript_14EDD6 @@ -180,12 +180,12 @@ Route103_EventScript_14EDAB:: @ 814EDAB end Route103_EventScript_14EDD6:: @ 814EDD6 - trainerbattle 7, TRAINER_AMY_AND_LIV_1, 0, Route103_Text_1B7FE7, Route103_Text_1B802B, Route103_Text_1B80AF + trainerbattle_rematch_double TRAINER_AMY_AND_LIV_1, Route103_Text_1B7FE7, Route103_Text_1B802B, Route103_Text_1B80AF msgbox Route103_Text_1B8053, 6 end Route103_EventScript_14EDF1:: @ 814EDF1 - trainerbattle 4, TRAINER_AMY_AND_LIV_1, 0, Route103_Text_1B7EFB, Route103_Text_1B7F20, Route103_Text_1B7F8E + trainerbattle_double TRAINER_AMY_AND_LIV_1, Route103_Text_1B7EFB, Route103_Text_1B7F20, Route103_Text_1B7F8E specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if_eq Route103_EventScript_14EE1C @@ -193,17 +193,17 @@ Route103_EventScript_14EDF1:: @ 814EDF1 end Route103_EventScript_14EE1C:: @ 814EE1C - trainerbattle 7, TRAINER_AMY_AND_LIV_1, 0, Route103_Text_1B80FE, Route103_Text_1B8123, Route103_Text_1B81A1 + trainerbattle_rematch_double TRAINER_AMY_AND_LIV_1, Route103_Text_1B80FE, Route103_Text_1B8123, Route103_Text_1B81A1 msgbox Route103_Text_1B814D, 6 end Route103_EventScript_14EE37:: @ 814EE37 - trainerbattle 0, TRAINER_ANDREW, 0, Route103_Text_1B81FA, Route103_Text_1B8258 + trainerbattle_single TRAINER_ANDREW, Route103_Text_1B81FA, Route103_Text_1B8258 msgbox Route103_Text_1B8281, 6 end Route103_EventScript_14EE4E:: @ 814EE4E - trainerbattle 0, TRAINER_MIGUEL_1, 0, Route103_Text_1B82A9, Route103_Text_1B82EC + trainerbattle_single TRAINER_MIGUEL_1, Route103_Text_1B82A9, Route103_Text_1B82EC specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if_eq Route103_EventScript_14EE75 @@ -211,6 +211,6 @@ Route103_EventScript_14EE4E:: @ 814EE4E end Route103_EventScript_14EE75:: @ 814EE75 - trainerbattle 5, TRAINER_MIGUEL_1, 0, Route103_Text_1B8349, Route103_Text_1B838C + trainerbattle_rematch TRAINER_MIGUEL_1, Route103_Text_1B8349, Route103_Text_1B838C msgbox Route103_Text_1B83A4, 6 end diff --git a/data/maps/Route104/scripts.inc b/data/maps/Route104/scripts.inc index 9e475791f..9e9789287 100644 --- a/data/maps/Route104/scripts.inc +++ b/data/maps/Route104/scripts.inc @@ -31,7 +31,7 @@ Route104_EventScript_14EEC8:: @ 814EEC8 faceplayer goto_if_set FLAG_RECEIVED_CHESTO_BERRY_ROUTE104, Route104_EventScript_14EEFF msgbox Route104_Text_1C55B9, 4 - giveitem_std ITEM_CHESTO_BERRY + giveitem ITEM_CHESTO_BERRY compare VAR_RESULT, 0 goto_if_eq Route104_EventScript_1A029B setflag FLAG_RECEIVED_CHESTO_BERRY_ROUTE104 @@ -49,7 +49,7 @@ Route104_EventScript_14EF09:: @ 814EF09 faceplayer goto_if_set FLAG_RECEIVED_WHITE_HERB, Route104_EventScript_14EF38 msgbox Route104_Text_16DD91, 4 - giveitem_std ITEM_WHITE_HERB + giveitem ITEM_WHITE_HERB compare VAR_RESULT, 0 goto_if_eq Route104_EventScript_1A029B setflag FLAG_RECEIVED_WHITE_HERB @@ -102,7 +102,7 @@ Route104_EventScript_14EF93:: @ 814EF93 faceplayer goto_if_set FLAG_RECEIVED_TM09, Route104_EventScript_14EFC2 msgbox Route104_Text_16DC5F, 4 - giveitem_std ITEM_TM09_BULLET_SEED + giveitem ITEM_TM09_BULLET_SEED compare VAR_RESULT, 0 goto_if_eq Route104_EventScript_1A029B setflag FLAG_RECEIVED_TM09 @@ -391,17 +391,17 @@ Route104_Movement_14F16F:: @ 814F16F end_movement Route104_EventScript_14F172:: @ 814F172 - trainerbattle 0, TRAINER_IVAN, 0, Route104_Text_1B85EB, Route104_Text_1B8637 + trainerbattle_single TRAINER_IVAN, Route104_Text_1B85EB, Route104_Text_1B8637 msgbox Route104_Text_1B8680, 6 end Route104_EventScript_14F189:: @ 814F189 - trainerbattle 0, TRAINER_BILLY, 0, Route104_Text_1B86BE, Route104_Text_1B86E8 + trainerbattle_single TRAINER_BILLY, Route104_Text_1B86BE, Route104_Text_1B86E8 msgbox Route104_Text_1B871C, 6 end Route104_EventScript_14F1A0:: @ 814F1A0 - trainerbattle 0, TRAINER_HALEY_1, 0, Route104_Text_1B8770, Route104_Text_1B87A7 + trainerbattle_single TRAINER_HALEY_1, Route104_Text_1B8770, Route104_Text_1B87A7 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if_eq Route104_EventScript_14F1C7 @@ -409,12 +409,12 @@ Route104_EventScript_14F1A0:: @ 814F1A0 end Route104_EventScript_14F1C7:: @ 814F1C7 - trainerbattle 5, TRAINER_HALEY_1, 0, Route104_Text_1B8839, Route104_Text_1B8852 + trainerbattle_rematch TRAINER_HALEY_1, Route104_Text_1B8839, Route104_Text_1B8852 msgbox Route104_Text_1B8872, 6 end Route104_EventScript_14F1DE:: @ 814F1DE - trainerbattle 0, TRAINER_WINSTON_1, 0, Route104_Text_1B88D4, Route104_Text_1B8911 + trainerbattle_single TRAINER_WINSTON_1, Route104_Text_1B88D4, Route104_Text_1B8911 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if_eq Route104_EventScript_14F205 @@ -422,12 +422,12 @@ Route104_EventScript_14F1DE:: @ 814F1DE end Route104_EventScript_14F205:: @ 814F205 - trainerbattle 5, TRAINER_WINSTON_1, 0, Route104_Text_1B895E, Route104_Text_1B899E + trainerbattle_rematch TRAINER_WINSTON_1, Route104_Text_1B895E, Route104_Text_1B899E msgbox Route104_Text_1B89C0, 6 end Route104_EventScript_14F21C:: @ 814F21C - trainerbattle 0, TRAINER_CINDY_1, 0, Route104_Text_1B8A24, Route104_Text_1B8A61 + trainerbattle_single TRAINER_CINDY_1, Route104_Text_1B8A24, Route104_Text_1B8A61 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if_eq Route104_EventScript_14F243 @@ -435,19 +435,19 @@ Route104_EventScript_14F21C:: @ 814F21C end Route104_EventScript_14F243:: @ 814F243 - trainerbattle 5, TRAINER_CINDY_1, 0, Route104_Text_1B8AA7, Route104_Text_1B8AD9 + trainerbattle_rematch TRAINER_CINDY_1, Route104_Text_1B8AA7, Route104_Text_1B8AD9 msgbox Route104_Text_1B8B02, 6 end Route104_EventScript_14F25A:: @ 814F25A - trainerbattle 4, TRAINER_GINA_AND_MIA_1, 0, Route104_Text_1B83E9, Route104_Text_1B8414, Route104_Text_1B845C + trainerbattle_double TRAINER_GINA_AND_MIA_1, Route104_Text_1B83E9, Route104_Text_1B8414, Route104_Text_1B845C special GetPlayerBigGuyGirlString msgbox Route104_Text_1B842C, 4 release end Route104_EventScript_14F279:: @ 814F279 - trainerbattle 4, TRAINER_GINA_AND_MIA_1, 0, Route104_Text_1B84DB, Route104_Text_1B850D, Route104_Text_1B8577 + trainerbattle_double TRAINER_GINA_AND_MIA_1, Route104_Text_1B84DB, Route104_Text_1B850D, Route104_Text_1B8577 special GetPlayerBigGuyGirlString msgbox Route104_Text_1B853B, 4 release diff --git a/data/maps/Route104_PrettyPetalFlowerShop/scripts.inc b/data/maps/Route104_PrettyPetalFlowerShop/scripts.inc index fa9d98c16..341ed1d6d 100644 --- a/data/maps/Route104_PrettyPetalFlowerShop/scripts.inc +++ b/data/maps/Route104_PrettyPetalFlowerShop/scripts.inc @@ -75,7 +75,7 @@ Route104_PrettyPetalFlowerShop_EventScript_15BEA4:: @ 815BEA4 Route104_PrettyPetalFlowerShop_EventScript_15BEB9:: @ 815BEB9 msgbox Route104_PrettyPetalFlowerShop_Text_1C6158, 4 - giveitem_std ITEM_WAILMER_PAIL + giveitem ITEM_WAILMER_PAIL msgbox Route104_PrettyPetalFlowerShop_Text_1C61E8, 4 setflag FLAG_RECEIVED_WAILMER_PAIL release @@ -84,12 +84,12 @@ Route104_PrettyPetalFlowerShop_EventScript_15BEB9:: @ 815BEB9 Route104_PrettyPetalFlowerShop_EventScript_15BEDA:: @ 815BEDA lock faceplayer - dodailyevents + dotimebasedevents goto_if_set FLAG_DAILY_RECEIVED_BERRY_FLOWER_SHOP, Route104_PrettyPetalFlowerShop_EventScript_15BF1A msgbox Route104_PrettyPetalFlowerShop_Text_1C62DA, 4 random 8 addvar VAR_RESULT, ITEM_CHERI_BERRY - giveitem_std VAR_RESULT + giveitem VAR_RESULT compare VAR_RESULT, 0 goto_if_eq Route104_PrettyPetalFlowerShop_EventScript_1A029B setflag FLAG_DAILY_RECEIVED_BERRY_FLOWER_SHOP diff --git a/data/maps/Route104_Prototype/scripts.inc b/data/maps/Route104_Prototype/scripts.inc index 1b8458e62..daeca526a 100644 --- a/data/maps/Route104_Prototype/scripts.inc +++ b/data/maps/Route104_Prototype/scripts.inc @@ -4,12 +4,12 @@ Route104_Prototype_MapScripts:: @ 8160C4A Route104_Prototype_EventScript_160C4B:: @ 8160C4B lock faceplayer - goto_if_trainer_not_defeated TRAINER_BRIANNA_1, Route104_Prototype_EventScript_160C99 - goto_if_trainer_not_defeated TRAINER_CINDY_2, Route104_Prototype_EventScript_160C99 - goto_if_trainer_not_defeated TRAINER_AMY_AND_LIV_3, Route104_Prototype_EventScript_160C99 - goto_if_trainer_not_defeated TRAINER_GINA_AND_MIA_2, Route104_Prototype_EventScript_160C99 - goto_if_trainer_not_defeated TRAINER_LUCAS_2, Route104_Prototype_EventScript_160C99 - goto_if_trainer_not_defeated TRAINER_MIKE_1, Route104_Prototype_EventScript_160C99 + goto_if_not_defeated TRAINER_BRIANNA_1, Route104_Prototype_EventScript_160C99 + goto_if_not_defeated TRAINER_CINDY_2, Route104_Prototype_EventScript_160C99 + goto_if_not_defeated TRAINER_AMY_AND_LIV_3, Route104_Prototype_EventScript_160C99 + goto_if_not_defeated TRAINER_GINA_AND_MIA_2, Route104_Prototype_EventScript_160C99 + goto_if_not_defeated TRAINER_LUCAS_2, Route104_Prototype_EventScript_160C99 + goto_if_not_defeated TRAINER_MIKE_1, Route104_Prototype_EventScript_160C99 setflag FLAG_ROUTE104_PROTOTYPE_COMPLETED_1 msgbox Route104_Prototype_Text_19B267, 4 goto_if_set FLAG_ROUTE104_PROTOTYPE_COMPLETED_2, Route104_Prototype_EventScript_160CFB @@ -24,12 +24,12 @@ Route104_Prototype_EventScript_160C99:: @ 8160C99 Route104_Prototype_EventScript_160CA3:: @ 8160CA3 lock faceplayer - goto_if_trainer_not_defeated TRAINER_BRIANNA_1, Route104_Prototype_EventScript_160CF1 - goto_if_trainer_not_defeated TRAINER_CINDY_2, Route104_Prototype_EventScript_160CF1 - goto_if_trainer_not_defeated TRAINER_AMY_AND_LIV_3, Route104_Prototype_EventScript_160CF1 - goto_if_trainer_not_defeated TRAINER_GINA_AND_MIA_2, Route104_Prototype_EventScript_160CF1 - goto_if_trainer_not_defeated TRAINER_LUCAS_2, Route104_Prototype_EventScript_160CF1 - goto_if_trainer_not_defeated TRAINER_MIKE_1, Route104_Prototype_EventScript_160CF1 + goto_if_not_defeated TRAINER_BRIANNA_1, Route104_Prototype_EventScript_160CF1 + goto_if_not_defeated TRAINER_CINDY_2, Route104_Prototype_EventScript_160CF1 + goto_if_not_defeated TRAINER_AMY_AND_LIV_3, Route104_Prototype_EventScript_160CF1 + goto_if_not_defeated TRAINER_GINA_AND_MIA_2, Route104_Prototype_EventScript_160CF1 + goto_if_not_defeated TRAINER_LUCAS_2, Route104_Prototype_EventScript_160CF1 + goto_if_not_defeated TRAINER_MIKE_1, Route104_Prototype_EventScript_160CF1 setflag FLAG_ROUTE104_PROTOTYPE_COMPLETED_2 msgbox Route104_Prototype_Text_19B2E9, 4 goto_if_set FLAG_ROUTE104_PROTOTYPE_COMPLETED_1, Route104_Prototype_EventScript_160CFB @@ -68,31 +68,31 @@ Route104_Prototype_EventScript_160D25:: @ 8160D25 end Route104_Prototype_EventScript_160D2E:: @ 8160D2E - trainerbattle 0, TRAINER_CINDY_2, 0, Route104_Prototype_Text_19AD9B, Route104_Prototype_Text_19ADDA + trainerbattle_single TRAINER_CINDY_2, Route104_Prototype_Text_19AD9B, Route104_Prototype_Text_19ADDA msgbox Route104_Prototype_Text_19ADF7, 6 end Route104_Prototype_EventScript_160D45:: @ 8160D45 - trainerbattle 4, TRAINER_AMY_AND_LIV_3, 0, Route104_Prototype_Text_19AE3E, Route104_Prototype_Text_19AE53, Route104_Prototype_Text_19AEA9 + trainerbattle_double TRAINER_AMY_AND_LIV_3, Route104_Prototype_Text_19AE3E, Route104_Prototype_Text_19AE53, Route104_Prototype_Text_19AEA9 msgbox Route104_Prototype_Text_19AE6A, 6 end Route104_Prototype_EventScript_160D60:: @ 8160D60 - trainerbattle 4, TRAINER_GINA_AND_MIA_2, 0, Route104_Prototype_Text_19B148, Route104_Prototype_Text_19B17D, Route104_Prototype_Text_19B1DD + trainerbattle_double TRAINER_GINA_AND_MIA_2, Route104_Prototype_Text_19B148, Route104_Prototype_Text_19B17D, Route104_Prototype_Text_19B1DD msgbox Route104_Prototype_Text_19B18D, 6 end Route104_Prototype_EventScript_160D7B:: @ 8160D7B - trainerbattle 0, TRAINER_MIKE_1, 0, Route104_Prototype_Text_19AEFB, Route104_Prototype_Text_19AF3E + trainerbattle_single TRAINER_MIKE_1, Route104_Prototype_Text_19AEFB, Route104_Prototype_Text_19AF3E msgbox Route104_Prototype_Text_19AF56, 6 end Route104_Prototype_EventScript_160D92:: @ 8160D92 - trainerbattle 0, TRAINER_BRIANNA_1, 0, Route104_Prototype_Text_19AF8A, Route104_Prototype_Text_19AFDB + trainerbattle_single TRAINER_BRIANNA_1, Route104_Prototype_Text_19AF8A, Route104_Prototype_Text_19AFDB msgbox Route104_Prototype_Text_19B00D, 6 end Route104_Prototype_EventScript_160DA9:: @ 8160DA9 - trainerbattle 0, TRAINER_LUCAS_2, 0, Route104_Prototype_Text_19B066, Route104_Prototype_Text_19B0D7 + trainerbattle_single TRAINER_LUCAS_2, Route104_Prototype_Text_19B066, Route104_Prototype_Text_19B0D7 msgbox Route104_Prototype_Text_19B0EF, 6 end diff --git a/data/maps/Route105/scripts.inc b/data/maps/Route105/scripts.inc index 7d0eeb62d..8afe141d2 100644 --- a/data/maps/Route105/scripts.inc +++ b/data/maps/Route105/scripts.inc @@ -12,26 +12,26 @@ Route105_EventScript_14F2A8:: @ 814F2A8 return Route105_EventScript_14F2BB:: @ 814F2BB - trainerbattle 0, TRAINER_FOSTER, 0, Route105_Text_1B8B40, Route105_Text_1B8B93 + trainerbattle_single TRAINER_FOSTER, Route105_Text_1B8B40, Route105_Text_1B8B93 msgbox Route105_Text_1B8BDE, 6 end Route105_EventScript_14F2D2:: @ 814F2D2 - trainerbattle 0, TRAINER_LUIS, 0, Route105_Text_1B8C28, Route105_Text_1B8C99 + trainerbattle_single TRAINER_LUIS, Route105_Text_1B8C28, Route105_Text_1B8C99 msgbox Route105_Text_1B8CA9, 6 end Route105_EventScript_14F2E9:: @ 814F2E9 - trainerbattle 0, TRAINER_AUSTIN, 0, Route105_Text_1B8CEE, Route105_Text_1B8D23 + trainerbattle_single TRAINER_AUSTIN, Route105_Text_1B8CEE, Route105_Text_1B8D23 msgbox Route105_Text_1B8D45, 6 end Route105_EventScript_14F300:: @ 814F300 - trainerbattle 0, TRAINER_BEVERLY, 0, Route105_Text_1B8D99, Route105_Text_1B8DDD + trainerbattle_single TRAINER_BEVERLY, Route105_Text_1B8D99, Route105_Text_1B8DDD msgbox Route105_Text_1B8DED, 6 end Route105_EventScript_14F317:: @ 814F317 - trainerbattle 0, TRAINER_DAWN, 0, Route105_Text_1B8E66, Route105_Text_1B8EA0 + trainerbattle_single TRAINER_DAWN, Route105_Text_1B8E66, Route105_Text_1B8EA0 msgbox Route105_Text_1B8EBD, 6 end diff --git a/data/maps/Route106/scripts.inc b/data/maps/Route106/scripts.inc index 1fe49235b..dba3041d6 100644 --- a/data/maps/Route106/scripts.inc +++ b/data/maps/Route106/scripts.inc @@ -6,17 +6,17 @@ Route106_EventScript_14F32F:: @ 814F32F end Route106_EventScript_14F338:: @ 814F338 - trainerbattle 0, TRAINER_DOUGLAS, 0, Route106_Text_1B913D, Route106_Text_1B917F + trainerbattle_single TRAINER_DOUGLAS, Route106_Text_1B913D, Route106_Text_1B917F msgbox Route106_Text_1B918A, 6 end Route106_EventScript_14F34F:: @ 814F34F - trainerbattle 0, TRAINER_NICOLE, 0, Route106_Text_1B91AC, Route106_Text_1B91F8 + trainerbattle_single TRAINER_NICOLE, Route106_Text_1B91AC, Route106_Text_1B91F8 msgbox Route106_Text_1B9222, 6 end Route106_EventScript_14F366:: @ 814F366 - trainerbattle 0, TRAINER_ELLIOT_1, 0, Route106_Text_1B8EF0, Route106_Text_1B8F25 + trainerbattle_single TRAINER_ELLIOT_1, Route106_Text_1B8EF0, Route106_Text_1B8F25 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if_eq Route106_EventScript_14F38D @@ -24,11 +24,11 @@ Route106_EventScript_14F366:: @ 814F366 end Route106_EventScript_14F38D:: @ 814F38D - trainerbattle 5, TRAINER_ELLIOT_1, 0, Route106_Text_1B8FAC, Route106_Text_1B8FF5 + trainerbattle_rematch TRAINER_ELLIOT_1, Route106_Text_1B8FAC, Route106_Text_1B8FF5 msgbox Route106_Text_1B9011, 6 end Route106_EventScript_14F3A4:: @ 814F3A4 - trainerbattle 0, TRAINER_NED, 0, Route106_Text_1B9052, Route106_Text_1B90D3 + trainerbattle_single TRAINER_NED, Route106_Text_1B9052, Route106_Text_1B90D3 msgbox Route106_Text_1B910A, 6 end diff --git a/data/maps/Route107/scripts.inc b/data/maps/Route107/scripts.inc index 5ad30f9f4..657811fc6 100644 --- a/data/maps/Route107/scripts.inc +++ b/data/maps/Route107/scripts.inc @@ -2,12 +2,12 @@ Route107_MapScripts:: @ 814F3BB .byte 0 Route107_EventScript_14F3BC:: @ 814F3BC - trainerbattle 0, TRAINER_DARRIN, 0, Route107_Text_1B926B, Route107_Text_1B92B7 + trainerbattle_single TRAINER_DARRIN, Route107_Text_1B926B, Route107_Text_1B92B7 msgbox Route107_Text_1B92E7, 6 end Route107_EventScript_14F3D3:: @ 814F3D3 - trainerbattle 0, TRAINER_TONY_1, 0, Route107_Text_1B933A, Route107_Text_1B9365 + trainerbattle_single TRAINER_TONY_1, Route107_Text_1B933A, Route107_Text_1B9365 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if_eq Route107_EventScript_14F3FA @@ -15,26 +15,26 @@ Route107_EventScript_14F3D3:: @ 814F3D3 end Route107_EventScript_14F3FA:: @ 814F3FA - trainerbattle 5, TRAINER_TONY_1, 0, Route107_Text_1B93EB, Route107_Text_1B9429 + trainerbattle_rematch TRAINER_TONY_1, Route107_Text_1B93EB, Route107_Text_1B9429 msgbox Route107_Text_1B9477, 6 end Route107_EventScript_14F411:: @ 814F411 - trainerbattle 0, TRAINER_DENISE, 0, Route107_Text_1B94C8, Route107_Text_1B94F2 + trainerbattle_single TRAINER_DENISE, Route107_Text_1B94C8, Route107_Text_1B94F2 msgbox Route107_Text_1B94FF, 6 end Route107_EventScript_14F428:: @ 814F428 - trainerbattle 0, TRAINER_BETH, 0, Route107_Text_1B9538, Route107_Text_1B956B + trainerbattle_single TRAINER_BETH, Route107_Text_1B9538, Route107_Text_1B956B msgbox Route107_Text_1B9589, 6 end Route107_EventScript_14F43F:: @ 814F43F - trainerbattle 4, TRAINER_LISA_AND_RAY, 0, Route107_Text_1B95CB, Route107_Text_1B95FB, Route107_Text_1B9672 + trainerbattle_double TRAINER_LISA_AND_RAY, Route107_Text_1B95CB, Route107_Text_1B95FB, Route107_Text_1B9672 msgbox Route107_Text_1B9630, 6 end Route107_EventScript_14F45A:: @ 814F45A - trainerbattle 4, TRAINER_LISA_AND_RAY, 0, Route107_Text_1B96AB, Route107_Text_1B9707, Route107_Text_1B9788 + trainerbattle_double TRAINER_LISA_AND_RAY, Route107_Text_1B96AB, Route107_Text_1B9707, Route107_Text_1B9788 msgbox Route107_Text_1B9735, 6 end diff --git a/data/maps/Route108/scripts.inc b/data/maps/Route108/scripts.inc index 498a52a51..117291ffd 100644 --- a/data/maps/Route108/scripts.inc +++ b/data/maps/Route108/scripts.inc @@ -2,21 +2,21 @@ Route108_MapScripts:: @ 814F475 .byte 0 Route108_EventScript_14F476:: @ 814F476 - trainerbattle 0, TRAINER_JEROME, 0, Route108_Text_1B97C3, Route108_Text_1B97EF + trainerbattle_single TRAINER_JEROME, Route108_Text_1B97C3, Route108_Text_1B97EF msgbox Route108_Text_1B9823, 6 end Route108_EventScript_14F48D:: @ 814F48D - trainerbattle 0, TRAINER_MATTHEW, 0, Route108_Text_1B9864, Route108_Text_1B989F + trainerbattle_single TRAINER_MATTHEW, Route108_Text_1B9864, Route108_Text_1B989F msgbox Route108_Text_1B98BC, 6 end Route108_EventScript_14F4A4:: @ 814F4A4 - trainerbattle 0, TRAINER_TARA, 0, Route108_Text_1B98EC, Route108_Text_1B992C + trainerbattle_single TRAINER_TARA, Route108_Text_1B98EC, Route108_Text_1B992C msgbox Route108_Text_1B9935, 6 end Route108_EventScript_14F4BB:: @ 814F4BB - trainerbattle 0, TRAINER_MISSY, 0, Route108_Text_1B9986, Route108_Text_1B99BB + trainerbattle_single TRAINER_MISSY, Route108_Text_1B9986, Route108_Text_1B99BB msgbox Route108_Text_1B99E9, 6 end diff --git a/data/maps/Route109/scripts.inc b/data/maps/Route109/scripts.inc index eeb21cacf..20678714d 100644 --- a/data/maps/Route109/scripts.inc +++ b/data/maps/Route109/scripts.inc @@ -329,7 +329,7 @@ Route109_EventScript_14F725:: @ 814F725 special GetPlayerBigGuyGirlString goto_if_set FLAG_RECEIVED_SOFT_SAND, Route109_EventScript_14F762 msgbox Route109_Text_16E433, 4 - giveitem_std ITEM_SOFT_SAND + giveitem ITEM_SOFT_SAND compare VAR_RESULT, 0 goto_if_eq Route109_EventScript_1A029B closemessage @@ -373,27 +373,27 @@ Route109_EventScript_14F7A4:: @ 814F7A4 end Route109_EventScript_14F7AD:: @ 814F7AD - trainerbattle 0, TRAINER_DAVID, 0, Route109_Text_1B9A1C, Route109_Text_1B9A59 + trainerbattle_single TRAINER_DAVID, Route109_Text_1B9A1C, Route109_Text_1B9A59 msgbox Route109_Text_1B9A6D, 6 end Route109_EventScript_14F7C4:: @ 814F7C4 - trainerbattle 0, TRAINER_ALICE, 0, Route109_Text_1B9AAD, Route109_Text_1B9AD9 + trainerbattle_single TRAINER_ALICE, Route109_Text_1B9AAD, Route109_Text_1B9AD9 msgbox Route109_Text_1B9AEB, 6 end Route109_EventScript_14F7DB:: @ 814F7DB - trainerbattle 0, TRAINER_HUEY, 0, Route109_Text_1B9B11, Route109_Text_1B9B57 + trainerbattle_single TRAINER_HUEY, Route109_Text_1B9B11, Route109_Text_1B9B57 msgbox Route109_Text_1B9B68, 6 end Route109_EventScript_14F7F2:: @ 814F7F2 - trainerbattle 0, TRAINER_EDMOND, 0, Route109_Text_1B9B91, Route109_Text_1B9BAE + trainerbattle_single TRAINER_EDMOND, Route109_Text_1B9B91, Route109_Text_1B9BAE msgbox Route109_Text_1B9BD3, 6 end Route109_EventScript_14F809:: @ 814F809 - trainerbattle 0, TRAINER_RICKY_1, 0, Route109_Text_1B9C23, Route109_Text_1B9C65 + trainerbattle_single TRAINER_RICKY_1, Route109_Text_1B9C23, Route109_Text_1B9C65 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if_eq Route109_EventScript_14F830 @@ -401,12 +401,12 @@ Route109_EventScript_14F809:: @ 814F809 end Route109_EventScript_14F830:: @ 814F830 - trainerbattle 5, TRAINER_RICKY_1, 0, Route109_Text_1B9CB3, Route109_Text_1B9CEB + trainerbattle_rematch TRAINER_RICKY_1, Route109_Text_1B9CB3, Route109_Text_1B9CEB msgbox Route109_Text_1B9D10, 6 end Route109_EventScript_14F847:: @ 814F847 - trainerbattle 0, TRAINER_LOLA_1, 0, Route109_Text_1B9D54, Route109_Text_1B9D87 + trainerbattle_single TRAINER_LOLA_1, Route109_Text_1B9D54, Route109_Text_1B9D87 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if_eq Route109_EventScript_14F86E @@ -414,31 +414,31 @@ Route109_EventScript_14F847:: @ 814F847 end Route109_EventScript_14F86E:: @ 814F86E - trainerbattle 5, TRAINER_LOLA_1, 0, Route109_Text_1B9DD8, Route109_Text_1B9E16 + trainerbattle_rematch TRAINER_LOLA_1, Route109_Text_1B9DD8, Route109_Text_1B9E16 msgbox Route109_Text_1B9E1D, 6 end Route109_EventScript_14F885:: @ 814F885 - trainerbattle 0, TRAINER_CARMEN, 0, Route109_Text_1B9E60, Route109_Text_1B9EA1 + trainerbattle_single TRAINER_CARMEN, Route109_Text_1B9E60, Route109_Text_1B9EA1 msgbox Route109_Text_1B9ECA, 6 end Route109_EventScript_14F89C:: @ 814F89C - trainerbattle 0, TRAINER_GWEN, 0, Route109_Text_1B9F07, Route109_Text_1B9F31 + trainerbattle_single TRAINER_GWEN, Route109_Text_1B9F07, Route109_Text_1B9F31 msgbox Route109_Text_1B9F44, 6 end Route109_EventScript_14F8B3:: @ 814F8B3 - trainerbattle 0, TRAINER_CARTER, 0, Route109_Text_1B9F65, Route109_Text_1B9F9C + trainerbattle_single TRAINER_CARTER, Route109_Text_1B9F65, Route109_Text_1B9F9C msgbox Route109_Text_1B9FB7, 6 end Route109_EventScript_14F8CA:: @ 814F8CA - trainerbattle 4, TRAINER_MEL_AND_PAUL, 0, Route109_Text_1B9FF6, Route109_Text_1BA052, Route109_Text_1BA0BF + trainerbattle_double TRAINER_MEL_AND_PAUL, Route109_Text_1B9FF6, Route109_Text_1BA052, Route109_Text_1BA0BF msgbox Route109_Text_1BA069, 6 end Route109_EventScript_14F8E5:: @ 814F8E5 - trainerbattle 4, TRAINER_MEL_AND_PAUL, 0, Route109_Text_1BA114, Route109_Text_1BA15F, Route109_Text_1BA1D0 + trainerbattle_double TRAINER_MEL_AND_PAUL, Route109_Text_1BA114, Route109_Text_1BA15F, Route109_Text_1BA1D0 msgbox Route109_Text_1BA193, 6 end diff --git a/data/maps/Route109_SeashoreHouse/scripts.inc b/data/maps/Route109_SeashoreHouse/scripts.inc index b4a731471..02449964b 100644 --- a/data/maps/Route109_SeashoreHouse/scripts.inc +++ b/data/maps/Route109_SeashoreHouse/scripts.inc @@ -24,7 +24,7 @@ Route109_SeashoreHouse_EventScript_160DFE:: @ 8160DFE Route109_SeashoreHouse_EventScript_160E08:: @ 8160E08 msgbox Route109_SeashoreHouse_Text_19B609, 4 - giveitem_std ITEM_SODA_POP, 6 + giveitem ITEM_SODA_POP, 6 compare VAR_RESULT, 0 goto_if_eq Route109_SeashoreHouse_EventScript_160E2C setflag FLAG_RECEIVED_6_SODA_POP @@ -48,17 +48,17 @@ Route109_SeashoreHouse_EventScript_160E36:: @ 8160E36 end Route109_SeashoreHouse_EventScript_160E5A:: @ 8160E5A - checkmoney 0x12c, 0 + checkmoney 300, 0 compare VAR_RESULT, 0 goto_if_eq Route109_SeashoreHouse_EventScript_160E9E checkitemspace ITEM_SODA_POP, 1 compare VAR_RESULT, 0 goto_if_eq Route109_SeashoreHouse_EventScript_160EAB msgbox Route109_SeashoreHouse_Text_19B74C, 4 - takemoney 0x12c, 0 + removemoney 300, 0 updatemoneybox 0, 0 nop - giveitem_std ITEM_SODA_POP + giveitem ITEM_SODA_POP hidemoneybox 0, 0 release end @@ -76,24 +76,24 @@ Route109_SeashoreHouse_EventScript_160EAB:: @ 8160EAB end Route109_SeashoreHouse_EventScript_160EB8:: @ 8160EB8 - trainerbattle 2, TRAINER_DWAYNE, 0, Route109_SeashoreHouse_Text_19B809, Route109_SeashoreHouse_Text_19B869, Route109_SeashoreHouse_EventScript_160F09 + trainerbattle_single TRAINER_DWAYNE, Route109_SeashoreHouse_Text_19B809, Route109_SeashoreHouse_Text_19B869, Route109_SeashoreHouse_EventScript_160F09 msgbox Route109_SeashoreHouse_Text_19B89F, 6 end Route109_SeashoreHouse_EventScript_160ED3:: @ 8160ED3 - trainerbattle 2, TRAINER_JOHANNA, 0, Route109_SeashoreHouse_Text_19B8E5, Route109_SeashoreHouse_Text_19B949, Route109_SeashoreHouse_EventScript_160F09 + trainerbattle_single TRAINER_JOHANNA, Route109_SeashoreHouse_Text_19B8E5, Route109_SeashoreHouse_Text_19B949, Route109_SeashoreHouse_EventScript_160F09 msgbox Route109_SeashoreHouse_Text_19B955, 6 end Route109_SeashoreHouse_EventScript_160EEE:: @ 8160EEE - trainerbattle 2, TRAINER_SIMON, 0, Route109_SeashoreHouse_Text_19B988, Route109_SeashoreHouse_Text_19B9C7, Route109_SeashoreHouse_EventScript_160F09 + trainerbattle_single TRAINER_SIMON, Route109_SeashoreHouse_Text_19B988, Route109_SeashoreHouse_Text_19B9C7, Route109_SeashoreHouse_EventScript_160F09 msgbox Route109_SeashoreHouse_Text_19B9E5, 6 end Route109_SeashoreHouse_EventScript_160F09:: @ 8160F09 - goto_if_trainer_not_defeated TRAINER_DWAYNE, Route109_SeashoreHouse_EventScript_160F29 - goto_if_trainer_not_defeated TRAINER_JOHANNA, Route109_SeashoreHouse_EventScript_160F29 - goto_if_trainer_not_defeated TRAINER_SIMON, Route109_SeashoreHouse_EventScript_160F29 + goto_if_not_defeated TRAINER_DWAYNE, Route109_SeashoreHouse_EventScript_160F29 + goto_if_not_defeated TRAINER_JOHANNA, Route109_SeashoreHouse_EventScript_160F29 + goto_if_not_defeated TRAINER_SIMON, Route109_SeashoreHouse_EventScript_160F29 setflag FLAG_DEFEATED_SEASHORE_HOUSE_TRAINERS release end diff --git a/data/maps/Route110/scripts.inc b/data/maps/Route110/scripts.inc index 077770cd2..003377ab0 100644 --- a/data/maps/Route110/scripts.inc +++ b/data/maps/Route110/scripts.inc @@ -166,17 +166,17 @@ Route110_EventScript_14FA84:: @ 814FA84 end Route110_EventScript_14FA8E:: @ 814FA8E - trainerbattle 0, TRAINER_EDWARD, 0, Route110_Text_1BA699, Route110_Text_1BA6D2 + trainerbattle_single TRAINER_EDWARD, Route110_Text_1BA699, Route110_Text_1BA6D2 msgbox Route110_Text_1BA6F8, 6 end Route110_EventScript_14FAA5:: @ 814FAA5 - trainerbattle 0, TRAINER_JACLYN, 0, Route110_Text_1BA72D, Route110_Text_1BA759 + trainerbattle_single TRAINER_JACLYN, Route110_Text_1BA72D, Route110_Text_1BA759 msgbox Route110_Text_1BA76C, 6 end Route110_EventScript_14FABC:: @ 814FABC - trainerbattle 0, TRAINER_EDWIN_1, 0, Route110_Text_1BA7D2, Route110_Text_1BA803 + trainerbattle_single TRAINER_EDWIN_1, Route110_Text_1BA7D2, Route110_Text_1BA803 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if_eq Route110_EventScript_14FAE3 @@ -184,27 +184,27 @@ Route110_EventScript_14FABC:: @ 814FABC end Route110_EventScript_14FAE3:: @ 814FAE3 - trainerbattle 5, TRAINER_EDWIN_1, 0, Route110_Text_1BA877, Route110_Text_1BA8CD + trainerbattle_rematch TRAINER_EDWIN_1, Route110_Text_1BA877, Route110_Text_1BA8CD msgbox Route110_Text_1BA8E9, 6 end Route110_EventScript_14FAFA:: @ 814FAFA - trainerbattle 0, TRAINER_DALE, 0, Route110_Text_1BA913, Route110_Text_1BA93C + trainerbattle_single TRAINER_DALE, Route110_Text_1BA913, Route110_Text_1BA93C msgbox Route110_Text_1BA94A, 6 end Route110_EventScript_14FB11:: @ 814FB11 - trainerbattle 0, TRAINER_JACOB, 0, Route110_Text_1BA22C, Route110_Text_1BA264 + trainerbattle_single TRAINER_JACOB, Route110_Text_1BA22C, Route110_Text_1BA264 msgbox Route110_Text_1BA27C, 6 end Route110_EventScript_14FB28:: @ 814FB28 - trainerbattle 0, TRAINER_ANTHONY, 0, Route110_Text_1BA2D4, Route110_Text_1BA2FC + trainerbattle_single TRAINER_ANTHONY, Route110_Text_1BA2D4, Route110_Text_1BA2FC msgbox Route110_Text_1BA30C, 6 end Route110_EventScript_14FB3F:: @ 814FB3F - trainerbattle 0, TRAINER_BENJAMIN_1, 0, Route110_Text_1BA352, Route110_Text_1BA379 + trainerbattle_single TRAINER_BENJAMIN_1, Route110_Text_1BA352, Route110_Text_1BA379 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if_eq Route110_EventScript_14FB66 @@ -212,17 +212,17 @@ Route110_EventScript_14FB3F:: @ 814FB3F end Route110_EventScript_14FB66:: @ 814FB66 - trainerbattle 5, TRAINER_BENJAMIN_1, 0, Route110_Text_1BA3EF, Route110_Text_1BA432 + trainerbattle_rematch TRAINER_BENJAMIN_1, Route110_Text_1BA3EF, Route110_Text_1BA432 msgbox Route110_Text_1BA456, 6 end Route110_EventScript_14FB7D:: @ 814FB7D - trainerbattle 0, TRAINER_JASMINE, 0, Route110_Text_1BA5FF, Route110_Text_1BA63C + trainerbattle_single TRAINER_JASMINE, Route110_Text_1BA5FF, Route110_Text_1BA63C msgbox Route110_Text_1BA65F, 6 end Route110_EventScript_14FB94:: @ 814FB94 - trainerbattle 0, TRAINER_ABIGAIL_1, 0, Route110_Text_1BA4A0, Route110_Text_1BA50F + trainerbattle_single TRAINER_ABIGAIL_1, Route110_Text_1BA4A0, Route110_Text_1BA50F specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if_eq Route110_EventScript_14FBBB @@ -230,12 +230,12 @@ Route110_EventScript_14FB94:: @ 814FB94 end Route110_EventScript_14FBBB:: @ 814FBBB - trainerbattle 5, TRAINER_ABIGAIL_1, 0, Route110_Text_1BA573, Route110_Text_1BA5A1 + trainerbattle_rematch TRAINER_ABIGAIL_1, Route110_Text_1BA573, Route110_Text_1BA5A1 msgbox Route110_Text_1BA5C4, 6 end Route110_EventScript_14FBD2:: @ 814FBD2 - trainerbattle 0, TRAINER_ISABEL_1, 0, Route110_Text_1BA990, Route110_Text_1BA9D0 + trainerbattle_single TRAINER_ISABEL_1, Route110_Text_1BA990, Route110_Text_1BA9D0 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if_eq Route110_EventScript_14FBF9 @@ -243,12 +243,12 @@ Route110_EventScript_14FBD2:: @ 814FBD2 end Route110_EventScript_14FBF9:: @ 814FBF9 - trainerbattle 5, TRAINER_ISABEL_1, 0, Route110_Text_1BAA2D, Route110_Text_1BAA76 + trainerbattle_rematch TRAINER_ISABEL_1, Route110_Text_1BAA2D, Route110_Text_1BAA76 msgbox Route110_Text_1BAA8F, 6 end Route110_EventScript_14FC10:: @ 814FC10 - trainerbattle 0, TRAINER_TIMMY, 0, Route110_Text_1BAAC3, Route110_Text_1BAAF7 + trainerbattle_single TRAINER_TIMMY, Route110_Text_1BAAC3, Route110_Text_1BAAF7 msgbox Route110_Text_1BAB19, 6 end @@ -368,17 +368,17 @@ Route110_EventScript_14FDB1:: @ 814FDB1 end Route110_EventScript_14FDE0:: @ 814FDE0 - trainerbattle 3, TRAINER_MAY_5, 0, Route110_Text_16E826 + trainerbattle_no_intro TRAINER_MAY_5, Route110_Text_16E826 goto Route110_EventScript_14FE10 end Route110_EventScript_14FDF0:: @ 814FDF0 - trainerbattle 3, TRAINER_MAY_8, 0, Route110_Text_16E826 + trainerbattle_no_intro TRAINER_MAY_8, Route110_Text_16E826 goto Route110_EventScript_14FE10 end Route110_EventScript_14FE00:: @ 814FE00 - trainerbattle 3, TRAINER_MAY_2, 0, Route110_Text_16E826 + trainerbattle_no_intro TRAINER_MAY_2, Route110_Text_16E826 goto Route110_EventScript_14FE10 end @@ -398,17 +398,17 @@ Route110_EventScript_14FE2B:: @ 814FE2B end Route110_EventScript_14FE5A:: @ 814FE5A - trainerbattle 3, TRAINER_BRENDAN_5, 0, Route110_Text_16EA0F + trainerbattle_no_intro TRAINER_BRENDAN_5, Route110_Text_16EA0F goto Route110_EventScript_14FE8A end Route110_EventScript_14FE6A:: @ 814FE6A - trainerbattle 3, TRAINER_BRENDAN_8, 0, Route110_Text_16EA0F + trainerbattle_no_intro TRAINER_BRENDAN_8, Route110_Text_16EA0F goto Route110_EventScript_14FE8A end Route110_EventScript_14FE7A:: @ 814FE7A - trainerbattle 3, TRAINER_BRENDAN_2, 0, Route110_Text_16EA0F + trainerbattle_no_intro TRAINER_BRENDAN_2, Route110_Text_16EA0F goto Route110_EventScript_14FE8A end @@ -420,7 +420,7 @@ Route110_EventScript_14FE8A:: @ 814FE8A end Route110_EventScript_14FEA5:: @ 814FEA5 - giveitem_std ITEM_ITEMFINDER + giveitem ITEM_ITEMFINDER return Route110_EventScript_14FEB2:: @ 814FEB2 diff --git a/data/maps/Route110_TrickHouseEnd/scripts.inc b/data/maps/Route110_TrickHouseEnd/scripts.inc index f294ea2b2..0cf2a6a9a 100644 --- a/data/maps/Route110_TrickHouseEnd/scripts.inc +++ b/data/maps/Route110_TrickHouseEnd/scripts.inc @@ -60,7 +60,7 @@ Route110_TrickHouseEnd_EventScript_161A0B:: @ 8161A0B msgbox Route110_TrickHouseEnd_Text_19C2B2, 4 msgbox Route110_TrickHouseEnd_Text_19C90B, 4 setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0 - giveitem_std ITEM_RARE_CANDY + giveitem ITEM_RARE_CANDY compare VAR_RESULT, 0 call_if_eq Route110_TrickHouseEnd_EventScript_161C4E msgbox Route110_TrickHouseEnd_Text_19C9BD, 4 @@ -73,7 +73,7 @@ Route110_TrickHouseEnd_EventScript_161A47:: @ 8161A47 msgbox Route110_TrickHouseEnd_Text_19C333, 4 msgbox Route110_TrickHouseEnd_Text_19C90B, 4 setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0 - giveitem_std ITEM_TIMER_BALL + giveitem ITEM_TIMER_BALL compare VAR_RESULT, 0 call_if_eq Route110_TrickHouseEnd_EventScript_161C4E msgbox Route110_TrickHouseEnd_Text_19C9BD, 4 @@ -86,7 +86,7 @@ Route110_TrickHouseEnd_EventScript_161A83:: @ 8161A83 msgbox Route110_TrickHouseEnd_Text_19C3A7, 4 msgbox Route110_TrickHouseEnd_Text_19C90B, 4 setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0 - giveitem_std ITEM_HARD_STONE + giveitem ITEM_HARD_STONE compare VAR_RESULT, 0 call_if_eq Route110_TrickHouseEnd_EventScript_161C4E msgbox Route110_TrickHouseEnd_Text_19C9BD, 4 @@ -99,7 +99,7 @@ Route110_TrickHouseEnd_EventScript_161ABF:: @ 8161ABF msgbox Route110_TrickHouseEnd_Text_19C41F, 4 msgbox Route110_TrickHouseEnd_Text_19C90B, 4 setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0 - giveitem_std ITEM_SMOKE_BALL + giveitem ITEM_SMOKE_BALL compare VAR_RESULT, 0 call_if_eq Route110_TrickHouseEnd_EventScript_161C4E msgbox Route110_TrickHouseEnd_Text_19C9BD, 4 @@ -112,7 +112,7 @@ Route110_TrickHouseEnd_EventScript_161AFB:: @ 8161AFB msgbox Route110_TrickHouseEnd_Text_19C491, 4 msgbox Route110_TrickHouseEnd_Text_19C90B, 4 setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0 - giveitem_std ITEM_TM12_TAUNT + giveitem ITEM_TM12_TAUNT compare VAR_RESULT, 0 call_if_eq Route110_TrickHouseEnd_EventScript_161C4E msgbox Route110_TrickHouseEnd_Text_19C9BD, 4 @@ -125,7 +125,7 @@ Route110_TrickHouseEnd_EventScript_161B37:: @ 8161B37 msgbox Route110_TrickHouseEnd_Text_19C515, 4 msgbox Route110_TrickHouseEnd_Text_19C90B, 4 setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0 - giveitem_std ITEM_MAGNET + giveitem ITEM_MAGNET compare VAR_RESULT, 0 call_if_eq Route110_TrickHouseEnd_EventScript_161C4E msgbox Route110_TrickHouseEnd_Text_19C9BD, 4 @@ -138,7 +138,7 @@ Route110_TrickHouseEnd_EventScript_161B73:: @ 8161B73 msgbox Route110_TrickHouseEnd_Text_19C567, 4 msgbox Route110_TrickHouseEnd_Text_19C90B, 4 setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0 - giveitem_std ITEM_PP_MAX + giveitem ITEM_PP_MAX compare VAR_RESULT, 0 call_if_eq Route110_TrickHouseEnd_EventScript_161C4E msgbox Route110_TrickHouseEnd_Text_19C9BD, 4 @@ -167,9 +167,9 @@ Route110_TrickHouseEnd_EventScript_161BAF:: @ 8161BAF msgbox Route110_TrickHouseEnd_Text_19C691, 4 setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0 .ifdef SAPPHIRE - givedecoration_std DECOR_BLUE_TENT + givedecoration DECOR_BLUE_TENT .else - givedecoration_std DECOR_RED_TENT + givedecoration DECOR_RED_TENT .endc compare VAR_RESULT, 0 call_if_eq Route110_TrickHouseEnd_EventScript_161C61 diff --git a/data/maps/Route110_TrickHouseEntrance/scripts.inc b/data/maps/Route110_TrickHouseEntrance/scripts.inc index ae36aa84a..93588f2d1 100644 --- a/data/maps/Route110_TrickHouseEntrance/scripts.inc +++ b/data/maps/Route110_TrickHouseEntrance/scripts.inc @@ -361,7 +361,7 @@ Route110_TrickHouseEntrance_EventScript_16136E:: @ 816136E end Route110_TrickHouseEntrance_EventScript_1613CE:: @ 81613CE - giveitem_std ITEM_RARE_CANDY + giveitem ITEM_RARE_CANDY compare VAR_RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_161502 compare VAR_RESULT, 0 @@ -371,7 +371,7 @@ Route110_TrickHouseEntrance_EventScript_1613CE:: @ 81613CE end Route110_TrickHouseEntrance_EventScript_1613FA:: @ 81613FA - giveitem_std ITEM_TIMER_BALL + giveitem ITEM_TIMER_BALL compare VAR_RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_161502 compare VAR_RESULT, 0 @@ -381,7 +381,7 @@ Route110_TrickHouseEntrance_EventScript_1613FA:: @ 81613FA end Route110_TrickHouseEntrance_EventScript_161426:: @ 8161426 - giveitem_std ITEM_HARD_STONE + giveitem ITEM_HARD_STONE compare VAR_RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_161502 compare VAR_RESULT, 0 @@ -391,7 +391,7 @@ Route110_TrickHouseEntrance_EventScript_161426:: @ 8161426 end Route110_TrickHouseEntrance_EventScript_161452:: @ 8161452 - giveitem_std ITEM_SMOKE_BALL + giveitem ITEM_SMOKE_BALL compare VAR_RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_161502 compare VAR_RESULT, 0 @@ -401,7 +401,7 @@ Route110_TrickHouseEntrance_EventScript_161452:: @ 8161452 end Route110_TrickHouseEntrance_EventScript_16147E:: @ 816147E - giveitem_std ITEM_TM12_TAUNT + giveitem ITEM_TM12_TAUNT compare VAR_RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_161502 compare VAR_RESULT, 0 @@ -411,7 +411,7 @@ Route110_TrickHouseEntrance_EventScript_16147E:: @ 816147E end Route110_TrickHouseEntrance_EventScript_1614AA:: @ 81614AA - giveitem_std ITEM_MAGNET + giveitem ITEM_MAGNET compare VAR_RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_161502 compare VAR_RESULT, 0 @@ -421,7 +421,7 @@ Route110_TrickHouseEntrance_EventScript_1614AA:: @ 81614AA end Route110_TrickHouseEntrance_EventScript_1614D6:: @ 81614D6 - giveitem_std ITEM_PP_MAX + giveitem ITEM_PP_MAX compare VAR_RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_161502 compare VAR_RESULT, 0 @@ -443,9 +443,9 @@ Route110_TrickHouseEntrance_EventScript_161518:: @ 8161518 waitmovement 0 msgbox Route110_TrickHouseEntrance_Text_19C128, 4 .ifdef SAPPHIRE - givedecoration_std DECOR_BLUE_TENT + givedecoration DECOR_BLUE_TENT .else - givedecoration_std DECOR_RED_TENT + givedecoration DECOR_RED_TENT .endif compare VAR_RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_161551 diff --git a/data/maps/Route110_TrickHousePuzzle1/scripts.inc b/data/maps/Route110_TrickHousePuzzle1/scripts.inc index dc66b71f4..690df6056 100644 --- a/data/maps/Route110_TrickHousePuzzle1/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle1/scripts.inc @@ -24,16 +24,16 @@ Route110_TrickHousePuzzle1_EventScript_161D26:: @ 8161D26 end Route110_TrickHousePuzzle1_EventScript_161D31:: @ 8161D31 - trainerbattle 0, TRAINER_SALLY, 0, Route110_TrickHousePuzzle1_Text_19CB4F, Route110_TrickHousePuzzle1_Text_19CB93 + trainerbattle_single TRAINER_SALLY, Route110_TrickHousePuzzle1_Text_19CB4F, Route110_TrickHousePuzzle1_Text_19CB93 msgbox Route110_TrickHousePuzzle1_Text_19CBAB, 6 end Route110_TrickHousePuzzle1_EventScript_161D48:: @ 8161D48 - trainerbattle 0, TRAINER_EDDIE, 0, Route110_TrickHousePuzzle1_Text_19CBD6, Route110_TrickHousePuzzle1_Text_19CC06 + trainerbattle_single TRAINER_EDDIE, Route110_TrickHousePuzzle1_Text_19CBD6, Route110_TrickHousePuzzle1_Text_19CC06 msgbox Route110_TrickHousePuzzle1_Text_19CC1B, 6 end Route110_TrickHousePuzzle1_EventScript_161D5F:: @ 8161D5F - trainerbattle 0, TRAINER_ROBIN, 0, Route110_TrickHousePuzzle1_Text_19CC68, Route110_TrickHousePuzzle1_Text_19CC86 + trainerbattle_single TRAINER_ROBIN, Route110_TrickHousePuzzle1_Text_19CC68, Route110_TrickHousePuzzle1_Text_19CC86 msgbox Route110_TrickHousePuzzle1_Text_19CCAA, 6 end diff --git a/data/maps/Route110_TrickHousePuzzle2/scripts.inc b/data/maps/Route110_TrickHousePuzzle2/scripts.inc index f1044e388..457e64a2f 100644 --- a/data/maps/Route110_TrickHousePuzzle2/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle2/scripts.inc @@ -90,16 +90,16 @@ Route110_TrickHousePuzzle2_EventScript_161E65:: @ 8161E65 return Route110_TrickHousePuzzle2_EventScript_161E78:: @ 8161E78 - trainerbattle 0, TRAINER_TED, 0, Route110_TrickHousePuzzle2_Text_19CD46, Route110_TrickHousePuzzle2_Text_19CD66 + trainerbattle_single TRAINER_TED, Route110_TrickHousePuzzle2_Text_19CD46, Route110_TrickHousePuzzle2_Text_19CD66 msgbox Route110_TrickHousePuzzle2_Text_19CD91, 6 end Route110_TrickHousePuzzle2_EventScript_161E8F:: @ 8161E8F - trainerbattle 0, TRAINER_PAUL, 0, Route110_TrickHousePuzzle2_Text_19CDBF, Route110_TrickHousePuzzle2_Text_19CDF0 + trainerbattle_single TRAINER_PAUL, Route110_TrickHousePuzzle2_Text_19CDBF, Route110_TrickHousePuzzle2_Text_19CDF0 msgbox Route110_TrickHousePuzzle2_Text_19CE0D, 6 end Route110_TrickHousePuzzle2_EventScript_161EA6:: @ 8161EA6 - trainerbattle 0, TRAINER_GEORGIA, 0, Route110_TrickHousePuzzle2_Text_19CE52, Route110_TrickHousePuzzle2_Text_19CE98 + trainerbattle_single TRAINER_GEORGIA, Route110_TrickHousePuzzle2_Text_19CE52, Route110_TrickHousePuzzle2_Text_19CE98 msgbox Route110_TrickHousePuzzle2_Text_19CEB8, 6 end diff --git a/data/maps/Route110_TrickHousePuzzle3/scripts.inc b/data/maps/Route110_TrickHousePuzzle3/scripts.inc index b8d8383fc..621277a19 100644 --- a/data/maps/Route110_TrickHousePuzzle3/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle3/scripts.inc @@ -381,16 +381,16 @@ Route110_TrickHousePuzzle3_EventScript_1626FD:: @ 81626FD end Route110_TrickHousePuzzle3_EventScript_162708:: @ 8162708 - trainerbattle 0, TRAINER_JUSTIN, 0, Route110_TrickHousePuzzle3_Text_19CF76, Route110_TrickHousePuzzle3_Text_19CF9D + trainerbattle_single TRAINER_JUSTIN, Route110_TrickHousePuzzle3_Text_19CF76, Route110_TrickHousePuzzle3_Text_19CF9D msgbox Route110_TrickHousePuzzle3_Text_19CFE6, 6 end Route110_TrickHousePuzzle3_EventScript_16271F:: @ 816271F - trainerbattle 0, TRAINER_MARTHA, 0, Route110_TrickHousePuzzle3_Text_19D026, Route110_TrickHousePuzzle3_Text_19D065 + trainerbattle_single TRAINER_MARTHA, Route110_TrickHousePuzzle3_Text_19D026, Route110_TrickHousePuzzle3_Text_19D065 msgbox Route110_TrickHousePuzzle3_Text_19D07A, 6 end Route110_TrickHousePuzzle3_EventScript_162736:: @ 8162736 - trainerbattle 0, TRAINER_ALAN, 0, Route110_TrickHousePuzzle3_Text_19D0AE, Route110_TrickHousePuzzle3_Text_19D0F0 + trainerbattle_single TRAINER_ALAN, Route110_TrickHousePuzzle3_Text_19D0AE, Route110_TrickHousePuzzle3_Text_19D0F0 msgbox Route110_TrickHousePuzzle3_Text_19D110, 6 end diff --git a/data/maps/Route110_TrickHousePuzzle4/scripts.inc b/data/maps/Route110_TrickHousePuzzle4/scripts.inc index 606697070..c58c3c553 100644 --- a/data/maps/Route110_TrickHousePuzzle4/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle4/scripts.inc @@ -14,16 +14,16 @@ Route110_TrickHousePuzzle4_EventScript_162760:: @ 8162760 end Route110_TrickHousePuzzle4_EventScript_16276B:: @ 816276B - trainerbattle 0, TRAINER_CORA, 0, Route110_TrickHousePuzzle4_Text_19D1DE, Route110_TrickHousePuzzle4_Text_19D21F + trainerbattle_single TRAINER_CORA, Route110_TrickHousePuzzle4_Text_19D1DE, Route110_TrickHousePuzzle4_Text_19D21F msgbox Route110_TrickHousePuzzle4_Text_19D253, 6 end Route110_TrickHousePuzzle4_EventScript_162782:: @ 8162782 - trainerbattle 0, TRAINER_YUJI, 0, Route110_TrickHousePuzzle4_Text_19D295, Route110_TrickHousePuzzle4_Text_19D2D1 + trainerbattle_single TRAINER_YUJI, Route110_TrickHousePuzzle4_Text_19D295, Route110_TrickHousePuzzle4_Text_19D2D1 msgbox Route110_TrickHousePuzzle4_Text_19D306, 6 end Route110_TrickHousePuzzle4_EventScript_162799:: @ 8162799 - trainerbattle 0, TRAINER_JILL, 0, Route110_TrickHousePuzzle4_Text_19D351, Route110_TrickHousePuzzle4_Text_19D380 + trainerbattle_single TRAINER_JILL, Route110_TrickHousePuzzle4_Text_19D351, Route110_TrickHousePuzzle4_Text_19D380 msgbox Route110_TrickHousePuzzle4_Text_19D386, 6 end diff --git a/data/maps/Route110_TrickHousePuzzle6/scripts.inc b/data/maps/Route110_TrickHousePuzzle6/scripts.inc index 3378dc50b..0478119e1 100644 --- a/data/maps/Route110_TrickHousePuzzle6/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle6/scripts.inc @@ -28,16 +28,16 @@ Route110_TrickHousePuzzle6_EventScript_1630FC:: @ 81630FC end Route110_TrickHousePuzzle6_EventScript_163107:: @ 8163107 - trainerbattle 0, TRAINER_SOPHIA, 0, Route110_TrickHousePuzzle6_Text_19DC87, Route110_TrickHousePuzzle6_Text_19DCC6 + trainerbattle_single TRAINER_SOPHIA, Route110_TrickHousePuzzle6_Text_19DC87, Route110_TrickHousePuzzle6_Text_19DCC6 msgbox Route110_TrickHousePuzzle6_Text_19DCE7, 6 end Route110_TrickHousePuzzle6_EventScript_16311E:: @ 816311E - trainerbattle 0, TRAINER_BENNY, 0, Route110_TrickHousePuzzle6_Text_19DD49, Route110_TrickHousePuzzle6_Text_19DD83 + trainerbattle_single TRAINER_BENNY, Route110_TrickHousePuzzle6_Text_19DD49, Route110_TrickHousePuzzle6_Text_19DD83 msgbox Route110_TrickHousePuzzle6_Text_19DD96, 6 end Route110_TrickHousePuzzle6_EventScript_163135:: @ 8163135 - trainerbattle 0, TRAINER_SEBASTIAN, 0, Route110_TrickHousePuzzle6_Text_19DDCF, Route110_TrickHousePuzzle6_Text_19DDFE + trainerbattle_single TRAINER_SEBASTIAN, Route110_TrickHousePuzzle6_Text_19DDCF, Route110_TrickHousePuzzle6_Text_19DDFE msgbox Route110_TrickHousePuzzle6_Text_19DE44, 6 end diff --git a/data/maps/Route110_TrickHousePuzzle7/scripts.inc b/data/maps/Route110_TrickHousePuzzle7/scripts.inc index ac113fe81..a26aff40b 100644 --- a/data/maps/Route110_TrickHousePuzzle7/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle7/scripts.inc @@ -219,16 +219,16 @@ Route110_TrickHousePuzzle7_EventScript_1633D1:: @ 81633D1 end Route110_TrickHousePuzzle7_EventScript_1633D6:: @ 81633D6 - trainerbattle 0, TRAINER_JOSHUA, 0, Route110_TrickHousePuzzle7_Text_19DF0B, Route110_TrickHousePuzzle7_Text_19DF4B + trainerbattle_single TRAINER_JOSHUA, Route110_TrickHousePuzzle7_Text_19DF0B, Route110_TrickHousePuzzle7_Text_19DF4B msgbox Route110_TrickHousePuzzle7_Text_19DF7E, 6 end Route110_TrickHousePuzzle7_EventScript_1633ED:: @ 81633ED - trainerbattle 0, TRAINER_PATRICIA, 0, Route110_TrickHousePuzzle7_Text_19DFBB, Route110_TrickHousePuzzle7_Text_19DFF2 + trainerbattle_single TRAINER_PATRICIA, Route110_TrickHousePuzzle7_Text_19DFBB, Route110_TrickHousePuzzle7_Text_19DFF2 msgbox Route110_TrickHousePuzzle7_Text_19E00F, 6 end Route110_TrickHousePuzzle7_EventScript_163404:: @ 8163404 - trainerbattle 0, TRAINER_ALEXIS, 0, Route110_TrickHousePuzzle7_Text_19E054, Route110_TrickHousePuzzle7_Text_19E098 + trainerbattle_single TRAINER_ALEXIS, Route110_TrickHousePuzzle7_Text_19E054, Route110_TrickHousePuzzle7_Text_19E098 msgbox Route110_TrickHousePuzzle7_Text_19E0B2, 6 end diff --git a/data/maps/Route110_TrickHousePuzzle8/scripts.inc b/data/maps/Route110_TrickHousePuzzle8/scripts.inc index 182f3d68a..8159e4343 100644 --- a/data/maps/Route110_TrickHousePuzzle8/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle8/scripts.inc @@ -14,16 +14,16 @@ Route110_TrickHousePuzzle8_EventScript_16342E:: @ 816342E end Route110_TrickHousePuzzle8_EventScript_163439:: @ 8163439 - trainerbattle 0, TRAINER_VINCENT, 0, Route110_TrickHousePuzzle8_Text_19E178, Route110_TrickHousePuzzle8_Text_19E1A1 + trainerbattle_single TRAINER_VINCENT, Route110_TrickHousePuzzle8_Text_19E178, Route110_TrickHousePuzzle8_Text_19E1A1 msgbox Route110_TrickHousePuzzle8_Text_19E1C5, 6 end Route110_TrickHousePuzzle8_EventScript_163450:: @ 8163450 - trainerbattle 0, TRAINER_ELAINE, 0, Route110_TrickHousePuzzle8_Text_19E201, Route110_TrickHousePuzzle8_Text_19E22C + trainerbattle_single TRAINER_ELAINE, Route110_TrickHousePuzzle8_Text_19E201, Route110_TrickHousePuzzle8_Text_19E22C msgbox Route110_TrickHousePuzzle8_Text_19E24C, 6 end Route110_TrickHousePuzzle8_EventScript_163467:: @ 8163467 - trainerbattle 0, TRAINER_LEROY, 0, Route110_TrickHousePuzzle8_Text_19E284, Route110_TrickHousePuzzle8_Text_19E2C1 + trainerbattle_single TRAINER_LEROY, Route110_TrickHousePuzzle8_Text_19E284, Route110_TrickHousePuzzle8_Text_19E2C1 msgbox Route110_TrickHousePuzzle8_Text_19E2EE, 6 end diff --git a/data/maps/Route111/scripts.inc b/data/maps/Route111/scripts.inc index 0092d793d..5c7f361cc 100644 --- a/data/maps/Route111/scripts.inc +++ b/data/maps/Route111/scripts.inc @@ -15,7 +15,7 @@ Route111_EventScript_14FFA6:: @ 814FFA6 Route111_MapScript1_14FFB9:: @ 814FFB9 call Route111_EventScript_14FFCD call Route111_EventScript_1AE313 - goto_if_trainer_not_defeated TRAINER_VICKY, Route111_EventScript_15000D + goto_if_not_defeated TRAINER_VICKY, Route111_EventScript_15000D end Route111_EventScript_14FFCD:: @ 814FFCD @@ -52,7 +52,7 @@ Route111_EventScript_150023:: @ 8150023 msgbox Route111_Text_16FA54, MSGBOX_YESNO compare VAR_RESULT, NO goto_if_eq Route111_EventScript_15005F - giveitem_std ITEM_ROOT_FOSSIL + giveitem ITEM_ROOT_FOSSIL closemessage setflag FLAG_HIDE_ROOT_FOSSIL setflag FLAG_HIDE_CLAW_FOSSIL @@ -74,7 +74,7 @@ Route111_EventScript_150069:: @ 8150069 msgbox Route111_Text_16FAED, MSGBOX_YESNO compare VAR_RESULT, NO goto_if_eq Route111_EventScript_1500A5 - giveitem_std ITEM_CLAW_FOSSIL + giveitem ITEM_CLAW_FOSSIL closemessage setflag FLAG_HIDE_CLAW_FOSSIL setflag FLAG_HIDE_ROOT_FOSSIL @@ -118,10 +118,10 @@ Route111_Movement_1500AF:: @ 81500AF Route111_EventScript_1500C5:: @ 81500C5 lock faceplayer - dodailyevents + dotimebasedevents goto_if_set FLAG_DAILY_RECEIVED_BERRY_ROUTE111, Route111_EventScript_150100 msgbox Route111_Text_1C56F0, 4 - giveitem_std ITEM_RAZZ_BERRY + giveitem ITEM_RAZZ_BERRY compare VAR_RESULT, 0 goto_if_eq Route111_EventScript_1A029B setflag FLAG_DAILY_RECEIVED_BERRY_ROUTE111 @@ -243,7 +243,7 @@ Route111_EventScript_1501D1:: @ 81501D1 Route111_EventScript_1501F3:: @ 81501F3 msgbox Route111_Text_16F7B3, 4 - trainerbattle 3, TRAINER_VICTOR, 0, Route111_Text_16F7D2 + trainerbattle_no_intro TRAINER_VICTOR, Route111_Text_16F7D2 applymovement 1, Route111_Movement_1A0841 waitmovement 0 call Route111_EventScript_150348 @@ -261,7 +261,7 @@ Route111_EventScript_1501F3:: @ 81501F3 waitmovement 0 call Route111_EventScript_15034F msgbox Route111_Text_16F82D, 4 - trainerbattle 3, TRAINER_VICTORIA, 0, Route111_Text_16F8A6 + trainerbattle_no_intro TRAINER_VICTORIA, Route111_Text_16F8A6 applymovement 2, Route111_Movement_1A0841 waitmovement 0 call Route111_EventScript_150348 @@ -279,7 +279,7 @@ Route111_EventScript_1501F3:: @ 81501F3 waitmovement 0 call Route111_EventScript_15034F msgbox Route111_Text_16F90E, 4 - trainerbattle 3, TRAINER_VIVI, 0, Route111_Text_16F956 + trainerbattle_no_intro TRAINER_VIVI, Route111_Text_16F956 applymovement 3, Route111_Movement_1A0841 waitmovement 0 call Route111_EventScript_150348 @@ -297,7 +297,7 @@ Route111_EventScript_1501F3:: @ 81501F3 waitmovement 0 call Route111_EventScript_15034F msgbox Route111_Text_16F991, 4 - trainerbattle 3, TRAINER_VICKY, 0, Route111_Text_16F9EC + trainerbattle_no_intro TRAINER_VICKY, Route111_Text_16F9EC msgbox Route111_Text_16FA22, 4 closemessage applymovement 4, Route111_Movement_1A0841 @@ -368,27 +368,27 @@ Route111_EventScript_15039E:: @ 815039E end Route111_EventScript_1503A7:: @ 81503A7 - trainerbattle 0, TRAINER_DREW, 0, Route111_Text_1BAB4B, Route111_Text_1BABC7 + trainerbattle_single TRAINER_DREW, Route111_Text_1BAB4B, Route111_Text_1BABC7 msgbox Route111_Text_1BAC10, 6 end Route111_EventScript_1503BE:: @ 81503BE - trainerbattle 0, TRAINER_HEIDI, 0, Route111_Text_1BAC60, Route111_Text_1BACC5 + trainerbattle_single TRAINER_HEIDI, Route111_Text_1BAC60, Route111_Text_1BACC5 msgbox Route111_Text_1BACD8, 6 end Route111_EventScript_1503D5:: @ 81503D5 - trainerbattle 0, TRAINER_CLIFF, 0, Route111_Text_1BAD4B, Route111_Text_1BADA3 + trainerbattle_single TRAINER_CLIFF, Route111_Text_1BAD4B, Route111_Text_1BADA3 msgbox Route111_Text_1BADC2, 6 end Route111_EventScript_1503EC:: @ 81503EC - trainerbattle 0, TRAINER_BECKY, 0, Route111_Text_1BAE24, Route111_Text_1BAE6E + trainerbattle_single TRAINER_BECKY, Route111_Text_1BAE24, Route111_Text_1BAE6E msgbox Route111_Text_1BAE81, 6 end Route111_EventScript_150403:: @ 8150403 - trainerbattle 0, TRAINER_DUSTY_1, 0, Route111_Text_1BAEC9, Route111_Text_1BAF14 + trainerbattle_single TRAINER_DUSTY_1, Route111_Text_1BAEC9, Route111_Text_1BAF14 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if_eq Route111_EventScript_15042A @@ -396,27 +396,27 @@ Route111_EventScript_150403:: @ 8150403 end Route111_EventScript_15042A:: @ 815042A - trainerbattle 5, TRAINER_DUSTY_1, 0, Route111_Text_1BAFC1, Route111_Text_1BB034 + trainerbattle_rematch TRAINER_DUSTY_1, Route111_Text_1BAFC1, Route111_Text_1BB034 msgbox Route111_Text_1BB070, 6 end Route111_EventScript_150441:: @ 8150441 - trainerbattle 0, TRAINER_TRAVIS, 0, Route111_Text_1BB111, Route111_Text_1BB140 + trainerbattle_single TRAINER_TRAVIS, Route111_Text_1BB111, Route111_Text_1BB140 msgbox Route111_Text_1BB15B, 6 end Route111_EventScript_150458:: @ 8150458 - trainerbattle 0, TRAINER_IRENE, 0, Route111_Text_1BB199, Route111_Text_1BB1D8 + trainerbattle_single TRAINER_IRENE, Route111_Text_1BB199, Route111_Text_1BB1D8 msgbox Route111_Text_1BB1F6, 6 end Route111_EventScript_15046F:: @ 815046F - trainerbattle 0, TRAINER_DAISUKE, 0, Route111_Text_1BB250, Route111_Text_1BB27E + trainerbattle_single TRAINER_DAISUKE, Route111_Text_1BB250, Route111_Text_1BB27E msgbox Route111_Text_1BB290, 6 end Route111_EventScript_150486:: @ 8150486 - trainerbattle 0, TRAINER_WILTON_1, 0, Route111_Text_1BB2E3, Route111_Text_1BB313 + trainerbattle_single TRAINER_WILTON_1, Route111_Text_1BB2E3, Route111_Text_1BB313 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if_eq Route111_EventScript_1504AD @@ -424,12 +424,12 @@ Route111_EventScript_150486:: @ 8150486 end Route111_EventScript_1504AD:: @ 81504AD - trainerbattle 5, TRAINER_WILTON_1, 0, Route111_Text_1BB3A7, Route111_Text_1BB3FA + trainerbattle_rematch TRAINER_WILTON_1, Route111_Text_1BB3A7, Route111_Text_1BB3FA msgbox Route111_Text_1BB40E, 6 end Route111_EventScript_1504C4:: @ 81504C4 - trainerbattle 0, TRAINER_BROOKE_1, 0, Route111_Text_1BB44F, Route111_Text_1BB49F + trainerbattle_single TRAINER_BROOKE_1, Route111_Text_1BB44F, Route111_Text_1BB49F specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if_eq Route111_EventScript_1504EB @@ -437,6 +437,6 @@ Route111_EventScript_1504C4:: @ 81504C4 end Route111_EventScript_1504EB:: @ 81504EB - trainerbattle 5, TRAINER_BROOKE_1, 0, Route111_Text_1BB529, Route111_Text_1BB5A2 + trainerbattle_rematch TRAINER_BROOKE_1, Route111_Text_1BB529, Route111_Text_1BB5A2 msgbox Route111_Text_1BB5C1, 6 end diff --git a/data/maps/Route111_WinstrateFamilysHouse/scripts.inc b/data/maps/Route111_WinstrateFamilysHouse/scripts.inc index e971a8b9f..20a1a1e89 100644 --- a/data/maps/Route111_WinstrateFamilysHouse/scripts.inc +++ b/data/maps/Route111_WinstrateFamilysHouse/scripts.inc @@ -15,7 +15,7 @@ Route111_WinstrateFamilysHouse_EventScript_15BF3A:: @ 815BF3A setvar VAR_0x8008, 3 goto_if_set FLAG_RECEIVED_MACHO_BRACE, Route111_WinstrateFamilysHouse_EventScript_15BF72 msgbox Route111_WinstrateFamilysHouse_Text_19208A, 4 - giveitem_std ITEM_MACHO_BRACE + giveitem ITEM_MACHO_BRACE compare VAR_RESULT, 0 goto_if_eq Route111_WinstrateFamilysHouse_EventScript_1A029B setflag FLAG_RECEIVED_MACHO_BRACE diff --git a/data/maps/Route112/scripts.inc b/data/maps/Route112/scripts.inc index ae03b2248..f3464e139 100644 --- a/data/maps/Route112/scripts.inc +++ b/data/maps/Route112/scripts.inc @@ -32,12 +32,12 @@ Route112_EventScript_150540:: @ 8150540 end Route112_EventScript_150549:: @ 8150549 - trainerbattle 0, TRAINER_BRICE, 0, Route112_Text_1BB619, Route112_Text_1BB655 + trainerbattle_single TRAINER_BRICE, Route112_Text_1BB619, Route112_Text_1BB655 msgbox Route112_Text_1BB667, 6 end Route112_EventScript_150560:: @ 8150560 - trainerbattle 0, TRAINER_TRENT_1, 0, Route112_Text_1BB6A0, Route112_Text_1BB707 + trainerbattle_single TRAINER_TRENT_1, Route112_Text_1BB6A0, Route112_Text_1BB707 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if_eq Route112_EventScript_150587 @@ -45,16 +45,16 @@ Route112_EventScript_150560:: @ 8150560 end Route112_EventScript_150587:: @ 8150587 - trainerbattle 5, TRAINER_TRENT_1, 0, Route112_Text_1BB7C7, Route112_Text_1BB801 + trainerbattle_rematch TRAINER_TRENT_1, Route112_Text_1BB7C7, Route112_Text_1BB801 msgbox Route112_Text_1BB819, 6 end Route112_EventScript_15059E:: @ 815059E - trainerbattle 0, TRAINER_LARRY, 0, Route112_Text_1BB893, Route112_Text_1BB8B6 + trainerbattle_single TRAINER_LARRY, Route112_Text_1BB893, Route112_Text_1BB8B6 msgbox Route112_Text_1BB8BE, 6 end Route112_EventScript_1505B5:: @ 81505B5 - trainerbattle 0, TRAINER_CAROL, 0, Route112_Text_1BB8F0, Route112_Text_1BB942 + trainerbattle_single TRAINER_CAROL, Route112_Text_1BB8F0, Route112_Text_1BB942 msgbox Route112_Text_1BB958, 6 end diff --git a/data/maps/Route113/scripts.inc b/data/maps/Route113/scripts.inc index 58c769273..c7435bf3d 100644 --- a/data/maps/Route113/scripts.inc +++ b/data/maps/Route113/scripts.inc @@ -49,17 +49,17 @@ Route113_EventScript_150632:: @ 8150632 end Route113_EventScript_15063B:: @ 815063B - trainerbattle 0, TRAINER_NEAL, 0, Route113_Text_1BB9BA, Route113_Text_1BB9E6 + trainerbattle_single TRAINER_NEAL, Route113_Text_1BB9BA, Route113_Text_1BB9E6 msgbox Route113_Text_1BB9FB, 6 end Route113_EventScript_150652:: @ 8150652 - trainerbattle 0, TRAINER_DILLON, 0, Route113_Text_1BBA62, Route113_Text_1BBA9B + trainerbattle_single TRAINER_DILLON, Route113_Text_1BBA62, Route113_Text_1BBA9B msgbox Route113_Text_1BBAB7, 6 end Route113_EventScript_150669:: @ 8150669 - trainerbattle 0, TRAINER_MADELINE_1, 0, Route113_Text_1BBB27, Route113_Text_1BBB7A + trainerbattle_single TRAINER_MADELINE_1, Route113_Text_1BBB27, Route113_Text_1BBB7A specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if_eq Route113_EventScript_150690 @@ -67,12 +67,12 @@ Route113_EventScript_150669:: @ 8150669 end Route113_EventScript_150690:: @ 8150690 - trainerbattle 5, TRAINER_MADELINE_1, 0, Route113_Text_1BBBCE, Route113_Text_1BBC0D + trainerbattle_rematch TRAINER_MADELINE_1, Route113_Text_1BBBCE, Route113_Text_1BBC0D msgbox Route113_Text_1BBC1C, 6 end Route113_EventScript_1506A7:: @ 81506A7 - trainerbattle 0, TRAINER_LAO_1, 0, Route113_Text_1BBC59, Route113_Text_1BBC90 + trainerbattle_single TRAINER_LAO_1, Route113_Text_1BBC59, Route113_Text_1BBC90 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if_eq Route113_EventScript_1506CE @@ -80,21 +80,21 @@ Route113_EventScript_1506A7:: @ 81506A7 end Route113_EventScript_1506CE:: @ 81506CE - trainerbattle 5, TRAINER_LAO_1, 0, Route113_Text_1BBCE6, Route113_Text_1BBD1D + trainerbattle_rematch TRAINER_LAO_1, Route113_Text_1BBCE6, Route113_Text_1BBD1D msgbox Route113_Text_1BBD38, 6 end Route113_EventScript_1506E5:: @ 81506E5 - trainerbattle 0, TRAINER_LUNG, 0, Route113_Text_1BBD92, Route113_Text_1BBDC6 + trainerbattle_single TRAINER_LUNG, Route113_Text_1BBD92, Route113_Text_1BBDC6 msgbox Route113_Text_1BBE1D, 6 end Route113_EventScript_1506FC:: @ 81506FC - trainerbattle 4, TRAINER_TORI_AND_TIA, 0, Route113_Text_1BBE65, Route113_Text_1BBEA1, Route113_Text_1BBF25 + trainerbattle_double TRAINER_TORI_AND_TIA, Route113_Text_1BBE65, Route113_Text_1BBEA1, Route113_Text_1BBF25 msgbox Route113_Text_1BBEE4, 6 end Route113_EventScript_150717:: @ 8150717 - trainerbattle 4, TRAINER_TORI_AND_TIA, 0, Route113_Text_1BBF62, Route113_Text_1BBF9D, Route113_Text_1BC021 + trainerbattle_double TRAINER_TORI_AND_TIA, Route113_Text_1BBF62, Route113_Text_1BBF9D, Route113_Text_1BC021 msgbox Route113_Text_1BBFE2, 6 end diff --git a/data/maps/Route113_GlassWorkshop/scripts.inc b/data/maps/Route113_GlassWorkshop/scripts.inc index 7940b9cd7..a41544354 100644 --- a/data/maps/Route113_GlassWorkshop/scripts.inc +++ b/data/maps/Route113_GlassWorkshop/scripts.inc @@ -22,7 +22,7 @@ Route113_GlassWorkshop_EventScript_163565:: @ 8163565 compare VAR_GLASS_WORKSHOP_STATE, 1 goto_if_eq Route113_GlassWorkshop_EventScript_1635AB msgbox Route113_GlassWorkshop_Text_19E4E6, 4 - giveitem_std ITEM_SOOT_SACK + giveitem ITEM_SOOT_SACK setvar VAR_GLASS_WORKSHOP_STATE, 1 msgbox Route113_GlassWorkshop_Text_19E59B, 4 release @@ -210,13 +210,13 @@ Route113_GlassWorkshop_EventScript_163851:: @ 8163851 end Route113_GlassWorkshop_EventScript_163889:: @ 8163889 - giveitem_std VAR_0x8008 + giveitem VAR_0x8008 compare VAR_RESULT, 0 goto_if_eq Route113_GlassWorkshop_EventScript_1638B4 return Route113_GlassWorkshop_EventScript_1638A1:: @ 81638A1 - givedecoration_std VAR_0x8008 + givedecoration VAR_0x8008 compare VAR_RESULT, 0 goto_if_eq Route113_GlassWorkshop_EventScript_1638C3 return diff --git a/data/maps/Route114/scripts.inc b/data/maps/Route114/scripts.inc index 7af6aaec0..2b6b3f56c 100644 --- a/data/maps/Route114/scripts.inc +++ b/data/maps/Route114/scripts.inc @@ -4,13 +4,13 @@ Route114_MapScripts:: @ 8150732 Route114_EventScript_150733:: @ 8150733 lock faceplayer - dodailyevents + dotimebasedevents goto_if_set FLAG_DAILY_RECEIVED_BERRY_ROUTE114, Route114_EventScript_150778 msgbox Route114_Text_1C5803, 4 random 5 addvar VAR_RESULT, 15 addvar VAR_RESULT, 133 - giveitem_std VAR_RESULT + giveitem VAR_RESULT compare VAR_RESULT, 0 goto_if_eq Route114_EventScript_1A029B setflag FLAG_DAILY_RECEIVED_BERRY_ROUTE114 @@ -28,7 +28,7 @@ Route114_EventScript_150782:: @ 8150782 faceplayer goto_if_set FLAG_RECEIVED_TM05, Route114_EventScript_1507B9 msgbox Route114_Text_170154, 4 - giveitem_std ITEM_TM05_ROAR + giveitem ITEM_TM05_ROAR compare VAR_RESULT, 0 goto_if_eq Route114_EventScript_1A029B setflag FLAG_RECEIVED_TM05 @@ -64,27 +64,27 @@ Route114_EventScript_1507E8:: @ 81507E8 end Route114_EventScript_1507F1:: @ 81507F1 - trainerbattle 0, TRAINER_LENNY, 0, Route114_Text_1BC05B, Route114_Text_1BC0B5 + trainerbattle_single TRAINER_LENNY, Route114_Text_1BC05B, Route114_Text_1BC0B5 msgbox Route114_Text_1BC0C3, 6 end Route114_EventScript_150808:: @ 8150808 - trainerbattle 0, TRAINER_LUCAS_1, 0, Route114_Text_1BC125, Route114_Text_1BC163 + trainerbattle_single TRAINER_LUCAS_1, Route114_Text_1BC125, Route114_Text_1BC163 msgbox Route114_Text_1BC184, 6 end Route114_EventScript_15081F:: @ 815081F - trainerbattle 0, TRAINER_SHANE, 0, Route114_Text_1BC1C8, Route114_Text_1BC23F + trainerbattle_single TRAINER_SHANE, Route114_Text_1BC1C8, Route114_Text_1BC23F msgbox Route114_Text_1BC24F, 6 end Route114_EventScript_150836:: @ 8150836 - trainerbattle 0, TRAINER_NANCY, 0, Route114_Text_1BC289, Route114_Text_1BC2BE + trainerbattle_single TRAINER_NANCY, Route114_Text_1BC289, Route114_Text_1BC2BE msgbox Route114_Text_1BC2C6, 6 end Route114_EventScript_15084D:: @ 815084D - trainerbattle 0, TRAINER_STEVE_1, 0, Route114_Text_1BC2F5, Route114_Text_1BC327 + trainerbattle_single TRAINER_STEVE_1, Route114_Text_1BC2F5, Route114_Text_1BC327 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if_eq Route114_EventScript_150874 @@ -92,12 +92,12 @@ Route114_EventScript_15084D:: @ 815084D end Route114_EventScript_150874:: @ 8150874 - trainerbattle 5, TRAINER_STEVE_1, 0, Route114_Text_1BC3B3, Route114_Text_1BC3E0 + trainerbattle_rematch TRAINER_STEVE_1, Route114_Text_1BC3B3, Route114_Text_1BC3E0 msgbox Route114_Text_1BC40F, 6 end Route114_EventScript_15088B:: @ 815088B - trainerbattle 0, TRAINER_BERNIE_1, 0, Route114_Text_1BC45A, Route114_Text_1BC499 + trainerbattle_single TRAINER_BERNIE_1, Route114_Text_1BC45A, Route114_Text_1BC499 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if_eq Route114_EventScript_1508B2 @@ -105,26 +105,26 @@ Route114_EventScript_15088B:: @ 815088B end Route114_EventScript_1508B2:: @ 81508B2 - trainerbattle 5, TRAINER_BERNIE_1, 0, Route114_Text_1BC525, Route114_Text_1BC559 + trainerbattle_rematch TRAINER_BERNIE_1, Route114_Text_1BC525, Route114_Text_1BC559 msgbox Route114_Text_1BC58C, 6 end Route114_EventScript_1508C9:: @ 81508C9 - trainerbattle 0, TRAINER_CLAUDE, 0, Route114_Text_1BC5FC, Route114_Text_1BC653 + trainerbattle_single TRAINER_CLAUDE, Route114_Text_1BC5FC, Route114_Text_1BC653 msgbox Route114_Text_1BC679, 6 end Route114_EventScript_1508E0:: @ 81508E0 - trainerbattle 0, TRAINER_NOLAN, 0, Route114_Text_1BC6EC, Route114_Text_1BC750 + trainerbattle_single TRAINER_NOLAN, Route114_Text_1BC6EC, Route114_Text_1BC750 msgbox Route114_Text_1BC78A, 6 end Route114_EventScript_1508F7:: @ 81508F7 - trainerbattle 4, TRAINER_TYRA_AND_IVY, 0, Route114_Text_1BC7E3, Route114_Text_1BC834, Route114_Text_1BC88A + trainerbattle_double TRAINER_TYRA_AND_IVY, Route114_Text_1BC7E3, Route114_Text_1BC834, Route114_Text_1BC88A msgbox Route114_Text_1BC858, 6 end Route114_EventScript_150912:: @ 8150912 - trainerbattle 4, TRAINER_TYRA_AND_IVY, 0, Route114_Text_1BC8D8, Route114_Text_1BC8FB, Route114_Text_1BC96A + trainerbattle_double TRAINER_TYRA_AND_IVY, Route114_Text_1BC8D8, Route114_Text_1BC8FB, Route114_Text_1BC96A msgbox Route114_Text_1BC91E, 6 end diff --git a/data/maps/Route114_FossilManiacsHouse/scripts.inc b/data/maps/Route114_FossilManiacsHouse/scripts.inc index 8313eacb1..39882bfa8 100644 --- a/data/maps/Route114_FossilManiacsHouse/scripts.inc +++ b/data/maps/Route114_FossilManiacsHouse/scripts.inc @@ -11,7 +11,7 @@ Route114_FossilManiacsHouse_EventScript_15C1C3:: @ 815C1C3 faceplayer goto_if_set FLAG_RECEIVED_TM28, Route114_FossilManiacsHouse_EventScript_15C1F2 msgbox Route114_FossilManiacsHouse_Text_1925E1, 4 - giveitem_std ITEM_TM28_DIG + giveitem ITEM_TM28_DIG compare VAR_RESULT, 0 goto_if_eq Route114_FossilManiacsHouse_EventScript_1A029B setflag FLAG_RECEIVED_TM28 diff --git a/data/maps/Route114_LanettesHouse/scripts.inc b/data/maps/Route114_LanettesHouse/scripts.inc index 2fe385c18..1dbfde334 100644 --- a/data/maps/Route114_LanettesHouse/scripts.inc +++ b/data/maps/Route114_LanettesHouse/scripts.inc @@ -13,9 +13,9 @@ Route114_LanettesHouse_EventScript_15C262:: @ 815C262 setflag FLAG_SYS_PC_LANETTE msgbox Route114_LanettesHouse_Text_192A0D, 4 .ifdef SAPPHIRE - givedecoration_std DECOR_LOTAD_DOLL + givedecoration DECOR_LOTAD_DOLL .else - givedecoration_std DECOR_SEEDOT_DOLL + givedecoration DECOR_SEEDOT_DOLL .endif compare VAR_RESULT, 0 goto_if_eq Route114_LanettesHouse_EventScript_1A02AE diff --git a/data/maps/Route115/scripts.inc b/data/maps/Route115/scripts.inc index 6fd262de4..31d4a2860 100644 --- a/data/maps/Route115/scripts.inc +++ b/data/maps/Route115/scripts.inc @@ -14,7 +14,7 @@ Route115_EventScript_150940:: @ 8150940 end Route115_EventScript_150949:: @ 8150949 - trainerbattle 0, TRAINER_TIMOTHY_1, 0, Route115_Text_1BC9AC, Route115_Text_1BC9E6 + trainerbattle_single TRAINER_TIMOTHY_1, Route115_Text_1BC9AC, Route115_Text_1BC9E6 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if_eq Route115_EventScript_150970 @@ -22,17 +22,17 @@ Route115_EventScript_150949:: @ 8150949 end Route115_EventScript_150970:: @ 8150970 - trainerbattle 5, TRAINER_TIMOTHY_1, 0, Route115_Text_1BCA6B, Route115_Text_1BCAB3 + trainerbattle_rematch TRAINER_TIMOTHY_1, Route115_Text_1BCA6B, Route115_Text_1BCAB3 msgbox Route115_Text_1BCAC6, 6 end Route115_EventScript_150987:: @ 8150987 - trainerbattle 0, TRAINER_KOICHI, 0, Route115_Text_1BCB0D, Route115_Text_1BCB2E + trainerbattle_single TRAINER_KOICHI, Route115_Text_1BCB0D, Route115_Text_1BCB2E msgbox Route115_Text_1BCB40, 6 end Route115_EventScript_15099E:: @ 815099E - trainerbattle 0, TRAINER_NOB_1, 0, Route115_Text_1BCB8A, Route115_Text_1BCBC1 + trainerbattle_single TRAINER_NOB_1, Route115_Text_1BCB8A, Route115_Text_1BCBC1 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if_eq Route115_EventScript_1509C5 @@ -40,12 +40,12 @@ Route115_EventScript_15099E:: @ 815099E end Route115_EventScript_1509C5:: @ 81509C5 - trainerbattle 5, TRAINER_NOB_1, 0, Route115_Text_1BCC4C, Route115_Text_1BCCA2 + trainerbattle_rematch TRAINER_NOB_1, Route115_Text_1BCC4C, Route115_Text_1BCCA2 msgbox Route115_Text_1BCCBA, 6 end Route115_EventScript_1509DC:: @ 81509DC - trainerbattle 0, TRAINER_CYNDY_1, 0, Route115_Text_1BCCF4, Route115_Text_1BCD32 + trainerbattle_single TRAINER_CYNDY_1, Route115_Text_1BCCF4, Route115_Text_1BCD32 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if_eq Route115_EventScript_150A03 @@ -53,16 +53,16 @@ Route115_EventScript_1509DC:: @ 81509DC end Route115_EventScript_150A03:: @ 8150A03 - trainerbattle 5, TRAINER_CYNDY_1, 0, Route115_Text_1BCDB0, Route115_Text_1BCDD0 + trainerbattle_rematch TRAINER_CYNDY_1, Route115_Text_1BCDB0, Route115_Text_1BCDD0 msgbox Route115_Text_1BCDEF, 6 end Route115_EventScript_150A1A:: @ 8150A1A .ifdef SAPPHIRE - trainerbattle 0, TRAINER_514, 0, UnknownString_81BCE47, UnknownString_81BCE7D + trainerbattle_single TRAINER_514, UnknownString_81BCE47, UnknownString_81BCE7D msgbox UnknownString_81BCEA4, 6 .else - trainerbattle 0, TRAINER_514, 0, Route115_Text_1BCEE0, Route115_Text_1BCF16 + trainerbattle_single TRAINER_514, Route115_Text_1BCEE0, Route115_Text_1BCF16 msgbox Route115_Text_1BCF3D, 6 .endc end diff --git a/data/maps/Route116/scripts.inc b/data/maps/Route116/scripts.inc index 29ddd8ae2..280a0e664 100644 --- a/data/maps/Route116/scripts.inc +++ b/data/maps/Route116/scripts.inc @@ -39,7 +39,7 @@ Route116_EventScript_150A7B:: @ 8150A7B Route116_EventScript_150A94:: @ 8150A94 setflag FLAG_MET_DEVON_EMPLOYEE - giveitem_std ITEM_REPEAT_BALL + giveitem ITEM_REPEAT_BALL compare VAR_RESULT, 0 goto_if_eq Route116_EventScript_150B12 msgbox Route116_Text_1707B8, 4 @@ -225,17 +225,17 @@ Route116_Movement_150C57:: @ 8150C57 end_movement Route116_EventScript_150C62:: @ 8150C62 - trainerbattle 0, TRAINER_JOEY, 0, Route116_Text_1BD02B, Route116_Text_1BD04C + trainerbattle_single TRAINER_JOEY, Route116_Text_1BD02B, Route116_Text_1BD04C msgbox Route116_Text_1BD078, 6 end Route116_EventScript_150C79:: @ 8150C79 - trainerbattle 0, TRAINER_JOSE, 0, Route116_Text_1BD0AF, Route116_Text_1BD0D7 + trainerbattle_single TRAINER_JOSE, Route116_Text_1BD0AF, Route116_Text_1BD0D7 msgbox Route116_Text_1BD0F4, 6 end Route116_EventScript_150C90:: @ 8150C90 - trainerbattle 0, TRAINER_JERRY_1, 0, Route116_Text_1BD1C0, Route116_Text_1BD21A + trainerbattle_single TRAINER_JERRY_1, Route116_Text_1BD1C0, Route116_Text_1BD21A specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if_eq Route116_EventScript_150CB7 @@ -243,22 +243,22 @@ Route116_EventScript_150C90:: @ 8150C90 end Route116_EventScript_150CB7:: @ 8150CB7 - trainerbattle 5, TRAINER_JERRY_1, 0, Route116_Text_1BD2A5, Route116_Text_1BD2FE + trainerbattle_rematch TRAINER_JERRY_1, Route116_Text_1BD2A5, Route116_Text_1BD2FE msgbox Route116_Text_1BD31A, 6 end Route116_EventScript_150CCE:: @ 8150CCE - trainerbattle 0, TRAINER_CLARK, 0, Route116_Text_1BCF79, Route116_Text_1BCFBB + trainerbattle_single TRAINER_CLARK, Route116_Text_1BCF79, Route116_Text_1BCFBB msgbox Route116_Text_1BCFE3, 6 end Route116_EventScript_150CE5:: @ 8150CE5 - trainerbattle 0, TRAINER_JANICE, 0, Route116_Text_1BD131, Route116_Text_1BD165 + trainerbattle_single TRAINER_JANICE, Route116_Text_1BD131, Route116_Text_1BD165 msgbox Route116_Text_1BD180, 6 end Route116_EventScript_150CFC:: @ 8150CFC - trainerbattle 0, TRAINER_KAREN_1, 0, Route116_Text_1BD377, Route116_Text_1BD3AC + trainerbattle_single TRAINER_KAREN_1, Route116_Text_1BD377, Route116_Text_1BD3AC specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if_eq Route116_EventScript_150D23 @@ -266,6 +266,6 @@ Route116_EventScript_150CFC:: @ 8150CFC end Route116_EventScript_150D23:: @ 8150D23 - trainerbattle 5, TRAINER_KAREN_1, 0, Route116_Text_1BD405, Route116_Text_1BD44A + trainerbattle_rematch TRAINER_KAREN_1, Route116_Text_1BD405, Route116_Text_1BD44A msgbox Route116_Text_1BD466, 6 end diff --git a/data/maps/Route117/scripts.inc b/data/maps/Route117/scripts.inc index 363b19280..96c549eee 100644 --- a/data/maps/Route117/scripts.inc +++ b/data/maps/Route117/scripts.inc @@ -38,7 +38,7 @@ Route117_EventScript_150D84:: @ 8150D84 end Route117_EventScript_150D8D:: @ 8150D8D - trainerbattle 0, TRAINER_ISAAC_1, 0, Route117_Text_1BD49E, Route117_Text_1BD4D9 + trainerbattle_single TRAINER_ISAAC_1, Route117_Text_1BD49E, Route117_Text_1BD4D9 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if_eq Route117_EventScript_150DB4 @@ -46,12 +46,12 @@ Route117_EventScript_150D8D:: @ 8150D8D end Route117_EventScript_150DB4:: @ 8150DB4 - trainerbattle 5, TRAINER_ISAAC_1, 0, Route117_Text_1BD569, Route117_Text_1BD5AB + trainerbattle_rematch TRAINER_ISAAC_1, Route117_Text_1BD569, Route117_Text_1BD5AB msgbox Route117_Text_1BD5F2, 6 end Route117_EventScript_150DCB:: @ 8150DCB - trainerbattle 0, TRAINER_LYDIA_1, 0, Route117_Text_1BD634, Route117_Text_1BD67B + trainerbattle_single TRAINER_LYDIA_1, Route117_Text_1BD634, Route117_Text_1BD67B specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if_eq Route117_EventScript_150DF2 @@ -59,12 +59,12 @@ Route117_EventScript_150DCB:: @ 8150DCB end Route117_EventScript_150DF2:: @ 8150DF2 - trainerbattle 5, TRAINER_LYDIA_1, 0, Route117_Text_1BD6F2, Route117_Text_1BD733 + trainerbattle_rematch TRAINER_LYDIA_1, Route117_Text_1BD6F2, Route117_Text_1BD733 msgbox Route117_Text_1BD74F, 6 end Route117_EventScript_150E09:: @ 8150E09 - trainerbattle 0, TRAINER_DYLAN_1, 0, Route117_Text_1BD79A, Route117_Text_1BD7E0 + trainerbattle_single TRAINER_DYLAN_1, Route117_Text_1BD79A, Route117_Text_1BD7E0 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if_eq Route117_EventScript_150E30 @@ -72,12 +72,12 @@ Route117_EventScript_150E09:: @ 8150E09 end Route117_EventScript_150E30:: @ 8150E30 - trainerbattle 5, TRAINER_DYLAN_1, 0, Route117_Text_1BD83F, Route117_Text_1BD8A2 + trainerbattle_rematch TRAINER_DYLAN_1, Route117_Text_1BD83F, Route117_Text_1BD8A2 msgbox Route117_Text_1BD8BD, 6 end Route117_EventScript_150E47:: @ 8150E47 - trainerbattle 0, TRAINER_MARIA_1, 0, Route117_Text_1BD914, Route117_Text_1BD965 + trainerbattle_single TRAINER_MARIA_1, Route117_Text_1BD914, Route117_Text_1BD965 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if_eq Route117_EventScript_150E6E @@ -85,17 +85,17 @@ Route117_EventScript_150E47:: @ 8150E47 end Route117_EventScript_150E6E:: @ 8150E6E - trainerbattle 5, TRAINER_MARIA_1, 0, Route117_Text_1BD9F1, Route117_Text_1BDA41 + trainerbattle_rematch TRAINER_MARIA_1, Route117_Text_1BD9F1, Route117_Text_1BDA41 msgbox Route117_Text_1BDA6B, 6 end Route117_EventScript_150E85:: @ 8150E85 - trainerbattle 0, TRAINER_DEREK, 0, Route117_Text_1BDAA7, Route117_Text_1BDAFC + trainerbattle_single TRAINER_DEREK, Route117_Text_1BDAA7, Route117_Text_1BDAFC msgbox Route117_Text_1BDB24, 6 end Route117_EventScript_150E9C:: @ 8150E9C - trainerbattle 4, TRAINER_ANNA_AND_MEG_1, 0, Route117_Text_1BDBC3, Route117_Text_1BDC07, Route117_Text_1BDC96 + trainerbattle_double TRAINER_ANNA_AND_MEG_1, Route117_Text_1BDBC3, Route117_Text_1BDC07, Route117_Text_1BDC96 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if_eq Route117_EventScript_150EC7 @@ -103,12 +103,12 @@ Route117_EventScript_150E9C:: @ 8150E9C end Route117_EventScript_150EC7:: @ 8150EC7 - trainerbattle 7, TRAINER_ANNA_AND_MEG_1, 0, Route117_Text_1BDDEF, Route117_Text_1BDE2F, Route117_Text_1BDEA7 + trainerbattle_rematch_double TRAINER_ANNA_AND_MEG_1, Route117_Text_1BDDEF, Route117_Text_1BDE2F, Route117_Text_1BDEA7 msgbox Route117_Text_1BDE55, 6 end Route117_EventScript_150EE2:: @ 8150EE2 - trainerbattle 4, TRAINER_ANNA_AND_MEG_1, 0, Route117_Text_1BDCD2, Route117_Text_1BDD1E, Route117_Text_1BDD8B + trainerbattle_double TRAINER_ANNA_AND_MEG_1, Route117_Text_1BDCD2, Route117_Text_1BDD1E, Route117_Text_1BDD8B specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if_eq Route117_EventScript_150F0D @@ -116,6 +116,6 @@ Route117_EventScript_150EE2:: @ 8150EE2 end Route117_EventScript_150F0D:: @ 8150F0D - trainerbattle 7, TRAINER_ANNA_AND_MEG_1, 0, Route117_Text_1BDEE3, Route117_Text_1BDF26, Route117_Text_1BDF90 + trainerbattle_rematch_double TRAINER_ANNA_AND_MEG_1, Route117_Text_1BDEE3, Route117_Text_1BDF26, Route117_Text_1BDF90 msgbox Route117_Text_1BDF37, 6 end diff --git a/data/maps/Route118/scripts.inc b/data/maps/Route118/scripts.inc index 0bb082903..fa27a4697 100644 --- a/data/maps/Route118/scripts.inc +++ b/data/maps/Route118/scripts.inc @@ -19,7 +19,7 @@ Route118_EventScript_150F34:: @ 8150F34 Route118_EventScript_150F5E:: @ 8150F5E msgbox Route118_Text_170F46, 4 - giveitem_std ITEM_GOOD_ROD + giveitem ITEM_GOOD_ROD setflag FLAG_RECEIVED_GOOD_ROD msgbox Route118_Text_170F7E, 4 release @@ -159,7 +159,7 @@ Route118_Movement_151086:: @ 8151086 end_movement Route118_EventScript_15108F:: @ 815108F - trainerbattle 0, TRAINER_ROSE_1, 0, Route118_Text_1BDFF4, Route118_Text_1BE03C + trainerbattle_single TRAINER_ROSE_1, Route118_Text_1BDFF4, Route118_Text_1BE03C specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if_eq Route118_EventScript_1510B6 @@ -167,22 +167,22 @@ Route118_EventScript_15108F:: @ 815108F end Route118_EventScript_1510B6:: @ 81510B6 - trainerbattle 5, TRAINER_ROSE_1, 0, Route118_Text_1BE0AB, Route118_Text_1BE0D3 + trainerbattle_rematch TRAINER_ROSE_1, Route118_Text_1BE0AB, Route118_Text_1BE0D3 msgbox Route118_Text_1BE104, 6 end Route118_EventScript_1510CD:: @ 81510CD - trainerbattle 0, TRAINER_BARNY, 0, Route118_Text_1BE24A, Route118_Text_1BE291 + trainerbattle_single TRAINER_BARNY, Route118_Text_1BE24A, Route118_Text_1BE291 msgbox Route118_Text_1BE2BE, 6 end Route118_EventScript_1510E4:: @ 81510E4 - trainerbattle 0, TRAINER_WADE, 0, Route118_Text_1BE318, Route118_Text_1BE385 + trainerbattle_single TRAINER_WADE, Route118_Text_1BE318, Route118_Text_1BE385 msgbox Route118_Text_1BE39C, 6 end Route118_EventScript_1510FB:: @ 81510FB - trainerbattle 0, TRAINER_DALTON_1, 0, Route118_Text_1BE3E8, Route118_Text_1BE406 + trainerbattle_single TRAINER_DALTON_1, Route118_Text_1BE3E8, Route118_Text_1BE406 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if_eq Route118_EventScript_151122 @@ -190,16 +190,16 @@ Route118_EventScript_1510FB:: @ 81510FB end Route118_EventScript_151122:: @ 8151122 - trainerbattle 5, TRAINER_DALTON_1, 0, Route118_Text_1BE489, Route118_Text_1BE4CC + trainerbattle_rematch TRAINER_DALTON_1, Route118_Text_1BE489, Route118_Text_1BE4CC msgbox Route118_Text_1BE4D9, 6 end Route118_EventScript_151139:: @ 8151139 - trainerbattle 0, TRAINER_PERRY, 0, Route118_Text_1BE148, Route118_Text_1BE188 + trainerbattle_single TRAINER_PERRY, Route118_Text_1BE148, Route118_Text_1BE188 msgbox Route118_Text_1BE19D, 6 end Route118_EventScript_151150:: @ 8151150 - trainerbattle 0, TRAINER_CHESTER, 0, Route118_Text_1BE1D7, Route118_Text_1BE1F5 + trainerbattle_single TRAINER_CHESTER, Route118_Text_1BE1D7, Route118_Text_1BE1F5 msgbox Route118_Text_1BE20D, 6 end diff --git a/data/maps/Route119/scripts.inc b/data/maps/Route119/scripts.inc index c94ce00e2..5b6d7fbba 100644 --- a/data/maps/Route119/scripts.inc +++ b/data/maps/Route119/scripts.inc @@ -95,17 +95,17 @@ Route119_EventScript_15125E:: @ 815125E end Route119_EventScript_15128D:: @ 815128D - trainerbattle 3, TRAINER_MAY_6, 0, Route119_Text_171156 + trainerbattle_no_intro TRAINER_MAY_6, Route119_Text_171156 goto Route119_EventScript_1512BD end Route119_EventScript_15129D:: @ 815129D - trainerbattle 3, TRAINER_MAY_9, 0, Route119_Text_171156 + trainerbattle_no_intro TRAINER_MAY_9, Route119_Text_171156 goto Route119_EventScript_1512BD end Route119_EventScript_1512AD:: @ 81512AD - trainerbattle 3, TRAINER_MAY_3, 0, Route119_Text_171156 + trainerbattle_no_intro TRAINER_MAY_3, Route119_Text_171156 goto Route119_EventScript_1512BD end @@ -125,17 +125,17 @@ Route119_EventScript_1512D8:: @ 81512D8 end Route119_EventScript_151307:: @ 8151307 - trainerbattle 3, TRAINER_BRENDAN_6, 0, Route119_Text_1713E2 + trainerbattle_no_intro TRAINER_BRENDAN_6, Route119_Text_1713E2 goto Route119_EventScript_151337 end Route119_EventScript_151317:: @ 8151317 - trainerbattle 3, TRAINER_BRENDAN_9, 0, Route119_Text_1713E2 + trainerbattle_no_intro TRAINER_BRENDAN_9, Route119_Text_1713E2 goto Route119_EventScript_151337 end Route119_EventScript_151327:: @ 8151327 - trainerbattle 3, TRAINER_BRENDAN_3, 0, Route119_Text_1713E2 + trainerbattle_no_intro TRAINER_BRENDAN_3, Route119_Text_1713E2 goto Route119_EventScript_151337 end @@ -147,7 +147,7 @@ Route119_EventScript_151337:: @ 8151337 end Route119_EventScript_151352:: @ 8151352 - giveitem_std ITEM_HM02_FLY + giveitem ITEM_HM02_FLY setflag FLAG_RECEIVED_HM02 return @@ -264,37 +264,37 @@ Route119_EventScript_15142C:: @ 815142C end Route119_EventScript_151435:: @ 8151435 - trainerbattle 0, TRAINER_BRENT, 0, Route119_Text_1BE521, Route119_Text_1BE54F + trainerbattle_single TRAINER_BRENT, Route119_Text_1BE521, Route119_Text_1BE54F msgbox Route119_Text_1BE561, 6 end Route119_EventScript_15144C:: @ 815144C - trainerbattle 0, TRAINER_DONALD, 0, Route119_Text_1BE5A4, Route119_Text_1BE5DF + trainerbattle_single TRAINER_DONALD, Route119_Text_1BE5A4, Route119_Text_1BE5DF msgbox Route119_Text_1BE5F8, 6 end Route119_EventScript_151463:: @ 8151463 - trainerbattle 0, TRAINER_TAYLOR, 0, Route119_Text_1BE632, Route119_Text_1BE67B + trainerbattle_single TRAINER_TAYLOR, Route119_Text_1BE632, Route119_Text_1BE67B msgbox Route119_Text_1BE695, 6 end Route119_EventScript_15147A:: @ 815147A - trainerbattle 0, TRAINER_DOUG, 0, Route119_Text_1BE6EA, Route119_Text_1BE729 + trainerbattle_single TRAINER_DOUG, Route119_Text_1BE6EA, Route119_Text_1BE729 msgbox Route119_Text_1BE748, 6 end Route119_EventScript_151491:: @ 8151491 - trainerbattle 0, TRAINER_GREG, 0, Route119_Text_1BE784, Route119_Text_1BE7D3 + trainerbattle_single TRAINER_GREG, Route119_Text_1BE784, Route119_Text_1BE7D3 msgbox Route119_Text_1BE7E9, 6 end Route119_EventScript_1514A8:: @ 81514A8 - trainerbattle 0, TRAINER_KENT, 0, Route119_Text_1BE82F, Route119_Text_1BE88D + trainerbattle_single TRAINER_KENT, Route119_Text_1BE82F, Route119_Text_1BE88D msgbox Route119_Text_1BE89A, 6 end Route119_EventScript_1514BF:: @ 81514BF - trainerbattle 0, TRAINER_JACKSON_1, 0, Route119_Text_1BE8BB, Route119_Text_1BE90E + trainerbattle_single TRAINER_JACKSON_1, Route119_Text_1BE8BB, Route119_Text_1BE90E specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if_eq Route119_EventScript_1514E6 @@ -302,12 +302,12 @@ Route119_EventScript_1514BF:: @ 81514BF end Route119_EventScript_1514E6:: @ 81514E6 - trainerbattle 5, TRAINER_JACKSON_1, 0, Route119_Text_1BE98D, Route119_Text_1BE9D0 + trainerbattle_rematch TRAINER_JACKSON_1, Route119_Text_1BE98D, Route119_Text_1BE9D0 msgbox Route119_Text_1BE9E8, 6 end Route119_EventScript_1514FD:: @ 81514FD - trainerbattle 0, TRAINER_CATHERINE_1, 0, Route119_Text_1BEA3A, Route119_Text_1BEA88 + trainerbattle_single TRAINER_CATHERINE_1, Route119_Text_1BEA3A, Route119_Text_1BEA88 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if_eq Route119_EventScript_151524 @@ -315,37 +315,37 @@ Route119_EventScript_1514FD:: @ 81514FD end Route119_EventScript_151524:: @ 8151524 - trainerbattle 5, TRAINER_CATHERINE_1, 0, Route119_Text_1BEB22, Route119_Text_1BEB49 + trainerbattle_rematch TRAINER_CATHERINE_1, Route119_Text_1BEB22, Route119_Text_1BEB49 msgbox Route119_Text_1BEB68, 6 end Route119_EventScript_15153B:: @ 815153B - trainerbattle 0, TRAINER_HUGH, 0, Route119_Text_1BEBC0, Route119_Text_1BEC1C + trainerbattle_single TRAINER_HUGH, Route119_Text_1BEBC0, Route119_Text_1BEC1C msgbox Route119_Text_1BEC2A, 6 end Route119_EventScript_151552:: @ 8151552 - trainerbattle 0, TRAINER_PHIL, 0, Route119_Text_1BEC5E, Route119_Text_1BEC9A + trainerbattle_single TRAINER_PHIL, Route119_Text_1BEC5E, Route119_Text_1BEC9A msgbox Route119_Text_1BECB1, 6 end Route119_EventScript_151569:: @ 8151569 - trainerbattle 0, TRAINER_YASU, 0, Route119_Text_1BECF1, Route119_Text_1BED4C + trainerbattle_single TRAINER_YASU, Route119_Text_1BECF1, Route119_Text_1BED4C msgbox Route119_Text_1BED5C, 6 end Route119_EventScript_151580:: @ 8151580 - trainerbattle 0, TRAINER_TAKASHI, 0, Route119_Text_1BEDB6, Route119_Text_1BEDEC + trainerbattle_single TRAINER_TAKASHI, Route119_Text_1BEDB6, Route119_Text_1BEDEC msgbox Route119_Text_1BEE06, 6 end Route119_EventScript_151597:: @ 8151597 - trainerbattle 0, TRAINER_HIDEO_2, 0, Route119_Text_1BEE2D, Route119_Text_1BEE4B + trainerbattle_single TRAINER_HIDEO_2, Route119_Text_1BEE2D, Route119_Text_1BEE4B msgbox Route119_Text_1BEE66, 6 end Route119_EventScript_1515AE:: @ 81515AE - trainerbattle 0, TRAINER_EUGENE, 0, Route119_Text_1BEED0, Route119_Text_1BEF37 + trainerbattle_single TRAINER_EUGENE, Route119_Text_1BEED0, Route119_Text_1BEF37 msgbox Route119_Text_1BEF67, 6 end diff --git a/data/maps/Route119_WeatherInstitute_1F/scripts.inc b/data/maps/Route119_WeatherInstitute_1F/scripts.inc index 547241940..4bdf722a9 100644 --- a/data/maps/Route119_WeatherInstitute_1F/scripts.inc +++ b/data/maps/Route119_WeatherInstitute_1F/scripts.inc @@ -45,11 +45,11 @@ Route119_WeatherInstitute_1F_EventScript_163C83:: @ 8163C83 end Route119_WeatherInstitute_1F_EventScript_163C94:: @ 8163C94 - trainerbattle 0, TRAINER_WEATHER_INSTITUTE_GRUNT_1, 0, Route119_WeatherInstitute_1F_Text_19EB8A, Route119_WeatherInstitute_1F_Text_19EBEE + trainerbattle_single TRAINER_WEATHER_INSTITUTE_GRUNT_1, Route119_WeatherInstitute_1F_Text_19EB8A, Route119_WeatherInstitute_1F_Text_19EBEE msgbox Route119_WeatherInstitute_1F_Text_19EC0E, 6 end Route119_WeatherInstitute_1F_EventScript_163CAB:: @ 8163CAB - trainerbattle 0, TRAINER_WEATHER_INSTITUTE_GRUNT_2, 0, Route119_WeatherInstitute_1F_Text_19EC6B, Route119_WeatherInstitute_1F_Text_19EC89 + trainerbattle_single TRAINER_WEATHER_INSTITUTE_GRUNT_2, Route119_WeatherInstitute_1F_Text_19EC6B, Route119_WeatherInstitute_1F_Text_19EC89 msgbox Route119_WeatherInstitute_1F_Text_19EC97, 6 end diff --git a/data/maps/Route119_WeatherInstitute_2F/scripts.inc b/data/maps/Route119_WeatherInstitute_2F/scripts.inc index a2317a791..c546e69f5 100644 --- a/data/maps/Route119_WeatherInstitute_2F/scripts.inc +++ b/data/maps/Route119_WeatherInstitute_2F/scripts.inc @@ -21,17 +21,17 @@ Route119_WeatherInstitute_2F_EventScript_163CF0:: @ 8163CF0 return Route119_WeatherInstitute_2F_EventScript_163CFC:: @ 8163CFC - trainerbattle 0, TRAINER_WEATHER_INSTITUTE_GRUNT_3, 0, Route119_WeatherInstitute_2F_Text_19EEAF, Route119_WeatherInstitute_2F_Text_19EF1B + trainerbattle_single TRAINER_WEATHER_INSTITUTE_GRUNT_3, Route119_WeatherInstitute_2F_Text_19EEAF, Route119_WeatherInstitute_2F_Text_19EF1B msgbox Route119_WeatherInstitute_2F_Text_19EF3E, 6 end Route119_WeatherInstitute_2F_EventScript_163D13:: @ 8163D13 - trainerbattle 0, TRAINER_WEATHER_INSTITUTE_GRUNT_4, 0, Route119_WeatherInstitute_2F_Text_19EFA3, Route119_WeatherInstitute_2F_Text_19EFDD + trainerbattle_single TRAINER_WEATHER_INSTITUTE_GRUNT_4, Route119_WeatherInstitute_2F_Text_19EFA3, Route119_WeatherInstitute_2F_Text_19EFDD msgbox Route119_WeatherInstitute_2F_Text_19EFE9, 6 end Route119_WeatherInstitute_2F_EventScript_163D2A:: @ 8163D2A - trainerbattle 2, TRAINER_WEATHER_INSTITUTE_GRUNT_5, 0, Route119_WeatherInstitute_2F_Text_19F042, Route119_WeatherInstitute_2F_Text_19F0F4, Route119_WeatherInstitute_2F_EventScript_163D45 + trainerbattle_single TRAINER_WEATHER_INSTITUTE_GRUNT_5, Route119_WeatherInstitute_2F_Text_19F042, Route119_WeatherInstitute_2F_Text_19F0F4, Route119_WeatherInstitute_2F_EventScript_163D45 msgbox Route119_WeatherInstitute_2F_Text_19F11B, 6 end @@ -62,7 +62,7 @@ Route119_WeatherInstitute_2F_EventScript_163D7A:: @ 8163D7A message Route119_WeatherInstitute_2F_Text_19F267 waitfanfare waitmessage - givemon SPECIES_CASTFORM, 25, ITEM_MYSTIC_WATER, 0x0, 0x0, 0 + givemon SPECIES_CASTFORM, 25, ITEM_MYSTIC_WATER setflag FLAG_RECEIVED_CASTFORM msgbox Route119_WeatherInstitute_2F_Text_19F27D, 4 release diff --git a/data/maps/Route120/scripts.inc b/data/maps/Route120/scripts.inc index 4c7aefdea..6ddeec03e 100644 --- a/data/maps/Route120/scripts.inc +++ b/data/maps/Route120/scripts.inc @@ -108,7 +108,7 @@ Route120_EventScript_151735:: @ 8151735 Route120_EventScript_151739:: @ 8151739 lock faceplayer - dodailyevents + dotimebasedevents goto_if_set FLAG_DAILY_RECEIVED_BERRY_ROUTE120, Route120_EventScript_151837 msgbox Route120_Text_1C58F1, MSGBOX_YESNO compare VAR_RESULT, YES @@ -155,7 +155,7 @@ Route120_EventScript_151808:: @ 8151808 end Route120_EventScript_151813:: @ 8151813 - giveitem_std VAR_0x8004 + giveitem VAR_0x8004 compare VAR_RESULT, 0 goto_if_eq Route120_EventScript_1A029B setflag FLAG_DAILY_RECEIVED_BERRY_ROUTE120 @@ -232,7 +232,7 @@ Route120_EventScript_151908:: @ 8151908 applymovement 255, Route120_Movement_1A0841 waitmovement 0 msgbox Route120_Text_171A40, 4 - giveitem_std ITEM_DEVON_SCOPE + giveitem ITEM_DEVON_SCOPE setflag FLAG_RECEIVED_DEVON_SCOPE msgbox Route120_Text_171B0E, 4 closemessage @@ -280,12 +280,12 @@ Route120_EventScript_1519AA:: @ 81519AA end Route120_EventScript_1519B3:: @ 81519B3 - trainerbattle 0, TRAINER_COLIN, 0, Route120_Text_1BEFC8, Route120_Text_1BF000 + trainerbattle_single TRAINER_COLIN, Route120_Text_1BEFC8, Route120_Text_1BF000 msgbox Route120_Text_1BF015, 6 end Route120_EventScript_1519CA:: @ 81519CA - trainerbattle 0, TRAINER_ROBERT_1, 0, Route120_Text_1BF07E, Route120_Text_1BF0A5 + trainerbattle_single TRAINER_ROBERT_1, Route120_Text_1BF07E, Route120_Text_1BF0A5 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if_eq Route120_EventScript_1519F1 @@ -293,22 +293,22 @@ Route120_EventScript_1519CA:: @ 81519CA end Route120_EventScript_1519F1:: @ 81519F1 - trainerbattle 5, TRAINER_ROBERT_1, 0, Route120_Text_1BF0FA, Route120_Text_1BF131 + trainerbattle_rematch TRAINER_ROBERT_1, Route120_Text_1BF0FA, Route120_Text_1BF131 msgbox Route120_Text_1BF154, 6 end Route120_EventScript_151A08:: @ 8151A08 - trainerbattle 0, TRAINER_CARLOS, 0, Route120_Text_1BF193, Route120_Text_1BF1D4 + trainerbattle_single TRAINER_CARLOS, Route120_Text_1BF193, Route120_Text_1BF1D4 msgbox Route120_Text_1BF215, 6 end Route120_EventScript_151A1F:: @ 8151A1F - trainerbattle 0, TRAINER_JENNA, 0, Route120_Text_1BF26E, Route120_Text_1BF2D2 + trainerbattle_single TRAINER_JENNA, Route120_Text_1BF26E, Route120_Text_1BF2D2 msgbox Route120_Text_1BF2EA, 6 end Route120_EventScript_151A36:: @ 8151A36 - trainerbattle 0, TRAINER_BRANDON_1, 0, Route120_Text_1BF32B, Route120_Text_1BF36B + trainerbattle_single TRAINER_BRANDON_1, Route120_Text_1BF32B, Route120_Text_1BF36B specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if_eq Route120_EventScript_151A5D @@ -316,36 +316,36 @@ Route120_EventScript_151A36:: @ 8151A36 end Route120_EventScript_151A5D:: @ 8151A5D - trainerbattle 5, TRAINER_BRANDON_1, 0, Route120_Text_1BF3D0, Route120_Text_1BF416 + trainerbattle_rematch TRAINER_BRANDON_1, Route120_Text_1BF3D0, Route120_Text_1BF416 msgbox Route120_Text_1BF43E, 6 end Route120_EventScript_151A74:: @ 8151A74 - trainerbattle 0, TRAINER_JENNIFER, 0, Route120_Text_1BF4A0, Route120_Text_1BF504 + trainerbattle_single TRAINER_JENNIFER, Route120_Text_1BF4A0, Route120_Text_1BF504 msgbox Route120_Text_1BF51F, 6 end Route120_EventScript_151A8B:: @ 8151A8B - trainerbattle 0, TRAINER_CHIP, 0, Route120_Text_1BF560, Route120_Text_1BF5D6 + trainerbattle_single TRAINER_CHIP, Route120_Text_1BF560, Route120_Text_1BF5D6 msgbox Route120_Text_1BF5F4, 6 end Route120_EventScript_151AA2:: @ 8151AA2 - trainerbattle 0, TRAINER_CLARISSA, 0, Route120_Text_1BF65B, Route120_Text_1BF6A4 + trainerbattle_single TRAINER_CLARISSA, Route120_Text_1BF65B, Route120_Text_1BF6A4 msgbox Route120_Text_1BF6D0, 6 end Route120_EventScript_151AB9:: @ 8151AB9 - trainerbattle 0, TRAINER_ANGELICA, 0, Route120_Text_1BF728, Route120_Text_1BF78C + trainerbattle_single TRAINER_ANGELICA, Route120_Text_1BF728, Route120_Text_1BF78C msgbox Route120_Text_1BF7B2, 6 end Route120_EventScript_151AD0:: @ 8151AD0 - trainerbattle 0, TRAINER_KEIGO, 0, Route120_Text_1BF80B, Route120_Text_1BF852 + trainerbattle_single TRAINER_KEIGO, Route120_Text_1BF80B, Route120_Text_1BF852 msgbox Route120_Text_1BF891, 6 end Route120_EventScript_151AE7:: @ 8151AE7 - trainerbattle 0, TRAINER_TSUNAO, 0, Route120_Text_1BF8C5, Route120_Text_1BF920 + trainerbattle_single TRAINER_TSUNAO, Route120_Text_1BF8C5, Route120_Text_1BF920 msgbox Route120_Text_1BF946, 6 end diff --git a/data/maps/Route121/scripts.inc b/data/maps/Route121/scripts.inc index b6a0abe09..92ca05aea 100644 --- a/data/maps/Route121/scripts.inc +++ b/data/maps/Route121/scripts.inc @@ -67,12 +67,12 @@ Route121_Movement_151B69:: @ 8151B69 end_movement Route121_EventScript_151B72:: @ 8151B72 - trainerbattle 0, TRAINER_VANESSA, 0, Route121_Text_1BF96E, Route121_Text_1BF9A1 + trainerbattle_single TRAINER_VANESSA, Route121_Text_1BF96E, Route121_Text_1BF9A1 msgbox Route121_Text_1BF9BA, 6 end Route121_EventScript_151B89:: @ 8151B89 - trainerbattle 0, TRAINER_WALTER_1, 0, Route121_Text_1BFA1B, Route121_Text_1BFA8C + trainerbattle_single TRAINER_WALTER_1, Route121_Text_1BFA1B, Route121_Text_1BFA8C specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if_eq Route121_EventScript_151BB0 @@ -80,27 +80,27 @@ Route121_EventScript_151B89:: @ 8151B89 end Route121_EventScript_151BB0:: @ 8151BB0 - trainerbattle 5, TRAINER_WALTER_1, 0, Route121_Text_1BFADA, Route121_Text_1BFB4B + trainerbattle_rematch TRAINER_WALTER_1, Route121_Text_1BFADA, Route121_Text_1BFB4B msgbox Route121_Text_1BFB5C, 6 end Route121_EventScript_151BC7:: @ 8151BC7 - trainerbattle 0, TRAINER_TAMMY, 0, Route121_Text_1BFBB4, Route121_Text_1BFBEE + trainerbattle_single TRAINER_TAMMY, Route121_Text_1BFBB4, Route121_Text_1BFBEE msgbox Route121_Text_1BFBFD, 6 end Route121_EventScript_151BDE:: @ 8151BDE - trainerbattle 4, TRAINER_KATE_AND_JOY, 0, Route121_Text_1BFC36, Route121_Text_1BFC7A, Route121_Text_1BFD08 + trainerbattle_double TRAINER_KATE_AND_JOY, Route121_Text_1BFC36, Route121_Text_1BFC7A, Route121_Text_1BFD08 msgbox Route121_Text_1BFCB3, 6 end Route121_EventScript_151BF9:: @ 8151BF9 - trainerbattle 4, TRAINER_KATE_AND_JOY, 0, Route121_Text_1BFD60, Route121_Text_1BFDA3, Route121_Text_1BFE0D + trainerbattle_double TRAINER_KATE_AND_JOY, Route121_Text_1BFD60, Route121_Text_1BFDA3, Route121_Text_1BFE0D msgbox Route121_Text_1BFDC1, 6 end Route121_EventScript_151C14:: @ 8151C14 - trainerbattle 0, TRAINER_JESSICA_1, 0, Route121_Text_1BFE51, Route121_Text_1BFE80 + trainerbattle_single TRAINER_JESSICA_1, Route121_Text_1BFE51, Route121_Text_1BFE80 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if_eq Route121_EventScript_151C3B @@ -108,6 +108,6 @@ Route121_EventScript_151C14:: @ 8151C14 end Route121_EventScript_151C3B:: @ 8151C3B - trainerbattle 5, TRAINER_JESSICA_1, 0, Route121_Text_1BFEDE, Route121_Text_1BFF0A + trainerbattle_rematch TRAINER_JESSICA_1, Route121_Text_1BFEDE, Route121_Text_1BFF0A msgbox Route121_Text_1BFF3A, 6 end diff --git a/data/maps/Route121_SafariZoneEntrance/scripts.inc b/data/maps/Route121_SafariZoneEntrance/scripts.inc index 75f134e7e..7ccd075bb 100644 --- a/data/maps/Route121_SafariZoneEntrance/scripts.inc +++ b/data/maps/Route121_SafariZoneEntrance/scripts.inc @@ -63,11 +63,11 @@ Route121_SafariZoneEntrance_EventScript_15C3B3:: @ 815C3B3 compare VAR_RESULT, 0 goto_if_eq Route121_SafariZoneEntrance_EventScript_15C450 call Route121_SafariZoneEntrance_EventScript_15C425 - checkmoney 0x1f4, 0 + checkmoney 500, 0 compare VAR_RESULT, 0 goto_if_eq Route121_SafariZoneEntrance_EventScript_15C45E msgbox Route121_SafariZoneEntrance_Text_1C38D9, 4 - takemoney 0x1f4, 0 + removemoney 500, 0 updatemoneybox 0, 0 nop msgbox Route121_SafariZoneEntrance_Text_1C38F4, 4 diff --git a/data/maps/Route123/scripts.inc b/data/maps/Route123/scripts.inc index f3ed72b9b..2f4819980 100644 --- a/data/maps/Route123/scripts.inc +++ b/data/maps/Route123/scripts.inc @@ -15,7 +15,7 @@ Route123_EventScript_151C5D:: @ 8151C5D compare VAR_RESULT, 0 goto_if_eq Route123_EventScript_151CAA msgbox Route123_Text_171DC2, 4 - giveitem_std ITEM_TM19_GIGA_DRAIN + giveitem ITEM_TM19_GIGA_DRAIN compare VAR_RESULT, 0 goto_if_eq Route123_EventScript_1A029B setflag FLAG_RECEIVED_TM19 @@ -45,22 +45,22 @@ Route123_EventScript_151CC8:: @ 8151CC8 end Route123_EventScript_151CD1:: @ 8151CD1 - trainerbattle 0, TRAINER_WENDY, 0, Route123_Text_1BFF6A, Route123_Text_1BFFA2 + trainerbattle_single TRAINER_WENDY, Route123_Text_1BFF6A, Route123_Text_1BFFA2 msgbox Route123_Text_1BFFC1, 6 end Route123_EventScript_151CE8:: @ 8151CE8 - trainerbattle 0, TRAINER_CLYDE, 0, Route123_Text_1BFFF0, Route123_Text_1C0057 + trainerbattle_single TRAINER_CLYDE, Route123_Text_1BFFF0, Route123_Text_1C0057 msgbox Route123_Text_1C0075, 6 end Route123_EventScript_151CFF:: @ 8151CFF - trainerbattle 0, TRAINER_VIOLET, 0, Route123_Text_1C009E, Route123_Text_1C00D4 + trainerbattle_single TRAINER_VIOLET, Route123_Text_1C009E, Route123_Text_1C00D4 msgbox Route123_Text_1C0100, 6 end Route123_EventScript_151D16:: @ 8151D16 - trainerbattle 0, TRAINER_CAMERON_1, 0, Route123_Text_1C013F, Route123_Text_1C01A3 + trainerbattle_single TRAINER_CAMERON_1, Route123_Text_1C013F, Route123_Text_1C01A3 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if_eq Route123_EventScript_151D3D @@ -68,12 +68,12 @@ Route123_EventScript_151D16:: @ 8151D16 end Route123_EventScript_151D3D:: @ 8151D3D - trainerbattle 5, TRAINER_CAMERON_1, 0, Route123_Text_1C01F9, Route123_Text_1C0240 + trainerbattle_rematch TRAINER_CAMERON_1, Route123_Text_1C01F9, Route123_Text_1C0240 msgbox Route123_Text_1C024E, 6 end Route123_EventScript_151D54:: @ 8151D54 - trainerbattle 0, TRAINER_JACKI_1, 0, Route123_Text_1C028C, Route123_Text_1C0303 + trainerbattle_single TRAINER_JACKI_1, Route123_Text_1C028C, Route123_Text_1C0303 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if_eq Route123_EventScript_151D7B @@ -81,21 +81,21 @@ Route123_EventScript_151D54:: @ 8151D54 end Route123_EventScript_151D7B:: @ 8151D7B - trainerbattle 5, TRAINER_JACKI_1, 0, Route123_Text_1C0351, Route123_Text_1C0380 + trainerbattle_rematch TRAINER_JACKI_1, Route123_Text_1C0351, Route123_Text_1C0380 msgbox Route123_Text_1C038C, 6 end Route123_EventScript_151D92:: @ 8151D92 - trainerbattle 4, TRAINER_MIU_AND_YUKI, 0, Route123_Text_1C03CB, Route123_Text_1C040E, Route123_Text_1C0462 + trainerbattle_double TRAINER_MIU_AND_YUKI, Route123_Text_1C03CB, Route123_Text_1C040E, Route123_Text_1C0462 msgbox Route123_Text_1C0423, 6 end Route123_EventScript_151DAD:: @ 8151DAD - trainerbattle 4, TRAINER_MIU_AND_YUKI, 0, Route123_Text_1C049C, Route123_Text_1C04CD, Route123_Text_1C0519 + trainerbattle_double TRAINER_MIU_AND_YUKI, Route123_Text_1C049C, Route123_Text_1C04CD, Route123_Text_1C0519 msgbox Route123_Text_1C04E3, 6 end Route123_EventScript_151DC8:: @ 8151DC8 - trainerbattle 0, TRAINER_KINDRA, 0, Route123_Text_1C0554, Route123_Text_1C059F + trainerbattle_single TRAINER_KINDRA, Route123_Text_1C0554, Route123_Text_1C059F msgbox Route123_Text_1C05BC, 6 end diff --git a/data/maps/Route123_BerryMastersHouse/scripts.inc b/data/maps/Route123_BerryMastersHouse/scripts.inc index d81cf9aee..796bcce13 100644 --- a/data/maps/Route123_BerryMastersHouse/scripts.inc +++ b/data/maps/Route123_BerryMastersHouse/scripts.inc @@ -9,13 +9,13 @@ Route123_BerryMastersHouse_MapScript1_1639E5:: @ 81639E5 Route123_BerryMastersHouse_EventScript_1639E9:: @ 81639E9 lock faceplayer - dodailyevents + dotimebasedevents goto_if_set FLAG_DAILY_RECEIVED_BERRY_FROM_BERRYMASTER, Route123_BerryMastersHouse_EventScript_163A5A msgbox Route123_BerryMastersHouse_Text_1C5BC4, 4 random 10 addvar VAR_RESULT, 20 addvar VAR_RESULT, 133 - giveitem_std VAR_RESULT + giveitem VAR_RESULT compare VAR_RESULT, 0 goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B setflag FLAG_DAILY_RECEIVED_BERRY_FROM_BERRYMASTER @@ -23,7 +23,7 @@ Route123_BerryMastersHouse_EventScript_1639E9:: @ 81639E9 random 10 addvar VAR_RESULT, 20 addvar VAR_RESULT, 133 - giveitem_std VAR_RESULT + giveitem VAR_RESULT compare VAR_RESULT, 0 goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B msgbox Route123_BerryMastersHouse_Text_1C5C83, 4 @@ -38,7 +38,7 @@ Route123_BerryMastersHouse_EventScript_163A5A:: @ 8163A5A Route123_BerryMastersHouse_EventScript_163A64:: @ 8163A64 lock faceplayer - dodailyevents + dotimebasedevents goto_if_set FLAG_DAILY_RECEIVED_BERRY_FROM_BERRYMASTER_WIFE, Route123_BerryMastersHouse_EventScript_163C13 msgbox Route123_BerryMastersHouse_Text_1C5D24, 4 setvar VAR_0x8004, 13 @@ -76,7 +76,7 @@ Route123_BerryMastersHouse_EventScript_163AF0:: @ 8163AF0 msgbox Route123_BerryMastersHouse_Text_1C5E0E, 4 random 10 addvar VAR_RESULT, ITEM_CHERI_BERRY - giveitem_std VAR_RESULT + giveitem VAR_RESULT compare VAR_RESULT, 0 goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B goto Route123_BerryMastersHouse_EventScript_163C1D @@ -86,7 +86,7 @@ Route123_BerryMastersHouse_EventScript_163AF0:: @ 8163AF0 Route123_BerryMastersHouse_EventScript_163B1E:: @ 8163B1E goto_if_set FLAG_RECEIVED_SPELON_BERRY, Route123_BerryMastersHouse_EventScript_163AF0 msgbox Route123_BerryMastersHouse_Text_1C5DC1, 4 - giveitem_std ITEM_SPELON_BERRY + giveitem ITEM_SPELON_BERRY compare VAR_RESULT, 0 goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B setflag FLAG_RECEIVED_SPELON_BERRY @@ -96,7 +96,7 @@ Route123_BerryMastersHouse_EventScript_163B1E:: @ 8163B1E Route123_BerryMastersHouse_EventScript_163B4F:: @ 8163B4F goto_if_set FLAG_RECEIVED_PAMTRE_BERRY, Route123_BerryMastersHouse_EventScript_163AF0 msgbox Route123_BerryMastersHouse_Text_1C5DC1, 4 - giveitem_std ITEM_PAMTRE_BERRY + giveitem ITEM_PAMTRE_BERRY compare VAR_RESULT, 0 goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B setflag FLAG_RECEIVED_PAMTRE_BERRY @@ -106,7 +106,7 @@ Route123_BerryMastersHouse_EventScript_163B4F:: @ 8163B4F Route123_BerryMastersHouse_EventScript_163B80:: @ 8163B80 goto_if_set FLAG_RECEIVED_WATMEL_BERRY, Route123_BerryMastersHouse_EventScript_163AF0 msgbox Route123_BerryMastersHouse_Text_1C5DC1, 4 - giveitem_std ITEM_WATMEL_BERRY + giveitem ITEM_WATMEL_BERRY compare VAR_RESULT, 0 goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B setflag FLAG_RECEIVED_WATMEL_BERRY @@ -116,7 +116,7 @@ Route123_BerryMastersHouse_EventScript_163B80:: @ 8163B80 Route123_BerryMastersHouse_EventScript_163BB1:: @ 8163BB1 goto_if_set FLAG_RECEIVED_DURIN_BERRY, Route123_BerryMastersHouse_EventScript_163AF0 msgbox Route123_BerryMastersHouse_Text_1C5DC1, 4 - giveitem_std ITEM_DURIN_BERRY + giveitem ITEM_DURIN_BERRY compare VAR_RESULT, 0 goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B setflag FLAG_RECEIVED_DURIN_BERRY @@ -126,7 +126,7 @@ Route123_BerryMastersHouse_EventScript_163BB1:: @ 8163BB1 Route123_BerryMastersHouse_EventScript_163BE2:: @ 8163BE2 goto_if_set FLAG_RECEIVED_BELUE_BERRY, Route123_BerryMastersHouse_EventScript_163AF0 msgbox Route123_BerryMastersHouse_Text_1C5DC1, 4 - giveitem_std ITEM_BELUE_BERRY + giveitem ITEM_BELUE_BERRY compare VAR_RESULT, 0 goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B setflag FLAG_RECEIVED_BELUE_BERRY diff --git a/data/maps/Route124/scripts.inc b/data/maps/Route124/scripts.inc index 8232dee34..e57ec4004 100644 --- a/data/maps/Route124/scripts.inc +++ b/data/maps/Route124/scripts.inc @@ -11,17 +11,17 @@ Route124_EventScript_151DEF:: @ 8151DEF end Route124_EventScript_151DF8:: @ 8151DF8 - trainerbattle 0, TRAINER_SPENCER, 0, Route124_Text_1C0624, Route124_Text_1C0675 + trainerbattle_single TRAINER_SPENCER, Route124_Text_1C0624, Route124_Text_1C0675 msgbox Route124_Text_1C0693, 6 end Route124_EventScript_151E0F:: @ 8151E0F - trainerbattle 0, TRAINER_ROLAND, 0, Route124_Text_1C06F7, Route124_Text_1C0741 + trainerbattle_single TRAINER_ROLAND, Route124_Text_1C06F7, Route124_Text_1C0741 msgbox Route124_Text_1C0750, 6 end Route124_EventScript_151E26:: @ 8151E26 - trainerbattle 0, TRAINER_JENNY_1, 0, Route124_Text_1C07B4, Route124_Text_1C07F9 + trainerbattle_single TRAINER_JENNY_1, Route124_Text_1C07B4, Route124_Text_1C07F9 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if_eq Route124_EventScript_151E4D @@ -29,22 +29,22 @@ Route124_EventScript_151E26:: @ 8151E26 end Route124_EventScript_151E4D:: @ 8151E4D - trainerbattle 5, TRAINER_JENNY_1, 0, Route124_Text_1C0888, Route124_Text_1C08C8 + trainerbattle_rematch TRAINER_JENNY_1, Route124_Text_1C0888, Route124_Text_1C08C8 msgbox Route124_Text_1C08EA, 6 end Route124_EventScript_151E64:: @ 8151E64 - trainerbattle 0, TRAINER_GRACE, 0, Route124_Text_1C0936, Route124_Text_1C096B + trainerbattle_single TRAINER_GRACE, Route124_Text_1C0936, Route124_Text_1C096B msgbox Route124_Text_1C0994, 6 end Route124_EventScript_151E7B:: @ 8151E7B - trainerbattle 0, TRAINER_CHAD, 0, Route124_Text_1C09CE, Route124_Text_1C0A2F + trainerbattle_single TRAINER_CHAD, Route124_Text_1C09CE, Route124_Text_1C0A2F msgbox Route124_Text_1C0A52, 6 end Route124_EventScript_151E92:: @ 8151E92 - trainerbattle 4, TRAINER_RITA_AND_SAM_1, 0, Route124_Text_1C0ABD, Route124_Text_1C0B36, Route124_Text_1C0BC8 + trainerbattle_double TRAINER_RITA_AND_SAM_1, Route124_Text_1C0ABD, Route124_Text_1C0B36, Route124_Text_1C0BC8 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if_eq Route124_EventScript_151EBD @@ -52,12 +52,12 @@ Route124_EventScript_151E92:: @ 8151E92 end Route124_EventScript_151EBD:: @ 8151EBD - trainerbattle 7, TRAINER_RITA_AND_SAM_1, 0, Route124_Text_1C0D1F, Route124_Text_1C0DB5, Route124_Text_1C0E5C + trainerbattle_rematch_double TRAINER_RITA_AND_SAM_1, Route124_Text_1C0D1F, Route124_Text_1C0DB5, Route124_Text_1C0E5C msgbox Route124_Text_1C0E06, 6 end Route124_EventScript_151ED8:: @ 8151ED8 - trainerbattle 4, TRAINER_RITA_AND_SAM_1, 0, Route124_Text_1C0C0E, Route124_Text_1C0C4F, Route124_Text_1C0CE0 + trainerbattle_double TRAINER_RITA_AND_SAM_1, Route124_Text_1C0C0E, Route124_Text_1C0C4F, Route124_Text_1C0CE0 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if_eq Route124_EventScript_151F03 @@ -65,6 +65,6 @@ Route124_EventScript_151ED8:: @ 8151ED8 end Route124_EventScript_151F03:: @ 8151F03 - trainerbattle 7, TRAINER_RITA_AND_SAM_1, 0, Route124_Text_1C0EA2, Route124_Text_1C0EE5, Route124_Text_1C0F90 + trainerbattle_rematch_double TRAINER_RITA_AND_SAM_1, Route124_Text_1C0EA2, Route124_Text_1C0EE5, Route124_Text_1C0F90 msgbox Route124_Text_1C0F19, 6 end diff --git a/data/maps/Route124_DivingTreasureHuntersHouse/scripts.inc b/data/maps/Route124_DivingTreasureHuntersHouse/scripts.inc index 128b48a25..d3ba1d83a 100644 --- a/data/maps/Route124_DivingTreasureHuntersHouse/scripts.inc +++ b/data/maps/Route124_DivingTreasureHuntersHouse/scripts.inc @@ -258,8 +258,8 @@ Route124_DivingTreasureHuntersHouse_EventScript_164292:: @ 8164292 end Route124_DivingTreasureHuntersHouse_EventScript_1642D3:: @ 81642D3 - takeitem VAR_0x8008, 1 - giveitem_std VAR_0x8009 + removeitem VAR_0x8008 + giveitem VAR_0x8009 msgbox Route124_DivingTreasureHuntersHouse_Text_19F606, 4 call Route124_DivingTreasureHuntersHouse_EventScript_163E44 compare VAR_TEMP_1, 0 diff --git a/data/maps/Route125/scripts.inc b/data/maps/Route125/scripts.inc index 3e1febd5d..5abebc1ed 100644 --- a/data/maps/Route125/scripts.inc +++ b/data/maps/Route125/scripts.inc @@ -7,27 +7,27 @@ Route125_MapScript1_151F24:: @ 8151F24 end Route125_EventScript_151F2E:: @ 8151F2E - trainerbattle 0, TRAINER_CODY, 0, Route125_Text_1C0FCF, Route125_Text_1C1002 + trainerbattle_single TRAINER_CODY, Route125_Text_1C0FCF, Route125_Text_1C1002 msgbox Route125_Text_1C1013, 6 end Route125_EventScript_151F45:: @ 8151F45 - trainerbattle 0, TRAINER_STAN, 0, Route125_Text_1C104B, Route125_Text_1C1073 + trainerbattle_single TRAINER_STAN, Route125_Text_1C104B, Route125_Text_1C1073 msgbox Route125_Text_1C1083, 6 end Route125_EventScript_151F5C:: @ 8151F5C - trainerbattle 0, TRAINER_TANYA, 0, Route125_Text_1C10C3, Route125_Text_1C10FB + trainerbattle_single TRAINER_TANYA, Route125_Text_1C10C3, Route125_Text_1C10FB msgbox Route125_Text_1C110C, 6 end Route125_EventScript_151F73:: @ 8151F73 - trainerbattle 0, TRAINER_SHARON, 0, Route125_Text_1C1136, Route125_Text_1C1175 + trainerbattle_single TRAINER_SHARON, Route125_Text_1C1136, Route125_Text_1C1175 msgbox Route125_Text_1C117F, 6 end Route125_EventScript_151F8A:: @ 8151F8A - trainerbattle 0, TRAINER_ERNEST_1, 0, Route125_Text_1C11AF, Route125_Text_1C11ED + trainerbattle_single TRAINER_ERNEST_1, Route125_Text_1C11AF, Route125_Text_1C11ED specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if_eq Route125_EventScript_151FB1 @@ -35,16 +35,16 @@ Route125_EventScript_151F8A:: @ 8151F8A end Route125_EventScript_151FB1:: @ 8151FB1 - trainerbattle 5, TRAINER_ERNEST_1, 0, Route125_Text_1C1282, Route125_Text_1C12C5 + trainerbattle_rematch TRAINER_ERNEST_1, Route125_Text_1C1282, Route125_Text_1C12C5 msgbox Route125_Text_1C12EE, 6 end Route125_EventScript_151FC8:: @ 8151FC8 - trainerbattle 4, TRAINER_KIM_AND_IRIS, 0, Route125_Text_1C13A1, Route125_Text_1C13FF, Route125_Text_1C146E + trainerbattle_double TRAINER_KIM_AND_IRIS, Route125_Text_1C13A1, Route125_Text_1C13FF, Route125_Text_1C146E msgbox Route125_Text_1C141C, 6 end Route125_EventScript_151FE3:: @ 8151FE3 - trainerbattle 4, TRAINER_KIM_AND_IRIS, 0, Route125_Text_1C14AB, Route125_Text_1C14E7, Route125_Text_1C154F + trainerbattle_double TRAINER_KIM_AND_IRIS, Route125_Text_1C14AB, Route125_Text_1C14E7, Route125_Text_1C154F msgbox Route125_Text_1C1508, 6 end diff --git a/data/maps/Route126/scripts.inc b/data/maps/Route126/scripts.inc index 3eb68a1d1..f13989401 100644 --- a/data/maps/Route126/scripts.inc +++ b/data/maps/Route126/scripts.inc @@ -7,21 +7,21 @@ Route126_MapScript1_152004:: @ 8152004 end Route126_EventScript_15200E:: @ 815200E - trainerbattle 0, TRAINER_BARRY, 0, Route126_Text_1C1590, Route126_Text_1C15C3 + trainerbattle_single TRAINER_BARRY, Route126_Text_1C1590, Route126_Text_1C15C3 msgbox Route126_Text_1C15D8, 6 end Route126_EventScript_152025:: @ 8152025 - trainerbattle 0, TRAINER_DEAN, 0, Route126_Text_1C1627, Route126_Text_1C1660 + trainerbattle_single TRAINER_DEAN, Route126_Text_1C1627, Route126_Text_1C1660 msgbox Route126_Text_1C166F, 6 end Route126_EventScript_15203C:: @ 815203C - trainerbattle 0, TRAINER_NIKKI, 0, Route126_Text_1C16AB, Route126_Text_1C16C5 + trainerbattle_single TRAINER_NIKKI, Route126_Text_1C16AB, Route126_Text_1C16C5 msgbox Route126_Text_1C1702, 6 end Route126_EventScript_152053:: @ 8152053 - trainerbattle 0, TRAINER_BRENDA, 0, Route126_Text_1C1741, Route126_Text_1C1766 + trainerbattle_single TRAINER_BRENDA, Route126_Text_1C1741, Route126_Text_1C1766 msgbox Route126_Text_1C1773, 6 end diff --git a/data/maps/Route127/scripts.inc b/data/maps/Route127/scripts.inc index 51ff52501..d59f99d56 100644 --- a/data/maps/Route127/scripts.inc +++ b/data/maps/Route127/scripts.inc @@ -7,36 +7,36 @@ Route127_MapScript1_152070:: @ 8152070 end Route127_EventScript_15207A:: @ 815207A - trainerbattle 0, TRAINER_CALEB, 0, Route127_Text_1C17A8, Route127_Text_1C17DD + trainerbattle_single TRAINER_CALEB, Route127_Text_1C17A8, Route127_Text_1C17DD msgbox Route127_Text_1C17EC, 6 end Route127_EventScript_152091:: @ 8152091 - trainerbattle 0, TRAINER_CONNOR, 0, Route127_Text_1C1828, Route127_Text_1C1860 + trainerbattle_single TRAINER_CONNOR, Route127_Text_1C1828, Route127_Text_1C1860 msgbox Route127_Text_1C1877, 6 end Route127_EventScript_1520A8:: @ 81520A8 - trainerbattle 0, TRAINER_JONAH, 0, Route127_Text_1C18CC, Route127_Text_1C1930 + trainerbattle_single TRAINER_JONAH, Route127_Text_1C18CC, Route127_Text_1C1930 msgbox Route127_Text_1C195D, 6 end Route127_EventScript_1520BF:: @ 81520BF - trainerbattle 0, TRAINER_HENRY, 0, Route127_Text_1C19A3, Route127_Text_1C19D6 + trainerbattle_single TRAINER_HENRY, Route127_Text_1C19A3, Route127_Text_1C19D6 msgbox Route127_Text_1C19E7, 6 end Route127_EventScript_1520D6:: @ 81520D6 - trainerbattle 0, TRAINER_ROGER, 0, Route127_Text_1C1A2E, Route127_Text_1C1A73 + trainerbattle_single TRAINER_ROGER, Route127_Text_1C1A2E, Route127_Text_1C1A73 msgbox Route127_Text_1C1AA0, 6 end Route127_EventScript_1520ED:: @ 81520ED - trainerbattle 0, TRAINER_KOJI, 0, Route127_Text_1C1AE2, Route127_Text_1C1B2A + trainerbattle_single TRAINER_KOJI, Route127_Text_1C1AE2, Route127_Text_1C1B2A msgbox Route127_Text_1C1B39, 6 end Route127_EventScript_152104:: @ 8152104 - trainerbattle 0, TRAINER_BYRON, 0, Route127_Text_1C1B92, Route127_Text_1C1BD9 + trainerbattle_single TRAINER_BYRON, Route127_Text_1C1B92, Route127_Text_1C1BD9 msgbox Route127_Text_1C1BEC, 6 end diff --git a/data/maps/Route128/scripts.inc b/data/maps/Route128/scripts.inc index 3b3522a6f..70bf49888 100644 --- a/data/maps/Route128/scripts.inc +++ b/data/maps/Route128/scripts.inc @@ -180,7 +180,7 @@ Route128_Movement_1522A1:: @ 81522A1 end_movement Route128_EventScript_1522A4:: @ 81522A4 - trainerbattle 0, TRAINER_ISAIAH_1, 0, Route128_Text_1C1C67, Route128_Text_1C1C95 + trainerbattle_single TRAINER_ISAIAH_1, Route128_Text_1C1C67, Route128_Text_1C1C95 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if_eq Route128_EventScript_1522CB @@ -188,12 +188,12 @@ Route128_EventScript_1522A4:: @ 81522A4 end Route128_EventScript_1522CB:: @ 81522CB - trainerbattle 5, TRAINER_ISAIAH_1, 0, Route128_Text_1C1D02, Route128_Text_1C1D45 + trainerbattle_rematch TRAINER_ISAIAH_1, Route128_Text_1C1D02, Route128_Text_1C1D45 msgbox Route128_Text_1C1D6B, 6 end Route128_EventScript_1522E2:: @ 81522E2 - trainerbattle 0, TRAINER_KATELYN_1, 0, Route128_Text_1C1DB0, Route128_Text_1C1E25 + trainerbattle_single TRAINER_KATELYN_1, Route128_Text_1C1DB0, Route128_Text_1C1E25 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if_eq Route128_EventScript_152309 @@ -201,21 +201,21 @@ Route128_EventScript_1522E2:: @ 81522E2 end Route128_EventScript_152309:: @ 8152309 - trainerbattle 5, TRAINER_KATELYN_1, 0, Route128_Text_1C1E90, Route128_Text_1C1EFA + trainerbattle_rematch TRAINER_KATELYN_1, Route128_Text_1C1E90, Route128_Text_1C1EFA msgbox Route128_Text_1C1F2E, 6 end Route128_EventScript_152320:: @ 8152320 - trainerbattle 0, TRAINER_ALEXA, 0, Route128_Text_1C1F6D, Route128_Text_1C1FCC + trainerbattle_single TRAINER_ALEXA, Route128_Text_1C1F6D, Route128_Text_1C1FCC msgbox Route128_Text_1C1FE8, 6 end Route128_EventScript_152337:: @ 8152337 - trainerbattle 0, TRAINER_RUBEN, 0, Route128_Text_1C202C, Route128_Text_1C2051 + trainerbattle_single TRAINER_RUBEN, Route128_Text_1C202C, Route128_Text_1C2051 msgbox Route128_Text_1C2060, 6 end Route128_EventScript_15234E:: @ 815234E - trainerbattle 0, TRAINER_WAYNE, 0, Route128_Text_1C2090, Route128_Text_1C20FC + trainerbattle_single TRAINER_WAYNE, Route128_Text_1C2090, Route128_Text_1C20FC msgbox Route128_Text_1C210D, 6 end diff --git a/data/maps/Route129/scripts.inc b/data/maps/Route129/scripts.inc index 360c67e02..27e5f9364 100644 --- a/data/maps/Route129/scripts.inc +++ b/data/maps/Route129/scripts.inc @@ -2,21 +2,21 @@ Route129_MapScripts:: @ 8152365 .byte 0 Route129_EventScript_152366:: @ 8152366 - trainerbattle 0, TRAINER_CHASE, 0, Route129_Text_1C2161, Route129_Text_1C2198 + trainerbattle_single TRAINER_CHASE, Route129_Text_1C2161, Route129_Text_1C2198 msgbox Route129_Text_1C21B4, 6 end Route129_EventScript_15237D:: @ 815237D - trainerbattle 0, TRAINER_ALLISON, 0, Route129_Text_1C21ED, Route129_Text_1C222F + trainerbattle_single TRAINER_ALLISON, Route129_Text_1C21ED, Route129_Text_1C222F msgbox Route129_Text_1C2243, 6 end Route129_EventScript_152394:: @ 8152394 - trainerbattle 0, TRAINER_REED, 0, Route129_Text_1C22C8, Route129_Text_1C22EC + trainerbattle_single TRAINER_REED, Route129_Text_1C22C8, Route129_Text_1C22EC msgbox Route129_Text_1C230F, 6 end Route129_EventScript_1523AB:: @ 81523AB - trainerbattle 0, TRAINER_TISHA, 0, Route129_Text_1C2349, Route129_Text_1C2378 + trainerbattle_single TRAINER_TISHA, Route129_Text_1C2349, Route129_Text_1C2378 msgbox Route129_Text_1C23A3, 6 end diff --git a/data/maps/Route130/scripts.inc b/data/maps/Route130/scripts.inc index a1e7b27d4..4c2ec5797 100644 --- a/data/maps/Route130/scripts.inc +++ b/data/maps/Route130/scripts.inc @@ -30,11 +30,11 @@ Route130_EventScript_15240C:: @ 815240C end Route130_EventScript_152410:: @ 8152410 - trainerbattle 0, TRAINER_RODNEY, 0, Route130_Text_1C2401, Route130_Text_1C245D + trainerbattle_single TRAINER_RODNEY, Route130_Text_1C2401, Route130_Text_1C245D msgbox Route130_Text_1C2479, 6 end Route130_EventScript_152427:: @ 8152427 - trainerbattle 0, TRAINER_KATIE, 0, Route130_Text_1C24DC, Route130_Text_1C2525 + trainerbattle_single TRAINER_KATIE, Route130_Text_1C24DC, Route130_Text_1C2525 msgbox Route130_Text_1C256E, 6 end diff --git a/data/maps/Route131/scripts.inc b/data/maps/Route131/scripts.inc index 6aa6868f3..59cc9c596 100644 --- a/data/maps/Route131/scripts.inc +++ b/data/maps/Route131/scripts.inc @@ -11,31 +11,31 @@ Route131_EventScript_15244E:: @ 815244E return Route131_EventScript_152452:: @ 8152452 - trainerbattle 0, TRAINER_RICHARD, 0, Route131_Text_1C25B3, Route131_Text_1C25F8 + trainerbattle_single TRAINER_RICHARD, Route131_Text_1C25B3, Route131_Text_1C25F8 msgbox Route131_Text_1C262A, 6 end Route131_EventScript_152469:: @ 8152469 - trainerbattle 0, TRAINER_HERMAN, 0, Route131_Text_1C26B9, Route131_Text_1C271F + trainerbattle_single TRAINER_HERMAN, Route131_Text_1C26B9, Route131_Text_1C271F msgbox Route131_Text_1C2726, 6 end Route131_EventScript_152480:: @ 8152480 - trainerbattle 0, TRAINER_SUSIE, 0, Route131_Text_1C2774, Route131_Text_1C27A4 + trainerbattle_single TRAINER_SUSIE, Route131_Text_1C2774, Route131_Text_1C27A4 msgbox Route131_Text_1C27CF, 6 end Route131_EventScript_152497:: @ 8152497 - trainerbattle 0, TRAINER_KARA, 0, Route131_Text_1C284A, Route131_Text_1C2883 + trainerbattle_single TRAINER_KARA, Route131_Text_1C284A, Route131_Text_1C2883 msgbox Route131_Text_1C2898, 6 end Route131_EventScript_1524AE:: @ 81524AE - trainerbattle 4, TRAINER_RELI_AND_IAN, 0, Route131_Text_1C28E2, Route131_Text_1C2918, Route131_Text_1C29B2 + trainerbattle_double TRAINER_RELI_AND_IAN, Route131_Text_1C28E2, Route131_Text_1C2918, Route131_Text_1C29B2 msgbox Route131_Text_1C2950, 6 end Route131_EventScript_1524C9:: @ 81524C9 - trainerbattle 4, TRAINER_RELI_AND_IAN, 0, Route131_Text_1C29F3, Route131_Text_1C2A20, Route131_Text_1C2ACA + trainerbattle_double TRAINER_RELI_AND_IAN, Route131_Text_1C29F3, Route131_Text_1C2A20, Route131_Text_1C2ACA msgbox Route131_Text_1C2A5D, 6 end diff --git a/data/maps/Route132/scripts.inc b/data/maps/Route132/scripts.inc index 6d964aacf..afbdc52ca 100644 --- a/data/maps/Route132/scripts.inc +++ b/data/maps/Route132/scripts.inc @@ -2,21 +2,21 @@ Route132_MapScripts:: @ 81524E4 .byte 0 Route132_EventScript_1524E5:: @ 81524E5 - trainerbattle 0, TRAINER_GILBERT, 0, Route132_Text_1C2AFB, Route132_Text_1C2B5B + trainerbattle_single TRAINER_GILBERT, Route132_Text_1C2AFB, Route132_Text_1C2B5B msgbox Route132_Text_1C2B71, 6 end Route132_EventScript_1524FC:: @ 81524FC - trainerbattle 0, TRAINER_DANA, 0, Route132_Text_1C2BB5, Route132_Text_1C2BEA + trainerbattle_single TRAINER_DANA, Route132_Text_1C2BB5, Route132_Text_1C2BEA msgbox Route132_Text_1C2BFA, 6 end Route132_EventScript_152513:: @ 8152513 - trainerbattle 0, TRAINER_RONALD, 0, Route132_Text_1C2C32, Route132_Text_1C2C60 + trainerbattle_single TRAINER_RONALD, Route132_Text_1C2C32, Route132_Text_1C2C60 msgbox Route132_Text_1C2C78, 6 end Route132_EventScript_15252A:: @ 815252A - trainerbattle 0, TRAINER_KIYO, 0, Route132_Text_1C2CD9, Route132_Text_1C2D1F + trainerbattle_single TRAINER_KIYO, Route132_Text_1C2CD9, Route132_Text_1C2D1F msgbox Route132_Text_1C2D3E, 6 end diff --git a/data/maps/Route133/scripts.inc b/data/maps/Route133/scripts.inc index 213be5562..eab0dd67a 100644 --- a/data/maps/Route133/scripts.inc +++ b/data/maps/Route133/scripts.inc @@ -2,26 +2,26 @@ Route133_MapScripts:: @ 8152541 .byte 0 Route133_EventScript_152542:: @ 8152542 - trainerbattle 0, TRAINER_FRANKLIN, 0, Route133_Text_1C2DA5, Route133_Text_1C2DF4 + trainerbattle_single TRAINER_FRANKLIN, Route133_Text_1C2DA5, Route133_Text_1C2DF4 msgbox Route133_Text_1C2E09, 6 end Route133_EventScript_152559:: @ 8152559 - trainerbattle 0, TRAINER_DEBRA, 0, Route133_Text_1C2E61, Route133_Text_1C2EBD + trainerbattle_single TRAINER_DEBRA, Route133_Text_1C2E61, Route133_Text_1C2EBD msgbox Route133_Text_1C2ECD, 6 end Route133_EventScript_152570:: @ 8152570 - trainerbattle 0, TRAINER_LINDA, 0, Route133_Text_1C2EF7, Route133_Text_1C2F19 + trainerbattle_single TRAINER_LINDA, Route133_Text_1C2EF7, Route133_Text_1C2F19 msgbox Route133_Text_1C2F25, 6 end Route133_EventScript_152587:: @ 8152587 - trainerbattle 0, TRAINER_WARREN, 0, Route133_Text_1C2F53, Route133_Text_1C2FA3 + trainerbattle_single TRAINER_WARREN, Route133_Text_1C2F53, Route133_Text_1C2FA3 msgbox Route133_Text_1C2FC7, 6 end Route133_EventScript_15259E:: @ 815259E - trainerbattle 0, TRAINER_BECK, 0, Route133_Text_1C302D, Route133_Text_1C305F + trainerbattle_single TRAINER_BECK, Route133_Text_1C302D, Route133_Text_1C305F msgbox Route133_Text_1C307E, 6 end diff --git a/data/maps/Route134/scripts.inc b/data/maps/Route134/scripts.inc index e5c106899..6f286466d 100644 --- a/data/maps/Route134/scripts.inc +++ b/data/maps/Route134/scripts.inc @@ -7,26 +7,26 @@ Route134_MapScript1_1525BB:: @ 81525BB end Route134_EventScript_1525C4:: @ 81525C4 - trainerbattle 0, TRAINER_JACK, 0, Route134_Text_1C30C6, Route134_Text_1C3110 + trainerbattle_single TRAINER_JACK, Route134_Text_1C30C6, Route134_Text_1C3110 msgbox Route134_Text_1C311A, 6 end Route134_EventScript_1525DB:: @ 81525DB - trainerbattle 0, TRAINER_LAUREL, 0, Route134_Text_1C315E, Route134_Text_1C3198 + trainerbattle_single TRAINER_LAUREL, Route134_Text_1C315E, Route134_Text_1C3198 msgbox Route134_Text_1C31A0, 6 end Route134_EventScript_1525F2:: @ 81525F2 - trainerbattle 0, TRAINER_ALEX, 0, Route134_Text_1C31D7, Route134_Text_1C3213 + trainerbattle_single TRAINER_ALEX, Route134_Text_1C31D7, Route134_Text_1C3213 msgbox Route134_Text_1C3229, 6 end Route134_EventScript_152609:: @ 8152609 - trainerbattle 0, TRAINER_AARON, 0, Route134_Text_1C3319, Route134_Text_1C335C + trainerbattle_single TRAINER_AARON, Route134_Text_1C3319, Route134_Text_1C335C msgbox Route134_Text_1C336E, 6 end Route134_EventScript_152620:: @ 8152620 - trainerbattle 0, TRAINER_HITOSHI, 0, Route134_Text_1C3262, Route134_Text_1C329E + trainerbattle_single TRAINER_HITOSHI, Route134_Text_1C3262, Route134_Text_1C329E msgbox Route134_Text_1C32D6, 6 end diff --git a/data/maps/RustboroCity/scripts.inc b/data/maps/RustboroCity/scripts.inc index 710b8c700..231fb1722 100644 --- a/data/maps/RustboroCity/scripts.inc +++ b/data/maps/RustboroCity/scripts.inc @@ -464,7 +464,7 @@ RustboroCity_EventScript_14C77D:: @ 814C77D compare VAR_TEMP_1, 4 call_if_eq RustboroCity_EventScript_14C8B8 msgbox RustboroCity_Text_166FB4, 4 - giveitem_std ITEM_GREAT_BALL + giveitem ITEM_GREAT_BALL compare VAR_RESULT, 0 call_if_eq RustboroCity_EventScript_14C7F5 msgbox RustboroCity_Text_16707F, 4 diff --git a/data/maps/RustboroCity_CuttersHouse/scripts.inc b/data/maps/RustboroCity_CuttersHouse/scripts.inc index b43e0aafe..bbf1adbab 100644 --- a/data/maps/RustboroCity_CuttersHouse/scripts.inc +++ b/data/maps/RustboroCity_CuttersHouse/scripts.inc @@ -6,7 +6,7 @@ RustboroCity_CuttersHouse_EventScript_157D27:: @ 8157D27 faceplayer goto_if_set FLAG_RECEIVED_HM01, RustboroCity_CuttersHouse_EventScript_157D53 msgbox RustboroCity_CuttersHouse_Text_18509C, 4 - giveitem_std ITEM_HM01_CUT + giveitem ITEM_HM01_CUT setflag FLAG_RECEIVED_HM01 msgbox RustboroCity_CuttersHouse_Text_1851C9, 4 release diff --git a/data/maps/RustboroCity_DevonCorp_2F/scripts.inc b/data/maps/RustboroCity_DevonCorp_2F/scripts.inc index 92c16e002..31453acb9 100644 --- a/data/maps/RustboroCity_DevonCorp_2F/scripts.inc +++ b/data/maps/RustboroCity_DevonCorp_2F/scripts.inc @@ -88,7 +88,7 @@ RustboroCity_DevonCorp_2F_EventScript_1575A6:: @ 81575A6 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157636 bufferitemname 0, ITEM_ROOT_FOSSIL msgbox RustboroCity_DevonCorp_2F_Text_183023, 4 - takeitem ITEM_ROOT_FOSSIL, 1 + removeitem ITEM_ROOT_FOSSIL setvar VAR_FOSSIL_RESURRECTION_STATE, 1 setvar VAR_WHICH_FOSSIL_REVIVED, 1 release @@ -106,7 +106,7 @@ RustboroCity_DevonCorp_2F_EventScript_1575EE:: @ 81575EE goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157636 bufferitemname 0, ITEM_CLAW_FOSSIL msgbox RustboroCity_DevonCorp_2F_Text_183023, 4 - takeitem ITEM_CLAW_FOSSIL, 1 + removeitem ITEM_CLAW_FOSSIL setvar VAR_FOSSIL_RESURRECTION_STATE, 1 setvar VAR_WHICH_FOSSIL_REVIVED, 2 release @@ -142,7 +142,7 @@ RustboroCity_DevonCorp_2F_EventScript_157661:: @ 8157661 message RustboroCity_DevonCorp_2F_Text_18319E waitfanfare waitmessage - givemon SPECIES_LILEEP, 20, ITEM_NONE, 0x0, 0x0, 0 + givemon SPECIES_LILEEP, 20, ITEM_NONE msgbox RustboroCity_DevonCorp_2F_Text_1A1102, MSGBOX_YESNO compare VAR_RESULT, YES call_if_eq RustboroCity_DevonCorp_2F_EventScript_1A0678 @@ -162,7 +162,7 @@ RustboroCity_DevonCorp_2F_EventScript_1576B4:: @ 81576B4 message RustboroCity_DevonCorp_2F_Text_18319E waitfanfare waitmessage - givemon SPECIES_ANORITH, 20, ITEM_NONE, 0x0, 0x0, 0 + givemon SPECIES_ANORITH, 20, ITEM_NONE msgbox RustboroCity_DevonCorp_2F_Text_1A1102, MSGBOX_YESNO compare VAR_RESULT, YES call_if_eq RustboroCity_DevonCorp_2F_EventScript_1A0678 diff --git a/data/maps/RustboroCity_DevonCorp_3F/scripts.inc b/data/maps/RustboroCity_DevonCorp_3F/scripts.inc index e8d2f4d68..8508aa548 100644 --- a/data/maps/RustboroCity_DevonCorp_3F/scripts.inc +++ b/data/maps/RustboroCity_DevonCorp_3F/scripts.inc @@ -48,7 +48,7 @@ RustboroCity_DevonCorp_3F_EventScript_157752:: @ 8157752 applymovement 255, RustboroCity_DevonCorp_3F_Movement_157835 waitmovement 0 msgbox RustboroCity_DevonCorp_3F_Text_18320B, 4 - giveitem_std ITEM_LETTER + giveitem ITEM_LETTER msgbox RustboroCity_DevonCorp_3F_Text_18337E, 4 playfanfare MUS_FANFA4 message RustboroCity_DevonCorp_3F_Text_183422 @@ -157,7 +157,7 @@ RustboroCity_DevonCorp_3F_EventScript_15783B:: @ 815783B RustboroCity_DevonCorp_3F_EventScript_157864:: @ 8157864 msgbox RustboroCity_DevonCorp_3F_Text_18353E, 4 - giveitem_std ITEM_EXP_SHARE + giveitem ITEM_EXP_SHARE compare VAR_RESULT, 0 goto_if_eq RustboroCity_DevonCorp_3F_EventScript_1A029B setflag FLAG_RECEIVED_EXP_SHARE diff --git a/data/maps/RustboroCity_Flat2_2F/scripts.inc b/data/maps/RustboroCity_Flat2_2F/scripts.inc index c100687a2..255164f4c 100644 --- a/data/maps/RustboroCity_Flat2_2F/scripts.inc +++ b/data/maps/RustboroCity_Flat2_2F/scripts.inc @@ -10,7 +10,7 @@ RustboroCity_Flat2_2F_EventScript_157DA0:: @ 8157DA0 faceplayer goto_if_set FLAG_RECEIVED_PREMIER_BALL_RUSTBORO, RustboroCity_Flat2_2F_EventScript_157DCF msgbox RustboroCity_Flat2_2F_Text_185461, 4 - giveitem_std ITEM_PREMIER_BALL + giveitem ITEM_PREMIER_BALL compare VAR_RESULT, 0 goto_if_eq RustboroCity_Flat2_2F_EventScript_1A029B setflag FLAG_RECEIVED_PREMIER_BALL_RUSTBORO diff --git a/data/maps/RustboroCity_Gym/scripts.inc b/data/maps/RustboroCity_Gym/scripts.inc index f1eb9d171..7c7f8a316 100644 --- a/data/maps/RustboroCity_Gym/scripts.inc +++ b/data/maps/RustboroCity_Gym/scripts.inc @@ -2,7 +2,7 @@ RustboroCity_Gym_MapScripts:: @ 81578D8 .byte 0 RustboroCity_Gym_EventScript_1578D9:: @ 81578D9 - trainerbattle 1, TRAINER_ROXANNE, 0, RustboroCity_Gym_Text_183EE5, RustboroCity_Gym_Text_183FC4, RustboroCity_Gym_EventScript_1578FE + trainerbattle_single TRAINER_ROXANNE, RustboroCity_Gym_Text_183EE5, RustboroCity_Gym_Text_183FC4, RustboroCity_Gym_EventScript_1578FE, NO_MUSIC goto_if_unset FLAG_RECEIVED_TM39, RustboroCity_Gym_EventScript_15793C msgbox RustboroCity_Gym_Text_184252, 4 release @@ -25,7 +25,7 @@ RustboroCity_Gym_EventScript_1578FE:: @ 81578FE end RustboroCity_Gym_EventScript_15793C:: @ 815793C - giveitem_std ITEM_TM39_ROCK_TOMB + giveitem ITEM_TM39_ROCK_TOMB compare VAR_RESULT, 0 goto_if_eq RustboroCity_Gym_EventScript_1A029B setflag FLAG_RECEIVED_TM39 @@ -34,12 +34,12 @@ RustboroCity_Gym_EventScript_15793C:: @ 815793C end RustboroCity_Gym_EventScript_157960:: @ 8157960 - trainerbattle 0, TRAINER_JOSH, 0, RustboroCity_Gym_Text_183D99, RustboroCity_Gym_Text_183DDD + trainerbattle_single TRAINER_JOSH, RustboroCity_Gym_Text_183D99, RustboroCity_Gym_Text_183DDD msgbox RustboroCity_Gym_Text_183DF9, 6 end RustboroCity_Gym_EventScript_157977:: @ 8157977 - trainerbattle 0, TRAINER_TOMMY, 0, RustboroCity_Gym_Text_183E38, RustboroCity_Gym_Text_183E78 + trainerbattle_single TRAINER_TOMMY, RustboroCity_Gym_Text_183E38, RustboroCity_Gym_Text_183E78 msgbox RustboroCity_Gym_Text_183E98, 6 end diff --git a/data/maps/RustboroCity_PokemonSchool/scripts.inc b/data/maps/RustboroCity_PokemonSchool/scripts.inc index 467a62b04..65fdb985b 100644 --- a/data/maps/RustboroCity_PokemonSchool/scripts.inc +++ b/data/maps/RustboroCity_PokemonSchool/scripts.inc @@ -83,7 +83,7 @@ RustboroCity_PokemonSchool_EventScript_157ACE:: @ 8157ACE compare VAR_FACING, 3 call_if_eq RustboroCity_PokemonSchool_EventScript_157B29 msgbox RustboroCity_PokemonSchool_Text_1846A2, 4 - giveitem_std ITEM_QUICK_CLAW + giveitem ITEM_QUICK_CLAW compare VAR_RESULT, 0 goto_if_eq RustboroCity_PokemonSchool_EventScript_1A029B closemessage diff --git a/data/maps/RusturfTunnel/scripts.inc b/data/maps/RusturfTunnel/scripts.inc index 0e3c71b22..41d1c3d37 100644 --- a/data/maps/RusturfTunnel/scripts.inc +++ b/data/maps/RusturfTunnel/scripts.inc @@ -63,7 +63,7 @@ RusturfTunnel_EventScript_15C7D1:: @ 815C7D1 call_if_eq RusturfTunnel_EventScript_15C8EB compare VAR_TEMP_1, 3 call_if_eq RusturfTunnel_EventScript_15C8EB - giveitem_std ITEM_HM04_STRENGTH + giveitem ITEM_HM04_STRENGTH setflag FLAG_RECEIVED_HM04 msgbox RusturfTunnel_Text_194693, 4 closemessage @@ -310,9 +310,9 @@ RusturfTunnel_EventScript_15C9EA:: @ 815C9EA faceplayer playbgm MUS_EVIL_TEAM, FALSE msgbox RusturfTunnel_Text_19419B, 4 - trainerbattle 3, TRAINER_RUSTURF_TUNNEL_GRUNT, 0, RusturfTunnel_Text_194243 + trainerbattle_no_intro TRAINER_RUSTURF_TUNNEL_GRUNT, RusturfTunnel_Text_194243 msgbox RusturfTunnel_Text_194274, 4 - giveitem_std ITEM_DEVON_GOODS + giveitem ITEM_DEVON_GOODS closemessage applymovement 255, RusturfTunnel_Movement_15CA99 applymovement 6, RusturfTunnel_Movement_15CAA2 @@ -415,6 +415,6 @@ RusturfTunnel_Movement_15CAC3:: @ 815CAC3 end_movement RusturfTunnel_EventScript_15CACD:: @ 815CACD - trainerbattle 0, TRAINER_MIKE_2, 0, RusturfTunnel_Text_194814, RusturfTunnel_Text_1948A2 + trainerbattle_single TRAINER_MIKE_2, RusturfTunnel_Text_194814, RusturfTunnel_Text_1948A2 msgbox RusturfTunnel_Text_1948C4, 6 end diff --git a/data/maps/SSTidalCorridor/scripts.inc b/data/maps/SSTidalCorridor/scripts.inc index 0f2028476..a9f0b6bae 100644 --- a/data/maps/SSTidalCorridor/scripts.inc +++ b/data/maps/SSTidalCorridor/scripts.inc @@ -173,14 +173,14 @@ SSTidalCorridor_EventScript_15FE7A:: @ 815FE7A end SSTidalCorridor_EventScript_15FE84:: @ 815FE84 - goto_if_trainer_not_defeated TRAINER_PHILLIP, SSTidalCorridor_EventScript_15FED5 - goto_if_trainer_not_defeated TRAINER_LEONARD, SSTidalCorridor_EventScript_15FED5 - goto_if_trainer_not_defeated TRAINER_COLTON, SSTidalCorridor_EventScript_15FED5 - goto_if_trainer_not_defeated TRAINER_TUCKER, SSTidalCorridor_EventScript_15FED5 - goto_if_trainer_not_defeated TRAINER_THOMAS, SSTidalCorridor_EventScript_15FED5 - goto_if_trainer_not_defeated TRAINER_LEA_AND_JED, SSTidalCorridor_EventScript_15FED5 - goto_if_trainer_not_defeated TRAINER_GARRET, SSTidalCorridor_EventScript_15FED5 - goto_if_trainer_not_defeated TRAINER_ANETTE, SSTidalCorridor_EventScript_15FED5 + goto_if_not_defeated TRAINER_PHILLIP, SSTidalCorridor_EventScript_15FED5 + goto_if_not_defeated TRAINER_LEONARD, SSTidalCorridor_EventScript_15FED5 + goto_if_not_defeated TRAINER_COLTON, SSTidalCorridor_EventScript_15FED5 + goto_if_not_defeated TRAINER_TUCKER, SSTidalCorridor_EventScript_15FED5 + goto_if_not_defeated TRAINER_THOMAS, SSTidalCorridor_EventScript_15FED5 + goto_if_not_defeated TRAINER_LEA_AND_JED, SSTidalCorridor_EventScript_15FED5 + goto_if_not_defeated TRAINER_GARRET, SSTidalCorridor_EventScript_15FED5 + goto_if_not_defeated TRAINER_ANETTE, SSTidalCorridor_EventScript_15FED5 setflag FLAG_DEFEATED_SS_TIDAL_TRAINERS goto SSTidalCorridor_EventScript_15FE7A return diff --git a/data/maps/SSTidalLowerDeck/scripts.inc b/data/maps/SSTidalLowerDeck/scripts.inc index 9b19a2f3a..032c14dfd 100644 --- a/data/maps/SSTidalLowerDeck/scripts.inc +++ b/data/maps/SSTidalLowerDeck/scripts.inc @@ -2,11 +2,11 @@ SSTidalLowerDeck_MapScripts:: @ 815FED6 .byte 0 SSTidalLowerDeck_EventScript_15FED7:: @ 815FED7 - trainerbattle 0, TRAINER_PHILLIP, 0, SSTidalLowerDeck_Text_1993C1, SSTidalLowerDeck_Text_19941A + trainerbattle_single TRAINER_PHILLIP, SSTidalLowerDeck_Text_1993C1, SSTidalLowerDeck_Text_19941A msgbox SSTidalLowerDeck_Text_19942E, 6 end SSTidalLowerDeck_EventScript_15FEEE:: @ 815FEEE - trainerbattle 0, TRAINER_LEONARD, 0, SSTidalLowerDeck_Text_199491, SSTidalLowerDeck_Text_1994F7 + trainerbattle_single TRAINER_LEONARD, SSTidalLowerDeck_Text_199491, SSTidalLowerDeck_Text_1994F7 msgbox SSTidalLowerDeck_Text_199508, 6 end diff --git a/data/maps/SSTidalRooms/scripts.inc b/data/maps/SSTidalRooms/scripts.inc index fd7854875..68bbe86ee 100644 --- a/data/maps/SSTidalRooms/scripts.inc +++ b/data/maps/SSTidalRooms/scripts.inc @@ -6,7 +6,7 @@ SSTidalRooms_EventScript_15FF06:: @ 815FF06 faceplayer goto_if_set FLAG_RECEIVED_TM49, SSTidalRooms_EventScript_15FF3D msgbox SSTidalRooms_Text_199B65, 4 - giveitem_std ITEM_TM49_SNATCH + giveitem ITEM_TM49_SNATCH compare VAR_RESULT, 0 goto_if_eq SSTidalRooms_EventScript_1A029B setflag FLAG_RECEIVED_TM49 @@ -29,36 +29,36 @@ SSTidalRooms_EventScript_15FF47:: @ 815FF47 end SSTidalRooms_EventScript_15FF5D:: @ 815FF5D - trainerbattle 0, TRAINER_COLTON, 0, SSTidalRooms_Text_19958A, SSTidalRooms_Text_199613 + trainerbattle_single TRAINER_COLTON, SSTidalRooms_Text_19958A, SSTidalRooms_Text_199613 msgbox SSTidalRooms_Text_199630, 6 end SSTidalRooms_EventScript_15FF74:: @ 815FF74 - trainerbattle 0, TRAINER_TUCKER, 0, SSTidalRooms_Text_1996A6, SSTidalRooms_Text_1996BF + trainerbattle_single TRAINER_TUCKER, SSTidalRooms_Text_1996A6, SSTidalRooms_Text_1996BF msgbox SSTidalRooms_Text_1996E1, 6 end SSTidalRooms_EventScript_15FF8B:: @ 815FF8B - trainerbattle 0, TRAINER_THOMAS, 0, SSTidalRooms_Text_199723, SSTidalRooms_Text_199747 + trainerbattle_single TRAINER_THOMAS, SSTidalRooms_Text_199723, SSTidalRooms_Text_199747 msgbox SSTidalRooms_Text_199778, 6 end SSTidalRooms_EventScript_15FFA2:: @ 815FFA2 - trainerbattle 4, TRAINER_LEA_AND_JED, 0, SSTidalRooms_Text_1997C1, SSTidalRooms_Text_199813, SSTidalRooms_Text_199887 + trainerbattle_double TRAINER_LEA_AND_JED, SSTidalRooms_Text_1997C1, SSTidalRooms_Text_199813, SSTidalRooms_Text_199887 msgbox SSTidalRooms_Text_199820, 6 end SSTidalRooms_EventScript_15FFBD:: @ 815FFBD - trainerbattle 4, TRAINER_LEA_AND_JED, 0, SSTidalRooms_Text_1998C5, SSTidalRooms_Text_19990E, SSTidalRooms_Text_199975 + trainerbattle_double TRAINER_LEA_AND_JED, SSTidalRooms_Text_1998C5, SSTidalRooms_Text_19990E, SSTidalRooms_Text_199975 msgbox SSTidalRooms_Text_19991C, 6 end SSTidalRooms_EventScript_15FFD8:: @ 815FFD8 - trainerbattle 0, TRAINER_GARRET, 0, SSTidalRooms_Text_1999B7, SSTidalRooms_Text_1999FF + trainerbattle_single TRAINER_GARRET, SSTidalRooms_Text_1999B7, SSTidalRooms_Text_1999FF msgbox SSTidalRooms_Text_199A10, 6 end SSTidalRooms_EventScript_15FFEF:: @ 815FFEF - trainerbattle 0, TRAINER_ANETTE, 0, SSTidalRooms_Text_199A62, SSTidalRooms_Text_199ABF + trainerbattle_single TRAINER_ANETTE, SSTidalRooms_Text_199A62, SSTidalRooms_Text_199ABF msgbox SSTidalRooms_Text_199ADE, 6 end diff --git a/data/maps/SeafloorCavern_Room1/scripts.inc b/data/maps/SeafloorCavern_Room1/scripts.inc index cd1513ec1..9ae4077d3 100644 --- a/data/maps/SeafloorCavern_Room1/scripts.inc +++ b/data/maps/SeafloorCavern_Room1/scripts.inc @@ -7,11 +7,11 @@ SeafloorCavern_Room1_MapScript1_15DA67:: @ 815DA67 end SeafloorCavern_Room1_EventScript_15DA6D:: @ 815DA6D - trainerbattle 0, TRAINER_SEAFLOOR_CAVERN_GRUNT_1, 0, SeafloorCavern_Room1_Text_1974BA, SeafloorCavern_Room1_Text_1974EA + trainerbattle_single TRAINER_SEAFLOOR_CAVERN_GRUNT_1, SeafloorCavern_Room1_Text_1974BA, SeafloorCavern_Room1_Text_1974EA msgbox SeafloorCavern_Room1_Text_1974FF, 6 end SeafloorCavern_Room1_EventScript_15DA84:: @ 815DA84 - trainerbattle 0, TRAINER_SEAFLOOR_CAVERN_GRUNT_2, 0, SeafloorCavern_Room1_Text_19753C, SeafloorCavern_Room1_Text_197573 + trainerbattle_single TRAINER_SEAFLOOR_CAVERN_GRUNT_2, SeafloorCavern_Room1_Text_19753C, SeafloorCavern_Room1_Text_197573 msgbox SeafloorCavern_Room1_Text_197589, 6 end diff --git a/data/maps/SeafloorCavern_Room3/scripts.inc b/data/maps/SeafloorCavern_Room3/scripts.inc index 57f2bc20a..3a9f01bc0 100644 --- a/data/maps/SeafloorCavern_Room3/scripts.inc +++ b/data/maps/SeafloorCavern_Room3/scripts.inc @@ -7,6 +7,6 @@ SeafloorCavern_Room3_MapScript1_15DAA2:: @ 815DAA2 end SeafloorCavern_Room3_EventScript_15DAA8:: @ 815DAA8 - trainerbattle 0, TRAINER_SEAFLOOR_CAVERN_GRUNT_3, 0, SeafloorCavern_Room3_Text_1975DC, SeafloorCavern_Room3_Text_1976F3 + trainerbattle_single TRAINER_SEAFLOOR_CAVERN_GRUNT_3, SeafloorCavern_Room3_Text_1975DC, SeafloorCavern_Room3_Text_1976F3 msgbox SeafloorCavern_Room3_Text_197704, 6 end diff --git a/data/maps/SeafloorCavern_Room4/scripts.inc b/data/maps/SeafloorCavern_Room4/scripts.inc index 8f53d948c..db3547bd0 100644 --- a/data/maps/SeafloorCavern_Room4/scripts.inc +++ b/data/maps/SeafloorCavern_Room4/scripts.inc @@ -7,6 +7,6 @@ SeafloorCavern_Room4_MapScript1_15DAC5:: @ 815DAC5 end SeafloorCavern_Room4_EventScript_15DACB:: @ 815DACB - trainerbattle 0, TRAINER_SEAFLOOR_CAVERN_GRUNT_4, 0, SeafloorCavern_Room4_Text_1977B9, SeafloorCavern_Room4_Text_1977E2 + trainerbattle_single TRAINER_SEAFLOOR_CAVERN_GRUNT_4, SeafloorCavern_Room4_Text_1977B9, SeafloorCavern_Room4_Text_1977E2 msgbox SeafloorCavern_Room4_Text_1977ED, 6 end diff --git a/data/maps/SeafloorCavern_Room9/scripts.inc b/data/maps/SeafloorCavern_Room9/scripts.inc index 6d6b58be8..bfaca303d 100644 --- a/data/maps/SeafloorCavern_Room9/scripts.inc +++ b/data/maps/SeafloorCavern_Room9/scripts.inc @@ -53,9 +53,9 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA msgbox SeafloorCavern_Room9_Text_1B491F, 4 .endif .ifdef SAPPHIRE - trainerbattle 3, TRAINER_SEAFLOOR_CAVERN_GRUNT_5, 0, UnknownString_81B4319 + trainerbattle_no_intro TRAINER_SEAFLOOR_CAVERN_GRUNT_5, UnknownString_81B4319 .else - trainerbattle 3, TRAINER_SEAFLOOR_CAVERN_GRUNT_5, 0, SeafloorCavern_Room9_Text_1B49AE + trainerbattle_no_intro TRAINER_SEAFLOOR_CAVERN_GRUNT_5, SeafloorCavern_Room9_Text_1B49AE .endif .ifdef SAPPHIRE msgbox UnknownString_81B432C, 4 diff --git a/data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc b/data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc index 76de79e6f..cfd306ec4 100644 --- a/data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc +++ b/data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc @@ -18,7 +18,7 @@ ShoalCave_LowTideEntranceRoom_EventScript_15E072:: @ 815E072 ShoalCave_LowTideEntranceRoom_EventScript_15E076:: @ 815E076 lock faceplayer - dodailyevents + dotimebasedevents call_if_set FLAG_SYS_SHOAL_ITEM, ShoalCave_LowTideEntranceRoom_EventScript_15E176 checkitem ITEM_SHOAL_SALT, 4 compare VAR_RESULT, 0 @@ -35,9 +35,9 @@ ShoalCave_LowTideEntranceRoom_EventScript_15E076:: @ 815E076 compare VAR_RESULT, 2 goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_15E12E msgbox ShoalCave_LowTideEntranceRoom_Text_1C6808, 4 - takeitem ITEM_SHOAL_SALT, 4 - takeitem ITEM_SHOAL_SHELL, 4 - giveitem_std ITEM_SHELL_BELL + removeitem ITEM_SHOAL_SALT, 4 + removeitem ITEM_SHOAL_SHELL, 4 + giveitem ITEM_SHELL_BELL compare VAR_RESULT, 0 goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_1A029B msgbox ShoalCave_LowTideEntranceRoom_Text_1C688E, 4 diff --git a/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc b/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc index 512de471c..2c7c9f49a 100644 --- a/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc +++ b/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc @@ -62,7 +62,7 @@ ShoalCave_LowTideInnerRoom_EventScript_15E256:: @ 815E256 ShoalCave_LowTideInnerRoom_EventScript_15E257:: @ 815E257 lockall goto_if_set FLAG_HIDE_TOOK_SHOAL_SHELL_1, ShoalCave_LowTideInnerRoom_EventScript_15E289 - giveitem_std ITEM_SHOAL_SHELL + giveitem ITEM_SHOAL_SHELL compare VAR_RESULT, 0 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B setmetatile 41, 20, METATILE_Cave_ShoalCave_BlueStone_Small, 0 @@ -79,7 +79,7 @@ ShoalCave_LowTideInnerRoom_EventScript_15E289:: @ 815E289 ShoalCave_LowTideInnerRoom_EventScript_15E293:: @ 815E293 lockall goto_if_set FLAG_HIDE_TOOK_SHOAL_SHELL_2, ShoalCave_LowTideInnerRoom_EventScript_15E289 - giveitem_std ITEM_SHOAL_SHELL + giveitem ITEM_SHOAL_SHELL compare VAR_RESULT, 0 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B setmetatile 41, 10, METATILE_Cave_ShoalCave_BlueStone_Small, 0 @@ -91,7 +91,7 @@ ShoalCave_LowTideInnerRoom_EventScript_15E293:: @ 815E293 ShoalCave_LowTideInnerRoom_EventScript_15E2C5:: @ 815E2C5 lockall goto_if_set FLAG_HIDE_TOOK_SHOAL_SHELL_3, ShoalCave_LowTideInnerRoom_EventScript_15E289 - giveitem_std ITEM_SHOAL_SHELL + giveitem ITEM_SHOAL_SHELL compare VAR_RESULT, 0 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B setmetatile 6, 9, METATILE_Cave_ShoalCave_BlueStone_Small, 0 @@ -103,7 +103,7 @@ ShoalCave_LowTideInnerRoom_EventScript_15E2C5:: @ 815E2C5 ShoalCave_LowTideInnerRoom_EventScript_15E2F7:: @ 815E2F7 lockall goto_if_set FLAG_HIDE_TOOK_SHOAL_SHELL_4, ShoalCave_LowTideInnerRoom_EventScript_15E289 - giveitem_std ITEM_SHOAL_SHELL + giveitem ITEM_SHOAL_SHELL compare VAR_RESULT, 0 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B setmetatile 16, 13, METATILE_Cave_ShoalCave_BlueStone_Small, 0 @@ -115,7 +115,7 @@ ShoalCave_LowTideInnerRoom_EventScript_15E2F7:: @ 815E2F7 ShoalCave_LowTideInnerRoom_EventScript_15E329:: @ 815E329 lockall goto_if_set FLAG_HIDE_TOOK_SHOAL_SALT_1, ShoalCave_LowTideInnerRoom_EventScript_15E35B - giveitem_std ITEM_SHOAL_SALT + giveitem ITEM_SHOAL_SALT compare VAR_RESULT, 0 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B setmetatile 31, 8, METATILE_Cave_ShoalCave_DirtPile_Small, 0 @@ -132,7 +132,7 @@ ShoalCave_LowTideInnerRoom_EventScript_15E35B:: @ 815E35B ShoalCave_LowTideInnerRoom_EventScript_15E365:: @ 815E365 lockall goto_if_set FLAG_HIDE_TOOK_SHOAL_SALT_2, ShoalCave_LowTideInnerRoom_EventScript_15E35B - giveitem_std ITEM_SHOAL_SALT + giveitem ITEM_SHOAL_SALT compare VAR_RESULT, 0 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B setmetatile 14, 26, METATILE_Cave_ShoalCave_DirtPile_Small, 0 diff --git a/data/maps/ShoalCave_LowTideLowerRoom/scripts.inc b/data/maps/ShoalCave_LowTideLowerRoom/scripts.inc index aa271034d..7debbc223 100644 --- a/data/maps/ShoalCave_LowTideLowerRoom/scripts.inc +++ b/data/maps/ShoalCave_LowTideLowerRoom/scripts.inc @@ -17,7 +17,7 @@ ShoalCave_LowTideLowerRoom_EventScript_15E412:: @ 815E412 ShoalCave_LowTideLowerRoom_EventScript_15E413:: @ 815E413 lockall goto_if_set FLAG_HIDE_TOOK_SHOAL_SALT_4, ShoalCave_LowTideLowerRoom_EventScript_15E445 - giveitem_std ITEM_SHOAL_SALT + giveitem ITEM_SHOAL_SALT compare VAR_RESULT, 0 goto_if_eq ShoalCave_LowTideLowerRoom_EventScript_1A029B setmetatile 18, 2, 858, 0 @@ -36,7 +36,7 @@ ShoalCave_LowTideLowerRoom_EventScript_15E44F:: @ 815E44F faceplayer goto_if_set FLAG_RECEIVED_FOCUS_BAND, ShoalCave_LowTideLowerRoom_EventScript_15E47E msgbox ShoalCave_LowTideLowerRoom_Text_198200, 4 - giveitem_std ITEM_FOCUS_BAND + giveitem ITEM_FOCUS_BAND compare VAR_RESULT, 0 goto_if_eq ShoalCave_LowTideLowerRoom_EventScript_1A029B setflag FLAG_RECEIVED_FOCUS_BAND diff --git a/data/maps/ShoalCave_LowTideStairsRoom/scripts.inc b/data/maps/ShoalCave_LowTideStairsRoom/scripts.inc index 3a935af56..e855afc9d 100644 --- a/data/maps/ShoalCave_LowTideStairsRoom/scripts.inc +++ b/data/maps/ShoalCave_LowTideStairsRoom/scripts.inc @@ -17,7 +17,7 @@ ShoalCave_LowTideStairsRoom_EventScript_15E3B6:: @ 815E3B6 ShoalCave_LowTideStairsRoom_EventScript_15E3B7:: @ 815E3B7 lockall goto_if_set FLAG_HIDE_TOOK_SHOAL_SALT_3, ShoalCave_LowTideStairsRoom_EventScript_15E3E9 - giveitem_std ITEM_SHOAL_SALT + giveitem ITEM_SHOAL_SALT compare VAR_RESULT, 0 goto_if_eq ShoalCave_LowTideStairsRoom_EventScript_1A029B setmetatile 11, 11, METATILE_Cave_ShoalCave_DirtPile_Small, 0 diff --git a/data/maps/SlateportCity_ContestHall/scripts.inc b/data/maps/SlateportCity_ContestHall/scripts.inc index d4b43ee56..f0d1a7119 100644 --- a/data/maps/SlateportCity_ContestHall/scripts.inc +++ b/data/maps/SlateportCity_ContestHall/scripts.inc @@ -14,7 +14,7 @@ SlateportCity_ContestHall_EventScript_15555E:: @ 815555E faceplayer goto_if_set FLAG_RECEIVED_TM41, SlateportCity_ContestHall_EventScript_155595 msgbox SlateportCity_ContestHall_Text_17CCE2, 4 - giveitem_std ITEM_TM41_TORMENT + giveitem ITEM_TM41_TORMENT compare VAR_RESULT, 0 goto_if_eq SlateportCity_ContestHall_EventScript_1A029B setflag FLAG_RECEIVED_TM41 diff --git a/data/maps/SlateportCity_ContestLobby/scripts.inc b/data/maps/SlateportCity_ContestLobby/scripts.inc index 3bf5a3d06..5bd0f5d1a 100644 --- a/data/maps/SlateportCity_ContestLobby/scripts.inc +++ b/data/maps/SlateportCity_ContestLobby/scripts.inc @@ -105,7 +105,7 @@ SlateportCity_ContestLobby_EventScript_1554F9:: @ 81554F9 applymovement 7, SlateportCity_ContestLobby_Movement_1A0839 waitmovement 0 msgbox SlateportCity_ContestLobby_Text_17CA67, 4 - giveitem_std ITEM_POKEBLOCK_CASE + giveitem ITEM_POKEBLOCK_CASE setflag FLAG_RECEIVED_POKEBLOCK_CASE releaseall end @@ -117,7 +117,7 @@ SlateportCity_ContestLobby_EventScript_155526:: @ 8155526 SlateportCity_ContestLobby_EventScript_15552F:: @ 815552F lockall fadescreen 1 - drawcontestwinner 3 + showcontestwinner 3 releaseall end diff --git a/data/maps/SlateportCity_Harbor/scripts.inc b/data/maps/SlateportCity_Harbor/scripts.inc index 76f9379b1..74e9e58f3 100644 --- a/data/maps/SlateportCity_Harbor/scripts.inc +++ b/data/maps/SlateportCity_Harbor/scripts.inc @@ -329,10 +329,10 @@ SlateportCity_Harbor_EventScript_1562EA:: @ 81562EA msgbox SlateportCity_Harbor_Text_1803DD, MSGBOX_YESNO compare VAR_RESULT, NO goto_if_eq SlateportCity_Harbor_EventScript_156374 - giveitem_std ITEM_DEEP_SEA_TOOTH + giveitem ITEM_DEEP_SEA_TOOTH compare VAR_RESULT, 0 goto_if_eq SlateportCity_Harbor_EventScript_1A029B - takeitem ITEM_SCANNER, 1 + removeitem ITEM_SCANNER msgbox SlateportCity_Harbor_Text_18046B, 4 setflag FLAG_EXCHANGED_SCANNER goto SlateportCity_Harbor_EventScript_156380 @@ -342,10 +342,10 @@ SlateportCity_Harbor_EventScript_15632A:: @ 815632A msgbox SlateportCity_Harbor_Text_180412, MSGBOX_YESNO compare VAR_RESULT, NO goto_if_eq SlateportCity_Harbor_EventScript_156374 - giveitem_std ITEM_DEEP_SEA_SCALE + giveitem ITEM_DEEP_SEA_SCALE compare VAR_RESULT, 0 goto_if_eq SlateportCity_Harbor_EventScript_1A029B - takeitem ITEM_SCANNER, 1 + removeitem ITEM_SCANNER msgbox SlateportCity_Harbor_Text_18046B, 4 setflag FLAG_EXCHANGED_SCANNER goto SlateportCity_Harbor_EventScript_156380 diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc b/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc index 0495e2b3c..da45b8378 100644 --- a/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc +++ b/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc @@ -44,10 +44,10 @@ SlateportCity_OceanicMuseum_1F_EventScript_155B06:: @ 8155B06 end SlateportCity_OceanicMuseum_1F_EventScript_155B2D:: @ 8155B2D - checkmoney 0x32, 0 + checkmoney 50, 0 compare VAR_RESULT, 0 goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_155B5A - takemoney 0x32, 0 + removemoney 50, 0 updatemoneybox 0, 0 nop msgbox SlateportCity_OceanicMuseum_1F_Text_17E1DE, 4 @@ -163,7 +163,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_155C3A:: @ 8155C3A applymovement 13, SlateportCity_OceanicMuseum_1F_Movement_1A0835 waitmovement 0 msgbox SlateportCity_OceanicMuseum_1F_Text_17E582, 4 - giveitem_std ITEM_TM46_THIEF + giveitem ITEM_TM46_THIEF compare VAR_RESULT, 0 goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_155CC2 setflag FLAG_RECEIVED_TM46 diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc b/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc index 569da9944..cba7ca337 100644 --- a/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc +++ b/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc @@ -37,7 +37,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_155CE6:: @ 8155CE6 call_if_eq SlateportCity_OceanicMuseum_2F_EventScript_155E78 compare VAR_FACING, 3 call_if_eq SlateportCity_OceanicMuseum_2F_EventScript_155E83 - trainerbattle 3, TRAINER_MUSEUM_2F_GRUNT_1, 0, SlateportCity_OceanicMuseum_2F_Text_17EE4E + trainerbattle_no_intro TRAINER_MUSEUM_2F_GRUNT_1, SlateportCity_OceanicMuseum_2F_Text_17EE4E msgbox SlateportCity_OceanicMuseum_2F_Text_17EE66, 4 closemessage applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_155EBF @@ -46,7 +46,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_155CE6:: @ 8155CE6 waitmovement 0 msgbox SlateportCity_OceanicMuseum_2F_Text_17EEA5, 4 savebgm 0 - trainerbattle 3, TRAINER_MUSEUM_2F_GRUNT_2, 0, SlateportCity_OceanicMuseum_2F_Text_17EED6 + trainerbattle_no_intro TRAINER_MUSEUM_2F_GRUNT_2, SlateportCity_OceanicMuseum_2F_Text_17EED6 applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_155EBF waitmovement 0 applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_1A0845 diff --git a/data/maps/SlateportCity_PokemonFanClub/scripts.inc b/data/maps/SlateportCity_PokemonFanClub/scripts.inc index b47b7b317..19da9e3e4 100644 --- a/data/maps/SlateportCity_PokemonFanClub/scripts.inc +++ b/data/maps/SlateportCity_PokemonFanClub/scripts.inc @@ -79,7 +79,7 @@ SlateportCity_PokemonFanClub_EventScript_1558A3:: @ 81558A3 goto_if_eq SlateportCity_PokemonFanClub_EventScript_155998 msgbox SlateportCity_PokemonFanClub_Text_17DB89, 4 setflag FLAG_RECEIVED_RED_SCARF - giveitem_std ITEM_RED_SCARF + giveitem ITEM_RED_SCARF msgbox SlateportCity_PokemonFanClub_Text_17DC1B, 4 release end @@ -90,7 +90,7 @@ SlateportCity_PokemonFanClub_EventScript_1558D4:: @ 81558D4 goto_if_eq SlateportCity_PokemonFanClub_EventScript_155998 msgbox SlateportCity_PokemonFanClub_Text_17DB89, 4 setflag FLAG_RECEIVED_BLUE_SCARF - giveitem_std ITEM_BLUE_SCARF + giveitem ITEM_BLUE_SCARF msgbox SlateportCity_PokemonFanClub_Text_17DC74, 4 release end @@ -101,7 +101,7 @@ SlateportCity_PokemonFanClub_EventScript_155905:: @ 8155905 goto_if_eq SlateportCity_PokemonFanClub_EventScript_155998 msgbox SlateportCity_PokemonFanClub_Text_17DB89, 4 setflag FLAG_RECEIVED_PINK_SCARF - giveitem_std ITEM_PINK_SCARF + giveitem ITEM_PINK_SCARF msgbox SlateportCity_PokemonFanClub_Text_17DCCB, 4 release end @@ -112,7 +112,7 @@ SlateportCity_PokemonFanClub_EventScript_155936:: @ 8155936 goto_if_eq SlateportCity_PokemonFanClub_EventScript_155998 msgbox SlateportCity_PokemonFanClub_Text_17DB89, 4 setflag FLAG_RECEIVED_GREEN_SCARF - giveitem_std ITEM_GREEN_SCARF + giveitem ITEM_GREEN_SCARF msgbox SlateportCity_PokemonFanClub_Text_17DD27, 4 release end @@ -123,7 +123,7 @@ SlateportCity_PokemonFanClub_EventScript_155967:: @ 8155967 goto_if_eq SlateportCity_PokemonFanClub_EventScript_155998 msgbox SlateportCity_PokemonFanClub_Text_17DB89, 4 setflag FLAG_RECEIVED_YELLOW_SCARF - giveitem_std ITEM_YELLOW_SCARF + giveitem ITEM_YELLOW_SCARF msgbox SlateportCity_PokemonFanClub_Text_17DD78, 4 release end @@ -201,7 +201,7 @@ SlateportCity_PokemonFanClub_EventScript_155A3A:: @ 8155A3A applymovement VAR_LAST_TALKED, SlateportCity_PokemonFanClub_Movement_1A0835 waitmovement 0 msgbox SlateportCity_PokemonFanClub_Text_17DF57, 4 - giveitem_std ITEM_SOOTHE_BELL + giveitem ITEM_SOOTHE_BELL compare VAR_RESULT, 0 goto_if_eq SlateportCity_PokemonFanClub_EventScript_1A029B setflag FLAG_RECEIVED_SOOTHE_BELL diff --git a/data/maps/SootopolisCity/scripts.inc b/data/maps/SootopolisCity/scripts.inc index 8806d6e76..20a4bca5b 100644 --- a/data/maps/SootopolisCity/scripts.inc +++ b/data/maps/SootopolisCity/scripts.inc @@ -84,14 +84,14 @@ SootopolisCity_EventScript_14D196:: @ 814D196 SootopolisCity_EventScript_14D19F:: @ 814D19F lock faceplayer - dodailyevents + dotimebasedevents special GetPlayerBigGuyGirlString goto_if_set FLAG_DAILY_RECEIVED_BERRY_SOOTOPOLIS, SootopolisCity_EventScript_14D241 msgbox SootopolisCity_Text_1C63F2, 4 random 10 addvar VAR_RESULT, 20 addvar VAR_RESULT, ITEM_CHERI_BERRY - giveitem_std VAR_RESULT + giveitem VAR_RESULT compare VAR_RESULT, 0 goto_if_eq SootopolisCity_EventScript_1A029B setflag FLAG_DAILY_RECEIVED_BERRY_SOOTOPOLIS @@ -104,7 +104,7 @@ SootopolisCity_EventScript_14D19F:: @ 814D19F end SootopolisCity_EventScript_14D1FF:: @ 814D1FF - giveitem_std ITEM_FIGY_BERRY + giveitem ITEM_FIGY_BERRY compare VAR_RESULT, 0 goto_if_eq SootopolisCity_EventScript_1A029B msgbox SootopolisCity_Text_1C650B, 4 @@ -112,7 +112,7 @@ SootopolisCity_EventScript_14D1FF:: @ 814D1FF end SootopolisCity_EventScript_14D220:: @ 814D220 - giveitem_std ITEM_IAPAPA_BERRY + giveitem ITEM_IAPAPA_BERRY compare VAR_RESULT, 0 goto_if_eq SootopolisCity_EventScript_1A029B msgbox SootopolisCity_Text_1C650B, 4 diff --git a/data/maps/SootopolisCity_Gym_1F/scripts.inc b/data/maps/SootopolisCity_Gym_1F/scripts.inc index 211620b00..296d10515 100644 --- a/data/maps/SootopolisCity_Gym_1F/scripts.inc +++ b/data/maps/SootopolisCity_Gym_1F/scripts.inc @@ -86,7 +86,7 @@ SootopolisCity_Gym_1F_Movement_15AFFD:: @ 815AFFD end_movement SootopolisCity_Gym_1F_EventScript_15AFFF:: @ 815AFFF - trainerbattle 1, TRAINER_WALLACE, 0, SootopolisCity_Gym_1F_Text_18F0CA, SootopolisCity_Gym_1F_Text_18F282, SootopolisCity_Gym_1F_EventScript_15B02D + trainerbattle_single TRAINER_WALLACE, SootopolisCity_Gym_1F_Text_18F0CA, SootopolisCity_Gym_1F_Text_18F282, SootopolisCity_Gym_1F_EventScript_15B02D, NO_MUSIC goto_if_unset FLAG_RECEIVED_TM03, SootopolisCity_Gym_1F_EventScript_15B056 goto_if_unset FLAG_BADGE06_GET, SootopolisCity_Gym_1F_EventScript_15B07A msgbox SootopolisCity_Gym_1F_Text_18F4D7, 4 @@ -106,7 +106,7 @@ SootopolisCity_Gym_1F_EventScript_15B02D:: @ 815B02D end SootopolisCity_Gym_1F_EventScript_15B056:: @ 815B056 - giveitem_std ITEM_TM03_WATER_PULSE + giveitem ITEM_TM03_WATER_PULSE compare VAR_RESULT, 0 goto_if_eq SootopolisCity_Gym_1F_EventScript_1A029B msgbox SootopolisCity_Gym_1F_Text_18F466, 4 diff --git a/data/maps/SootopolisCity_Gym_B1F/scripts.inc b/data/maps/SootopolisCity_Gym_B1F/scripts.inc index 06c7d33a3..48a6de21b 100644 --- a/data/maps/SootopolisCity_Gym_B1F/scripts.inc +++ b/data/maps/SootopolisCity_Gym_B1F/scripts.inc @@ -2,41 +2,41 @@ SootopolisCity_Gym_B1F_MapScripts:: @ 815B0D7 .byte 0 SootopolisCity_Gym_B1F_EventScript_15B0D8:: @ 815B0D8 - trainerbattle 0, TRAINER_ANDREA, 0, SootopolisCity_Gym_B1F_Text_18EA87, SootopolisCity_Gym_B1F_Text_18EACF + trainerbattle_single TRAINER_ANDREA, SootopolisCity_Gym_B1F_Text_18EA87, SootopolisCity_Gym_B1F_Text_18EACF msgbox SootopolisCity_Gym_B1F_Text_18EAED, 6 end SootopolisCity_Gym_B1F_EventScript_15B0EF:: @ 815B0EF - trainerbattle 0, TRAINER_CRISSY, 0, SootopolisCity_Gym_B1F_Text_18EB22, SootopolisCity_Gym_B1F_Text_18EB81 + trainerbattle_single TRAINER_CRISSY, SootopolisCity_Gym_B1F_Text_18EB22, SootopolisCity_Gym_B1F_Text_18EB81 msgbox SootopolisCity_Gym_B1F_Text_18EBB1, 6 end SootopolisCity_Gym_B1F_EventScript_15B106:: @ 815B106 - trainerbattle 0, TRAINER_BRIANNA_2, 0, SootopolisCity_Gym_B1F_Text_18EBFA, SootopolisCity_Gym_B1F_Text_18EC5E + trainerbattle_single TRAINER_BRIANNA_2, SootopolisCity_Gym_B1F_Text_18EBFA, SootopolisCity_Gym_B1F_Text_18EC5E msgbox SootopolisCity_Gym_B1F_Text_18EC92, 6 end SootopolisCity_Gym_B1F_EventScript_15B11D:: @ 815B11D - trainerbattle 0, TRAINER_CONNIE, 0, SootopolisCity_Gym_B1F_Text_18ECEB, SootopolisCity_Gym_B1F_Text_18ED18 + trainerbattle_single TRAINER_CONNIE, SootopolisCity_Gym_B1F_Text_18ECEB, SootopolisCity_Gym_B1F_Text_18ED18 msgbox SootopolisCity_Gym_B1F_Text_18ED2B, 6 end SootopolisCity_Gym_B1F_EventScript_15B134:: @ 815B134 - trainerbattle 0, TRAINER_BRIDGET, 0, SootopolisCity_Gym_B1F_Text_18ED91, SootopolisCity_Gym_B1F_Text_18EDE8 + trainerbattle_single TRAINER_BRIDGET, SootopolisCity_Gym_B1F_Text_18ED91, SootopolisCity_Gym_B1F_Text_18EDE8 msgbox SootopolisCity_Gym_B1F_Text_18EE03, 6 end SootopolisCity_Gym_B1F_EventScript_15B14B:: @ 815B14B - trainerbattle 0, TRAINER_OLIVIA, 0, SootopolisCity_Gym_B1F_Text_18EE96, SootopolisCity_Gym_B1F_Text_18EEDC + trainerbattle_single TRAINER_OLIVIA, SootopolisCity_Gym_B1F_Text_18EE96, SootopolisCity_Gym_B1F_Text_18EEDC msgbox SootopolisCity_Gym_B1F_Text_18EEF7, 6 end SootopolisCity_Gym_B1F_EventScript_15B162:: @ 815B162 - trainerbattle 0, TRAINER_TIFFANY, 0, SootopolisCity_Gym_B1F_Text_18EF39, SootopolisCity_Gym_B1F_Text_18EFB8 + trainerbattle_single TRAINER_TIFFANY, SootopolisCity_Gym_B1F_Text_18EF39, SootopolisCity_Gym_B1F_Text_18EFB8 msgbox SootopolisCity_Gym_B1F_Text_18EFCA, 6 end SootopolisCity_Gym_B1F_EventScript_15B179:: @ 815B179 - trainerbattle 0, TRAINER_MARISSA, 0, SootopolisCity_Gym_B1F_Text_18F037, SootopolisCity_Gym_B1F_Text_18F07F + trainerbattle_single TRAINER_MARISSA, SootopolisCity_Gym_B1F_Text_18F037, SootopolisCity_Gym_B1F_Text_18F07F msgbox SootopolisCity_Gym_B1F_Text_18F085, 6 end diff --git a/data/maps/SootopolisCity_House1/scripts.inc b/data/maps/SootopolisCity_House1/scripts.inc index d1b842f7b..25133ab42 100644 --- a/data/maps/SootopolisCity_House1/scripts.inc +++ b/data/maps/SootopolisCity_House1/scripts.inc @@ -6,7 +6,7 @@ SootopolisCity_House1_EventScript_15B29B:: @ 815B29B faceplayer goto_if_set FLAG_RECEIVED_TM31, SootopolisCity_House1_EventScript_15B2C7 msgbox SootopolisCity_House1_Text_18F991, 4 - giveitem_std ITEM_TM31_BRICK_BREAK + giveitem ITEM_TM31_BRICK_BREAK setflag FLAG_RECEIVED_TM31 msgbox SootopolisCity_House1_Text_18FA03, 4 release diff --git a/data/maps/SootopolisCity_House6/scripts.inc b/data/maps/SootopolisCity_House6/scripts.inc index 897531b5b..19b0e9378 100644 --- a/data/maps/SootopolisCity_House6/scripts.inc +++ b/data/maps/SootopolisCity_House6/scripts.inc @@ -9,7 +9,7 @@ SootopolisCity_House6_EventScript_15B386:: @ 815B386 compare VAR_RESULT, NO call_if_eq SootopolisCity_House6_EventScript_15B3C3 msgbox SootopolisCity_House6_Text_18FF12, 4 - givedecoration_std DECOR_WAILMER_DOLL + givedecoration DECOR_WAILMER_DOLL compare VAR_RESULT, 0 goto_if_eq SootopolisCity_House6_EventScript_15B3D7 setflag FLAG_RECEIVED_WAILMER_DOLL diff --git a/data/maps/SootopolisCity_House8/scripts.inc b/data/maps/SootopolisCity_House8/scripts.inc index f7971a225..fdb92eb91 100644 --- a/data/maps/SootopolisCity_House8/scripts.inc +++ b/data/maps/SootopolisCity_House8/scripts.inc @@ -38,7 +38,7 @@ SootopolisCity_House8_EventScript_15B45C:: @ 815B45C SootopolisCity_House8_EventScript_15B466:: @ 815B466 msgbox SootopolisCity_House8_Text_19021D, 4 - giveitem_std ITEM_ELIXIR + giveitem ITEM_ELIXIR compare VAR_RESULT, 0 goto_if_eq SootopolisCity_House8_EventScript_15B488 closemessage @@ -87,7 +87,7 @@ SootopolisCity_House8_EventScript_15B4ED:: @ 815B4ED SootopolisCity_House8_EventScript_15B4F7:: @ 815B4F7 msgbox SootopolisCity_House8_Text_190536, 4 - giveitem_std ITEM_ELIXIR + giveitem ITEM_ELIXIR compare VAR_RESULT, 0 goto_if_eq SootopolisCity_House8_EventScript_15B519 closemessage diff --git a/data/maps/VerdanturfTown_ContestLobby/scripts.inc b/data/maps/VerdanturfTown_ContestLobby/scripts.inc index ff95f3c64..e8293f6ca 100644 --- a/data/maps/VerdanturfTown_ContestLobby/scripts.inc +++ b/data/maps/VerdanturfTown_ContestLobby/scripts.inc @@ -90,7 +90,7 @@ VerdanturfTown_ContestLobby_Movement_153E35:: @ 8153E35 VerdanturfTown_ContestLobby_EventScript_153E37:: @ 8153E37 lockall fadescreen 1 - drawcontestwinner 1 + showcontestwinner 1 releaseall end @@ -103,7 +103,7 @@ VerdanturfTown_ContestLobby_EventScript_153E47:: @ 8153E47 faceplayer goto_if_set FLAG_RECEIVED_TM45, VerdanturfTown_ContestLobby_EventScript_153E76 msgbox VerdanturfTown_ContestLobby_Text_177DEC, 4 - giveitem_std ITEM_TM45_ATTRACT + giveitem ITEM_TM45_ATTRACT compare VAR_RESULT, 0 goto_if_eq VerdanturfTown_ContestLobby_EventScript_1A029B setflag FLAG_RECEIVED_TM45 diff --git a/data/maps/VictoryRoad_1F/scripts.inc b/data/maps/VictoryRoad_1F/scripts.inc index 7247ce1d7..a48cf49b0 100644 --- a/data/maps/VictoryRoad_1F/scripts.inc +++ b/data/maps/VictoryRoad_1F/scripts.inc @@ -38,7 +38,7 @@ VictoryRoad_1F_EventScript_15DED3:: @ 815DED3 applymovement 255, VictoryRoad_1F_Movement_1A083F waitmovement 0 msgbox VictoryRoad_1F_Text_19782B, 4 - trainerbattle 3, TRAINER_WALLY_1, 0, VictoryRoad_1F_Text_197943 + trainerbattle_no_intro TRAINER_WALLY_1, VictoryRoad_1F_Text_197943 msgbox VictoryRoad_1F_Text_197967, 4 clearflag FLAG_HIDE_WALLY_BATTLE_VICTORY_ROAD moveobjectoffscreen 4 @@ -91,7 +91,7 @@ VictoryRoad_1F_EventScript_15DF28:: @ 815DF28 end VictoryRoad_1F_EventScript_15DF31:: @ 815DF31 - trainerbattle 0, TRAINER_WALLY_3, 0, VictoryRoad_1F_Text_1979BA, VictoryRoad_1F_Text_197A23 + trainerbattle_single TRAINER_WALLY_3, VictoryRoad_1F_Text_1979BA, VictoryRoad_1F_Text_197A23 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if_eq VictoryRoad_1F_EventScript_15DF58 @@ -99,21 +99,21 @@ VictoryRoad_1F_EventScript_15DF31:: @ 815DF31 end VictoryRoad_1F_EventScript_15DF58:: @ 815DF58 - trainerbattle 5, TRAINER_WALLY_3, 0, VictoryRoad_1F_Text_1979BA, VictoryRoad_1F_Text_197A23 + trainerbattle_rematch TRAINER_WALLY_3, VictoryRoad_1F_Text_1979BA, VictoryRoad_1F_Text_197A23 msgbox VictoryRoad_1F_Text_197A47, 6 end VictoryRoad_1F_EventScript_15DF6F:: @ 815DF6F - trainerbattle 0, TRAINER_EDGAR, 0, VictoryRoad_1F_Text_197AD1, VictoryRoad_1F_Text_197B1A + trainerbattle_single TRAINER_EDGAR, VictoryRoad_1F_Text_197AD1, VictoryRoad_1F_Text_197B1A msgbox VictoryRoad_1F_Text_197B36, 6 end VictoryRoad_1F_EventScript_15DF86:: @ 815DF86 - trainerbattle 0, TRAINER_ALBERT, 0, VictoryRoad_1F_Text_197B99, VictoryRoad_1F_Text_197BE1 + trainerbattle_single TRAINER_ALBERT, VictoryRoad_1F_Text_197B99, VictoryRoad_1F_Text_197BE1 msgbox VictoryRoad_1F_Text_197BF7, 6 end VictoryRoad_1F_EventScript_15DF9D:: @ 815DF9D - trainerbattle 0, TRAINER_HOPE, 0, VictoryRoad_1F_Text_197C45, VictoryRoad_1F_Text_197C8D + trainerbattle_single TRAINER_HOPE, VictoryRoad_1F_Text_197C45, VictoryRoad_1F_Text_197C8D msgbox VictoryRoad_1F_Text_197CAF, 6 end diff --git a/data/maps/VictoryRoad_B1F/scripts.inc b/data/maps/VictoryRoad_B1F/scripts.inc index 5667866d7..c62a046b3 100644 --- a/data/maps/VictoryRoad_B1F/scripts.inc +++ b/data/maps/VictoryRoad_B1F/scripts.inc @@ -2,16 +2,16 @@ VictoryRoad_B1F_MapScripts:: @ 815DFB4 .byte 0 VictoryRoad_B1F_EventScript_15DFB5:: @ 815DFB5 - trainerbattle 0, TRAINER_SAMUEL, 0, VictoryRoad_B1F_Text_197CE9, VictoryRoad_B1F_Text_197D42 + trainerbattle_single TRAINER_SAMUEL, VictoryRoad_B1F_Text_197CE9, VictoryRoad_B1F_Text_197D42 msgbox VictoryRoad_B1F_Text_197D5B, 6 end VictoryRoad_B1F_EventScript_15DFCC:: @ 815DFCC - trainerbattle 0, TRAINER_SHANNON, 0, VictoryRoad_B1F_Text_197D98, VictoryRoad_B1F_Text_197DE8 + trainerbattle_single TRAINER_SHANNON, VictoryRoad_B1F_Text_197D98, VictoryRoad_B1F_Text_197DE8 msgbox VictoryRoad_B1F_Text_197E13, 6 end VictoryRoad_B1F_EventScript_15DFE3:: @ 815DFE3 - trainerbattle 0, TRAINER_MICHELLE, 0, VictoryRoad_B1F_Text_197E5D, VictoryRoad_B1F_Text_197EA6 + trainerbattle_single TRAINER_MICHELLE, VictoryRoad_B1F_Text_197E5D, VictoryRoad_B1F_Text_197EA6 msgbox VictoryRoad_B1F_Text_197EB6, 6 end diff --git a/data/maps/VictoryRoad_B2F/scripts.inc b/data/maps/VictoryRoad_B2F/scripts.inc index 929af39e8..28a1272b5 100644 --- a/data/maps/VictoryRoad_B2F/scripts.inc +++ b/data/maps/VictoryRoad_B2F/scripts.inc @@ -2,21 +2,21 @@ VictoryRoad_B2F_MapScripts:: @ 815DFFA .byte 0 VictoryRoad_B2F_EventScript_15DFFB:: @ 815DFFB - trainerbattle 0, TRAINER_VITO, 0, VictoryRoad_B2F_Text_197EF2, VictoryRoad_B2F_Text_197F46 + trainerbattle_single TRAINER_VITO, VictoryRoad_B2F_Text_197EF2, VictoryRoad_B2F_Text_197F46 msgbox VictoryRoad_B2F_Text_197F71, 6 end VictoryRoad_B2F_EventScript_15E012:: @ 815E012 - trainerbattle 0, TRAINER_OWEN, 0, VictoryRoad_B2F_Text_197FE5, VictoryRoad_B2F_Text_19802B + trainerbattle_single TRAINER_OWEN, VictoryRoad_B2F_Text_197FE5, VictoryRoad_B2F_Text_19802B msgbox VictoryRoad_B2F_Text_198047, 6 end VictoryRoad_B2F_EventScript_15E029:: @ 815E029 - trainerbattle 0, TRAINER_CAROLINE, 0, VictoryRoad_B2F_Text_198089, VictoryRoad_B2F_Text_1980AD + trainerbattle_single TRAINER_CAROLINE, VictoryRoad_B2F_Text_198089, VictoryRoad_B2F_Text_1980AD msgbox VictoryRoad_B2F_Text_1980C8, 6 end VictoryRoad_B2F_EventScript_15E040:: @ 815E040 - trainerbattle 0, TRAINER_JULIE, 0, VictoryRoad_B2F_Text_198121, VictoryRoad_B2F_Text_1981A3 + trainerbattle_single TRAINER_JULIE, VictoryRoad_B2F_Text_198121, VictoryRoad_B2F_Text_1981A3 msgbox VictoryRoad_B2F_Text_1981BA, 6 end diff --git a/data/script_cmd_table.inc b/data/script_cmd_table.inc index 3f47da1da..31e5e8fcc 100644 --- a/data/script_cmd_table.inc +++ b/data/script_cmd_table.inc @@ -45,7 +45,7 @@ gScriptCmdTable:: @ 814AE30 .4byte ScrCmd_clearflag @ 0x2A .4byte ScrCmd_checkflag @ 0x2B .4byte ScrCmd_initclock @ 0x2C - .4byte ScrCmd_dodailyevents @ 0x2D + .4byte ScrCmd_dotimebasedevents @ 0x2D .4byte ScrCmd_gettime @ 0x2E .4byte ScrCmd_playse @ 0x2F .4byte ScrCmd_waitse @ 0x30 @@ -68,15 +68,15 @@ gScriptCmdTable:: @ 814AE30 .4byte ScrCmd_setholewarp @ 0x41 .4byte ScrCmd_getplayerxy @ 0x42 .4byte ScrCmd_getpartysize @ 0x43 - .4byte ScrCmd_giveitem @ 0x44 - .4byte ScrCmd_takeitem @ 0x45 + .4byte ScrCmd_additem @ 0x44 + .4byte ScrCmd_removeitem @ 0x45 .4byte ScrCmd_checkitemspace @ 0x46 .4byte ScrCmd_checkitem @ 0x47 .4byte ScrCmd_checkitemtype @ 0x48 - .4byte ScrCmd_givepcitem @ 0x49 + .4byte ScrCmd_addpcitem @ 0x49 .4byte ScrCmd_checkpcitem @ 0x4A - .4byte ScrCmd_givedecoration @ 0x4B - .4byte ScrCmd_takedecoration @ 0x4C + .4byte ScrCmd_adddecoration @ 0x4B + .4byte ScrCmd_removedecoration @ 0x4C .4byte ScrCmd_checkdecor @ 0x4D .4byte ScrCmd_checkdecorspace @ 0x4E .4byte ScrCmd_applymovement @ 0x4F @@ -117,9 +117,9 @@ gScriptCmdTable:: @ 814AE30 .4byte ScrCmd_drawbox @ 0x72 .4byte ScrCmd_erasebox @ 0x73 .4byte ScrCmd_drawboxtext @ 0x74 - .4byte ScrCmd_drawmonpic @ 0x75 - .4byte ScrCmd_erasemonpic @ 0x76 - .4byte ScrCmd_drawcontestwinner @ 0x77 + .4byte ScrCmd_showmonpic @ 0x75 + .4byte ScrCmd_hidemonpic @ 0x76 + .4byte ScrCmd_showcontestwinner @ 0x77 .4byte ScrCmd_braillemessage @ 0x78 .4byte ScrCmd_givemon @ 0x79 .4byte ScrCmd_giveegg @ 0x7A @@ -144,8 +144,8 @@ gScriptCmdTable:: @ 814AE30 .4byte ScrCmd_showcontestresults @ 0x8D .4byte ScrCmd_contestlinktransfer @ 0x8E .4byte ScrCmd_random @ 0x8F - .4byte ScrCmd_givemoney @ 0x90 - .4byte ScrCmd_takemoney @ 0x91 + .4byte ScrCmd_addmoney @ 0x90 + .4byte ScrCmd_removemoney @ 0x91 .4byte ScrCmd_checkmoney @ 0x92 .4byte ScrCmd_showmoneybox @ 0x93 .4byte ScrCmd_hidemoneybox @ 0x94 @@ -180,8 +180,8 @@ gScriptCmdTable:: @ 814AE30 .4byte ScrCmd_addelevmenuitem @ 0xB1 .4byte ScrCmd_showelevmenu @ 0xB2 .4byte ScrCmd_checkcoins @ 0xB3 - .4byte ScrCmd_givecoins @ 0xB4 - .4byte ScrCmd_takecoins @ 0xB5 + .4byte ScrCmd_addcoins @ 0xB4 + .4byte ScrCmd_removecoins @ 0xB5 .4byte ScrCmd_setwildbattle @ 0xB6 .4byte ScrCmd_dowildbattle @ 0xB7 .4byte ScrCmd_setvaddress @ 0xB8 diff --git a/data/scripts/berry_tree.inc b/data/scripts/berry_tree.inc index 1a72316bc..c47cb9bee 100644 --- a/data/scripts/berry_tree.inc +++ b/data/scripts/berry_tree.inc @@ -45,7 +45,7 @@ BerryTree_EventScript_1A1577:: @ 81A1577 waitstate compare VAR_ITEM_ID, 0 goto_if_eq BerryTree_EventScript_1A1593 - takeitem VAR_ITEM_ID, 1 + removeitem VAR_ITEM_ID, 1 call S_PlantBerryTree BerryTree_EventScript_1A1593:: @ 81A1593 release diff --git a/data/scripts/contest_hall.inc b/data/scripts/contest_hall.inc index 2a63d97f8..2f5634b8e 100644 --- a/data/scripts/contest_hall.inc +++ b/data/scripts/contest_hall.inc @@ -41,7 +41,7 @@ FallarborTown_ContestLobby_EventScript_1A4EF6:: @ 81A4EF6 FallarborTown_ContestLobby_EventScript_1A4F13:: @ 81A4F13 goto_if_set FLAG_RECEIVED_CONTEST_PASS, FallarborTown_ContestLobby_EventScript_1A4F44 msgbox FallarborTown_ContestLobby_Text_1A6583, 4 - giveitem_std ITEM_CONTEST_PASS + giveitem ITEM_CONTEST_PASS setflag FLAG_RECEIVED_CONTEST_PASS setflag FLAG_TEMP_1 msgbox FallarborTown_ContestLobby_Text_1A5E98, 4 @@ -60,7 +60,7 @@ FallarborTown_ContestLobby_EventScript_1A4F4E:: @ 81A4F4E end FallarborTown_ContestLobby_EventScript_1A4F67:: @ 81A4F67 - giveitem_std ITEM_LUXURY_BALL + giveitem ITEM_LUXURY_BALL compare VAR_RESULT, 0 goto_if_eq FallarborTown_ContestLobby_EventScript_1A4F86 setvar VAR_CONTEST_PRIZE_PICKUP, 0 @@ -1131,7 +1131,7 @@ LinkContestRoom1_EventScript_1A5D2D:: @ 81A5D2D return LinkContestRoom1_EventScript_1A5D3B:: @ 81A5D3B - giveitem_std ITEM_LUXURY_BALL + giveitem ITEM_LUXURY_BALL compare VAR_RESULT, 0 goto_if_eq LinkContestRoom1_EventScript_1A5D2D msgbox LinkContestRoom1_Text_1A6DF1, 3 diff --git a/data/scripts/debug.inc b/data/scripts/debug.inc index c11e78a8d..c8f795d56 100644 --- a/data/scripts/debug.inc +++ b/data/scripts/debug.inc @@ -9,7 +9,7 @@ DebugScript_081C1D07:: @ 81C1D07 checkitem ITEM_COIN_CASE, 1 compare VAR_RESULT, 1 goto_if_eq DebugScript_081C1D1D - giveitem ITEM_COIN_CASE, 1 + additem ITEM_COIN_CASE, 1 end DebugScript_081C1D1D:: @ 81C1D1D @@ -26,7 +26,7 @@ DebugScript_081C1D24:: @ 81C1D24 end DebugScript_081C1D2A:: @ 81C1D2A - giveitem ITEM_SS_TICKET, 1 + additem ITEM_SS_TICKET, 1 goto DebugScript_081C1CFE DebugScript_081C1D34:: @ 81C1D34 @@ -43,411 +43,411 @@ DebugScript_081C1D45:: @ 81C1D45 end DebugScript_081C1D46:: @ 81C1D46 - giveitem ITEM_POTION, 99 - giveitem ITEM_ANTIDOTE, 99 - giveitem ITEM_BURN_HEAL, 99 - giveitem ITEM_ICE_HEAL, 99 - giveitem ITEM_AWAKENING, 99 - giveitem ITEM_PARALYZE_HEAL, 99 - giveitem ITEM_FULL_RESTORE, 99 - giveitem ITEM_MAX_POTION, 99 - giveitem ITEM_HYPER_POTION, 99 - giveitem ITEM_SUPER_POTION, 99 - giveitem ITEM_FULL_HEAL, 99 - giveitem ITEM_REVIVE, 99 - giveitem ITEM_MAX_REVIVE, 99 - giveitem ITEM_FRESH_WATER, 99 - giveitem ITEM_SODA_POP, 99 - giveitem ITEM_LEMONADE, 99 - giveitem ITEM_MOOMOO_MILK, 99 - giveitem ITEM_ENERGY_POWDER, 99 - giveitem ITEM_ENERGY_ROOT, 99 - giveitem ITEM_HEAL_POWDER, 99 - giveitem ITEM_ORANGE_MAIL, 92 - giveitem ITEM_RETRO_MAIL, 94 - giveitem ITEM_POTION, 89 - giveitem ITEM_MASTER_BALL, 99 - giveitem ITEM_ULTRA_BALL, 99 - giveitem ITEM_GREAT_BALL, 99 - giveitem ITEM_POKE_BALL, 99 - giveitem ITEM_NET_BALL, 99 - giveitem ITEM_DIVE_BALL, 99 - giveitem ITEM_NEST_BALL, 99 - giveitem ITEM_REPEAT_BALL, 99 - giveitem ITEM_TIMER_BALL, 99 - giveitem ITEM_LUXURY_BALL, 99 - giveitem ITEM_PREMIER_BALL, 99 - giveitem ITEM_MASTER_BALL, 99 - giveitem ITEM_MASTER_BALL, 99 - giveitem ITEM_MASTER_BALL, 99 - giveitem ITEM_MASTER_BALL, 99 - giveitem ITEM_MASTER_BALL, 99 - giveitem ITEM_MASTER_BALL, 99 - giveitem ITEM_MASTER_BALL, 99 - giveitem ITEM_MASTER_BALL, 99 - giveitem ITEM_MASTER_BALL, 99 - giveitem ITEM_GREAT_BALL, 79 - giveitem ITEM_ULTRA_BALL, 84 - giveitem ITEM_POKE_BALL, 89 - giveitem ITEM_MASTER_BALL, 74 - giveitem ITEM_TM01_FOCUS_PUNCH, 99 - giveitem ITEM_TM02_DRAGON_CLAW, 99 - giveitem ITEM_TM03_WATER_PULSE, 99 - giveitem ITEM_TM04_CALM_MIND, 99 - giveitem ITEM_TM05_ROAR, 99 - giveitem ITEM_TM06_TOXIC, 99 - giveitem ITEM_TM07_HAIL, 99 - giveitem ITEM_TM08_BULK_UP, 99 - giveitem ITEM_TM09_BULLET_SEED, 99 - giveitem ITEM_TM10_HIDDEN_POWER, 99 - giveitem ITEM_TM11_SUNNY_DAY, 99 - giveitem ITEM_TM12_TAUNT, 99 - giveitem ITEM_TM13_ICE_BEAM, 99 - giveitem ITEM_TM14_BLIZZARD, 99 - giveitem ITEM_TM15_HYPER_BEAM, 99 - giveitem ITEM_TM16_LIGHT_SCREEN, 99 - giveitem ITEM_TM17_PROTECT, 99 - giveitem ITEM_TM18_RAIN_DANCE, 99 - giveitem ITEM_TM19_GIGA_DRAIN, 99 - giveitem ITEM_TM20_SAFEGUARD, 99 - giveitem ITEM_TM21_FRUSTRATION, 99 - giveitem ITEM_TM22_SOLARBEAM, 99 - giveitem ITEM_TM23_IRON_TAIL, 99 - giveitem ITEM_TM24_THUNDERBOLT, 99 - giveitem ITEM_TM25_THUNDER, 99 - giveitem ITEM_TM26_EARTHQUAKE, 99 - giveitem ITEM_TM27_RETURN, 99 - giveitem ITEM_TM28_DIG, 99 - giveitem ITEM_TM29_PSYCHIC, 99 - giveitem ITEM_TM30_SHADOW_BALL, 99 - giveitem ITEM_TM31_BRICK_BREAK, 99 - giveitem ITEM_TM32_DOUBLE_TEAM, 99 - giveitem ITEM_TM33_REFLECT, 99 - giveitem ITEM_TM34_SHOCK_WAVE, 99 - giveitem ITEM_TM35_FLAMETHROWER, 99 - giveitem ITEM_TM36_SLUDGE_BOMB, 99 - giveitem ITEM_TM37_SANDSTORM, 99 - giveitem ITEM_TM38_FIRE_BLAST, 99 - giveitem ITEM_TM39_ROCK_TOMB, 99 - giveitem ITEM_TM40_AERIAL_ACE, 99 - giveitem ITEM_TM41_TORMENT, 99 - giveitem ITEM_TM42_FACADE, 99 - giveitem ITEM_TM43_SECRET_POWER, 99 - giveitem ITEM_TM44_REST, 99 - giveitem ITEM_TM45_ATTRACT, 99 - giveitem ITEM_TM46_THIEF, 99 - giveitem ITEM_TM47_STEEL_WING, 99 - giveitem ITEM_TM48_SKILL_SWAP, 99 - giveitem ITEM_TM49_SNATCH, 99 - giveitem ITEM_TM50_OVERHEAT, 99 - giveitem ITEM_CHERI_BERRY, 200 - giveitem ITEM_CHERI_BERRY, 200 - giveitem ITEM_CHERI_BERRY, 200 - giveitem ITEM_CHERI_BERRY, 200 - giveitem ITEM_CHERI_BERRY, 199 - giveitem ITEM_CHESTO_BERRY, 200 - giveitem ITEM_CHESTO_BERRY, 200 - giveitem ITEM_CHESTO_BERRY, 200 - giveitem ITEM_CHESTO_BERRY, 200 - giveitem ITEM_CHESTO_BERRY, 199 - giveitem ITEM_PECHA_BERRY, 200 - giveitem ITEM_PECHA_BERRY, 200 - giveitem ITEM_PECHA_BERRY, 200 - giveitem ITEM_PECHA_BERRY, 200 - giveitem ITEM_PECHA_BERRY, 199 - giveitem ITEM_RAWST_BERRY, 200 - giveitem ITEM_RAWST_BERRY, 200 - giveitem ITEM_RAWST_BERRY, 200 - giveitem ITEM_RAWST_BERRY, 200 - giveitem ITEM_RAWST_BERRY, 199 - giveitem ITEM_ASPEAR_BERRY, 200 - giveitem ITEM_ASPEAR_BERRY, 200 - giveitem ITEM_ASPEAR_BERRY, 200 - giveitem ITEM_ASPEAR_BERRY, 200 - giveitem ITEM_ASPEAR_BERRY, 199 - giveitem ITEM_LEPPA_BERRY, 200 - giveitem ITEM_LEPPA_BERRY, 200 - giveitem ITEM_LEPPA_BERRY, 200 - giveitem ITEM_LEPPA_BERRY, 200 - giveitem ITEM_LEPPA_BERRY, 199 - giveitem ITEM_ORAN_BERRY, 200 - giveitem ITEM_ORAN_BERRY, 200 - giveitem ITEM_ORAN_BERRY, 200 - giveitem ITEM_ORAN_BERRY, 200 - giveitem ITEM_ORAN_BERRY, 199 - giveitem ITEM_PERSIM_BERRY, 200 - giveitem ITEM_PERSIM_BERRY, 200 - giveitem ITEM_PERSIM_BERRY, 200 - giveitem ITEM_PERSIM_BERRY, 200 - giveitem ITEM_PERSIM_BERRY, 199 - giveitem ITEM_LUM_BERRY, 200 - giveitem ITEM_LUM_BERRY, 200 - giveitem ITEM_LUM_BERRY, 200 - giveitem ITEM_LUM_BERRY, 200 - giveitem ITEM_LUM_BERRY, 199 - giveitem ITEM_SITRUS_BERRY, 200 - giveitem ITEM_SITRUS_BERRY, 200 - giveitem ITEM_SITRUS_BERRY, 200 - giveitem ITEM_SITRUS_BERRY, 200 - giveitem ITEM_SITRUS_BERRY, 199 - giveitem ITEM_FIGY_BERRY, 200 - giveitem ITEM_FIGY_BERRY, 200 - giveitem ITEM_FIGY_BERRY, 200 - giveitem ITEM_FIGY_BERRY, 200 - giveitem ITEM_FIGY_BERRY, 199 - giveitem ITEM_WIKI_BERRY, 200 - giveitem ITEM_WIKI_BERRY, 200 - giveitem ITEM_WIKI_BERRY, 200 - giveitem ITEM_WIKI_BERRY, 200 - giveitem ITEM_WIKI_BERRY, 199 - giveitem ITEM_MAGO_BERRY, 200 - giveitem ITEM_MAGO_BERRY, 200 - giveitem ITEM_MAGO_BERRY, 200 - giveitem ITEM_MAGO_BERRY, 200 - giveitem ITEM_MAGO_BERRY, 199 - giveitem ITEM_AGUAV_BERRY, 200 - giveitem ITEM_AGUAV_BERRY, 200 - giveitem ITEM_AGUAV_BERRY, 200 - giveitem ITEM_AGUAV_BERRY, 200 - giveitem ITEM_AGUAV_BERRY, 199 - giveitem ITEM_IAPAPA_BERRY, 200 - giveitem ITEM_IAPAPA_BERRY, 200 - giveitem ITEM_IAPAPA_BERRY, 200 - giveitem ITEM_IAPAPA_BERRY, 200 - giveitem ITEM_IAPAPA_BERRY, 199 - giveitem ITEM_RAZZ_BERRY, 200 - giveitem ITEM_RAZZ_BERRY, 200 - giveitem ITEM_RAZZ_BERRY, 200 - giveitem ITEM_RAZZ_BERRY, 200 - giveitem ITEM_RAZZ_BERRY, 199 - giveitem ITEM_BLUK_BERRY, 200 - giveitem ITEM_BLUK_BERRY, 200 - giveitem ITEM_BLUK_BERRY, 200 - giveitem ITEM_BLUK_BERRY, 200 - giveitem ITEM_BLUK_BERRY, 199 - giveitem ITEM_NANAB_BERRY, 200 - giveitem ITEM_NANAB_BERRY, 200 - giveitem ITEM_NANAB_BERRY, 200 - giveitem ITEM_NANAB_BERRY, 200 - giveitem ITEM_NANAB_BERRY, 199 - giveitem ITEM_WEPEAR_BERRY, 200 - giveitem ITEM_WEPEAR_BERRY, 200 - giveitem ITEM_WEPEAR_BERRY, 200 - giveitem ITEM_WEPEAR_BERRY, 200 - giveitem ITEM_WEPEAR_BERRY, 199 - giveitem ITEM_PINAP_BERRY, 200 - giveitem ITEM_PINAP_BERRY, 200 - giveitem ITEM_PINAP_BERRY, 200 - giveitem ITEM_PINAP_BERRY, 200 - giveitem ITEM_PINAP_BERRY, 199 - giveitem ITEM_POMEG_BERRY, 200 - giveitem ITEM_POMEG_BERRY, 200 - giveitem ITEM_POMEG_BERRY, 200 - giveitem ITEM_POMEG_BERRY, 200 - giveitem ITEM_POMEG_BERRY, 199 - giveitem ITEM_KELPSY_BERRY, 200 - giveitem ITEM_KELPSY_BERRY, 200 - giveitem ITEM_KELPSY_BERRY, 200 - giveitem ITEM_KELPSY_BERRY, 200 - giveitem ITEM_KELPSY_BERRY, 199 - giveitem ITEM_QUALOT_BERRY, 200 - giveitem ITEM_QUALOT_BERRY, 200 - giveitem ITEM_QUALOT_BERRY, 200 - giveitem ITEM_QUALOT_BERRY, 200 - giveitem ITEM_QUALOT_BERRY, 199 - giveitem ITEM_HONDEW_BERRY, 200 - giveitem ITEM_HONDEW_BERRY, 200 - giveitem ITEM_HONDEW_BERRY, 200 - giveitem ITEM_HONDEW_BERRY, 200 - giveitem ITEM_HONDEW_BERRY, 199 - giveitem ITEM_GREPA_BERRY, 200 - giveitem ITEM_GREPA_BERRY, 200 - giveitem ITEM_GREPA_BERRY, 200 - giveitem ITEM_GREPA_BERRY, 200 - giveitem ITEM_GREPA_BERRY, 199 - giveitem ITEM_TAMATO_BERRY, 200 - giveitem ITEM_TAMATO_BERRY, 200 - giveitem ITEM_TAMATO_BERRY, 200 - giveitem ITEM_TAMATO_BERRY, 200 - giveitem ITEM_TAMATO_BERRY, 199 - giveitem ITEM_CORNN_BERRY, 200 - giveitem ITEM_CORNN_BERRY, 200 - giveitem ITEM_CORNN_BERRY, 200 - giveitem ITEM_CORNN_BERRY, 200 - giveitem ITEM_CORNN_BERRY, 199 - giveitem ITEM_MAGOST_BERRY, 999 - giveitem ITEM_RABUTA_BERRY, 999 - giveitem ITEM_NOMEL_BERRY, 999 - giveitem ITEM_SPELON_BERRY, 999 - giveitem ITEM_PAMTRE_BERRY, 999 - giveitem ITEM_WATMEL_BERRY, 999 - giveitem ITEM_DURIN_BERRY, 999 - giveitem ITEM_BELUE_BERRY, 999 - giveitem ITEM_LIECHI_BERRY, 999 - giveitem ITEM_GANLON_BERRY, 999 - giveitem ITEM_SALAC_BERRY, 999 - giveitem ITEM_PETAYA_BERRY, 999 - giveitem ITEM_APICOT_BERRY, 999 - giveitem ITEM_LANSAT_BERRY, 999 - giveitem ITEM_STARF_BERRY, 999 - giveitem ITEM_ENIGMA_BERRY, 999 + additem ITEM_POTION, 99 + additem ITEM_ANTIDOTE, 99 + additem ITEM_BURN_HEAL, 99 + additem ITEM_ICE_HEAL, 99 + additem ITEM_AWAKENING, 99 + additem ITEM_PARALYZE_HEAL, 99 + additem ITEM_FULL_RESTORE, 99 + additem ITEM_MAX_POTION, 99 + additem ITEM_HYPER_POTION, 99 + additem ITEM_SUPER_POTION, 99 + additem ITEM_FULL_HEAL, 99 + additem ITEM_REVIVE, 99 + additem ITEM_MAX_REVIVE, 99 + additem ITEM_FRESH_WATER, 99 + additem ITEM_SODA_POP, 99 + additem ITEM_LEMONADE, 99 + additem ITEM_MOOMOO_MILK, 99 + additem ITEM_ENERGY_POWDER, 99 + additem ITEM_ENERGY_ROOT, 99 + additem ITEM_HEAL_POWDER, 99 + additem ITEM_ORANGE_MAIL, 92 + additem ITEM_RETRO_MAIL, 94 + additem ITEM_POTION, 89 + additem ITEM_MASTER_BALL, 99 + additem ITEM_ULTRA_BALL, 99 + additem ITEM_GREAT_BALL, 99 + additem ITEM_POKE_BALL, 99 + additem ITEM_NET_BALL, 99 + additem ITEM_DIVE_BALL, 99 + additem ITEM_NEST_BALL, 99 + additem ITEM_REPEAT_BALL, 99 + additem ITEM_TIMER_BALL, 99 + additem ITEM_LUXURY_BALL, 99 + additem ITEM_PREMIER_BALL, 99 + additem ITEM_MASTER_BALL, 99 + additem ITEM_MASTER_BALL, 99 + additem ITEM_MASTER_BALL, 99 + additem ITEM_MASTER_BALL, 99 + additem ITEM_MASTER_BALL, 99 + additem ITEM_MASTER_BALL, 99 + additem ITEM_MASTER_BALL, 99 + additem ITEM_MASTER_BALL, 99 + additem ITEM_MASTER_BALL, 99 + additem ITEM_GREAT_BALL, 79 + additem ITEM_ULTRA_BALL, 84 + additem ITEM_POKE_BALL, 89 + additem ITEM_MASTER_BALL, 74 + additem ITEM_TM01_FOCUS_PUNCH, 99 + additem ITEM_TM02_DRAGON_CLAW, 99 + additem ITEM_TM03_WATER_PULSE, 99 + additem ITEM_TM04_CALM_MIND, 99 + additem ITEM_TM05_ROAR, 99 + additem ITEM_TM06_TOXIC, 99 + additem ITEM_TM07_HAIL, 99 + additem ITEM_TM08_BULK_UP, 99 + additem ITEM_TM09_BULLET_SEED, 99 + additem ITEM_TM10_HIDDEN_POWER, 99 + additem ITEM_TM11_SUNNY_DAY, 99 + additem ITEM_TM12_TAUNT, 99 + additem ITEM_TM13_ICE_BEAM, 99 + additem ITEM_TM14_BLIZZARD, 99 + additem ITEM_TM15_HYPER_BEAM, 99 + additem ITEM_TM16_LIGHT_SCREEN, 99 + additem ITEM_TM17_PROTECT, 99 + additem ITEM_TM18_RAIN_DANCE, 99 + additem ITEM_TM19_GIGA_DRAIN, 99 + additem ITEM_TM20_SAFEGUARD, 99 + additem ITEM_TM21_FRUSTRATION, 99 + additem ITEM_TM22_SOLARBEAM, 99 + additem ITEM_TM23_IRON_TAIL, 99 + additem ITEM_TM24_THUNDERBOLT, 99 + additem ITEM_TM25_THUNDER, 99 + additem ITEM_TM26_EARTHQUAKE, 99 + additem ITEM_TM27_RETURN, 99 + additem ITEM_TM28_DIG, 99 + additem ITEM_TM29_PSYCHIC, 99 + additem ITEM_TM30_SHADOW_BALL, 99 + additem ITEM_TM31_BRICK_BREAK, 99 + additem ITEM_TM32_DOUBLE_TEAM, 99 + additem ITEM_TM33_REFLECT, 99 + additem ITEM_TM34_SHOCK_WAVE, 99 + additem ITEM_TM35_FLAMETHROWER, 99 + additem ITEM_TM36_SLUDGE_BOMB, 99 + additem ITEM_TM37_SANDSTORM, 99 + additem ITEM_TM38_FIRE_BLAST, 99 + additem ITEM_TM39_ROCK_TOMB, 99 + additem ITEM_TM40_AERIAL_ACE, 99 + additem ITEM_TM41_TORMENT, 99 + additem ITEM_TM42_FACADE, 99 + additem ITEM_TM43_SECRET_POWER, 99 + additem ITEM_TM44_REST, 99 + additem ITEM_TM45_ATTRACT, 99 + additem ITEM_TM46_THIEF, 99 + additem ITEM_TM47_STEEL_WING, 99 + additem ITEM_TM48_SKILL_SWAP, 99 + additem ITEM_TM49_SNATCH, 99 + additem ITEM_TM50_OVERHEAT, 99 + additem ITEM_CHERI_BERRY, 200 + additem ITEM_CHERI_BERRY, 200 + additem ITEM_CHERI_BERRY, 200 + additem ITEM_CHERI_BERRY, 200 + additem ITEM_CHERI_BERRY, 199 + additem ITEM_CHESTO_BERRY, 200 + additem ITEM_CHESTO_BERRY, 200 + additem ITEM_CHESTO_BERRY, 200 + additem ITEM_CHESTO_BERRY, 200 + additem ITEM_CHESTO_BERRY, 199 + additem ITEM_PECHA_BERRY, 200 + additem ITEM_PECHA_BERRY, 200 + additem ITEM_PECHA_BERRY, 200 + additem ITEM_PECHA_BERRY, 200 + additem ITEM_PECHA_BERRY, 199 + additem ITEM_RAWST_BERRY, 200 + additem ITEM_RAWST_BERRY, 200 + additem ITEM_RAWST_BERRY, 200 + additem ITEM_RAWST_BERRY, 200 + additem ITEM_RAWST_BERRY, 199 + additem ITEM_ASPEAR_BERRY, 200 + additem ITEM_ASPEAR_BERRY, 200 + additem ITEM_ASPEAR_BERRY, 200 + additem ITEM_ASPEAR_BERRY, 200 + additem ITEM_ASPEAR_BERRY, 199 + additem ITEM_LEPPA_BERRY, 200 + additem ITEM_LEPPA_BERRY, 200 + additem ITEM_LEPPA_BERRY, 200 + additem ITEM_LEPPA_BERRY, 200 + additem ITEM_LEPPA_BERRY, 199 + additem ITEM_ORAN_BERRY, 200 + additem ITEM_ORAN_BERRY, 200 + additem ITEM_ORAN_BERRY, 200 + additem ITEM_ORAN_BERRY, 200 + additem ITEM_ORAN_BERRY, 199 + additem ITEM_PERSIM_BERRY, 200 + additem ITEM_PERSIM_BERRY, 200 + additem ITEM_PERSIM_BERRY, 200 + additem ITEM_PERSIM_BERRY, 200 + additem ITEM_PERSIM_BERRY, 199 + additem ITEM_LUM_BERRY, 200 + additem ITEM_LUM_BERRY, 200 + additem ITEM_LUM_BERRY, 200 + additem ITEM_LUM_BERRY, 200 + additem ITEM_LUM_BERRY, 199 + additem ITEM_SITRUS_BERRY, 200 + additem ITEM_SITRUS_BERRY, 200 + additem ITEM_SITRUS_BERRY, 200 + additem ITEM_SITRUS_BERRY, 200 + additem ITEM_SITRUS_BERRY, 199 + additem ITEM_FIGY_BERRY, 200 + additem ITEM_FIGY_BERRY, 200 + additem ITEM_FIGY_BERRY, 200 + additem ITEM_FIGY_BERRY, 200 + additem ITEM_FIGY_BERRY, 199 + additem ITEM_WIKI_BERRY, 200 + additem ITEM_WIKI_BERRY, 200 + additem ITEM_WIKI_BERRY, 200 + additem ITEM_WIKI_BERRY, 200 + additem ITEM_WIKI_BERRY, 199 + additem ITEM_MAGO_BERRY, 200 + additem ITEM_MAGO_BERRY, 200 + additem ITEM_MAGO_BERRY, 200 + additem ITEM_MAGO_BERRY, 200 + additem ITEM_MAGO_BERRY, 199 + additem ITEM_AGUAV_BERRY, 200 + additem ITEM_AGUAV_BERRY, 200 + additem ITEM_AGUAV_BERRY, 200 + additem ITEM_AGUAV_BERRY, 200 + additem ITEM_AGUAV_BERRY, 199 + additem ITEM_IAPAPA_BERRY, 200 + additem ITEM_IAPAPA_BERRY, 200 + additem ITEM_IAPAPA_BERRY, 200 + additem ITEM_IAPAPA_BERRY, 200 + additem ITEM_IAPAPA_BERRY, 199 + additem ITEM_RAZZ_BERRY, 200 + additem ITEM_RAZZ_BERRY, 200 + additem ITEM_RAZZ_BERRY, 200 + additem ITEM_RAZZ_BERRY, 200 + additem ITEM_RAZZ_BERRY, 199 + additem ITEM_BLUK_BERRY, 200 + additem ITEM_BLUK_BERRY, 200 + additem ITEM_BLUK_BERRY, 200 + additem ITEM_BLUK_BERRY, 200 + additem ITEM_BLUK_BERRY, 199 + additem ITEM_NANAB_BERRY, 200 + additem ITEM_NANAB_BERRY, 200 + additem ITEM_NANAB_BERRY, 200 + additem ITEM_NANAB_BERRY, 200 + additem ITEM_NANAB_BERRY, 199 + additem ITEM_WEPEAR_BERRY, 200 + additem ITEM_WEPEAR_BERRY, 200 + additem ITEM_WEPEAR_BERRY, 200 + additem ITEM_WEPEAR_BERRY, 200 + additem ITEM_WEPEAR_BERRY, 199 + additem ITEM_PINAP_BERRY, 200 + additem ITEM_PINAP_BERRY, 200 + additem ITEM_PINAP_BERRY, 200 + additem ITEM_PINAP_BERRY, 200 + additem ITEM_PINAP_BERRY, 199 + additem ITEM_POMEG_BERRY, 200 + additem ITEM_POMEG_BERRY, 200 + additem ITEM_POMEG_BERRY, 200 + additem ITEM_POMEG_BERRY, 200 + additem ITEM_POMEG_BERRY, 199 + additem ITEM_KELPSY_BERRY, 200 + additem ITEM_KELPSY_BERRY, 200 + additem ITEM_KELPSY_BERRY, 200 + additem ITEM_KELPSY_BERRY, 200 + additem ITEM_KELPSY_BERRY, 199 + additem ITEM_QUALOT_BERRY, 200 + additem ITEM_QUALOT_BERRY, 200 + additem ITEM_QUALOT_BERRY, 200 + additem ITEM_QUALOT_BERRY, 200 + additem ITEM_QUALOT_BERRY, 199 + additem ITEM_HONDEW_BERRY, 200 + additem ITEM_HONDEW_BERRY, 200 + additem ITEM_HONDEW_BERRY, 200 + additem ITEM_HONDEW_BERRY, 200 + additem ITEM_HONDEW_BERRY, 199 + additem ITEM_GREPA_BERRY, 200 + additem ITEM_GREPA_BERRY, 200 + additem ITEM_GREPA_BERRY, 200 + additem ITEM_GREPA_BERRY, 200 + additem ITEM_GREPA_BERRY, 199 + additem ITEM_TAMATO_BERRY, 200 + additem ITEM_TAMATO_BERRY, 200 + additem ITEM_TAMATO_BERRY, 200 + additem ITEM_TAMATO_BERRY, 200 + additem ITEM_TAMATO_BERRY, 199 + additem ITEM_CORNN_BERRY, 200 + additem ITEM_CORNN_BERRY, 200 + additem ITEM_CORNN_BERRY, 200 + additem ITEM_CORNN_BERRY, 200 + additem ITEM_CORNN_BERRY, 199 + additem ITEM_MAGOST_BERRY, 999 + additem ITEM_RABUTA_BERRY, 999 + additem ITEM_NOMEL_BERRY, 999 + additem ITEM_SPELON_BERRY, 999 + additem ITEM_PAMTRE_BERRY, 999 + additem ITEM_WATMEL_BERRY, 999 + additem ITEM_DURIN_BERRY, 999 + additem ITEM_BELUE_BERRY, 999 + additem ITEM_LIECHI_BERRY, 999 + additem ITEM_GANLON_BERRY, 999 + additem ITEM_SALAC_BERRY, 999 + additem ITEM_PETAYA_BERRY, 999 + additem ITEM_APICOT_BERRY, 999 + additem ITEM_LANSAT_BERRY, 999 + additem ITEM_STARF_BERRY, 999 + additem ITEM_ENIGMA_BERRY, 999 end DebugScript_081C221F:: @ 81C221F - givedecoration DECOR_SMALL_DESK - givedecoration DECOR_SMALL_DESK - givedecoration DECOR_SMALL_DESK - givedecoration DECOR_SMALL_DESK - givedecoration DECOR_SMALL_DESK - givedecoration DECOR_SMALL_DESK - givedecoration DECOR_SMALL_DESK - givedecoration DECOR_SMALL_DESK - givedecoration DECOR_SMALL_DESK - givedecoration DECOR_SMALL_DESK - givedecoration DECOR_SMALL_CHAIR - givedecoration DECOR_SMALL_CHAIR - givedecoration DECOR_SMALL_CHAIR - givedecoration DECOR_SMALL_CHAIR - givedecoration DECOR_SMALL_CHAIR - givedecoration DECOR_SMALL_CHAIR - givedecoration DECOR_SMALL_CHAIR - givedecoration DECOR_SMALL_CHAIR - givedecoration DECOR_SMALL_CHAIR - givedecoration DECOR_SMALL_CHAIR - givedecoration DECOR_RED_PLANT - givedecoration DECOR_RED_PLANT - givedecoration DECOR_RED_PLANT - givedecoration DECOR_RED_PLANT - givedecoration DECOR_RED_PLANT - givedecoration DECOR_RED_PLANT - givedecoration DECOR_RED_PLANT - givedecoration DECOR_RED_PLANT - givedecoration DECOR_RED_PLANT - givedecoration DECOR_RED_PLANT - givedecoration DECOR_RED_BRICK - givedecoration DECOR_RED_BRICK - givedecoration DECOR_RED_BRICK - givedecoration DECOR_RED_BRICK - givedecoration DECOR_RED_BRICK - givedecoration DECOR_RED_BRICK - givedecoration DECOR_RED_BRICK - givedecoration DECOR_RED_BRICK - givedecoration DECOR_RED_BRICK - givedecoration DECOR_RED_BRICK - givedecoration DECOR_RED_BRICK - givedecoration DECOR_RED_BRICK - givedecoration DECOR_RED_BRICK - givedecoration DECOR_RED_BRICK - givedecoration DECOR_RED_BRICK - givedecoration DECOR_RED_BRICK - givedecoration DECOR_RED_BRICK - givedecoration DECOR_RED_BRICK - givedecoration DECOR_RED_BRICK - givedecoration DECOR_RED_BRICK - givedecoration DECOR_RED_BRICK - givedecoration DECOR_RED_BRICK - givedecoration DECOR_RED_BRICK - givedecoration DECOR_RED_BRICK - givedecoration DECOR_RED_BRICK - givedecoration DECOR_RED_BRICK - givedecoration DECOR_RED_BRICK - givedecoration DECOR_RED_BRICK - givedecoration DECOR_RED_BRICK - givedecoration DECOR_RED_BRICK - givedecoration DECOR_JUMP_MAT - givedecoration DECOR_JUMP_MAT - givedecoration DECOR_JUMP_MAT - givedecoration DECOR_JUMP_MAT - givedecoration DECOR_JUMP_MAT - givedecoration DECOR_JUMP_MAT - givedecoration DECOR_JUMP_MAT - givedecoration DECOR_JUMP_MAT - givedecoration DECOR_JUMP_MAT - givedecoration DECOR_JUMP_MAT - givedecoration DECOR_JUMP_MAT - givedecoration DECOR_JUMP_MAT - givedecoration DECOR_JUMP_MAT - givedecoration DECOR_JUMP_MAT - givedecoration DECOR_JUMP_MAT - givedecoration DECOR_JUMP_MAT - givedecoration DECOR_JUMP_MAT - givedecoration DECOR_JUMP_MAT - givedecoration DECOR_JUMP_MAT - givedecoration DECOR_JUMP_MAT - givedecoration DECOR_JUMP_MAT - givedecoration DECOR_JUMP_MAT - givedecoration DECOR_JUMP_MAT - givedecoration DECOR_JUMP_MAT - givedecoration DECOR_JUMP_MAT - givedecoration DECOR_JUMP_MAT - givedecoration DECOR_JUMP_MAT - givedecoration DECOR_JUMP_MAT - givedecoration DECOR_JUMP_MAT - givedecoration DECOR_JUMP_MAT - givedecoration DECOR_BALL_POSTER - givedecoration DECOR_BALL_POSTER - givedecoration DECOR_BALL_POSTER - givedecoration DECOR_BALL_POSTER - givedecoration DECOR_BALL_POSTER - givedecoration DECOR_BALL_POSTER - givedecoration DECOR_BALL_POSTER - givedecoration DECOR_BALL_POSTER - givedecoration DECOR_BALL_POSTER - givedecoration DECOR_BALL_POSTER - givedecoration DECOR_DUSKULL_DOLL - givedecoration DECOR_DUSKULL_DOLL - givedecoration DECOR_DUSKULL_DOLL - givedecoration DECOR_DUSKULL_DOLL - givedecoration DECOR_DUSKULL_DOLL - givedecoration DECOR_DUSKULL_DOLL - givedecoration DECOR_DUSKULL_DOLL - givedecoration DECOR_DUSKULL_DOLL - givedecoration DECOR_DUSKULL_DOLL - givedecoration DECOR_DUSKULL_DOLL - givedecoration DECOR_DUSKULL_DOLL - givedecoration DECOR_DUSKULL_DOLL - givedecoration DECOR_DUSKULL_DOLL - givedecoration DECOR_DUSKULL_DOLL - givedecoration DECOR_DUSKULL_DOLL - givedecoration DECOR_DUSKULL_DOLL - givedecoration DECOR_DUSKULL_DOLL - givedecoration DECOR_DUSKULL_DOLL - givedecoration DECOR_DUSKULL_DOLL - givedecoration DECOR_DUSKULL_DOLL - givedecoration DECOR_DUSKULL_DOLL - givedecoration DECOR_DUSKULL_DOLL - givedecoration DECOR_DUSKULL_DOLL - givedecoration DECOR_DUSKULL_DOLL - givedecoration DECOR_DUSKULL_DOLL - givedecoration DECOR_DUSKULL_DOLL - givedecoration DECOR_DUSKULL_DOLL - givedecoration DECOR_DUSKULL_DOLL - givedecoration DECOR_DUSKULL_DOLL - givedecoration DECOR_DUSKULL_DOLL - givedecoration DECOR_DUSKULL_DOLL - givedecoration DECOR_DUSKULL_DOLL - givedecoration DECOR_DUSKULL_DOLL - givedecoration DECOR_DUSKULL_DOLL - givedecoration DECOR_DUSKULL_DOLL - givedecoration DECOR_DUSKULL_DOLL - givedecoration DECOR_DUSKULL_DOLL - givedecoration DECOR_DUSKULL_DOLL - givedecoration DECOR_DUSKULL_DOLL - givedecoration DECOR_DUSKULL_DOLL - givedecoration DECOR_KISS_CUSHION - givedecoration DECOR_KISS_CUSHION - givedecoration DECOR_KISS_CUSHION - givedecoration DECOR_KISS_CUSHION - givedecoration DECOR_KISS_CUSHION - givedecoration DECOR_KISS_CUSHION - givedecoration DECOR_KISS_CUSHION - givedecoration DECOR_KISS_CUSHION - givedecoration DECOR_KISS_CUSHION - givedecoration DECOR_KISS_CUSHION + adddecoration DECOR_SMALL_DESK + adddecoration DECOR_SMALL_DESK + adddecoration DECOR_SMALL_DESK + adddecoration DECOR_SMALL_DESK + adddecoration DECOR_SMALL_DESK + adddecoration DECOR_SMALL_DESK + adddecoration DECOR_SMALL_DESK + adddecoration DECOR_SMALL_DESK + adddecoration DECOR_SMALL_DESK + adddecoration DECOR_SMALL_DESK + adddecoration DECOR_SMALL_CHAIR + adddecoration DECOR_SMALL_CHAIR + adddecoration DECOR_SMALL_CHAIR + adddecoration DECOR_SMALL_CHAIR + adddecoration DECOR_SMALL_CHAIR + adddecoration DECOR_SMALL_CHAIR + adddecoration DECOR_SMALL_CHAIR + adddecoration DECOR_SMALL_CHAIR + adddecoration DECOR_SMALL_CHAIR + adddecoration DECOR_SMALL_CHAIR + adddecoration DECOR_RED_PLANT + adddecoration DECOR_RED_PLANT + adddecoration DECOR_RED_PLANT + adddecoration DECOR_RED_PLANT + adddecoration DECOR_RED_PLANT + adddecoration DECOR_RED_PLANT + adddecoration DECOR_RED_PLANT + adddecoration DECOR_RED_PLANT + adddecoration DECOR_RED_PLANT + adddecoration DECOR_RED_PLANT + adddecoration DECOR_RED_BRICK + adddecoration DECOR_RED_BRICK + adddecoration DECOR_RED_BRICK + adddecoration DECOR_RED_BRICK + adddecoration DECOR_RED_BRICK + adddecoration DECOR_RED_BRICK + adddecoration DECOR_RED_BRICK + adddecoration DECOR_RED_BRICK + adddecoration DECOR_RED_BRICK + adddecoration DECOR_RED_BRICK + adddecoration DECOR_RED_BRICK + adddecoration DECOR_RED_BRICK + adddecoration DECOR_RED_BRICK + adddecoration DECOR_RED_BRICK + adddecoration DECOR_RED_BRICK + adddecoration DECOR_RED_BRICK + adddecoration DECOR_RED_BRICK + adddecoration DECOR_RED_BRICK + adddecoration DECOR_RED_BRICK + adddecoration DECOR_RED_BRICK + adddecoration DECOR_RED_BRICK + adddecoration DECOR_RED_BRICK + adddecoration DECOR_RED_BRICK + adddecoration DECOR_RED_BRICK + adddecoration DECOR_RED_BRICK + adddecoration DECOR_RED_BRICK + adddecoration DECOR_RED_BRICK + adddecoration DECOR_RED_BRICK + adddecoration DECOR_RED_BRICK + adddecoration DECOR_RED_BRICK + adddecoration DECOR_JUMP_MAT + adddecoration DECOR_JUMP_MAT + adddecoration DECOR_JUMP_MAT + adddecoration DECOR_JUMP_MAT + adddecoration DECOR_JUMP_MAT + adddecoration DECOR_JUMP_MAT + adddecoration DECOR_JUMP_MAT + adddecoration DECOR_JUMP_MAT + adddecoration DECOR_JUMP_MAT + adddecoration DECOR_JUMP_MAT + adddecoration DECOR_JUMP_MAT + adddecoration DECOR_JUMP_MAT + adddecoration DECOR_JUMP_MAT + adddecoration DECOR_JUMP_MAT + adddecoration DECOR_JUMP_MAT + adddecoration DECOR_JUMP_MAT + adddecoration DECOR_JUMP_MAT + adddecoration DECOR_JUMP_MAT + adddecoration DECOR_JUMP_MAT + adddecoration DECOR_JUMP_MAT + adddecoration DECOR_JUMP_MAT + adddecoration DECOR_JUMP_MAT + adddecoration DECOR_JUMP_MAT + adddecoration DECOR_JUMP_MAT + adddecoration DECOR_JUMP_MAT + adddecoration DECOR_JUMP_MAT + adddecoration DECOR_JUMP_MAT + adddecoration DECOR_JUMP_MAT + adddecoration DECOR_JUMP_MAT + adddecoration DECOR_JUMP_MAT + adddecoration DECOR_BALL_POSTER + adddecoration DECOR_BALL_POSTER + adddecoration DECOR_BALL_POSTER + adddecoration DECOR_BALL_POSTER + adddecoration DECOR_BALL_POSTER + adddecoration DECOR_BALL_POSTER + adddecoration DECOR_BALL_POSTER + adddecoration DECOR_BALL_POSTER + adddecoration DECOR_BALL_POSTER + adddecoration DECOR_BALL_POSTER + adddecoration DECOR_DUSKULL_DOLL + adddecoration DECOR_DUSKULL_DOLL + adddecoration DECOR_DUSKULL_DOLL + adddecoration DECOR_DUSKULL_DOLL + adddecoration DECOR_DUSKULL_DOLL + adddecoration DECOR_DUSKULL_DOLL + adddecoration DECOR_DUSKULL_DOLL + adddecoration DECOR_DUSKULL_DOLL + adddecoration DECOR_DUSKULL_DOLL + adddecoration DECOR_DUSKULL_DOLL + adddecoration DECOR_DUSKULL_DOLL + adddecoration DECOR_DUSKULL_DOLL + adddecoration DECOR_DUSKULL_DOLL + adddecoration DECOR_DUSKULL_DOLL + adddecoration DECOR_DUSKULL_DOLL + adddecoration DECOR_DUSKULL_DOLL + adddecoration DECOR_DUSKULL_DOLL + adddecoration DECOR_DUSKULL_DOLL + adddecoration DECOR_DUSKULL_DOLL + adddecoration DECOR_DUSKULL_DOLL + adddecoration DECOR_DUSKULL_DOLL + adddecoration DECOR_DUSKULL_DOLL + adddecoration DECOR_DUSKULL_DOLL + adddecoration DECOR_DUSKULL_DOLL + adddecoration DECOR_DUSKULL_DOLL + adddecoration DECOR_DUSKULL_DOLL + adddecoration DECOR_DUSKULL_DOLL + adddecoration DECOR_DUSKULL_DOLL + adddecoration DECOR_DUSKULL_DOLL + adddecoration DECOR_DUSKULL_DOLL + adddecoration DECOR_DUSKULL_DOLL + adddecoration DECOR_DUSKULL_DOLL + adddecoration DECOR_DUSKULL_DOLL + adddecoration DECOR_DUSKULL_DOLL + adddecoration DECOR_DUSKULL_DOLL + adddecoration DECOR_DUSKULL_DOLL + adddecoration DECOR_DUSKULL_DOLL + adddecoration DECOR_DUSKULL_DOLL + adddecoration DECOR_DUSKULL_DOLL + adddecoration DECOR_DUSKULL_DOLL + adddecoration DECOR_KISS_CUSHION + adddecoration DECOR_KISS_CUSHION + adddecoration DECOR_KISS_CUSHION + adddecoration DECOR_KISS_CUSHION + adddecoration DECOR_KISS_CUSHION + adddecoration DECOR_KISS_CUSHION + adddecoration DECOR_KISS_CUSHION + adddecoration DECOR_KISS_CUSHION + adddecoration DECOR_KISS_CUSHION + adddecoration DECOR_KISS_CUSHION end DebugScript_081C23E2:: @ 81C23E2 - givecoins 9999 + addcoins 9999 end DebugScript_081C23E6:: @ 81C23E6 @@ -458,7 +458,7 @@ DebugScript_081C23E6:: @ 81C23E6 end DebugScript_081C23F6:: @ 81C23F6 - takemoney 999999, 0x00 + removemoney 999999, 0 end DebugScript_081C23FD:: @ 81C23FD @@ -476,15 +476,15 @@ DebugScript_081C23FD:: @ 81C23FD end DebugScript_081C2436:: @ 81C2436 - givemon SPECIES_BARBOACH, 99, 0, 0, 0, 0 + givemon SPECIES_BARBOACH, 99, ITEM_NONE DebugScript_081C2445: - givemon SPECIES_BARBOACH, 99, 0, 0, 0, 0 + givemon SPECIES_BARBOACH, 99, ITEM_NONE DebugScript_081C2454: - givemon SPECIES_BARBOACH, 99, 0, 0, 0, 0 + givemon SPECIES_BARBOACH, 99, ITEM_NONE DebugScript_081C2463: - givemon SPECIES_BARBOACH, 99, 0, 0, 0, 0 + givemon SPECIES_BARBOACH, 99, ITEM_NONE DebugScript_081C2472: - givemon SPECIES_BARBOACH, 99, 0, 0, 0, 0 + givemon SPECIES_BARBOACH, 99, ITEM_NONE end DebugScript_081C2482:: @ 81C2482 @@ -502,15 +502,15 @@ DebugScript_081C2482:: @ 81C2482 end DebugScript_081C24BB:: @ 81C24BB - givemon SPECIES_SHROOMISH, 99, 0, 0, 0, 0 + givemon SPECIES_SHROOMISH, 99, ITEM_NONE DebugScript_081C24CA: - givemon SPECIES_SHROOMISH, 99, 0, 0, 0, 0 + givemon SPECIES_SHROOMISH, 99, ITEM_NONE DebugScript_081C24D9: - givemon SPECIES_SHROOMISH, 99, 0, 0, 0, 0 + givemon SPECIES_SHROOMISH, 99, ITEM_NONE DebugScript_081C24E8: - givemon SPECIES_SHROOMISH, 99, 0, 0, 0, 0 + givemon SPECIES_SHROOMISH, 99, ITEM_NONE DebugScript_081C24F7: - givemon SPECIES_SHROOMISH, 99, 0, 0, 0, 0 + givemon SPECIES_SHROOMISH, 99, ITEM_NONE end DebugScript_081C2507:: @ 81C2507 diff --git a/data/scripts/gabby_and_ty.inc b/data/scripts/gabby_and_ty.inc index f8d57f084..b2d0e598b 100644 --- a/data/scripts/gabby_and_ty.inc +++ b/data/scripts/gabby_and_ty.inc @@ -124,61 +124,61 @@ Route111_EventScript_1AE41E:: @ 81AE41E return Route111_EventScript_1AE422:: @ 81AE422 - trainerbattle 6, TRAINER_GABBY_AND_TY_1, 0, Route111_Text_1ABED8, Route111_Text_1ABFD3, Route111_Text_1AC5CA, Route111_EventScript_1AE5A2 + trainerbattle_double TRAINER_GABBY_AND_TY_1, Route111_Text_1ABED8, Route111_Text_1ABFD3, Route111_Text_1AC5CA, Route111_EventScript_1AE5A2 msgbox Route111_Text_1AC59E, 4 release end Route111_EventScript_1AE442:: @ 81AE442 - trainerbattle 6, TRAINER_GABBY_AND_TY_1, 0, Route111_Text_1AC73B, Route111_Text_1AC892, Route111_Text_1AC820, Route111_EventScript_1AE5A2 + trainerbattle_double TRAINER_GABBY_AND_TY_1, Route111_Text_1AC73B, Route111_Text_1AC892, Route111_Text_1AC820, Route111_EventScript_1AE5A2 msgbox Route111_Text_1AC7E4, 4 release end Route118_EventScript_1AE462:: @ 81AE462 - trainerbattle 6, TRAINER_GABBY_AND_TY_2, 0, Route118_Text_1ABF50, Route118_Text_1AC6F8, Route118_Text_1AC5CA, Route118_EventScript_1AE60F + trainerbattle_double TRAINER_GABBY_AND_TY_2, Route118_Text_1ABF50, Route118_Text_1AC6F8, Route118_Text_1AC5CA, Route118_EventScript_1AE60F msgbox Route118_Text_1AC59E, 4 release end Route118_EventScript_1AE482:: @ 81AE482 - trainerbattle 6, TRAINER_GABBY_AND_TY_2, 0, Route118_Text_1AC790, Route118_Text_1AC8D7, Route118_Text_1AC820, Route118_EventScript_1AE60F + trainerbattle_double TRAINER_GABBY_AND_TY_2, Route118_Text_1AC790, Route118_Text_1AC8D7, Route118_Text_1AC820, Route118_EventScript_1AE60F msgbox Route118_Text_1AC7E4, 4 release end Route120_EventScript_1AE4A2:: @ 81AE4A2 - trainerbattle 6, TRAINER_GABBY_AND_TY_3, 0, Route120_Text_1ABF50, Route120_Text_1AC6F8, Route120_Text_1AC5CA, Route120_EventScript_1AE60F + trainerbattle_double TRAINER_GABBY_AND_TY_3, Route120_Text_1ABF50, Route120_Text_1AC6F8, Route120_Text_1AC5CA, Route120_EventScript_1AE60F msgbox Route120_Text_1AC59E, 4 release end Route120_EventScript_1AE4C2:: @ 81AE4C2 - trainerbattle 6, TRAINER_GABBY_AND_TY_3, 0, Route120_Text_1AC790, Route120_Text_1AC8D7, Route120_Text_1AC820, Route120_EventScript_1AE60F + trainerbattle_double TRAINER_GABBY_AND_TY_3, Route120_Text_1AC790, Route120_Text_1AC8D7, Route120_Text_1AC820, Route120_EventScript_1AE60F msgbox Route120_Text_1AC7E4, 4 release end Route111_EventScript_1AE4E2:: @ 81AE4E2 - trainerbattle 6, TRAINER_GABBY_AND_TY_4, 0, Route111_Text_1ABF50, Route111_Text_1AC6F8, Route111_Text_1AC5CA, Route111_EventScript_1AE60F + trainerbattle_double TRAINER_GABBY_AND_TY_4, Route111_Text_1ABF50, Route111_Text_1AC6F8, Route111_Text_1AC5CA, Route111_EventScript_1AE60F msgbox Route111_Text_1AC59E, 4 release end Route111_EventScript_1AE502:: @ 81AE502 - trainerbattle 6, TRAINER_GABBY_AND_TY_4, 0, Route111_Text_1AC790, Route111_Text_1AC8D7, Route111_Text_1AC820, Route111_EventScript_1AE60F + trainerbattle_double TRAINER_GABBY_AND_TY_4, Route111_Text_1AC790, Route111_Text_1AC8D7, Route111_Text_1AC820, Route111_EventScript_1AE60F msgbox Route111_Text_1AC7E4, 4 release end Route118_EventScript_1AE522:: @ 81AE522 - trainerbattle 6, TRAINER_GABBY_AND_TY_5, 0, Route118_Text_1ABF50, Route118_Text_1AC6F8, Route118_Text_1AC5CA, Route118_EventScript_1AE60F + trainerbattle_double TRAINER_GABBY_AND_TY_5, Route118_Text_1ABF50, Route118_Text_1AC6F8, Route118_Text_1AC5CA, Route118_EventScript_1AE60F msgbox Route118_Text_1AC59E, 4 release end Route118_EventScript_1AE542:: @ 81AE542 - trainerbattle 6, TRAINER_GABBY_AND_TY_5, 0, Route118_Text_1AC790, Route118_Text_1AC8D7, Route118_Text_1AC820, Route118_EventScript_1AE60F + trainerbattle_double TRAINER_GABBY_AND_TY_5, Route118_Text_1AC790, Route118_Text_1AC8D7, Route118_Text_1AC820, Route118_EventScript_1AE60F msgbox Route118_Text_1AC7E4, 4 release end @@ -186,7 +186,7 @@ Route118_EventScript_1AE542:: @ 81AE542 Route111_EventScript_1AE562:: @ 81AE562 Route118_EventScript_1AE562:: @ 81AE562 Route120_EventScript_1AE562:: @ 81AE562 - trainerbattle 6, TRAINER_GABBY_AND_TY_6, 0, Route111_Text_1ABF50, Route111_Text_1AC6F8, Route111_Text_1AC5CA, Route111_EventScript_1AE60F + trainerbattle_double TRAINER_GABBY_AND_TY_6, Route111_Text_1ABF50, Route111_Text_1AC6F8, Route111_Text_1AC5CA, Route111_EventScript_1AE60F msgbox Route111_Text_1AC59E, 4 release end @@ -194,7 +194,7 @@ Route120_EventScript_1AE562:: @ 81AE562 Route111_EventScript_1AE582:: @ 81AE582 Route118_EventScript_1AE582:: @ 81AE582 Route120_EventScript_1AE582:: @ 81AE582 - trainerbattle 6, TRAINER_GABBY_AND_TY_6, 0, Route111_Text_1AC790, Route111_Text_1AC8D7, Route111_Text_1AC820, Route111_EventScript_1AE60F + trainerbattle_double TRAINER_GABBY_AND_TY_6, Route111_Text_1AC790, Route111_Text_1AC8D7, Route111_Text_1AC820, Route111_EventScript_1AE60F msgbox Route111_Text_1AC7E4, 4 release end diff --git a/data/scripts/magma_chimney.inc b/data/scripts/magma_chimney.inc index ff31d8b97..92a4c055a 100644 --- a/data/scripts/magma_chimney.inc +++ b/data/scripts/magma_chimney.inc @@ -46,9 +46,9 @@ MtChimney_EventScript_1B2CCB:: @ 81B2CCB msgbox MtChimney_Text_1B38B3, 4 .endif .ifdef SAPPHIRE - trainerbattle 3, TRAINER_MT_CHIMNEY_GRUNT_3, 0, MtChimney_Text_1B3099 + trainerbattle_no_intro TRAINER_MT_CHIMNEY_GRUNT_3, MtChimney_Text_1B3099 .else - trainerbattle 3, TRAINER_MT_CHIMNEY_GRUNT_3, 0, MtChimney_Text_1B3A68 + trainerbattle_no_intro TRAINER_MT_CHIMNEY_GRUNT_3, MtChimney_Text_1B3A68 .endif .ifdef SAPPHIRE msgbox MtChimney_Text_1B30C2, 4 diff --git a/data/scripts/magma_summit.inc b/data/scripts/magma_summit.inc index 0992a62c0..766b1625e 100644 --- a/data/scripts/magma_summit.inc +++ b/data/scripts/magma_summit.inc @@ -1,29 +1,29 @@ MtPyre_Summit_EventScript_1B2DA9:: @ 81B2DA9 .ifdef SAPPHIRE - trainerbattle 0, TRAINER_MT_PYRE_SUMMIT_GRUNT_1, 0, UnknownString_81B50C3, UnknownString_81B50F5 + trainerbattle_single TRAINER_MT_PYRE_SUMMIT_GRUNT_1, UnknownString_81B50C3, UnknownString_81B50F5 msgbox UnknownString_81B5131, 6 .else - trainerbattle 0, TRAINER_MT_PYRE_SUMMIT_GRUNT_1, 0, MtPyre_Summit_Text_1B5CFD, MtPyre_Summit_Text_1B5D30 + trainerbattle_single TRAINER_MT_PYRE_SUMMIT_GRUNT_1, MtPyre_Summit_Text_1B5CFD, MtPyre_Summit_Text_1B5D30 msgbox MtPyre_Summit_Text_1B5D6D, 6 .endif end MtPyre_Summit_EventScript_1B2DC0:: @ 81B2DC0 .ifdef SAPPHIRE - trainerbattle 0, TRAINER_MT_PYRE_SUMMIT_GRUNT_2, 0, UnknownString_81B5166, UnknownString_81B519F + trainerbattle_single TRAINER_MT_PYRE_SUMMIT_GRUNT_2, UnknownString_81B5166, UnknownString_81B519F msgbox UnknownString_81B51B5, 6 .else - trainerbattle 0, TRAINER_MT_PYRE_SUMMIT_GRUNT_2, 0, MtPyre_Summit_Text_1B5DA2, MtPyre_Summit_Text_1B5DDB + trainerbattle_single TRAINER_MT_PYRE_SUMMIT_GRUNT_2, MtPyre_Summit_Text_1B5DA2, MtPyre_Summit_Text_1B5DDB msgbox MtPyre_Summit_Text_1B5DF1, 6 .endif end MtPyre_Summit_EventScript_1B2DD7:: @ 81B2DD7 .ifdef SAPPHIRE - trainerbattle 0, TRAINER_MT_PYRE_SUMMIT_GRUNT_3, 0, UnknownString_81B51EB, UnknownString_81B5224 + trainerbattle_single TRAINER_MT_PYRE_SUMMIT_GRUNT_3, UnknownString_81B51EB, UnknownString_81B5224 msgbox UnknownString_81B5248, 6 .else - trainerbattle 0, TRAINER_MT_PYRE_SUMMIT_GRUNT_3, 0, MtPyre_Summit_Text_1B5E27, MtPyre_Summit_Text_1B5E60 + trainerbattle_single TRAINER_MT_PYRE_SUMMIT_GRUNT_3, MtPyre_Summit_Text_1B5E27, MtPyre_Summit_Text_1B5E60 msgbox MtPyre_Summit_Text_1B5E84, 6 .endif end diff --git a/data/scripts/players_house.inc b/data/scripts/players_house.inc index a4de5d113..ab21dbba0 100644 --- a/data/scripts/players_house.inc +++ b/data/scripts/players_house.inc @@ -273,7 +273,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_1B6C33:: @ 81B6C33 LittlerootTown_BrendansHouse_1F_EventScript_1B6C3D:: @ 81B6C3D goto_if_set FLAG_RECEIVED_AMULET_COIN, LittlerootTown_BrendansHouse_1F_EventScript_1B6C72 msgbox LittlerootTown_BrendansHouse_1F_Text_172782, 4 - giveitem_std ITEM_AMULET_COIN + giveitem ITEM_AMULET_COIN compare VAR_RESULT, 0 goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1A029B msgbox LittlerootTown_BrendansHouse_1F_Text_1727CD, 4 @@ -379,7 +379,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6CDE:: @ 81B6CDE compare VAR_0x8008, 1 call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6DD8 msgbox LittlerootTown_BrendansHouse_1F_Text_17298B, 4 - giveitem_std ITEM_SS_TICKET + giveitem ITEM_SS_TICKET msgbox LittlerootTown_BrendansHouse_1F_Text_172A7D, 4 closemessage compare VAR_0x8008, 0 diff --git a/data/scripts/pokeblocks.inc b/data/scripts/pokeblocks.inc index 95525b4c9..f05821107 100644 --- a/data/scripts/pokeblocks.inc +++ b/data/scripts/pokeblocks.inc @@ -75,7 +75,7 @@ FallarborTown_ContestLobby_EventScript_1B76EF:: @ 81B76EF FallarborTown_ContestLobby_EventScript_1B770E:: @ 81B770E msgbox FallarborTown_ContestLobby_Text_1B6FF0, 4 - dodailyevents + dotimebasedevents goto_if_set FLAG_DAILY_RECEIVED_BERRY_FALLARBOR, FallarborTown_ContestLobby_EventScript_1B774F goto FallarborTown_ContestLobby_EventScript_1B7759 end @@ -105,7 +105,7 @@ FallarborTown_ContestLobby_EventScript_1B774F:: @ 81B774F FallarborTown_ContestLobby_EventScript_1B7759:: @ 81B7759 msgbox FallarborTown_ContestLobby_Text_1B704A, 4 - giveitem_std ITEM_PECHA_BERRY + giveitem ITEM_PECHA_BERRY setflag FLAG_DAILY_RECEIVED_BERRY_FALLARBOR goto FallarborTown_ContestLobby_EventScript_1B76EF end @@ -160,7 +160,7 @@ FallarborTown_ContestLobby_EventScript_1B77DC:: @ 81B77DC end FallarborTown_ContestLobby_EventScript_1B77E6:: @ 81B77E6 - dodailyevents + dotimebasedevents goto_if_set FLAG_DAILY_RECEIVED_BERRY_FALLARBOR, FallarborTown_ContestLobby_EventScript_1B77F6 goto FallarborTown_ContestLobby_EventScript_1B7800 end @@ -172,7 +172,7 @@ FallarborTown_ContestLobby_EventScript_1B77F6:: @ 81B77F6 FallarborTown_ContestLobby_EventScript_1B7800:: @ 81B7800 msgbox FallarborTown_ContestLobby_Text_1B74B4, 4 - giveitem_std ITEM_PECHA_BERRY + giveitem ITEM_PECHA_BERRY setflag FLAG_DAILY_RECEIVED_BERRY_FALLARBOR msgbox FallarborTown_ContestLobby_Text_1B753A, 4 release diff --git a/data/scripts/secret_power_tm.inc b/data/scripts/secret_power_tm.inc index 22f998d14..fab2bfbff 100644 --- a/data/scripts/secret_power_tm.inc +++ b/data/scripts/secret_power_tm.inc @@ -9,7 +9,7 @@ Route111_EventScript_1A3858:: @ 81A3858 end Route111_EventScript_1A3877:: @ 81A3877 - giveitem_std ITEM_TM43_SECRET_POWER + giveitem ITEM_TM43_SECRET_POWER compare VAR_RESULT, 0 goto_if_eq Route111_EventScript_1A38D9 msgbox Route111_Text_1A35C5, 4 diff --git a/include/coins.h b/include/coins.h index d066c2422..5af56d81c 100644 --- a/include/coins.h +++ b/include/coins.h @@ -6,7 +6,7 @@ void ShowCoinsWindow(u32 a, u8 b, u8 c); void HideCoinsWindow(u8 a, u8 b); void PrintCoins(s32 a, u8 b, u8 c, u8 d); u16 GetCoins(void); -bool8 GiveCoins(u16 coins); -bool8 TakeCoins(u16 coins); +bool8 AddCoins(u16 coins); +bool8 RemoveCoins(u16 coins); #endif // GUARD_COINS_H diff --git a/include/constants/battle_setup.h b/include/constants/battle_setup.h new file mode 100644 index 000000000..e1a663e44 --- /dev/null +++ b/include/constants/battle_setup.h @@ -0,0 +1,14 @@ +#ifndef GUARD_CONSTANTS_BATTLE_SETUP_H +#define GUARD_CONSTANTS_BATTLE_SETUP_H + +#define TRAINER_BATTLE_SINGLE 0 +#define TRAINER_BATTLE_CONTINUE_SCRIPT_NO_MUSIC 1 +#define TRAINER_BATTLE_CONTINUE_SCRIPT 2 +#define TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT 3 +#define TRAINER_BATTLE_DOUBLE 4 +#define TRAINER_BATTLE_REMATCH 5 +#define TRAINER_BATTLE_CONTINUE_SCRIPT_DOUBLE 6 +#define TRAINER_BATTLE_REMATCH_DOUBLE 7 +#define TRAINER_BATTLE_CONTINUE_SCRIPT_DOUBLE_NO_MUSIC 8 + +#endif // GUARD_CONSTANTS_BATTLE_SETUP_H diff --git a/include/constants/vars.h b/include/constants/vars.h index 795498212..8f478b794 100644 --- a/include/constants/vars.h +++ b/include/constants/vars.h @@ -1,8 +1,6 @@ #ifndef GUARD_CONSTANTS_VARS_H #define GUARD_CONSTANTS_VARS_H -#define VAR_0x3F20 0x3F20 - #define VARS_START 0x4000 // temporary vars @@ -172,6 +170,8 @@ #define VAR_STEVENS_HOUSE_STATE 0x40C6 #define VAR_OLDALE_STATE 0x40C7 +#define VARS_END 0x40FF + #define SPECIAL_VARS_START 0x8000 // special vars // They are commonly used as parameters to commands, or return values from commands. @@ -194,4 +194,6 @@ #define VAR_CONTEST_RANK 0x8010 #define VAR_CONTEST_CATEGORY 0x8011 +#define SPECIAL_VARS_END 0x8015 + #endif // GUARD_CONSTANTS_VARS_H diff --git a/include/decoration_inventory.h b/include/decoration_inventory.h index 65bfcc8c0..abe95aef4 100644 --- a/include/decoration_inventory.h +++ b/include/decoration_inventory.h @@ -4,7 +4,7 @@ void ClearDecorationInventories(void); s8 FindFreeDecorationInventorySlot(u8); u8 InventoryContainsDecoration(u8); -u8 GiveDecoration(u8); +u8 AddDecoration(u8); u8 CheckDecorationInventoryHasSpace(u8); s8 RemoveDecorationFromInventory(u8); void SortDecorationInventory(u8); diff --git a/include/macros/event.inc b/include/macros/event.inc index 7250ec5ca..c516e993f 100644 --- a/include/macros/event.inc +++ b/include/macros/event.inc @@ -19,52 +19,58 @@ .endm @ Jumps to destination and continues script execution from there. The location of the calling script is remembered and can be returned to later. - .macro call destination + .macro call destination:req .byte 0x04 .4byte \destination .endm @ Jumps to destination and continues script execution from there. - .macro goto destination + .macro goto destination:req .byte 0x05 .4byte \destination .endm @ If the result of the last comparison matches condition (see Comparison operators), jumps to destination and continues script execution from there. - .macro goto_if condition, destination + .macro goto_if condition:req, destination:req .byte 0x06 .byte \condition .4byte \destination .endm @ If the result of the last comparison matches condition (see Comparison operators), calls destination. - .macro call_if condition, destination + .macro call_if condition:req, destination:req .byte 0x07 .byte \condition .4byte \destination .endm @ Jumps to the standard function at index function. - .macro gotostd function + .macro gotostd function:req .byte 0x08 .byte \function .endm + @ callstd function names + STD_OBTAIN_ITEM = 0 + STD_FIND_ITEM = 1 + STD_OBTAIN_DECORATION = 7 + STD_REGISTER_MATCH_CALL = 8 + @ Calls the standard function at index function. - .macro callstd function + .macro callstd function:req .byte 0x09 .byte \function .endm @ If the result of the last comparison matches condition (see Comparison operators), jumps to the standard function at index function. - .macro gotostd_if condition, function + .macro gotostd_if condition:req, function:req .byte 0x0a .byte \condition .byte \function .endm @ If the result of the last comparison matches condition (see Comparison operators), calls the standard function at index function. - .macro callstd_if condition, function + .macro callstd_if condition:req, function:req .byte 0x0b .byte \condition .byte \function @@ -81,183 +87,181 @@ .endm @ Sets some status related to Mystery Event. - .macro setmysteryeventstatus value + .macro setmysteryeventstatus value:req .byte 0x0e .byte \value .endm @ Sets the specified script bank to value. - .macro loadword destination, value + .macro loadword destination:req, value:req .byte 0x0f .byte \destination .4byte \value .endm @ Sets the specified script bank to value. - .macro loadbyte destination, value + .macro loadbyte destination:req, value:req .byte 0x10 .byte \destination .byte \value .endm @ Sets the byte at offset to value. - .macro writebytetoaddr value, offset + .macro writebytetoaddr value:req, offset:req .byte 0x11 .byte \value .4byte \offset .endm @ Copies the byte value at source into the specified script bank. - .macro loadbytefromaddr destination, source + .macro loadbytefromaddr destination:req, source:req .byte 0x12 .byte \destination .4byte \source .endm @ Not sure. Judging from XSE's description I think it takes the least-significant byte in bank source and writes it to destination. - .macro setptrbyte source, destination + .macro setptrbyte source:req, destination:req .byte 0x13 .byte \source .4byte \destination .endm @ Copies the contents of bank source into bank destination. - .macro copylocal destination, source + .macro copylocal destination:req, source:req .byte 0x14 .byte \destination .byte \source .endm @ Copies the byte at source to destination, replacing whatever byte was previously there. - .macro copybyte destination, source + .macro copybyte destination:req, source:req .byte 0x15 .4byte \destination .4byte \source .endm @ Changes the value of destination to value. - .macro setvar destination, value + .macro setvar destination:req, value:req .byte 0x16 .2byte \destination .2byte \value .endm @ Changes the value of destination by adding value to it. Overflow is not prevented (0xFFFF + 1 = 0x0000). - .macro addvar destination, value + .macro addvar destination:req, value:req .byte 0x17 .2byte \destination .2byte \value .endm @ Changes the value of destination by subtracting value to it. Overflow is not prevented (0x0000 - 1 = 0xFFFF). - .macro subvar destination, value + .macro subvar destination:req, value:req .byte 0x18 .2byte \destination .2byte \value .endm @ Copies the value of source into destination. - .macro copyvar destination, source + .macro copyvar destination:req, source:req .byte 0x19 .2byte \destination .2byte \source .endm @ If source is not a variable, then this function acts like setvar. Otherwise, it acts like copyvar. - .macro setorcopyvar destination, source + .macro setorcopyvar destination:req, source:req .byte 0x1a .2byte \destination .2byte \source .endm @ Compares the values of script banks a and b, after forcing the values to bytes. - .macro compare_local_to_local byte1, byte2 + .macro compare_local_to_local byte1:req, byte2:req .byte 0x1b .byte \byte1 .byte \byte2 .endm @ Compares the least-significant byte of the value of script bank a to a fixed byte value (b). - .macro compare_local_to_value a, b + .macro compare_local_to_value a:req, b:req .byte 0x1c .byte \a .byte \b .endm @ Compares the least-significant byte of the value of script bank a to the byte located at offset b. - .macro compare_local_to_addr a, b + .macro compare_local_to_addr a:req, b:req .byte 0x1d .byte \a .4byte \b .endm @ Compares the byte located at offset a to the least-significant byte of the value of script bank b. - .macro compare_addr_to_local a, b + .macro compare_addr_to_local a:req, b:req .byte 0x1e .4byte \a .byte \b .endm @ Compares the byte located at offset a to a fixed byte value (b). - .macro compare_addr_to_value a, b + .macro compare_addr_to_value a:req, b:req .byte 0x1f .4byte \a .byte \b .endm @ Compares the byte located at offset a to the byte located at offset b. - .macro compare_addr_to_addr a, b + .macro compare_addr_to_addr a:req, b:req .byte 0x20 .4byte \a .4byte \b .endm @ Compares the value of `var` to a fixed word value (b). - .macro compare_var_to_value var, value + .macro compare_var_to_value var:req, value:req .byte 0x21 .2byte \var .2byte \value .endm @ Compares the value of `var1` to the value of `var2`. - .macro compare_var_to_var var1, var2 + .macro compare_var_to_var var1:req, var2:req .byte 0x22 .2byte \var1 .2byte \var2 .endm @ Generic compare macro which attempts to deduce argument types based on their values - @ Any values between 0x4000 to 0x4FFF and 0x8000 to 0x8FFF are considered event variable identifiers - .macro compare arg1, arg2 - .if (((\arg1) >> 12) == 4 || ((\arg1) >> 12) == 8) && (((\arg2) >> 12) == 4 || ((\arg2) >> 12) == 8) - compare_var_to_var (\arg1), (\arg2) - .elseif (((\arg1) >> 12) == 4 || ((\arg1) >> 12) == 8) && ((\arg2) >= -0xFFFF && (\arg2) <= 0xFFFF) - compare_var_to_value (\arg1), ((\arg2) & 0xFFFF) + @ Any values between 0x4000 to 0x40FF and 0x8000 to 0x8015 are considered event variable identifiers + .macro compare var:req, arg:req + .if ((\arg >= VARS_START && \arg <= VARS_END) || (\arg >= SPECIAL_VARS_START && \arg <= SPECIAL_VARS_END)) + compare_var_to_var \var, \arg .else - .error "Invalid arguments for 'compare'" + compare_var_to_value \var, \arg .endif .endm @ Calls the native C function stored at `func`. - .macro callnative func + .macro callnative func:req .byte 0x23 .4byte \func .endm @ Replaces the script with the function stored at `func`. Execution returns to the bytecode script when func returns TRUE. - .macro gotonative func + .macro gotonative func:req .byte 0x24 .4byte \func .endm @ Calls a special function; that is, a function designed for use by scripts and listed in a table of pointers. - .macro special function + .macro special function:req .byte 0x25 .2byte SPECIAL_\function .endm @ Calls a special function. That function's output (if any) will be written to the variable you specify. - .macro specialvar output, function + .macro specialvar output:req, function:req .byte 0x26 .2byte \output .2byte SPECIAL_\function @@ -269,38 +273,38 @@ .endm @ Blocks script execution for time (frames? milliseconds?). - .macro delay time + .macro delay time:req .byte 0x28 .2byte \time .endm @ Sets a to 1. - .macro setflag a + .macro setflag a:req .byte 0x29 .2byte \a .endm @ Sets a to 0. - .macro clearflag a + .macro clearflag a:req .byte 0x2a .2byte \a .endm @ Compares a to 1. - .macro checkflag a + .macro checkflag a:req .byte 0x2b .2byte \a .endm @ Initializes the RTC`s local time offset to the given hour and minute. In FireRed, this command is a nop. - .macro initclock hour, minute + .macro initclock hour:req, minute:req .byte 0x2c .2byte \hour .2byte \minute .endm @ Runs time based events. In FireRed, this command is a nop. - .macro dodailyevents + .macro dotimebasedevents .byte 0x2d .endm @@ -310,7 +314,7 @@ .endm @ Plays the specified (sound_number) sound. Only one sound may play at a time, with newer ones interrupting older ones. - .macro playse sound_number + .macro playse sound_number:req .byte 0x2f .2byte \sound_number .endm @@ -321,7 +325,7 @@ .endm @ Plays the specified (fanfare_number) fanfare. - .macro playfanfare fanfare_number + .macro playfanfare fanfare_number:req .byte 0x31 .2byte \fanfare_number .endm @@ -332,14 +336,14 @@ .endm @ Plays the specified (song_number) song. The byte is apparently supposed to be 0x00. - .macro playbgm song_number, unknown + .macro playbgm song_number:req, unknown:req .byte 0x33 .2byte \song_number .byte \unknown .endm @ Saves the specified (song_number) song to be played later. - .macro savebgm song_number + .macro savebgm song_number:req .byte 0x34 .2byte \song_number .endm @@ -350,25 +354,25 @@ .endm @ Crossfades the currently-playng song into the specified (song_number) song. - .macro fadenewbgm song_number + .macro fadenewbgm song_number:req .byte 0x36 .2byte \song_number .endm @ Fades out the currently-playing song. - .macro fadeoutbgm speed + .macro fadeoutbgm speed:req .byte 0x37 .byte \speed .endm @ Fades the previously-playing song back in. - .macro fadeinbgm speed + .macro fadeinbgm speed:req .byte 0x38 .byte \speed .endm @ Sends the player to Warp warp on Map bank.map. If the specified warp is 0xFF, then the player will instead be sent to (X, Y) on the map. - .macro warp map, warp, X, Y + .macro warp map:req, warp:req, X:req, Y:req .byte 0x39 map \map .byte \warp @@ -377,7 +381,7 @@ .endm @ Clone of warp that does not play a sound effect. - .macro warpsilent map, warp, X, Y + .macro warpsilent map:req, warp:req, X:req, Y:req .byte 0x3a map \map .byte \warp @@ -386,7 +390,7 @@ .endm @ Clone of warp that plays a door opening animation before stepping upwards into it. - .macro warpdoor map, warp, X, Y + .macro warpdoor map:req, warp:req, X:req, Y:req .byte 0x3b map \map .byte \warp @@ -395,13 +399,13 @@ .endm @ Warps the player to another map using a hole animation. - .macro warphole map + .macro warphole map:req .byte 0x3c map \map .endm @ Clone of warp that uses a teleport effect. It is apparently only used in R/S/E. - .macro warpteleport map, warp, X, Y + .macro warpteleport map:req, warp:req, X:req, Y:req .byte 0x3d map \map .byte \warp @@ -410,7 +414,7 @@ .endm @ Sets the warp destination to be used later. - .macro setwarp map, warp, X, Y + .macro setwarp map:req, warp:req, X:req, Y:req .byte 0x3e map \map .byte \warp @@ -419,7 +423,7 @@ .endm @ Sets the warp destination that a warp to Warp 127 on Map 127.127 will connect to. Useful when a map has warps that need to go to script-controlled locations (i.e. elevators). - .macro setdynamicwarp map, warp, X, Y + .macro setdynamicwarp map:req, warp:req, X:req, Y:req .byte 0x3f map \map .byte \warp @@ -428,7 +432,7 @@ .endm @ Sets the destination that diving or emerging from a dive will take the player to. - .macro setdivewarp map, warp, X, Y + .macro setdivewarp map:req, warp:req, X:req, Y:req .byte 0x40 map \map .byte \warp @@ -437,7 +441,7 @@ .endm @ Sets the destination that falling into a hole will take the player to. - .macro setholewarp map, warp, X, Y + .macro setholewarp map:req, warp:req, X:req, Y:req .byte 0x41 map \map .byte \warp @@ -446,93 +450,93 @@ .endm @ Retrieves the player's zero-indexed X- and Y-coordinates in the map, and stores them in the specified variables. - .macro getplayerxy X, Y + .macro getplayerxy X:req, Y:req .byte 0x42 .2byte \X .2byte \Y .endm - @ Retrieves the number of Pokemon in the player's party, and stores that number in variable 0x800D (LASTRESULT). + @ Retrieves the number of Pokemon in the player's party, and stores that number in VAR_RESULT. .macro getpartysize .byte 0x43 .endm - @ Attempts to add quantity of item index to the player's Bag. If the player has enough room, the item will be added and variable 0x800D (LASTRESULT) will be set to 0x0001; otherwise, LASTRESULT is set to 0x0000. - .macro giveitem index, quantity + @ Attempts to add quantity of item index to the player's Bag. If the player has enough room, the item will be added and VAR_RESULT will be set to TRUE; otherwise, VAR_RESULT is set to FALSE. + .macro additem index:req, quantity=1 .byte 0x44 .2byte \index .2byte \quantity .endm @ Removes quantity of item index from the player's Bag. - .macro takeitem index, quantity + .macro removeitem index:req, quantity=1 .byte 0x45 .2byte \index .2byte \quantity .endm - @ Checks if the player has enough space in their Bag to hold quantity more of item index. Sets variable 0x800D (LASTRESULT) to 0x0001 if there is room, or 0x0000 is there is no room. - .macro checkitemspace index, quantity + @ Checks if the player has enough space in their Bag to hold quantity more of item index. Sets VAR_RESULT to TRUE if there is room, or FALSE is there is no room. + .macro checkitemspace index:req, quantity=1 .byte 0x46 .2byte \index .2byte \quantity .endm - @ Checks if the player has quantity or more of item index in their Bag. Sets variable 0x800D (LASTRESULT) to 0x0001 if the player has enough of the item, or 0x0000 if they have fewer than quantity of the item. - .macro checkitem index, quantity + @ Checks if the player has quantity or more of item index in their Bag. Sets VAR_RESULT to TRUE if the player has enough of the item, or FALSE if they have fewer than quantity of the item. + .macro checkitem index:req, quantity=1 .byte 0x47 .2byte \index .2byte \quantity .endm - @ Checks which Bag pocket the specified (index) item belongs in, and writes the value to variable 0x800D (LASTRESULT). This script is used to show the name of the proper Bag pocket when the player receives an item via callstd (simplified to giveitem in XSE). - .macro checkitemtype index + @ Checks which Bag pocket the specified item belongs in, and writes the pocket value (POCKET_*) to VAR_RESULT. This script is used to show the name of the proper Bag pocket when the player receives an item via callstd (simplified to giveitem in XSE). + .macro checkitemtype index:req .byte 0x48 .2byte \index .endm @ Adds a quantity amount of item index to the player's PC. Both arguments can be variables. - .macro givepcitem index, quantity + .macro addpcitem index:req, quantity=1 .byte 0x49 .2byte \index .2byte \quantity .endm @ Checks for quantity amount of item index in the player's PC. Both arguments can be variables. - .macro checkpcitem index, quantity + .macro checkpcitem index:req, quantity=1 .byte 0x4a .2byte \index .2byte \quantity .endm @ Adds decoration to the player's PC. In FireRed, this command is a nop. (The argument is read, but not used for anything.) - .macro givedecoration decoration + .macro adddecoration decoration:req .byte 0x4b .2byte \decoration .endm @ Removes a decoration from the player's PC. In FireRed, this command is a nop. (The argument is read, but not used for anything.) - .macro takedecoration decoration + .macro removedecoration decoration:req .byte 0x4c .2byte \decoration .endm @ Checks for decoration in the player's PC. In FireRed, this command is a nop. (The argument is read, but not used for anything.) - .macro checkdecor decoration + .macro checkdecor decoration:req .byte 0x4d .2byte \decoration .endm - @ Checks if the player has enough space in their PC to hold decoration. Sets variable 0x800D (LASTRESULT) to 0x0001 if there is room, or 0x0000 is there is no room. In FireRed, this command is a nop. (The argument is read, but not used for anything.) - .macro checkdecorspace decoration + @ Checks if the player has enough space in their PC to hold decoration. Sets VAR_RESULT to TRUE if there is room, or FALSE is there is no room. In FireRed, this command is a nop. (The argument is read, but not used for anything.) + .macro checkdecorspace decoration:req .byte 0x4e .2byte \decoration .endm - @ Applies the movement data at movements to the specified (index) Object event. Also closes any standard message boxes that are still open. - @ This command in fact uses variables to access the Object event ID. So, for example, if you setvar 0x8000 to 0x3, and then use applymovementpos 0x8000 @move1, Object event 3 will have the movements at @move1 applied to them. - .macro applymovement index, movements, mapGroup, mapNum - .ifb \mapGroup + @ Applies the movement data at movements to the specified (index) Object. Also closes any standard message boxes that are still open. + @ If no map is specified, then the current map is used. + .macro applymovement index:req, movements:req, map + .ifb \map .byte 0x4f .2byte \index .4byte \movements @@ -540,117 +544,116 @@ .byte 0x50 .2byte \index .4byte \movements - .byte \mapGroup - .byte \mapNum + map \map .endif .endm @ Blocks script execution until the movements being applied to the specified (index) Object event finish. If the specified Object event is 0x0000, then the command will block script execution until all Object events affected by applymovement finish their movements. If the specified Object event is not currently being manipulated with applymovement, then this command does nothing. - .macro waitmovement index, mapBank, mapNum - .ifb \mapBank + @ If no map is specified, then the current map is used. + .macro waitmovement index:req, map + .ifb \map .byte 0x51 .2byte \index .else .byte 0x52 .2byte \index - .byte \mapBank - .byte \mapNum + map \map .endif .endm - @ Attempts to hide the specified (local_ID, a local ID) Object event on the specified map, by setting its visibility flag if it has a valid one. If the Object does not have a valid visibility flag, this command does nothing. + @ Attempts to hide the specified (index) Object event on the specified map, by setting its visibility flag if it has a valid one. If the Object does not have a valid visibility flag, this command does nothing. @ If no map is specified, then the current map is used - .macro removeobject localId, mapGroup, mapNum - .ifb \mapGroup + .macro removeobject index:req, map + .ifb \map .byte 0x53 - .2byte \localId + .2byte \index .else .byte 0x54 - .2byte \localId - .byte \mapGroup - .byte \mapNum + .2byte \index + map \map .endif .endm - .macro addobject localId, mapGroup, mapNum - .ifb \mapGroup + @ Unsets the specified (index) Object's visibility flag on the specified (map_group, map_num) map if it has a valid one. If the Object does not have a valid visibility flag, this command does nothing. + @ If no map is specified, then the current map is used. + .macro addobject index:req, map + .ifb \map .byte 0x55 - .2byte \localId + .2byte \index .else .byte 0x56 - .2byte \localId - .byte \mapGroup - .byte \mapNum + .2byte \index + map \map .endif .endm @ Sets the specified (index) Object's position on the current map. - .macro setobjectxy index, x, y + .macro setobjectxy index:req, x:req, y:req .byte 0x57 .2byte \index .2byte \x .2byte \y .endm - .macro showobjectat index, map + .macro showobjectat index:req, map:req .byte 0x58 .2byte \index map \map .endm - .macro hideobjectat index, map + .macro hideobjectat index:req, map:req .byte 0x59 .2byte \index map \map .endm - @ If the script was called by a Object event, then that Object will turn to face toward the tile that the player is stepping off of. + @ If the script was called by an Object, then that Object will turn to face toward the metatile that the player is standing on. .macro faceplayer .byte 0x5a .endm - .macro turnobject index, direction + .macro turnobject index:req, direction:req .byte 0x5b .2byte \index .byte \direction .endm @ If the Trainer flag for Trainer index is not set, this command does absolutely nothing. - .macro trainerbattle type, trainer, word, pointer1, pointer2, pointer3, pointer4 + .macro trainerbattle type:req, trainer:req, local_id:req, pointer1:req, pointer2, pointer3, pointer4 .byte 0x5c .byte \type .2byte \trainer - .2byte \word - .if \type == 0 + .2byte \local_id + .if \type == TRAINER_BATTLE_SINGLE .4byte \pointer1 @ text .4byte \pointer2 @ text - .elseif \type == 1 + .elseif \type == TRAINER_BATTLE_CONTINUE_SCRIPT_NO_MUSIC .4byte \pointer1 @ text .4byte \pointer2 @ text .4byte \pointer3 @ event script - .elseif \type == 2 + .elseif \type == TRAINER_BATTLE_CONTINUE_SCRIPT .4byte \pointer1 @ text .4byte \pointer2 @ text .4byte \pointer3 @ event script - .elseif \type == 3 + .elseif \type == TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT .4byte \pointer1 @ text - .elseif \type == 4 + .elseif \type == TRAINER_BATTLE_DOUBLE .4byte \pointer1 @ text .4byte \pointer2 @ text .4byte \pointer3 @ text - .elseif \type == 5 + .elseif \type == TRAINER_BATTLE_REMATCH .4byte \pointer1 @ text .4byte \pointer2 @ text - .elseif \type == 6 + .elseif \type == TRAINER_BATTLE_CONTINUE_SCRIPT_DOUBLE .4byte \pointer1 @ text .4byte \pointer2 @ text .4byte \pointer3 @ text .4byte \pointer4 @ event script - .elseif \type == 7 + .elseif \type == TRAINER_BATTLE_REMATCH_DOUBLE .4byte \pointer1 @ text .4byte \pointer2 @ text .4byte \pointer3 @ text - .elseif \type == 8 + .elseif \type == TRAINER_BATTLE_CONTINUE_SCRIPT_DOUBLE_NO_MUSIC .4byte \pointer1 @ text .4byte \pointer2 @ text .4byte \pointer3 @ text @@ -658,6 +661,45 @@ .endif .endm + @ Starts a single trainer battle, takes a trainer, intro text, loss text, and an optional event script + @ when used with an event script, you can also pass in an optional flag to disable music + .macro trainerbattle_single trainer:req, intro_text:req, lose_text:req, event_script=FALSE, music=TRUE + .if \event_script == FALSE + trainerbattle TRAINER_BATTLE_SINGLE, \trainer, 0, \intro_text, \lose_text + .elseif \music == TRUE + trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, \trainer, 0, \intro_text, \lose_text, \event_script + .else + trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT_NO_MUSIC, \trainer, 0, \intro_text, \lose_text, \event_script + .endif + .endm + + @ Starts a double trainer battle, takes a trainer, intro text, loss text, text for when you have too few pokemon + @ and an optional event script, when used with an event script you can pass in an optional flag to disable music + .macro trainerbattle_double trainer:req, intro_text:req, lose_text:req, not_enough_pkmn_text:req, event_script=FALSE, music=TRUE + .if \event_script == FALSE + trainerbattle TRAINER_BATTLE_DOUBLE, \trainer, 0, \intro_text, \lose_text, \not_enough_pkmn_text + .elseif \music == TRUE + trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT_DOUBLE, \trainer, 0, \intro_text, \lose_text, \not_enough_pkmn_text, \event_script + .else + trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT_DOUBLE_NO_MUSIC, \trainer, 0, \intro_text, \lose_text, \not_enough_pkmn_text, \event_script + .endif + .endm + + @ Starts a rematch battle, takes a trainer, intro text and loss text + .macro trainerbattle_rematch trainer:req, intro_text:req, lose_text:req + trainerbattle TRAINER_BATTLE_REMATCH, \trainer, 0, \intro_text, \lose_text + .endm + + @ Starts a rematch double battle, takes a trainer, intro text, loss text, and text for when you have too few pokemon + .macro trainerbattle_rematch_double trainer:req, intro_text:req, lose_text:req, not_enough_pkmn_text:req + trainerbattle TRAINER_BATTLE_REMATCH_DOUBLE, \trainer, 0, \intro_text, \lose_text, \not_enough_pkmn_text + .endm + + @ Starts a trainer battle, skipping intro text, takes a trainer and loss text + .macro trainerbattle_no_intro trainer:req, lose_text:req + trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, \trainer, 0, \lose_text + .endm + @ Starts a trainer battle using the battle information stored in RAM (usually by trainerbattle, which actually calls this command behind-the-scenes), and blocks script execution until the battle finishes. .macro trainerbattlebegin .byte 0x5d @@ -674,36 +716,36 @@ .endm @ Compares Flag (trainer + 0x500) to 1. (If the flag is set, then the trainer has been defeated by the player.) - .macro checktrainerflag trainer + .macro checktrainerflag trainer:req .byte 0x60 .2byte \trainer .endm @ Sets Flag (trainer + 0x500). - .macro settrainerflag trainer + .macro settrainerflag trainer:req .byte 0x61 .2byte \trainer .endm @ Clears Flag (trainer + 0x500). - .macro cleartrainerflag trainer + .macro cleartrainerflag trainer:req .byte 0x62 .2byte \trainer .endm - .macro setobjectxyperm index, x, y + .macro setobjectxyperm index:req, x:req, y:req .byte 0x63 .2byte \index .2byte \x .2byte \y .endm - .macro moveobjectoffscreen index + .macro moveobjectoffscreen index:req .byte 0x64 .2byte \index .endm - .macro setobjectmovementtype word, byte + .macro setobjectmovementtype word:req, byte:req .byte 0x65 .2byte \word .byte \byte @@ -715,7 +757,7 @@ .endm @ Starts displaying a standard message box containing the specified text. If text is a pointer, then the string at that offset will be loaded and used. If text is script bank 0, then the value of script bank 0 will be treated as a pointer to the text. (You can use loadpointer to place a string pointer in a script bank.) - .macro message text + .macro message text:req .byte 0x67 .4byte \text .endm @@ -750,15 +792,15 @@ .byte 0x6d .endm - @ Displays a YES/NO multichoice box at the specified coordinates, and blocks script execution until the user makes a selection. Their selection is stored in variable 0x800D (LASTRESULT); 0x0000 for "NO" or if the user pressed B, and 0x0001 for "YES". - .macro yesnobox x, y + @ Displays a YES/NO multichoice box at the specified coordinates, and blocks script execution until the user makes a selection. Their selection is stored in VAR_RESULT as NO (0) or YES (1). Pressing B is equivalent to answering NO + .macro yesnobox x:req, y:req .byte 0x6e .byte \x .byte \y .endm - @ Displays a multichoice box from which the user can choose a selection, and blocks script execution until a selection is made. Lists of options are predefined and the one to be used is specified with list. If b is set to a non-zero value, then the user will not be allowed to back out of the multichoice with the B button. - .macro multichoice x, y, list, b + @ Displays a multichoice box from which the user can choose a selection, and blocks script execution until a selection is made. Lists of options are predefined (sMultichoiceLists) and the one to be used is specified with list. If b is set to a non-zero value, then the user will not be allowed to back out of the multichoice with the B button. + .macro multichoice x:req, y:req, list:req, b:req .byte 0x6f .byte \x .byte \y @@ -766,8 +808,8 @@ .byte \b .endm - @ Displays a multichoice box from which the user can choose a selection, and blocks script execution until a selection is made. Lists of options are predefined and the one to be used is specified with list. The default argument determines the initial position of the cursor when the box is first opened; it is zero-indexed, and if it is too large, it is treated as 0x00. If b is set to a non-zero value, then the user will not be allowed to back out of the multichoice with the B button. - .macro multichoicedefault x, y, list, default, b + @ Displays a multichoice box from which the user can choose a selection, and blocks script execution until a selection is made. Lists of options are predefined (sMultichoiceLists) and the one to be used is specified with list. The default argument determines the initial position of the cursor when the box is first opened; it is zero-indexed, and if it is too large, it is treated as 0x00. If b is set to a non-zero value, then the user will not be allowed to back out of the multichoice with the B button. + .macro multichoicedefault x:req, y:req, list:req, default:req, b:req .byte 0x70 .byte \x .byte \y @@ -776,8 +818,8 @@ .byte \b .endm - @ Displays a multichoice box from which the user can choose a selection, and blocks script execution until a selection is made. Lists of options are predefined and the one to be used is specified with list. The per_row argument determines how many list items will be shown on a single row of the box. - .macro multichoicegrid x, y, list, per_row, B + @ Displays a multichoice box from which the user can choose a selection, and blocks script execution until a selection is made. Lists of options are predefined (sMultichoiceLists) and the one to be used is specified with list. The per_row argument determines how many list items will be shown on a single row of the box. + .macro multichoicegrid x:req, y:req, list:req, per_row:req, B:req .byte 0x71 .byte \x .byte \y @@ -786,7 +828,7 @@ .byte \B .endm - .macro drawbox byte1, byte2, byte3, byte4 + .macro drawbox byte1:req, byte2:req, byte3:req, byte4:req .byte 0x72 .byte \byte1 .byte \byte2 @@ -794,7 +836,7 @@ .byte \byte4 .endm - .macro erasebox byte1, byte2, byte3, byte4 + .macro erasebox byte1:req, byte2:req, byte3:req, byte4:req .byte 0x73 .byte \byte1 .byte \byte2 @@ -802,7 +844,7 @@ .byte \byte4 .endm - .macro drawboxtext byte1, byte2, byte3, byte4 + .macro drawboxtext byte1:req, byte2:req, byte3:req, byte4:req .byte 0x74 .byte \byte1 .byte \byte2 @@ -811,147 +853,147 @@ .endm @ Displays a box containing the front sprite for the specified (species) Pokemon species. - .macro drawmonpic species, x, y + .macro showmonpic species:req, x:req, y:req .byte 0x75 .2byte \species .byte \x .byte \y .endm - @ Hides all boxes displayed with drawmonpic. - .macro erasemonpic + @ Hides all boxes displayed with showmonpic. + .macro hidemonpic .byte 0x76 .endm @ Draws an image of the winner of the contest. In FireRed, this command is a nop. (The argument is discarded.) - .macro drawcontestwinner a + .macro showcontestwinner a:req .byte 0x77 .byte \a .endm @ Displays the string at pointer as braille text in a standard message box. The string must be formatted to use braille characters. - .macro braillemessage text + .macro braillemessage text:req .byte 0x78 .4byte \text .endm - @ Gives the player one of the specified (species) Pokemon at level level holding item. The unknown arguments should all be zeroes. - .macro givemon species, level, item, unknown1, unknown2, unknown3 + @ Gives the player one of the specified (species) Pokemon at level level holding item. The trailing 0s are unused parameters + .macro givemon species:req, level:req, item:req .byte 0x79 .2byte \species .byte \level .2byte \item - .4byte \unknown1 - .4byte \unknown2 - .byte \unknown3 + .4byte 0x0 + .4byte 0x0 + .byte 0 .endm - .macro giveegg species + .macro giveegg species:req .byte 0x7a .2byte \species .endm - .macro setmonmove index, slot, move + .macro setmonmove index:req, slot:req, move:req .byte 0x7b .byte \index .byte \slot .2byte \move .endm - @ Checks if at least one Pokemon in the player's party knows the specified (index) attack. If so, variable 0x800D (LASTRESULT) is set to the (zero-indexed) slot number of the first Pokemon that knows the move. If not, LASTRESULT is set to 0x0006. Variable 0x8004 is also set to this Pokemon's species. - .macro checkpartymove index + @ Checks if at least one Pokemon in the player's party knows the specified (index) attack. If so, VAR_RESULT is set to the (zero-indexed) slot number of the first Pokemon that knows the move. If not, VAR_RESULT is set to PARTY_SIZE. VAR_0x8004 is also set to this Pokemon's species. + .macro checkpartymove index:req .byte 0x7c .2byte \index .endm @ Writes the name of the Pokemon at index species to the specified buffer. - .macro bufferspeciesname out, species + .macro bufferspeciesname out:req, species:req .byte 0x7d .byte \out .2byte \species .endm @ Writes the name of the species of the first Pokemon in the player's party to the specified buffer. - .macro bufferleadmonspeciesname out + .macro bufferleadmonspeciesname out:req .byte 0x7e .byte \out .endm @ Writes the nickname of the Pokemon in slot slot (zero-indexed) of the player's party to the specified buffer. If an empty or invalid slot is specified, ten spaces ("") are written to the buffer. - .macro bufferpartymonnick out, slot + .macro bufferpartymonnick out:req, slot:req .byte 0x7f .byte \out .2byte \slot .endm @ Writes the name of the item at index item to the specified buffer. If the specified index is larger than the number of items in the game (0x176), the name of item 0 ("????????") is buffered instead. - .macro bufferitemname out, item + .macro bufferitemname out:req, item:req .byte 0x80 .byte \out .2byte \item .endm @ Writes the name of the decoration at index decoration to the specified buffer. In FireRed, this command is a nop. - .macro bufferdecorationname out, decoration + .macro bufferdecorationname out:req, decoration:req .byte 0x81 .byte \out .2byte \decoration .endm @ Writes the name of the move at index move to the specified buffer. - .macro buffermovename out, move + .macro buffermovename out:req, move:req .byte 0x82 .byte \out .2byte \move .endm @ Converts the value of input to a decimal string, and writes that string to the specified buffer. - .macro buffernumberstring out, input + .macro buffernumberstring out:req, input:req .byte 0x83 .byte \out .2byte \input .endm @ Writes the standard string identified by index to the specified buffer. This command has no protections in place at all, so specifying an invalid standard string (e.x. 0x2B) can and usually will cause data corruption. - .macro bufferstdstring out, index + .macro bufferstdstring out:req, index:req .byte 0x84 .byte \out .2byte \index .endm @ Copies the string at offset to the specified buffer. - .macro bufferstring out, offset + .macro bufferstring out:req, offset:req .byte 0x85 .byte \out .4byte \offset .endm @ Opens the Pokemart system, offering the specified products for sale. - .macro pokemart products + .macro pokemart products:req .byte 0x86 .4byte \products .endm @ Opens the Pokemart system and treats the list of items as decorations. - .macro pokemartdecoration products + .macro pokemartdecoration products:req .byte 0x87 .4byte \products .endm @ Apparent clone of pokemartdecoration. - .macro pokemartdecoration2 products + .macro pokemartdecoration2 products:req .byte 0x88 .4byte \products .endm @ Starts up the slot machine minigame. - .macro playslotmachine word + .macro playslotmachine word:req .byte 0x89 .2byte \word .endm @ Sets a berry tree's specific berry and growth stage. In FireRed, this command is a nop. - .macro setberrytree tree_id, berry, growth_stage + .macro setberrytree tree_id:req, berry:req, growth_stage:req .byte 0x8a .byte \tree_id .byte \berry @@ -978,132 +1020,132 @@ .byte 0x8e .endm - @ Stores a random integer between 0 and limit in variable 0x800D (LASTRESULT). - .macro random limit + @ Stores a random integer between 0 and limit in VAR_RESULT. + .macro random limit:req .byte 0x8f .2byte \limit .endm @ If check is 0x00, this command adds value to the player's money. - .macro givemoney value, check + .macro addmoney value:req, check:req .byte 0x90 .4byte \value .byte \check .endm @ If check is 0x00, this command subtracts value from the player's money. - .macro takemoney value, check + .macro removemoney value:req, check:req .byte 0x91 .4byte \value .byte \check .endm - @ If check is 0x00, this command will check if the player has value or more money; script variable 0x800D (LASTRESULT) is set to 0x0001 if the player has enough money, or 0x0000 if the do not. - .macro checkmoney value, check + @ If check is 0x00, this command will check if the player has money >= value; VAR_RESULT is set to TRUE if the player has enough money, or FALSE if they do not. + .macro checkmoney value:req, check:req .byte 0x92 .4byte \value .byte \check .endm @ Spawns a secondary box showing how much money the player has. - .macro showmoneybox x, y + .macro showmoneybox x:req, y:req .byte 0x93 .byte \x .byte \y .endm @ Hides the secondary box spawned by showmoney. - .macro hidemoneybox x, y + .macro hidemoneybox x:req, y:req .byte 0x94 .byte \x .byte \y .endm @ Updates the secondary box spawned by showmoney. Consumes but does not use arguments. - .macro updatemoneybox x, y + .macro updatemoneybox x:req, y:req .byte 0x95 .byte \x .byte \y .endm @ Gets the price reduction for the index given. In FireRed, this command is a nop. - .macro getpricereduction index + .macro getpricereduction index:req .byte 0x96 .2byte \index .endm @ Fades the screen to and from black and white. Mode 0x00 fades from black, mode 0x01 fades out to black, mode 0x2 fades in from white, and mode 0x3 fades out to white. - .macro fadescreen effect + .macro fadescreen mode:req .byte 0x97 - .byte \effect + .byte \mode .endm @ Fades the screen to and from black and white. Mode 0x00 fades from black, mode 0x01 fades out to black, mode 0x2 fades in from white, and mode 0x3 fades out to white. Other modes may exist. - .macro fadescreenspeed effect, speed + .macro fadescreenspeed mode:req, speed:req .byte 0x98 - .byte \effect + .byte \mode .byte \speed .endm - .macro setflashradius word + .macro setflashradius word:req .byte 0x99 .2byte \word .endm - .macro animateflash byte + .macro animateflash byte:req .byte 0x9a .byte \byte .endm - .macro messageautoscroll pointer + .macro messageautoscroll pointer:req .byte 0x9b .4byte \pointer .endm @ Executes the specified field move animation. - .macro dofieldeffect animation + .macro dofieldeffect animation:req .byte 0x9c .2byte \animation .endm @ Sets up the field effect argument argument with the value value. - .macro setfieldeffectargument argument, param + .macro setfieldeffectargument argument:req, param:req .byte 0x9d .byte \argument .2byte \param .endm @ Blocks script execution until all playing field move animations complete. - .macro waitfieldeffect animation + .macro waitfieldeffect animation:req .byte 0x9e .2byte \animation .endm @ Sets which healing place the player will return to if all of the Pokemon in their party faint. - .macro setrespawn heallocation + .macro setrespawn heallocation:req .byte 0x9f .2byte \heallocation .endm - @ Checks the player's gender. If male, then 0x0000 is stored in variable 0x800D (LASTRESULT). If female, then 0x0001 is stored in LASTRESULT. + @ Checks the player's gender. If male, then MALE (0) is stored in VAR_RESULT. If female, then FEMALE (1) is stored in VAR_RESULT. .macro checkplayergender .byte 0xa0 .endm @ Plays the specified (species) Pokemon's cry. You can use waitcry to block script execution until the sound finishes. - .macro playmoncry species, effect + .macro playmoncry species:req, effect:req .byte 0xa1 .2byte \species .2byte \effect .endm @ Changes the metatile at (x, y) on the current map. - .macro setmetatile x, y, metatile_number, tile_attrib + .macro setmetatile x:req, y:req, metatile_number:req, has_collision:req .byte 0xa2 .2byte \x .2byte \y .2byte \metatile_number - .2byte \tile_attrib + .2byte \has_collision .endm @ Queues a weather change to the default weather for the map. @@ -1112,7 +1154,7 @@ .endm @ Queues a weather change to type weather. - .macro setweather type + .macro setweather type:req .byte 0xa4 .2byte \type .endm @@ -1123,30 +1165,30 @@ .endm @ This command manages cases in which maps have tiles that change state when stepped on (specifically, cracked/breakable floors). - .macro setstepcallback subroutine + .macro setstepcallback subroutine:req .byte 0xa6 .byte \subroutine .endm - .macro setmaplayoutindex index + .macro setmaplayoutindex index:req .byte 0xa7 .2byte \index .endm - .macro setobjectpriority index, map, priority + .macro setobjectpriority index:req, map:req, priority:req .byte 0xa8 .2byte \index map \map .byte \priority .endm - .macro resetobjectpriority index, map + .macro resetobjectpriority index:req, map:req .byte 0xa9 .2byte \index map \map .endm - .macro createvobject sprite, byte2, x, y, elevation, direction + .macro createvobject sprite:req, byte2:req, x:req, y:req, elevation, direction .byte 0xaa .byte \sprite .byte \byte2 @@ -1156,21 +1198,21 @@ .byte \direction .endm - .macro turnvobject index, direction + .macro turnvobject index:req, direction:req .byte 0xab .byte \index .byte \direction .endm @ Opens the door metatile at (X, Y) with an animation. - .macro opendoor x, y + .macro opendoor x:req, y:req .byte 0xac .2byte \x .2byte \y .endm @ Closes the door metatile at (X, Y) with an animation. - .macro closedoor x, y + .macro closedoor x:req, y:req .byte 0xad .2byte \x .2byte \y @@ -1182,14 +1224,14 @@ .endm @ Sets the door tile at (x, y) to be open without an animation. - .macro setdooropen x, y + .macro setdooropen x:req, y:req .byte 0xaf .2byte \x .2byte \y .endm @ Sets the door tile at (x, y) to be closed without an animation. - .macro setdoorclosed x, y + .macro setdoorclosed x:req, y:req .byte 0xb0 .2byte \x .2byte \y @@ -1205,23 +1247,23 @@ .byte 0xb2 .endm - .macro checkcoins out + .macro checkcoins count:req .byte 0xb3 - .2byte \out + .2byte \count .endm - .macro givecoins count + .macro addcoins count:req .byte 0xb4 .2byte \count .endm - .macro takecoins count + .macro removecoins count:req .byte 0xb5 .2byte \count .endm @ Prepares to start a wild battle against a species at Level level holding item. Running this command will not affect normal wild battles. You start the prepared battle with dowildbattle. - .macro setwildbattle species, level, item + .macro setwildbattle species:req, level:req, item:req .byte 0xb6 .2byte \species .byte \level @@ -1233,78 +1275,78 @@ .byte 0xb7 .endm - .macro setvaddress addr + .macro setvaddress pointer:req .byte 0xb8 - .4byte \addr + .4byte \pointer .endm - .macro vgoto pointer + .macro vgoto pointer:req .byte 0xb9 .4byte \pointer .endm - .macro vcall pointer + .macro vcall pointer:req .byte 0xba .4byte \pointer .endm - .macro vgoto_if byte, pointer + .macro vgoto_if byte:req, pointer:req .byte 0xbb .byte \byte .4byte \pointer .endm - .macro vcall_if byte, pointer + .macro vcall_if byte:req, pointer:req .byte 0xbc .byte \byte .4byte \pointer .endm - .macro vmessage pointer + .macro vmessage pointer:req .byte 0xbd .4byte \pointer .endm - .macro vloadptr pointer + .macro vloadptr pointer:req .byte 0xbe .4byte \pointer .endm - .macro vbufferstring byte, pointer + .macro vbufferstring byte:req, pointer:req .byte 0xbf .byte \byte .4byte \pointer .endm @ Spawns a secondary box showing how many Coins the player has. - .macro showcoinsbox x, y + .macro showcoinsbox x:req, y:req .byte 0xc0 .byte \x .byte \y .endm @ Hides the secondary box spawned by showcoins. It consumes its arguments but doesn't use them. - .macro hidecoinsbox x, y + .macro hidecoinsbox x:req, y:req .byte 0xc1 .byte \x .byte \y .endm @ Updates the secondary box spawned by showcoins. It consumes its arguments but doesn't use them. - .macro updatecoinsbox x, y + .macro updatecoinsbox x:req, y:req .byte 0xc2 .byte \x .byte \y .endm @ Increases the value of the specified game stat by 1. The stat's value will not be allowed to exceed 0x00FFFFFF. - .macro incrementgamestat stat + .macro incrementgamestat stat:req .byte 0xc3 .byte \stat .endm @ Sets the destination that using an Escape Rope or Dig will take the player to. - .macro setescapewarp map, warp, x, y + .macro setescapewarp map:req, warp:req, x:req, y:req .byte 0xc4 map \map .byte \warp @@ -1318,20 +1360,20 @@ .endm @ Writes the name of the specified (box) PC box to the specified buffer. - .macro bufferboxname out, box + .macro bufferboxname out:req, box:req .byte 0xc6 .byte \out .2byte \box .endm @ Sets the color of the text in standard message boxes. 0x00 produces blue (male) text, 0x01 produces red (female) text, 0xFF resets the color to the default for the current OW's gender, and all other values produce black text. - .macro textcolor color + .macro textcolor color:req .byte 0xc7 .byte \color .endm @ The exact purpose of this command is unknown, but it is related to the blue help-text box that appears on the bottom of the screen when the Main Menu is opened. - .macro loadhelp pointer + .macro loadhelp pointer:req .byte 0xc8 .4byte \pointer .endm @@ -1352,7 +1394,7 @@ .endm @ Compares the value of a hidden variable to a dword. - .macro comparehiddenvar a, value + .macro comparehiddenvar a:req, value:req .byte 0xcc .byte \a .4byte \value @@ -1360,121 +1402,149 @@ @ Supplementary - .macro goto_if_trainer_not_defeated opponent, dest - checktrainerflag \opponent - goto_if 0, \dest - .endm - - .macro goto_if_trainer_defeated opponent, dest - checktrainerflag \opponent - goto_if 1, \dest - .endm - - .macro call_if_trainer_not_defeated opponent, dest - checktrainerflag \opponent - call_if 0, \dest - .endm - - .macro call_if_trainer_defeated opponent, dest - checktrainerflag \opponent - call_if 1, \dest - .endm - - .macro goto_if_unset flag, dest + .macro goto_if_unset flag:req, dest:req checkflag \flag - goto_if 0, \dest + goto_if FALSE, \dest .endm - .macro goto_if_set flag, dest + .macro goto_if_set flag:req, dest:req checkflag \flag - goto_if 1, \dest + goto_if TRUE, \dest .endm - .macro goto_if_lt dest @ LESS THAN + .macro goto_if_lt dest:req @ LESS THAN goto_if 0, \dest .endm - .macro goto_if_eq dest @ EQUAL + .macro goto_if_eq dest:req @ EQUAL goto_if 1, \dest .endm - .macro goto_if_gt dest @ GREATER THAN + .macro goto_if_gt dest:req @ GREATER THAN goto_if 2, \dest .endm - .macro goto_if_le dest @ LESS THAN OR EQUAL + .macro goto_if_le dest:req @ LESS THAN OR EQUAL goto_if 3, \dest .endm - .macro goto_if_ge dest @ GREATER THAN OR EQUAL + .macro goto_if_ge dest:req @ GREATER THAN OR EQUAL goto_if 4, \dest .endm - .macro goto_if_ne dest @ NOT EQUAL + .macro goto_if_ne dest:req @ NOT EQUAL goto_if 5, \dest .endm - .macro call_if_unset flag, dest + .macro call_if_unset flag:req, dest:req checkflag \flag - call_if 0, \dest + call_if FALSE, \dest .endm - .macro call_if_set flag, dest + .macro call_if_set flag:req, dest:req checkflag \flag - call_if 1, \dest + call_if TRUE, \dest .endm - .macro call_if_lt dest @ LESS THAN + .macro call_if_lt dest:req @ LESS THAN call_if 0, \dest .endm - .macro call_if_eq dest @ EQUAL + .macro call_if_eq dest:req @ EQUAL call_if 1, \dest .endm - .macro call_if_gt dest @ GREATER THAN + .macro call_if_gt dest:req @ GREATER THAN call_if 2, \dest .endm - .macro call_if_le dest @ LESS THAN OR EQUAL + .macro call_if_le dest:req @ LESS THAN OR EQUAL call_if 3, \dest .endm - .macro call_if_ge dest @ GREATER THAN OR EQUAL + .macro call_if_ge dest:req @ GREATER THAN OR EQUAL call_if 4, \dest .endm - .macro call_if_ne dest @ NOT EQUAL + .macro call_if_ne dest:req @ NOT EQUAL call_if 5, \dest .endm - .macro switch var - copyvar VAR_0x8000, \var + .macro vgoto_if_eq dest:req + vgoto_if TRUE, \dest .endm - .macro case condition, dest - compare_var_to_value VAR_0x8000, \condition - goto_if_eq \dest + .macro vgoto_if_ne dest:req + vgoto_if FALSE, \dest .endm - .macro msgbox text, type=4 - loadword 0, \text - callstd \type + .macro vgoto_if_unset flag:req, dest:req + checkflag \flag + vgoto_if FALSE, \dest + .endm + + .macro vgoto_if_set flag:req, dest:req + checkflag \flag + vgoto_if TRUE, \dest + .endm + + .macro goto_if_defeated trainer:req, dest:req + checktrainerflag \trainer + goto_if TRUE, \dest + .endm + + .macro goto_if_not_defeated trainer:req, dest:req + checktrainerflag \trainer + goto_if FALSE, \dest + .endm + + .macro call_if_defeated trainer:req, dest:req + checktrainerflag \trainer + call_if TRUE, \dest + .endm + + .macro call_if_not_defeated trainer:req, dest:req + checktrainerflag \trainer + call_if FALSE, \dest + .endm + + .macro switch var:req + copyvar VAR_0x8000, \var + .endm + + .macro case condition:req, dest:req + compare VAR_0x8000, \condition + goto_if_eq \dest .endm @ Message box types + MSGBOX_NPC = 2 + MSGBOX_SIGN = 3 + MSGBOX_DEFAULT = 4 MSGBOX_YESNO = 5 + MSGBOX_AUTOCLOSE = 6 YES = 1 NO = 0 - .macro giveitem_std item, amount=1, function=0 + .macro msgbox text:req, type=MSGBOX_DEFAULT + loadword 0, \text + callstd \type + .endm + + .macro giveitem item:req, amount=1 + setorcopyvar VAR_0x8000, \item + setorcopyvar VAR_0x8001, \amount + callstd STD_OBTAIN_ITEM + .endm + + .macro finditem item:req, amount=1 setorcopyvar VAR_0x8000, \item setorcopyvar VAR_0x8001, \amount - callstd \function + callstd STD_FIND_ITEM .endm - .macro givedecoration_std decoration + .macro givedecoration decoration setorcopyvar VAR_0x8000, \decoration - callstd 7 + callstd STD_OBTAIN_DECORATION .endm diff --git a/src/battle_setup.c b/src/battle_setup.c index a7da9905a..b3a42858d 100644 --- a/src/battle_setup.c +++ b/src/battle_setup.c @@ -27,6 +27,7 @@ #include "task.h" #include "text.h" #include "trainer.h" +#include "constants/battle_setup.h" #include "constants/map_types.h" #include "constants/maps.h" #include "constants/opponents.h" @@ -1005,34 +1006,34 @@ u8 *BattleSetup_ConfigureTrainerBattle(const u8 *data) switch (sTrainerBattleMode) { - case 3: + case TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT: TrainerBattleLoadArgs(gTrainerBattleSpecs_3, data); return gUnknown_0819F878; - case 4: + case TRAINER_BATTLE_DOUBLE: TrainerBattleLoadArgs(gTrainerBattleSpecs_2, data); SetMapVarsToTrainer(); return gUnknown_0819F840; - case 1: - case 2: + case TRAINER_BATTLE_CONTINUE_SCRIPT_NO_MUSIC: + case TRAINER_BATTLE_CONTINUE_SCRIPT: TrainerBattleLoadArgs(gTrainerBattleSpecs_1, data); SetMapVarsToTrainer(); return gUnknown_0819F818; - case 6: - case 8: + case TRAINER_BATTLE_CONTINUE_SCRIPT_DOUBLE: + case TRAINER_BATTLE_CONTINUE_SCRIPT_DOUBLE_NO_MUSIC: TrainerBattleLoadArgs(gTrainerBattleSpecs_4, data); SetMapVarsToTrainer(); return gUnknown_0819F840; - case 7: + case TRAINER_BATTLE_REMATCH_DOUBLE: TrainerBattleLoadArgs(gTrainerBattleSpecs_2, data); SetMapVarsToTrainer(); gTrainerBattleOpponent = GetRematchTrainerId(gTrainerBattleOpponent); return gUnknown_0819F8AE; - case 5: + case TRAINER_BATTLE_REMATCH: TrainerBattleLoadArgs(gTrainerBattleSpecs_0, data); SetMapVarsToTrainer(); gTrainerBattleOpponent = GetRematchTrainerId(gTrainerBattleOpponent); return gUnknown_0819F887; - default: + default: // TRAINER_BATTLE_SINGLE TrainerBattleLoadArgs(gTrainerBattleSpecs_0, data); SetMapVarsToTrainer(); return gUnknown_0819F818; diff --git a/src/coins.c b/src/coins.c index 2c217e635..273322161 100644 --- a/src/coins.c +++ b/src/coins.c @@ -54,7 +54,7 @@ u16 GetCoins(void) return gSaveBlock1.coins; } -bool8 GiveCoins(u16 coins) +bool8 AddCoins(u16 coins) { u32 newCoins; @@ -72,7 +72,7 @@ bool8 GiveCoins(u16 coins) return TRUE; } -bool8 TakeCoins(u16 coins) +bool8 RemoveCoins(u16 coins) { if (GetCoins() >= coins) { diff --git a/src/decoration_inventory.c b/src/decoration_inventory.c index feec11670..d9aa5d0fc 100644 --- a/src/decoration_inventory.c +++ b/src/decoration_inventory.c @@ -61,7 +61,7 @@ bool8 InventoryContainsDecoration(u8 decorationId) return FALSE; } -bool8 GiveDecoration(u8 decorationId) +bool8 AddDecoration(u8 decorationId) { u8 category; s8 slot; @@ -159,6 +159,6 @@ void Debug_GiveAllDecorations(void) u8 decor; for (decor = 0; decor < DECOR_COUNT; decor++) - GiveDecoration(decor); + AddDecoration(decor); } #endif diff --git a/src/scrcmd.c b/src/scrcmd.c index ec3d2c1bc..fa13fa522 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -483,7 +483,7 @@ bool8 ScrCmd_random(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_giveitem(struct ScriptContext *ctx) +bool8 ScrCmd_additem(struct ScriptContext *ctx) { u16 itemId = VarGet(ScriptReadHalfword(ctx)); u32 quantity = VarGet(ScriptReadHalfword(ctx)); @@ -492,7 +492,7 @@ bool8 ScrCmd_giveitem(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_takeitem(struct ScriptContext *ctx) +bool8 ScrCmd_removeitem(struct ScriptContext *ctx) { u16 itemId = VarGet(ScriptReadHalfword(ctx)); u32 quantity = VarGet(ScriptReadHalfword(ctx)); @@ -527,7 +527,7 @@ bool8 ScrCmd_checkitemtype(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_givepcitem(struct ScriptContext *ctx) +bool8 ScrCmd_addpcitem(struct ScriptContext *ctx) { u16 itemId = VarGet(ScriptReadHalfword(ctx)); u16 quantity = VarGet(ScriptReadHalfword(ctx)); @@ -545,15 +545,15 @@ bool8 ScrCmd_checkpcitem(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_givedecoration(struct ScriptContext *ctx) +bool8 ScrCmd_adddecoration(struct ScriptContext *ctx) { u32 decoration = VarGet(ScriptReadHalfword(ctx)); - gSpecialVar_Result = GiveDecoration(decoration); + gSpecialVar_Result = AddDecoration(decoration); return FALSE; } -bool8 ScrCmd_takedecoration(struct ScriptContext *ctx) +bool8 ScrCmd_removedecoration(struct ScriptContext *ctx) { u32 decoration = VarGet(ScriptReadHalfword(ctx)); @@ -667,7 +667,7 @@ bool8 ScrCmd_initclock(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_dodailyevents(struct ScriptContext *ctx) +bool8 ScrCmd_dotimebasedevents(struct ScriptContext *ctx) { DoTimeBasedEvents(); return FALSE; @@ -1386,7 +1386,7 @@ bool8 ScrCmd_drawboxtext(struct ScriptContext *ctx) } } -bool8 ScrCmd_drawmonpic(struct ScriptContext *ctx) +bool8 ScrCmd_showmonpic(struct ScriptContext *ctx) { u16 species = VarGet(ScriptReadHalfword(ctx)); u8 x = ScriptReadByte(ctx); @@ -1396,7 +1396,7 @@ bool8 ScrCmd_drawmonpic(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_erasemonpic(struct ScriptContext *ctx) +bool8 ScrCmd_hidemonpic(struct ScriptContext *ctx) { bool8 (*func)(void) = ScriptMenu_GetPicboxWaitFunc(); @@ -1406,7 +1406,7 @@ bool8 ScrCmd_erasemonpic(struct ScriptContext *ctx) return TRUE; } -bool8 ScrCmd_drawcontestwinner(struct ScriptContext *ctx) +bool8 ScrCmd_showcontestwinner(struct ScriptContext *ctx) { u8 v1 = ScriptReadByte(ctx); @@ -1598,7 +1598,7 @@ bool8 ScrCmd_checkpartymove(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_givemoney(struct ScriptContext *ctx) +bool8 ScrCmd_addmoney(struct ScriptContext *ctx) { u32 amount = ScriptReadWord(ctx); u8 ignore = ScriptReadByte(ctx); @@ -1608,7 +1608,7 @@ bool8 ScrCmd_givemoney(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_takemoney(struct ScriptContext *ctx) +bool8 ScrCmd_removemoney(struct ScriptContext *ctx) { u32 amount = ScriptReadWord(ctx); u8 ignore = ScriptReadByte(ctx); @@ -1997,22 +1997,22 @@ bool8 ScrCmd_checkcoins(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_givecoins(struct ScriptContext *ctx) +bool8 ScrCmd_addcoins(struct ScriptContext *ctx) { u16 coins = VarGet(ScriptReadHalfword(ctx)); - if (GiveCoins(coins) == TRUE) + if (AddCoins(coins) == TRUE) gSpecialVar_Result = 0; else gSpecialVar_Result = 1; return FALSE; } -bool8 ScrCmd_takecoins(struct ScriptContext *ctx) +bool8 ScrCmd_removecoins(struct ScriptContext *ctx) { u16 coins = VarGet(ScriptReadHalfword(ctx)); - if (TakeCoins(coins) == TRUE) + if (RemoveCoins(coins) == TRUE) gSpecialVar_Result = 0; else gSpecialVar_Result = 1; diff --git a/src/secret_base.c b/src/secret_base.c index 097d95cfe..d4a44de54 100644 --- a/src/secret_base.c +++ b/src/secret_base.c @@ -30,6 +30,7 @@ #include "task.h" #include "text.h" #include "constants/event_bg.h" +#include "constants/event_objects.h" #include "constants/decorations.h" #include "constants/items.h" #include "constants/map_types.h" @@ -512,7 +513,7 @@ void sub_80BBDD0(void) metatile = MapGridGetMetatileBehaviorAt(gSpecialVar_0x8006 + 7, gSpecialVar_0x8007 + 7); if (MetatileBehavior_IsSecretBaseLargeMatEdge(metatile) == TRUE || MetatileBehavior_IsLargeMatCenter(metatile) == TRUE) { - gSpecialVar_Result = gMapHeader.events->objectEvents[objid].graphicsId + VAR_0x3F20; + gSpecialVar_Result = VAR_OBJ_GFX_ID_0 + (gMapHeader.events->objectEvents[objid].graphicsId - OBJ_EVENT_GFX_VAR_0); VarSet(gSpecialVar_Result, gDecorations[roomdecor[decidx]].tiles[0]); gSpecialVar_Result = gMapHeader.events->objectEvents[objid].localId; FlagClear(gSpecialVar_0x8004 + 0xAE); diff --git a/src/shop.c b/src/shop.c index 3e399f0da..75d83d132 100644 --- a/src/shop.c +++ b/src/shop.c @@ -691,7 +691,7 @@ static void Task_DoItemPurchase(u8 taskId) } else // a normal mart is only type 0, so types 1 and 2 are decoration marts. { - if (GiveDecoration(gMartInfo.itemList[gMartInfo.choicesAbove + gMartInfo.cursor])) + if (AddDecoration(gMartInfo.itemList[gMartInfo.choicesAbove + gMartInfo.cursor])) { if (gMartInfo.martType == MART_TYPE_1) DisplayItemMessageOnField(taskId, gOtherText_HereYouGo2, Shop_DoItemTransaction, 0xC3E1); diff --git a/src/trader.c b/src/trader.c index f8606d499..5403f53eb 100644 --- a/src/trader.c +++ b/src/trader.c @@ -249,7 +249,7 @@ void ScrSpecial_TraderDoDecorationTrade(void) struct MauvilleManTrader *trader = &gSaveBlock1.mauvilleMan.trader; RemoveDecorationFromInventory(gSpecialVar_0x8006); - GiveDecoration(gSpecialVar_0x8004); + AddDecoration(gSpecialVar_0x8004); StringCopy(trader->unk5[gSpecialVar_0x8005], gSaveBlock2.playerName); trader->unk1[gSpecialVar_0x8005] = gSpecialVar_0x8006; sub_810993C(); |