Version 1.8.0 (#4259)

2026-09-08 19:16:01 -05:00 · 2024-03-17 12:45:58 -03:00
parent dbd7e2a7c8 331efedf7e
commit 107bcdf623
862 changed files with 1375439 additions and 77688 deletions
--- a/.github/ISSUE_TEMPLATE/01_battle_engine_bugs.yaml
+++ b/.github/ISSUE_TEMPLATE/01_battle_engine_bugs.yaml
@@ -23,17 +23,15 @@ body:
      label: Version
      description: What version of pokeemerald-expansion are you using as a base?
      options:
-        - 1.7.4 (Latest release)
-        - master (default when pulling, unreleased bugfixes)
+        - 1.8.0 (Latest release)
+        - master (default, unreleased bugfixes)
        - upcoming (Edge)
+        - 1.7.4
        - 1.7.3
        - 1.7.2
        - 1.7.1
        - 1.7.0
-        - 1.6.2
-        - 1.6.1
-        - 1.6.0
-        - pre-1.6.0
+        - pre-1.7.0
    validations:
      required: true
  - type: input
--- a/.github/ISSUE_TEMPLATE/02_battle_ai_issues.yaml
+++ b/.github/ISSUE_TEMPLATE/02_battle_ai_issues.yaml
@@ -23,17 +23,15 @@ body:
      label: Version
      description: What version of pokeemerald-expansion are you using as a base?
      options:
-        - 1.7.4 (Latest release)
-        - master (default when pulling, unreleased bugfixes)
+        - 1.8.0 (Latest release)
+        - master (default, unreleased bugfixes)
        - upcoming (Edge)
+        - 1.7.4
        - 1.7.3
        - 1.7.2
        - 1.7.1
        - 1.7.0
-        - 1.6.2
-        - 1.6.1
-        - 1.6.0
-        - pre-1.6.0
+        - pre-1.7.0
    validations:
      required: true
  - type: input
--- a/.github/ISSUE_TEMPLATE/04_other_errors.yaml
+++ b/.github/ISSUE_TEMPLATE/04_other_errors.yaml
@@ -23,17 +23,15 @@ body:
      label: Version
      description: What version of pokeemerald-expansion are you using as a base?
      options:
-        - 1.7.4 (Latest release)
-        - master (default when pulling, unreleased bugfixes)
+        - 1.8.0 (Latest release)
+        - master (default, unreleased bugfixes)
        - upcoming (Edge)
+        - 1.7.4
        - 1.7.3
        - 1.7.2
        - 1.7.1
        - 1.7.0
-        - 1.6.2
-        - 1.6.1
-        - 1.6.0
-        - pre-1.6.0
+        - pre-1.7.0
    validations:
      required: true
  - type: input
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Pokeemerald-Expansion Changelogs

+## Version 1.8.x
+### [Version 1.8.0](docs/changelogs/1.8.0.md) - Feature Release
+
 ## Version 1.7.x
 ### [Version 1.7.4](docs/changelogs/1.7.4.md) - Bugfix Release
 ### [Version 1.7.3](docs/changelogs/1.7.3.md) - Bugfix Release
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -118,6 +118,17 @@ Some tips before proceeding:

 devkitARM is now installed.

+### Installing Python on WSL1
+
+To install Python on WSL1, simply run the following commands:
+
+    ```bash
+    sudo apt update && upgrade
+    sudo apt install python3
+    ```
+
+Python is now installed.
+
 ### Choosing where to store pokeemerald Expansion (WSL1)
 WSL has its own file system that's not natively accessible from Windows, but Windows files *are* accessible from WSL. So you're going to want to store pokeemerald Expansion within Windows.

@@ -200,6 +211,16 @@ Note that in msys2, Copy is Ctrl+Insert and Paste is Shift+Insert.
    cd
    ```

+### Installing Python on msys2
+
+To install Python on WSL1, simply run the following commands:
+
+    ```bash
+    pacman -S mingw-w64-x86_64-python3
+    ```
+
+Python is now installed.
+
 ### Choosing where to store pokeemerald Expansion (msys2)
 At this point, you can choose a folder to store pokeemerald Expansion into. If you're okay with storing pokeemerald Expansion in the user profile folder, then proceed to [Installation](#installation). Otherwise, you'll need to account for where pokeemerald Expansion is stored when changing directory to the pokeemerald-expansion folder.

@@ -334,6 +355,12 @@ If this works, then proceed to [Installation](#installation). Otherwise, ask for
    echo "if [ -f ~/.bashrc ]; then . ~/.bashrc; fi" >> ~/.bash_profile
    ```

+### Installing Python (macOS)
+1. Download the latest Python package from [here](https://www.python.org/downloads/).
+2. Open the package to install Python.
+
+Python is now installed.
+
 ### Choosing where to store pokeemerald Expansion (macOS)
 At this point, you can choose a folder to store pokeemerald Expansion into. If you're okay with storing pokeemerald Expansion in the user folder, then proceed to [Installation](#installation). Otherwise, you'll need to account for where pokeemerald Expansion is stored when changing directory to the pokeemerald-expansion folder.

@@ -434,6 +461,9 @@ _(Specific instructions for other distributions would be greatly appreciated!)_

    The last command will ask for the selection of packages to install. Just press Enter to install all of them, followed by entering Y to proceed with the installation.

+### Installing Python in Linux
+Installing Python depends on your distribution, please refere to the instructions [here](https://docs.python-guide.org/starting/install3/linux/).
+
 ### Choosing where to store pokeemerald Expansion (Linux)
 At this point, you can choose a folder to store pokeemerald Expansion into. If so, you'll have to account for the modified folder path when changing directory to the pokeemerald-expansion folder.

@@ -576,4 +606,4 @@ Note that this is not necessary for a non-modern (agbcc) build since those are b

 * [porymap](https://github.com/huderlem/porymap) for viewing and editing maps
 * [poryscript](https://github.com/huderlem/poryscript) for scripting ([VS Code extension](https://marketplace.visualstudio.com/items?itemName=karathan.poryscript))
-* [Tilemap Studio](https://github.com/Rangi42/tilemap-studio) for viewing and editing tilemaps
+* [Tilemap Studio](https://github.com/Rangi42/tilemap-studio) for viewing and editing tilemaps
--- a/4
+++ b/4
@@ -461,6 +461,10 @@ $(OBJ_DIR)/sym_common.ld: sym_common.txt $(C_OBJS) $(wildcard common_syms/*.txt)
 $(OBJ_DIR)/sym_ewram.ld: sym_ewram.txt
 	$(RAMSCRGEN) ewram_data $< ENGLISH > $@

+# NOTE: Depending on event_scripts.o is hacky, but we want to depend on everything event_scripts.s depends on without having to alter scaninc
+$(DATA_SRC_SUBDIR)/pokemon/teachable_learnsets.h: $(DATA_ASM_BUILDDIR)/event_scripts.o
+	python3 tools/learnset_helpers/teachable.py
+
 # NOTE: Based on C_DEP above, but without NODEP and KEEP_TEMPS handling.
 define TEST_DEP
 $1: $2 $$(shell $(SCANINC) -I include -I tools/agbcc/include -I gflib $2)
--- a/README.md
+++ b/README.md
@@ -22,27 +22,26 @@ Based off RHH's pokeemerald-expansion v1.7.3 https://github.com/rh-hideout/pokee
    - 2v2 Wild battles support.
    - 1v2/2v1 battles support.
    - Fairy Type (configurable).
-    - Physical/Special/Status Category Split (configurable).
+    - Physical/Special/Status Category (configurable).
    - New moves and abilities up to Scarlet and Violet.
        - Custom Contest data up to SwSh, newer moves are WIP. ([source](https://pokemonurpg.com/info/contests/rse-move-list/))
-    - Mega Evolution
-    - Primal Reversion
-    - Ultra Burst
-    - Z-Moves
-        - Gen 8+ damaging moves are given power extrapolated from Gen 7.
-        - Gen 8+ status moves have no additional effects, like Healing Wish.
-    - Dynamax
-        - Gigantamax forms
+    - Battle gimmick support:
+        - Mega Evolution
+        - Primal Reversion
+        - Ultra Burst
+        - Z-Moves
+            - Gen 8+ damaging moves are given power extrapolated from Gen 7.
+            - Gen 8+ status moves have no additional effects, like Healing Wish.
+        - Dynamax and Gigantamax
    - Initial battle parameters
        - Queueing stat boosts (aka, Totem Boosts)
        - Setting Terrains.
    - Mid-turn speed recalculation.
    - Quick Poké Ball selection in Wild Battles
-        - Press `R` to use last selected Poké Ball.
        - Hold `R` to change selection with the D-Pad.
+        - Press `R` to use last selected Poké Ball.
    - Run option shortcut
-    - Faster battle intro
-        - Message and animation/cry happens at the same time.
+    - Faster battle intro - Message and animation/cry happens at the same time.
    - Faster HP drain.
    - Battle Debug menu.
        - Accessed by pressing `Select` on the "Fight/Bag/Pokémon/Run" menu.
@@ -105,7 +104,8 @@ Based off RHH's pokeemerald-expansion v1.7.3 https://github.com/rh-hideout/pokee
    - HP Threshold (eg. Darmanitan)
    - Weather (eg. Castform)
    - End of turn (eg. Morpeko)
-    - Time of day (Shaymin)
+    - Time of day (eg. Shaymin)
+    - Fusions (eg. Kyurem)
 - ***Breeding Improvements***
    - Incense Baby Pokémon now happen automatically (configurable).
    - Level 1 eggs (configurable).
@@ -118,9 +118,6 @@ Based off RHH's pokeemerald-expansion v1.7.3 https://github.com/rh-hideout/pokee
    - Berserk Gene
    - Most battle items from Gen 4+
    - Existing item data but missing effects:
-        - Mints
-        - Dynamax Candy
-        - Mulches
        - Gimmighoul Coin
        - Booster Energy
        - Tera Shards
@@ -140,6 +137,7 @@ Based off RHH's pokeemerald-expansion v1.7.3 https://github.com/rh-hideout/pokee
            - *Support for new evolution methods*.
            - *Dark Mode*.
    - [Nature Colors](https://github.com/DizzyEggg/pokeemerald/tree/nature_color) in summary screen by @DizzyEggg
+    - [Dynamic Multichoice](https://github.com/SBird1337/pokeemerald/tree/feature/dynmulti) by @SBird1337
 - ***Other features***
    - Pressing B while holding a Pokémon drops them like in modern games (configurable).
    - Running indoors (configurable).
@@ -166,7 +164,7 @@ With this, you'll get the latest version of pokeemerald-expansion, plus a couple

 ## **How do I update my version of pokeemerald-expansion?**
 - If you haven't set up a remote, run the command `git remote add RHH https://github.com/rh-hideout/pokeemerald-expansion`.
- Once you have your remote set up, run the command `git pull RHH expansion/1.7.4`.
+- Once you have your remote set up, run the command `git pull RHH expansion/1.8.0`.

 ### Please consider crediting the entire [list of contributors](https://github.com/rh-hideout/pokeemerald-expansion/wiki/Credits) in your project, as they have all worked hard to develop this project :)

--- a/asm/macros/battle_ai_script.inc
+++ b/asm/macros/battle_ai_script.inc
@@ -1,783 +0,0 @@
-	.macro if_random_less_than param0:req, param1:req
-	.byte 0x0
-	.byte \param0
-	.4byte \param1
-	.endm
-
-	.macro if_random_greater_than param0:req, param1:req
-	.byte 0x1
-	.byte \param0
-	.4byte \param1
-	.endm
-
-	.macro if_random_equal param0:req, param1:req
-	.byte 0x2
-	.byte \param0
-	.4byte \param1
-	.endm
-
-	.macro if_random_not_equal param0:req, param1:req
-	.byte 0x3
-	.byte \param0
-	.4byte \param1
-	.endm
-
-	.macro score param0:req
-	.byte 0x4
-	.byte \param0
-	.endm
-
-	.macro if_hp_less_than battler:req, param1:req, param2:req
-	.byte 0x5
-	.byte \battler
-	.byte \param1
-	.4byte \param2
-	.endm
-
-	.macro if_hp_more_than battler:req, param1:req, param2:req
-	.byte 0x6
-	.byte \battler
-	.byte \param1
-	.4byte \param2
-	.endm
-
-	.macro if_hp_equal battler:req, param1:req, param2:req
-	.byte 0x7
-	.byte \battler
-	.byte \param1
-	.4byte \param2
-	.endm
-
-	.macro if_hp_not_equal battler:req, param1:req, param2:req
-	.byte 0x8
-	.byte \battler
-	.byte \param1
-	.4byte \param2
-	.endm
-
-	.macro if_status battler:req, status1:req, param2:req
-	.byte 0x9
-	.byte \battler
-	.4byte \status1
-	.4byte \param2
-	.endm
-
-	.macro if_not_status battler:req, status1:req, param2:req
-	.byte 0xa
-	.byte \battler
-	.4byte \status1
-	.4byte \param2
-	.endm
-
-	.macro if_status2 battler:req, status2:req, param2:req
-	.byte 0xb
-	.byte \battler
-	.4byte \status2
-	.4byte \param2
-	.endm
-
-	.macro if_not_status2 battler:req, status2:req, param2:req
-	.byte 0xc
-	.byte \battler
-	.4byte \status2
-	.4byte \param2
-	.endm
-
-	.macro if_status3 battler:req, status3:req, param2:req
-	.byte 0xd
-	.byte \battler
-	.4byte \status3
-	.4byte \param2
-	.endm
-
-	.macro if_not_status3 battler:req, status3:req, param2:req
-	.byte 0xe
-	.byte \battler
-	.4byte \status3
-	.4byte \param2
-	.endm
-
-	.macro if_side_affecting battler:req, sidestatus:req, param2:req
-	.byte 0xf
-	.byte \battler
-	.4byte \sidestatus
-	.4byte \param2
-	.endm
-
-	.macro if_not_side_affecting battler:req, sidestatus:req, param2:req
-	.byte 0x10
-	.byte \battler
-	.4byte \sidestatus
-	.4byte \param2
-	.endm
-
-	.macro if_less_than param0:req, param1:req
-	.byte 0x11
-	.byte \param0
-	.4byte \param1
-	.endm
-
-	.macro if_more_than param0:req, param1:req
-	.byte 0x12
-	.byte \param0
-	.4byte \param1
-	.endm
-
-	.macro if_equal param0:req, param1:req
-	.byte 0x13
-	.byte \param0
-	.4byte \param1
-	.endm
-
-	.macro if_not_equal param0:req, param1:req
-	.byte 0x14
-	.byte \param0
-	.4byte \param1
-	.endm
-
-	.macro if_less_than_ptr param0:req, param1:req
-	.byte 0x15
-	.4byte \param0
-	.4byte \param1
-	.endm
-
-	.macro if_more_than_ptr param0:req, param1:req
-	.byte 0x16
-	.4byte \param0
-	.4byte \param1
-	.endm
-
-	.macro if_equal_ptr param0:req, param1:req
-	.byte 0x17
-	.4byte \param0
-	.4byte \param1
-	.endm
-
-	.macro if_not_equal_ptr param0:req, param1:req
-	.byte 0x18
-	.4byte \param0
-	.4byte \param1
-	.endm
-
-	.macro if_move param0:req, param1:req
-	.byte 0x19
-	.2byte \param0
-	.4byte \param1
-	.endm
-
-	.macro if_not_move param0:req, param1:req
-	.byte 0x1a
-	.2byte \param0
-	.4byte \param1
-	.endm
-
-	.macro if_in_bytes param0:req, param1:req
-	.byte 0x1b
-	.4byte \param0
-	.4byte \param1
-	.endm
-
-	.macro if_not_in_bytes param0:req, param1:req
-	.byte 0x1c
-	.4byte \param0
-	.4byte \param1
-	.endm
-
-	.macro if_in_hwords param0:req, param1:req
-	.byte 0x1d
-	.4byte \param0
-	.4byte \param1
-	.endm
-
-	.macro if_not_in_hwords param0:req, param1:req
-	.byte 0x1e
-	.4byte \param0
-	.4byte \param1
-	.endm
-
-	.macro if_user_has_attacking_move param0:req
-	.byte 0x1f
-	.4byte \param0
-	.endm
-
-	.macro if_user_has_no_attacking_moves param0:req
-	.byte 0x20
-	.4byte \param0
-	.endm
-
-	.macro get_turn_count
-	.byte 0x21
-	.endm
-
-	.macro get_type param0:req
-	.byte 0x22
-	.byte \param0
-	.endm
-
-	.macro get_considered_move_power
-	.byte 0x23
-	.endm
-
-	.macro get_how_powerful_move_is
-	.byte 0x24
-	.endm
-
-	.macro get_last_used_bank_move battler:req
-	.byte 0x25
-	.byte \battler
-	.endm
-
-	.macro if_equal_u32 param0:req, param1:req
-	.byte 0x26
-	.4byte \param0
-	.4byte \param1
-	.endm
-
-	.macro if_not_equal_u32 param0:req, param1:req
-	.byte 0x27
-	.4byte \param0
-	.4byte \param1
-	.endm
-
-	.macro if_user_goes param0:req, param1:req
-	.byte 0x28
-	.byte \param0
-	.4byte \param1
-	.endm
-
-	.macro if_cant_use_belch battler:req, ptr:req
-	.byte 0x29
-	.byte \battler
-	.4byte \ptr
-	.endm
-
-	.macro nop_2A
-	.byte 0x2a
-	.endm
-
-	.macro nop_2B
-	.byte 0x2b
-	.endm
-
-	.macro count_usable_party_mons battler:req
-	.byte 0x2c
-	.byte \battler
-	.endm
-
-	.macro get_considered_move
-	.byte 0x2d
-	.endm
-
-	.macro get_considered_move_effect
-	.byte 0x2e
-	.endm
-
-	.macro get_ability battler:req
-	.byte 0x2f
-	.byte \battler
-	.endm
-
-	.macro get_highest_type_effectiveness
-	.byte 0x30
-	.endm
-
-	.macro if_type_effectiveness param0:req, param1:req
-	.byte 0x31
-	.byte \param0
-	.4byte \param1
-	.endm
-
-	.macro nop_32
-	.byte 0x32
-	.endm
-
-	.macro nop_33
-	.byte 0x33
-	.endm
-
-	.macro if_status_in_party battler:req, status1:req, param2:req
-	.byte 0x34
-	.byte \battler
-	.4byte \status1
-	.4byte \param2
-	.endm
-
-	.macro if_status_not_in_party battler:req, status1:req, param2:req
-	.byte 0x35
-	.byte \battler
-	.4byte \status1
-	.4byte \param2
-	.endm
-
-	.macro get_weather
-	.byte 0x36
-	.endm
-
-	.macro if_effect param0:req, param1:req
-	.byte 0x37
-	.2byte \param0
-	.4byte \param1
-	.endm
-
-	.macro if_not_effect param0:req, param1:req
-	.byte 0x38
-	.2byte \param0
-	.4byte \param1
-	.endm
-
-	.macro if_stat_level_less_than battler:req, stat:req, param2:req, param3:req
-	.byte 0x39
-	.byte \battler
-	.byte \stat
-	.byte \param2
-	.4byte \param3
-	.endm
-
-	.macro if_stat_level_more_than battler:req, stat:req, param2:req, param3:req
-	.byte 0x3a
-	.byte \battler
-	.byte \stat
-	.byte \param2
-	.4byte \param3
-	.endm
-
-	.macro if_stat_level_equal battler:req, stat:req, param2:req, param3:req
-	.byte 0x3b
-	.byte \battler
-	.byte \stat
-	.byte \param2
-	.4byte \param3
-	.endm
-
-	.macro if_stat_level_not_equal battler:req, stat:req, param2:req, param3:req
-	.byte 0x3c
-	.byte \battler
-	.byte \stat
-	.byte \param2
-	.4byte \param3
-	.endm
-
-	.macro if_can_faint param0:req
-	.byte 0x3d
-	.4byte \param0
-	.endm
-
-	.macro if_cant_faint param0:req
-	.byte 0x3e
-	.4byte \param0
-	.endm
-
-	.macro if_has_move battler:req, param1:req, param2:req
-	.byte 0x3f
-	.byte \battler
-	.2byte \param1
-	.4byte \param2
-	.endm
-
-	.macro if_doesnt_have_move battler:req, param1:req, param2:req
-	.byte 0x40
-	.byte \battler
-	.2byte \param1
-	.4byte \param2
-	.endm
-
-	.macro if_has_move_with_effect battler:req, param1:req, param2:req
-	.byte 0x41
-	.byte \battler
-	.byte \param1
-	.4byte \param2
-	.endm
-
-	.macro if_doesnt_have_move_with_effect battler:req, param1:req, param2:req
-	.byte 0x42
-	.byte \battler
-	.byte \param1
-	.4byte \param2
-	.endm
-
-	.macro if_any_move_disabled_or_encored battler:req, param1:req, param2:req
-	.byte 0x43
-	.byte \battler
-	.byte \param1
-	.4byte \param2
-	.endm
-
-	.macro if_curr_move_disabled_or_encored param0:req, param1:req
-	.byte 0x44
-	.byte \param0
-	.4byte \param1
-	.endm
-
-	.macro flee
-	.byte 0x45
-	.endm
-
-	.macro if_random_safari_flee param0:req
-	.byte 0x46
-	.4byte \param0
-	.endm
-
-	.macro watch
-	.byte 0x47
-	.endm
-
-	.macro get_hold_effect battler:req
-	.byte 0x48
-	.byte \battler
-	.endm
-
-	.macro get_gender battler:req
-	.byte 0x49
-	.byte \battler
-	.endm
-
-	.macro is_first_turn_for battler:req
-	.byte 0x4a
-	.byte \battler
-	.endm
-
-	.macro get_stockpile_count battler:req
-	.byte 0x4b
-	.byte \battler
-	.endm
-
-	.macro is_double_battle
-	.byte 0x4c
-	.endm
-
-	.macro get_used_held_item battler:req
-	.byte 0x4d
-	.byte \battler
-	.endm
-
-	.macro get_move_type_from_result
-	.byte 0x4e
-	.endm
-
-	.macro get_move_power_from_result
-	.byte 0x4f
-	.endm
-
-	.macro get_move_effect_from_result
-	.byte 0x50
-	.endm
-
-	.macro get_protect_count battler:req
-	.byte 0x51
-	.byte \battler
-	.endm
-
-	.macro if_move_flag flag jumpptr
-	.byte 0x52
-	.4byte \flag
-	.4byte \jumpptr
-	.endm
-
-	.macro if_field_status flag jumpptr
-	.byte 0x53
-	.4byte \flag
-	.4byte \jumpptr
-	.endm
-
-	.macro get_move_accuracy
-	.byte 0x54
-	.endm
-
-	.macro call_if_eq value, ptr
-	.byte 0x55
-	.2byte \value
-	.4byte \ptr
-	.endm
-
-	.macro call_if_move_flag flag ptr
-	.byte 0x56
-	.4byte \flag
-	.4byte \ptr
-	.endm
-
-	.macro nop_57
-	.byte 0x57
-	.endm
-
-	.macro call param0:req
-	.byte 0x58
-	.4byte \param0
-	.endm
-
-	.macro goto param0:req
-	.byte 0x59
-	.4byte \param0
-	.endm
-
-	.macro end
-	.byte 0x5a
-	.endm
-
-	.macro if_level_cond param0:req, param1:req
-	.byte 0x5b
-	.byte \param0
-	.4byte \param1
-	.endm
-
-	.macro if_target_taunted param0:req
-	.byte 0x5c
-	.4byte \param0
-	.endm
-
-	.macro if_target_not_taunted param0:req
-	.byte 0x5d
-	.4byte \param0
-	.endm
-
-	.macro if_target_is_ally param0:req
-	.byte 0x5e
-	.4byte \param0
-	.endm
-
-	.macro is_of_type battler:req, type:req
-	.byte 0x5f
-	.byte \battler
-	.byte \type
-	.endm
-
-	.macro check_ability battler:req, ability:req
-	.byte 0x60
-	.byte \battler
-	.byte \ability
-	.endm
-
-	.macro if_flash_fired battler:req, param1:req
-	.byte 0x61
-	.byte \battler
-	.4byte \param1
-	.endm
-
-	.macro if_holds_item battler:req, param1:req, param2:req
-	.byte 0x62
-	.byte \battler
-	.2byte \param1
-	.4byte \param2
-	.endm
-
-	.macro get_ally_chosen_move
-	.byte 0x63
-	.endm
-
-	.macro if_has_no_attacking_moves battler:req, param1:req
-	.byte 0x64
-	.byte \battler
-	.4byte \param1
-	.endm
-
-	.macro get_hazards_count battler:req, effect:req
-	.byte 0x65
-	.byte \battler
-	.2byte \effect
-	.endm
-
-	.macro if_doesnt_hold_berry battler:req, ptr:req
-	.byte 0x66
-	.byte \battler
-	.4byte \ptr
-	.endm
-
-	.macro if_share_type battler1:req, battler2:req, ptr:req
-	.byte 0x67
-	.byte \battler1
-	.byte \battler2
-	.4byte \ptr
-	.endm
-
-	.macro if_cant_use_last_resort battler:req, ptr:req
-	.byte 0x68
-	.byte \battler
-	.4byte \ptr
-	.endm
-
-	.macro if_has_move_with_split battler:req, split:req, ptr:req
-	.byte 0x69
-	.byte \battler
-	.byte \split
-	.4byte \ptr
-	.endm
-
-	.macro if_has_no_move_with_split battler:req, split:req, ptr:req
-	.byte 0x6A
-	.byte \battler
-	.byte \split
-	.4byte \ptr
-	.endm
-
-	.macro if_physical_moves_unusable attacker:req, target:req, ptr:req
-	.byte 0x6B
-	.byte \attacker
-	.byte \target
-	.4byte \ptr
-	.endm
-
-	.macro if_ai_can_go_down ptr:req
-	.byte 0x6C
-	.4byte \ptr
-	.endm
-
-	.macro if_has_move_with_type battler:req, type:req, ptr:req
-	.byte 0x6D
-	.byte \battler
-	.byte \type
-	.4byte \ptr
-	.endm
-
-	.macro if_no_move_used battler:req, ptr:req
-	.byte 0x6E
-	.byte \battler
-	.4byte \ptr
-	.endm
-
-	.macro if_has_move_with_flag battler:req, flag:req, ptr:req
-	.byte 0x6F
-	.byte \battler
-	.4byte \flag
-	.4byte \ptr
-	.endm
-
-	.macro if_battler_absent battler:req, ptr:req
-	.byte 0x70
-	.byte \battler
-	.4byte \ptr
-	.endm
-
-	.macro if_grounded battler:req, ptr:req
-	.byte 0x71
-	.byte \battler
-	.4byte \ptr
-	.endm
-
-	.macro get_best_dmg_hp_percent
-	.byte 0x72
-	.endm
-
-	.macro get_curr_dmg_hp_percent
-	.byte 0x73
-	.endm
-
-	.macro get_move_split_from_result
-	.byte 0x74
-	.endm
-
-	.macro get_considered_move_split
-	.byte 0x75
-	.endm
-
-	.macro get_considered_move_target
-	.byte 0x76
-	.endm
-
-	.macro compare_speeds battler1:req, battler2:req
-	.byte 0x77
-	.byte \battler1
-	.byte \battler2
-	.endm
-
-	.macro is_wakeup_turn battler:req
-	.byte 0x78
-	.byte \battler
-	.endm
-
-	.macro if_has_move_with_accuracy_lt battler:req, value:req, ptr:req
-	.byte 0x79
-	.byte \battler
-	.byte \value
-	.4byte \ptr
-	.endm
-
-@ useful script macros
-	.macro if_has_physical_move battler:req, ptr:req
-	if_has_move_with_split \battler, SPLIT_PHYSICAL, \ptr
-	.endm
-
-	.macro if_has_no_physical_move battler:req, ptr:req
-	if_has_no_move_with_split \battler, SPLIT_PHYSICAL, \ptr
-	.endm
-
-	.macro if_has_special_move battler:req, ptr:req
-	if_has_move_with_split \battler, SPLIT_SPECIAL, \ptr
-	.endm
-
-	.macro if_has_no_special_move battler:req, ptr:req
-	if_has_no_move_with_split \battler, SPLIT_SPECIAL, \ptr
-	.endm
-
-	.macro if_holds_no_item battler, ptr:req
-	if_holds_item \battler, 0, \ptr
-	.endm
-
-	.macro get_curr_move_type
-	get_type AI_TYPE_MOVE
-	.endm
-
-	.macro get_user_type1
-	get_type AI_TYPE1_USER
-	.endm
-
-	.macro get_user_type2
-	get_type AI_TYPE2_USER
-	.endm
-
-	.macro get_target_type1
-	get_type AI_TYPE1_TARGET
-	.endm
-
-	.macro get_target_type2
-	get_type AI_TYPE2_TARGET
-	.endm
-
-	.macro if_ability battler:req, ability:req, ptr:req
-	check_ability \battler, \ability
-	if_equal 1, \ptr
-	.endm
-
-	.macro if_no_ability battler:req, ability:req, ptr:req
-	check_ability \battler, \ability
-	if_equal 0, \ptr
-	.endm
-
-	.macro if_type battler:req, type:req, ptr:req
-	is_of_type \battler, \type
-	if_equal 1, \ptr
-	.endm
-
-	.macro if_no_type battler:req, type:req, ptr:req
-	is_of_type \battler, \type
-	if_equal 0, \ptr
-	.endm
-
-	.macro if_target_faster ptr:req
-	if_user_goes 1, \ptr
-	.endm
-
-	.macro if_user_faster ptr:req
-	if_user_goes 0, \ptr
-	.endm
-
-	.macro if_double_battle ptr:req
-	is_double_battle
-	if_equal 1, \ptr
-	.endm
-
-	.macro if_not_double_battle ptr:req
-	is_double_battle
-	if_equal 0, \ptr
-	.endm
-
-	.macro if_any_move_disabled battler:req, ptr:req
-	if_any_move_disabled_or_encored \battler, 0, \ptr
-	.endm
-
-	.macro if_any_move_encored battler:req, ptr:req
-	if_any_move_disabled_or_encored \battler, 1, \ptr
-	.endm
-
-	.macro call_if_always_hit ptr:req
-	get_move_accuracy
-	call_if_eq 0, \ptr
-	.endm
--- a/asm/macros/battle_script.inc
+++ b/asm/macros/battle_script.inc
@@ -72,6 +72,10 @@
 	.2byte \id
 	.endm

+	.macro printsavedstring
+	printstring 0
+	.endm
+
 	.macro printselectionstring id:req
 	.byte 0x11
 	.2byte \id
@@ -92,19 +96,30 @@
 	.4byte \ptr
 	.endm

-	.macro seteffectwithchance
+	.macro setadditionaleffects
+	1:
 	.byte 0x15
+	jumpifhalfword CMP_EQUAL, sMOVE_EFFECT, MOVE_EFFECT_CONTINUE, 1b
 	.endm

-	.macro seteffectprimary
+	.macro seteffectprimary moveEffect=0
+	.if \moveEffect != 0
+		setmoveeffect \moveEffect
+	.endif
 	.byte 0x16
 	.endm

-	.macro seteffectsecondary
+	.macro seteffectsecondary moveEffect=0
+	.if \moveEffect != 0
+		setmoveeffect \moveEffect
+	.endif
 	.byte 0x17
 	.endm

-	.macro clearstatusfromeffect battler:req
+	.macro clearstatusfromeffect battler:req, moveEffect=0
+	.if \moveEffect != 0
+		setmoveeffect \moveEffect
+	.endif
 	.byte 0x18
 	.byte \battler
 	.endm
@@ -516,9 +531,10 @@
 	.byte 0x57
 	.endm

-	.macro returntoball battler:req
+	.macro returntoball battler:req, changingForm:req
 	.byte 0x58
 	.byte \battler
+	.byte \changingForm
 	.endm

 	.macro handlelearnnewmove learnedMoveInstr:req, nothingToLearnInstr:req, isFirstMove:req
@@ -764,8 +780,21 @@
 	.byte 0x8b
 	.endm

-	.macro confuseifrepeatingattackends
+	.macro twoturnmoveschargestringandanimation
 	.byte 0x8c
+	.4byte 1f @animation then attack string
+	@default - attack string then animation
+	printsavedstring
+	waitmessage B_WAIT_TIME_LONG
+	attackanimation
+	waitanimation
+	goto 2f
+	1:
+	attackanimation
+	waitanimation
+	printsavedstring
+	waitmessage B_WAIT_TIME_LONG
+	2:
 	.endm

 	.macro setmultihitcounter value:req
@@ -980,7 +1009,7 @@
 	.byte 0xbb
 	.endm

-	.macro maxattackhalvehp failInstr:req
+	.macro halvehp failInstr:req
 	.byte 0xbc
 	.4byte \failInstr
 	.endm
@@ -1023,12 +1052,28 @@
 	.4byte \failInstr
 	.endm

-	.macro setsemiinvulnerablebit
+	.macro setsemiinvulnerablebit clear=FALSE
 	.byte 0xc5
+	.byte \clear
 	.endm

 	.macro clearsemiinvulnerablebit
+	setsemiinvulnerablebit TRUE
+	.endm
+
+	.macro tryfiretwoturnmovenowbyeffect battler:req, checkChargeTurnEffects:req, jumpInstr:req
 	.byte 0xc6
+	.byte \battler
+	.byte \checkChargeTurnEffects
+	.4byte \jumpInstr
+	.endm
+
+	.macro tryfiretwoturnmovewithoutcharging battler:req, jumpInstr:req
+	tryfiretwoturnmovenowbyeffect \battler, TRUE, \jumpInstr
+	.endm
+
+	.macro tryfiretwoturnmoveaftercharging battler:req, jumpInstr:req
+	tryfiretwoturnmovenowbyeffect \battler, FALSE, \jumpInstr
 	.endm

 	.macro setminimize
@@ -1087,8 +1132,9 @@
 	.4byte \failInstr
 	.endm

-	.macro trycopyability failInstr:req
+	.macro trycopyability battler:req, failInstr:req
 	.byte 0xd3
+	.byte \battler
 	.4byte \failInstr
 	.endm

@@ -1174,8 +1220,10 @@
 	.4byte \jumpInstr
 	.endm

-	.macro getsecretpowereffect
+	.macro jumpifnotcurrentmoveargtype battler:req, failInstr:req
 	.byte 0xe4
+	.byte \battler
+	.4byte \failInstr
 	.endm

 	.macro pickup
@@ -1313,10 +1361,12 @@
 	.4byte \jumpInstr
 	.endm

-	.macro jumpifholdeffect battler:req, holdEffect:req, jumpInstr:req
-	callnative BS_JumpIfHoldEffect
-	.byte \battler
-	.2byte \holdEffect
+	.macro allyswitchswapbattlers
+	callnative BS_AllySwitchSwapBattler
+	.endm
+
+	.macro allyswitchfailchance jumpInstr:req
+	callnative BS_AllySwitchFailChance
 	.4byte \jumpInstr
 	.endm

@@ -1562,6 +1612,21 @@
 	callnative BS_SetPhotonGeyserCategory
 	.endm

+	.macro tryupperhand failInstr:req
+	callnative BS_TryUpperHand
+	.4byte \failInstr
+	.endm
+
+	.macro tryupdaterecoiltracker
+	callnative BS_TryUpdateRecoilTracker
+	.endm
+
+	.macro trytidyup clear:req, jumpInstr:req
+	callnative BS_TryTidyUp
+	.byte \clear
+	.4byte \jumpInstr
+	.endm
+
@ various command changed to more readable macros
 	.macro cancelmultiturnmoves battler:req
 	various \battler, VARIOUS_CANCEL_MULTI_TURN_MOVES
@@ -1802,8 +1867,8 @@
 	.4byte \jumpInstr
 	.endm

-	.macro argumentstatuseffect
-	various BS_ATTACKER, VARIOUS_ARGUMENT_STATUS_EFFECT
+	.macro setargtobattledamage
+	various BS_ATTACKER, VARIOUS_SET_ARG_TO_BATTLE_DAMAGE
 	.endm

 	.macro tryhitswitchtarget failInstr:req
@@ -1847,10 +1912,6 @@
 	various \battler, VARIOUS_POWER_TRICK
 	.endm

-	.macro argumenttomoveeffect
-	various BS_ATTACKER, VARIOUS_ARGUMENT_TO_MOVE_EFFECT
-	.endm
-
 	.macro jumpifnotgrounded battler:req, jumpInstr:req
 	various \battler, VARIOUS_JUMP_IF_NOT_GROUNDED
 	.4byte \jumpInstr
@@ -1978,10 +2039,15 @@
 	.4byte \jumpInstr
 	.endm

-	.macro jumpifnoholdeffect battler:req, holdEffect:req, jumpInstr:req
-	various \battler, VARIOUS_JUMP_IF_NO_HOLD_EFFECT
+	.macro jumpifholdeffect battler:req, holdEffect:req, jumpInstr:req, equal=TRUE
+	various \battler, VARIOUS_JUMP_IF_HOLD_EFFECT
 	.byte \holdEffect
 	.4byte \jumpInstr
+	.byte \equal
+	.endm
+
+	.macro jumpifnoholdeffect battler:req, holdEffect:req, jumpInstr:req
+	jumpifholdeffect \battler, \holdEffect, \jumpInstr, FALSE
 	.endm

 	.macro infatuatewithbattler battler:req, infatuateWith:req
@@ -2325,6 +2391,15 @@
 	goto \jumpInstr
 	.endm

+	.macro setallytonextattacker jumpInstr:req
+	jumpifbyte CMP_GREATER_THAN, gBattlerAttacker, 0x1, 1f
+	addbyte gBattlerAttacker, 0x2
+	goto \jumpInstr
+	1:
+	subbyte gBattlerAttacker, 0x2
+	goto \jumpInstr
+	.endm
+
 	.macro jumpifleafguardprotected battler:req, jumpInstr:req
 	various \battler, VARIOUS_JUMP_IF_LEAF_GUARD_PROTECTED
 	.4byte \jumpInstr
--- a/asm/macros/event.inc
+++ b/asm/macros/event.inc
@@ -984,16 +984,62 @@
 	.byte \textTop
 	.endm

-	@ Gives the player a Pokémon of the specified species and level, holding the specified item. The trailing 0s are unused parameters.
+	@ Gives the player a Pokémon of the specified species and level, and allows to customize extra parameters.
 	@ VAR_RESULT will be set to MON_GIVEN_TO_PARTY, MON_GIVEN_TO_PC, or MON_CANT_GIVE depending on the outcome.
-	.macro givemon species:req, level:req, item=ITEM_NONE
-	.byte 0x79
+	.macro givemon species:req, level:req, item, ball, nature, abilityNum, gender, hpEv, atkEv, defEv, speedEv, spAtkEv, spDefEv, hpIv, atkIv, defIv, speedIv, spAtkIv, spDefIv, move1, move2, move3, move4, isShiny, ggMaxFactor, teraType
+	callnative ScrCmd_givemon
+	.set givemon_flags, 0
 	.2byte \species
-	.byte \level
-	.2byte \item
-	.4byte 0
-	.4byte 0
-	.byte 0
+	.2byte \level
+	.ifnb \item; .set givemon_flags, givemon_flags | (1 << 0); .endif
+	.ifnb \ball; .set givemon_flags, givemon_flags | (1 << 1); .endif
+	.ifnb \nature; .set givemon_flags, givemon_flags | (1 << 2); .endif
+	.ifnb \abilityNum; .set givemon_flags, givemon_flags | (1 << 3); .endif
+	.ifnb \gender; .set givemon_flags, givemon_flags | (1 << 4); .endif
+	.ifnb \hpEv; .set givemon_flags, givemon_flags | (1 << 5); .endif
+	.ifnb \atkEv; .set givemon_flags, givemon_flags | (1 << 6); .endif
+	.ifnb \defEv; .set givemon_flags, givemon_flags | (1 << 7); .endif
+	.ifnb \speedEv; .set givemon_flags, givemon_flags | (1 << 8); .endif
+	.ifnb \spAtkEv; .set givemon_flags, givemon_flags | (1 << 9); .endif
+	.ifnb \spDefEv; .set givemon_flags, givemon_flags | (1 << 10); .endif
+	.ifnb \hpIv; .set givemon_flags, givemon_flags | (1 << 11); .endif
+	.ifnb \atkIv; .set givemon_flags, givemon_flags | (1 << 12); .endif
+	.ifnb \defIv; .set givemon_flags, givemon_flags | (1 << 13); .endif
+	.ifnb \speedIv; .set givemon_flags, givemon_flags | (1 << 14); .endif
+	.ifnb \spAtkIv; .set givemon_flags, givemon_flags | (1 << 15); .endif
+	.ifnb \spDefIv; .set givemon_flags, givemon_flags | (1 << 16); .endif
+	.ifnb \move1; .set givemon_flags, givemon_flags | (1 << 17); .endif
+	.ifnb \move2; .set givemon_flags, givemon_flags | (1 << 18); .endif
+	.ifnb \move3; .set givemon_flags, givemon_flags | (1 << 19); .endif
+	.ifnb \move4; .set givemon_flags, givemon_flags | (1 << 20); .endif
+	.ifnb \isShiny; .set givemon_flags, givemon_flags | (1 << 21); .endif
+	.ifnb \ggMaxFactor; .set givemon_flags, givemon_flags | (1 << 22); .endif
+	.ifnb \teraType; .set givemon_flags, givemon_flags | (1 << 23); .endif
+	.4byte givemon_flags
+	.ifnb \item; .2byte \item; .endif
+	.ifnb \ball; .2byte \ball; .endif
+	.ifnb \nature; .2byte \nature; .endif
+	.ifnb \abilityNum; .2byte \abilityNum; .endif
+	.ifnb \gender; .2byte \gender; .endif
+	.ifnb \hpEv; .2byte \hpEv; .endif
+	.ifnb \atkEv; .2byte \atkEv; .endif
+	.ifnb \defEv; .2byte \defEv; .endif
+	.ifnb \speedEv; .2byte \speedEv; .endif
+	.ifnb \spAtkEv; .2byte \spAtkEv; .endif
+	.ifnb \spDefEv; .2byte \spDefEv; .endif
+	.ifnb \hpIv; .2byte \hpIv; .endif
+	.ifnb \atkIv; .2byte \atkIv; .endif
+	.ifnb \defIv; .2byte \defIv; .endif
+	.ifnb \speedIv; .2byte \speedIv; .endif
+	.ifnb \spAtkIv; .2byte \spAtkIv; .endif
+	.ifnb \spDefIv; .2byte \spDefIv; .endif
+	.ifnb \move1; .2byte \move1; .endif
+	.ifnb \move2; .2byte \move2; .endif
+	.ifnb \move3; .2byte \move3; .endif
+	.ifnb \move4; .2byte \move4; .endif
+	.ifnb \isShiny; .2byte \isShiny; .endif
+	.ifnb \ggMaxFactor; .2byte \ggMaxFactor; .endif
+	.ifnb \teraType; .2byte \teraType; .endif
 	.endm

 	@ Gives the player an Egg of the specified species.
@@ -1735,6 +1781,38 @@
 	.2byte \quantity
 	.endm

+	.macro _dynmultichoice left:req, top:req, ignoreBPress:req, maxBeforeScroll:req, shouldSort:req, initialSelected:req, callbacks:req argv:vararg
+	.byte 0xe3
+	.2byte \left
+	.2byte \top
+	.byte \ignoreBPress
+	.byte \maxBeforeScroll
+	.byte \shouldSort
+	.2byte \initialSelected
+	.byte \callbacks
+	.byte (.Ldynmultichoice_\@_2 - .Ldynmultichoice_\@_1) / 4
+.Ldynmultichoice_\@_1:
+	.4byte \argv
+.Ldynmultichoice_\@_2:
+	.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 provided in argv.
+	@ If ignoreBPress 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 dynmultichoice left:req, top:req, ignoreBPress:req, maxBeforeScroll:req, initialSelected:req, callbacks:req argv:vararg
+	_dynmultichoice \left, \top, \ignoreBPress, \maxBeforeScroll, FALSE, \initialSelected, \callbacks, \argv
+	.endm
+
+	.macro dynmultipush name:req, id:req
+	.byte 0xe4
+	.4byte \name
+	.2byte \id
+	.endm
+
+	.macro dynmultistack left:req, top:req, ignoreBPress:req, maxBeforeScroll:req, shouldSort:req, initialSelected:req, callbacks:req
+	_dynmultichoice \left, \top, \ignoreBPress, \maxBeforeScroll, \shouldSort, \initialSelected, \callbacks, NULL
+	.endm
+

@ Supplementary

@@ -2025,3 +2103,72 @@
 	callnative CreateTrainerPartyForPlayer
 	trainerbattle_no_intro \trainer2, NULL
 	.endm
+
+	@ Sets VAR_RESULT to TRUE if stat can be hyper trained, or to
+	@ FALSE otherwise.
+	.macro canhypertrain stat:req, slot:req
+	callnative CanHyperTrain
+	.byte \stat
+	.2byte \slot
+	.endm
+
+	@ Hyper Trains a stat.
+	.macro hypertrain stat:req, slot:req
+	callnative HyperTrain
+	.byte \stat
+	.2byte \slot
+	.endm
+
+	@ Sets VAR_RESULT to TRUE if the Pokemon has the Gigantamax Factor,
+	@ or to FALSE otherwise.
+	.macro hasgigantamaxfactor slot:req
+	callnative HasGigantamaxFactor
+	.2byte \slot
+	.endm
+
+	@ Toggles the Gigantamax Factor for a Pokemon.
+	@ Fails for Melmetal (vanilla behavior).
+	@ Sets VAR_RESULT to TRUE if it succeeds, and FALSE otherwise.
+	.macro togglegigantamaxfactor slot:req
+	callnative ToggleGigantamaxFactor
+	.2byte \slot
+	.endm
+
+	@ Sets VAR_RESULT to one of the arguments (via setorcopyvar).
+	.macro randomelement element:req, elements:vararg
+	.set _randomelement_n, 0
+	.irp el, \element, \elements
+	.set _randomelement_n, _randomelement_n + 1
+	.endr
+		random _randomelement_n
+
+	.set _randomelement_n, 0
+	.irp el, \element, \elements
+		goto_if_ne VAR_RESULT, _randomelement_n, 1f
+		setorcopyvar VAR_RESULT, \el
+		goto 2f
+	1:
+	.set _randomelement_n, _randomelement_n + 1
+	.endr
+	2:
+	.endm
+
+	@ Sets VAR_RESULT to TRUE with probability 'percent', and FALSE
+	@ with probability '100% - percent'.
+	.macro randompercentage percent:req
+		random 100
+		goto_if_lt VAR_RESULT, \percent, 1f
+		setvar VAR_RESULT, FALSE
+		goto 2f
+	1:
+		setvar VAR_RESULT, TRUE
+	2:
+	.endm
+
+	@ Inflicts \status1 to the Pokémon in \slot.
+	@ If \slot is greater or equal than PARTY_SIZE, the status is inflicted on each of the Player's Pokémon.
+	.macro setstatus1 status1:req, slot:req
+	callnative Script_SetStatus1
+	.2byte \status1
+	.2byte \slot
+	.endm
--- a/asm/macros/map.inc
+++ b/asm/macros/map.inc
@@ -28,6 +28,10 @@
 	.2byte \x, \y
 	.byte \elevation
 	.byte \movement_type
+	.if \x_radius > 15
+		@ This warning is relevant for GetItemBallIdAndAmountFromTemplate
+		.error "movementRangeX has a bitfield of 4 bytes, so values over 15 will overflow. Use a custom script for item balls that should give the player more than 15 items."
+	.endif
 	.byte ((\y_radius << 4) | \x_radius)
 	.space 1  @ Padding
 	.2byte \trainer_type
--- a/charmap.txt
+++ b/charmap.txt
@@ -61,6 +61,13 @@ UP_ARROW    = 79
 DOWN_ARROW  = 7A
 LEFT_ARROW  = 7B
 RIGHT_ARROW = 7C
+@ Case-fixing/unfixing chars
+@ These are 1-2 pixel spaces in vanilla.
+@ 7D collides with 'ヲ' in JP,
+@ but that kana is practically unused in JP text.
+FIXED_CASE  = 7D
+UNFIX_CASE  = 7E
+
 SUPER_E     = 84
 '<'         = 85
 '>'         = 86
@@ -347,6 +354,10 @@ ARCHIE         = FD 0A
 MAXIE          = FD 0B
 KYOGRE         = FD 0C
 GROUDON        = FD 0D
+@ Like STR_VAR_X, but prepends CHAR_FIXED_CASE
+STR_VAR_1_FIXED  = FD 82
+STR_VAR_2_FIXED  = FD 83
+STR_VAR_3_FIXED  = FD 84

@ battle string placeholders

--- a/data/battle_anim_scripts.s
+++ b/data/battle_anim_scripts.s
--- a/data/battle_scripts_1.s
+++ b/data/battle_scripts_1.s
--- a/data/battle_scripts_2.s
+++ b/data/battle_scripts_2.s
@@ -112,7 +112,7 @@ BattleScript_ItemSetMist::

 BattleScript_ItemSetFocusEnergy::
 	call BattleScript_UseItemMessage
-	jumpifstatus2 BS_ATTACKER, STATUS2_FOCUS_ENERGY, BattleScript_ButItFailed
+	jumpifstatus2 BS_ATTACKER, STATUS2_FOCUS_ENERGY_ANY, BattleScript_ButItFailed
 	setfocusenergy
 	playmoveanimation BS_ATTACKER, MOVE_FOCUS_ENERGY
 	waitanimation
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -947,6 +947,10 @@ gText_PlayerFoundOneTMHM::
 	.string "{PLAYER} found one {STR_VAR_1}\n"
 	.string "{STR_VAR_2}!$"

+gText_PlayerFoundTMHMs::
+	.string "{PLAYER} found {STR_VAR_3} {STR_VAR_1}\n"
+	.string "{STR_VAR_2}!$"
+
 gText_Sudowoodo_Attacked::
 	.string "The weird tree doesn't like the\n"
 	.string "WAILMER PAIL!\p"
--- a/data/maps/AbandonedShip_CaptainsOffice/map.json
+++ b/data/maps/AbandonedShip_CaptainsOffice/map.json
@@ -36,8 +36,8 @@
      "movement_range_x": 1,
      "movement_range_y": 1,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "AbandonedShip_CaptainsOffice_EventScript_ItemStorageKey",
+      "trainer_sight_or_berry_tree_id": "ITEM_STORAGE_KEY",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_ABANDONED_SHIP_CAPTAINS_OFFICE_STORAGE_KEY"
    }
  ],
--- a/data/maps/AbandonedShip_HiddenFloorRooms/map.json
+++ b/data/maps/AbandonedShip_HiddenFloorRooms/map.json
@@ -23,8 +23,8 @@
      "movement_range_x": 0,
      "movement_range_y": 0,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "AbandonedShip_HiddenFloorRooms_EventScript_ItemLuxuryBall",
+      "trainer_sight_or_berry_tree_id": "ITEM_LUXURY_BALL",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_6_LUXURY_BALL"
    },
    {
@@ -36,8 +36,8 @@
      "movement_range_x": 0,
      "movement_range_y": 0,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "AbandonedShip_HiddenFloorRooms_EventScript_ItemScanner",
+      "trainer_sight_or_berry_tree_id": "ITEM_SCANNER",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_2_SCANNER"
    },
    {
@@ -49,8 +49,8 @@
      "movement_range_x": 1,
      "movement_range_y": 1,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "AbandonedShip_HiddenFloorRooms_EventScript_ItemTMRainDance",
+      "trainer_sight_or_berry_tree_id": "ITEM_TM_RAIN_DANCE",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_1_TM_RAIN_DANCE"
    },
    {
@@ -62,8 +62,8 @@
      "movement_range_x": 1,
      "movement_range_y": 1,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "AbandonedShip_HiddenFloorRooms_EventScript_ItemWaterStone",
+      "trainer_sight_or_berry_tree_id": "ITEM_WATER_STONE",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_3_WATER_STONE"
    }
  ],
--- a/data/maps/AbandonedShip_Room_B1F/map.json
+++ b/data/maps/AbandonedShip_Room_B1F/map.json
@@ -23,8 +23,8 @@
      "movement_range_x": 1,
      "movement_range_y": 1,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "AbandonedShip_Room_B1F_EventScript_ItemTMIceBeam",
+      "trainer_sight_or_berry_tree_id": "ITEM_TM_ICE_BEAM",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_ABANDONED_SHIP_ROOMS_B1F_TM_ICE_BEAM"
    }
  ],
--- a/data/maps/AbandonedShip_Rooms2_1F/map.json
+++ b/data/maps/AbandonedShip_Rooms2_1F/map.json
@@ -49,8 +49,8 @@
      "movement_range_x": 1,
      "movement_range_y": 1,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "AbandonedShip_Rooms2_1F_EventScript_ItemRevive",
+      "trainer_sight_or_berry_tree_id": "ITEM_REVIVE",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_ABANDONED_SHIP_ROOMS_2_1F_REVIVE"
    },
    {
--- a/data/maps/AbandonedShip_Rooms2_B1F/map.json
+++ b/data/maps/AbandonedShip_Rooms2_B1F/map.json
@@ -36,8 +36,8 @@
      "movement_range_x": 1,
      "movement_range_y": 1,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "AbandonedShip_Rooms2_B1F_EventScript_ItemDiveBall",
+      "trainer_sight_or_berry_tree_id": "ITEM_DIVE_BALL",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_ABANDONED_SHIP_ROOMS_2_B1F_DIVE_BALL"
    }
  ],
--- a/data/maps/AbandonedShip_Rooms_1F/map.json
+++ b/data/maps/AbandonedShip_Rooms_1F/map.json
@@ -36,8 +36,8 @@
      "movement_range_x": 1,
      "movement_range_y": 1,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "AbandonedShip_Rooms_1F_EventScript_ItemHarborMail",
+      "trainer_sight_or_berry_tree_id": "ITEM_HARBOR_MAIL",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_ABANDONED_SHIP_ROOMS_1F_HARBOR_MAIL"
    },
    {
--- a/data/maps/AbandonedShip_Rooms_B1F/map.json
+++ b/data/maps/AbandonedShip_Rooms_B1F/map.json
@@ -36,8 +36,8 @@
      "movement_range_x": 1,
      "movement_range_y": 1,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "AbandonedShip_Rooms_B1F_EventScript_ItemEscapeRope",
+      "trainer_sight_or_berry_tree_id": "ITEM_ESCAPE_ROPE",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_ABANDONED_SHIP_ROOMS_B1F_ESCAPE_ROPE"
    }
  ],
--- a/data/maps/AquaHideout_B1F/map.json
+++ b/data/maps/AquaHideout_B1F/map.json
@@ -49,8 +49,8 @@
      "movement_range_x": 0,
      "movement_range_y": 0,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "AquaHideout_B1F_EventScript_ItemMaxElixir",
+      "trainer_sight_or_berry_tree_id": "ITEM_MAX_ELIXIR",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_AQUA_HIDEOUT_B1F_MAX_ELIXIR"
    },
    {
@@ -75,8 +75,8 @@
      "movement_range_x": 1,
      "movement_range_y": 1,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "AquaHideout_B1F_EventScript_ItemMasterBall",
+      "trainer_sight_or_berry_tree_id": "ITEM_MASTER_BALL",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_AQUA_HIDEOUT_B1F_MASTER_BALL"
    },
    {
@@ -101,8 +101,8 @@
      "movement_range_x": 1,
      "movement_range_y": 1,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "AquaHideout_B1F_EventScript_ItemNugget",
+      "trainer_sight_or_berry_tree_id": "ITEM_NUGGET",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_AQUA_HIDEOUT_B1F_NUGGET"
    },
    {
--- a/data/maps/AquaHideout_B2F/map.json
+++ b/data/maps/AquaHideout_B2F/map.json
@@ -49,8 +49,8 @@
      "movement_range_x": 0,
      "movement_range_y": 0,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "AquaHideout_B2F_EventScript_ItemNestBall",
+      "trainer_sight_or_berry_tree_id": "ITEM_NEST_BALL",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_AQUA_HIDEOUT_B2F_NEST_BALL"
    },
    {
--- a/data/maps/ArtisanCave_1F/map.json
+++ b/data/maps/ArtisanCave_1F/map.json
@@ -23,8 +23,8 @@
      "movement_range_x": 1,
      "movement_range_y": 1,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "ArtisanCave_1F_EventScript_ItemCarbos",
+      "trainer_sight_or_berry_tree_id": "ITEM_CARBOS",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_ARTISAN_CAVE_1F_CARBOS"
    }
  ],
--- a/data/maps/ArtisanCave_B1F/map.json
+++ b/data/maps/ArtisanCave_B1F/map.json
@@ -23,8 +23,8 @@
      "movement_range_x": 1,
      "movement_range_y": 1,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "ArtisanCave_B1F_EventScript_ItemHPUp",
+      "trainer_sight_or_berry_tree_id": "ITEM_HP_UP",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_ARTISAN_CAVE_B1F_HP_UP"
    }
  ],
--- a/data/maps/FieryPath/map.json
+++ b/data/maps/FieryPath/map.json
@@ -23,8 +23,8 @@
      "movement_range_x": 1,
      "movement_range_y": 1,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "FieryPath_EventScript_ItemTMToxic",
+      "trainer_sight_or_berry_tree_id": "ITEM_TM_TOXIC",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_FIERY_PATH_TM_TOXIC"
    },
    {
@@ -114,8 +114,8 @@
      "movement_range_x": 1,
      "movement_range_y": 1,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "FieryPath_EventScript_ItemFireStone",
+      "trainer_sight_or_berry_tree_id": "ITEM_FIRE_STONE",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_FIERY_PATH_FIRE_STONE"
    }
  ],
--- a/data/maps/GraniteCave_1F/map.json
+++ b/data/maps/GraniteCave_1F/map.json
@@ -36,8 +36,8 @@
      "movement_range_x": 0,
      "movement_range_y": 0,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "GraniteCave_1F_EventScript_ItemEscapeRope",
+      "trainer_sight_or_berry_tree_id": "ITEM_ESCAPE_ROPE",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_GRANITE_CAVE_1F_ESCAPE_ROPE"
    }
  ],
--- a/data/maps/GraniteCave_B1F/map.json
+++ b/data/maps/GraniteCave_B1F/map.json
@@ -23,8 +23,8 @@
      "movement_range_x": 0,
      "movement_range_y": 0,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "GraniteCave_B1F_EventScript_ItemPokeBall",
+      "trainer_sight_or_berry_tree_id": "ITEM_POKE_BALL",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_GRANITE_CAVE_B1F_POKE_BALL"
    }
  ],
--- a/data/maps/GraniteCave_B2F/map.json
+++ b/data/maps/GraniteCave_B2F/map.json
@@ -23,8 +23,8 @@
      "movement_range_x": 0,
      "movement_range_y": 0,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "GraniteCave_B2F_EventScript_ItemRepel",
+      "trainer_sight_or_berry_tree_id": "ITEM_REPEL",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_GRANITE_CAVE_B2F_REPEL"
    },
    {
@@ -36,8 +36,8 @@
      "movement_range_x": 0,
      "movement_range_y": 0,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "GraniteCave_B2F_EventScript_ItemRareCandy",
+      "trainer_sight_or_berry_tree_id": "ITEM_RARE_CANDY",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_GRANITE_CAVE_B2F_RARE_CANDY"
    },
    {
--- a/data/maps/JaggedPass/map.json
+++ b/data/maps/JaggedPass/map.json
@@ -49,8 +49,8 @@
      "movement_range_x": 0,
      "movement_range_y": 0,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "JaggedPass_EventScript_ItemBurnHeal",
+      "trainer_sight_or_berry_tree_id": "ITEM_BURN_HEAL",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_JAGGED_PASS_BURN_HEAL"
    },
    {
--- a/data/maps/LilycoveCity/map.json
+++ b/data/maps/LilycoveCity/map.json
@@ -164,8 +164,8 @@
      "movement_range_x": 0,
      "movement_range_y": 0,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_EventScript_ItemMaxRepel",
+      "trainer_sight_or_berry_tree_id": "ITEM_MAX_REPEL",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_LILYCOVE_CITY_MAX_REPEL"
    },
    {
--- a/data/maps/MagmaHideout_1F/map.json
+++ b/data/maps/MagmaHideout_1F/map.json
@@ -36,8 +36,8 @@
      "movement_range_x": 1,
      "movement_range_y": 1,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "MagmaHideout_1F_EventScript_ItemRareCandy",
+      "trainer_sight_or_berry_tree_id": "ITEM_RARE_CANDY",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_MAGMA_HIDEOUT_1F_RARE_CANDY"
    },
    {
--- a/data/maps/MagmaHideout_2F_2R/map.json
+++ b/data/maps/MagmaHideout_2F_2R/map.json
@@ -49,8 +49,8 @@
      "movement_range_x": 1,
      "movement_range_y": 1,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "MagmaHideout_2F_2R_EventScript_ItemMaxElixir",
+      "trainer_sight_or_berry_tree_id": "ITEM_MAX_ELIXIR",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_MAGMA_HIDEOUT_2F_2R_MAX_ELIXIR"
    },
    {
@@ -88,8 +88,8 @@
      "movement_range_x": 1,
      "movement_range_y": 1,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "MagmaHideout_2F_2R_EventScript_ItemFullRestore",
+      "trainer_sight_or_berry_tree_id": "ITEM_FULL_RESTORE",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_MAGMA_HIDEOUT_2F_2R_FULL_RESTORE"
    }
  ],
--- a/data/maps/MagmaHideout_3F_1R/map.json
+++ b/data/maps/MagmaHideout_3F_1R/map.json
@@ -49,8 +49,8 @@
      "movement_range_x": 1,
      "movement_range_y": 1,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "MagmaHideout_3F_1R_EventScript_ItemNugget",
+      "trainer_sight_or_berry_tree_id": "ITEM_NUGGET",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_MAGMA_HIDEOUT_3F_1R_NUGGET"
    }
  ],
--- a/data/maps/MagmaHideout_3F_2R/map.json
+++ b/data/maps/MagmaHideout_3F_2R/map.json
@@ -36,8 +36,8 @@
      "movement_range_x": 1,
      "movement_range_y": 1,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "MagmaHideout_3F_2R_EventScript_ItemPPMax",
+      "trainer_sight_or_berry_tree_id": "ITEM_PP_MAX",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_MAGMA_HIDEOUT_3F_2R_PP_MAX"
    }
  ],
--- a/data/maps/MagmaHideout_3F_3R/map.json
+++ b/data/maps/MagmaHideout_3F_3R/map.json
@@ -23,8 +23,8 @@
      "movement_range_x": 1,
      "movement_range_y": 1,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "MagmaHideout_3F_3R_EventScript_ItemEscapeRope",
+      "trainer_sight_or_berry_tree_id": "ITEM_ESCAPE_ROPE",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_MAGMA_HIDEOUT_3F_3R_ECAPE_ROPE"
    }
  ],
--- a/data/maps/MagmaHideout_4F/map.json
+++ b/data/maps/MagmaHideout_4F/map.json
@@ -114,8 +114,8 @@
      "movement_range_x": 1,
      "movement_range_y": 1,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "MagmaHideout_4F_EventScript_ItemMaxRevive",
+      "trainer_sight_or_berry_tree_id": "ITEM_MAX_REVIVE",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_MAGMA_HIDEOUT_4F_MAX_REVIVE"
    }
  ],
--- a/data/maps/MauvilleCity/map.json
+++ b/data/maps/MauvilleCity/map.json
@@ -148,8 +148,8 @@
      "movement_range_x": 1,
      "movement_range_y": 1,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "MauvilleCity_EventScript_ItemXSpeed",
+      "trainer_sight_or_berry_tree_id": "ITEM_X_SPEED",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_MAUVILLE_CITY_X_SPEED"
    },
    {
--- a/data/maps/MeteorFalls_1F_1R/map.json
+++ b/data/maps/MeteorFalls_1F_1R/map.json
@@ -23,8 +23,8 @@
      "movement_range_x": 0,
      "movement_range_y": 0,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "MeteorFalls_1F_1R_EventScript_ItemTMIronTail",
+      "trainer_sight_or_berry_tree_id": "ITEM_TM_IRON_TAIL",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_METEOR_FALLS_1F_1R_TM_IRON_TAIL"
    },
    {
@@ -36,8 +36,8 @@
      "movement_range_x": 0,
      "movement_range_y": 0,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "MeteorFalls_1F_1R_EventScript_ItemMoonStone",
+      "trainer_sight_or_berry_tree_id": "ITEM_MOON_STONE",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_METEOR_FALLS_1F_1R_MOON_STONE"
    },
    {
@@ -49,8 +49,8 @@
      "movement_range_x": 0,
      "movement_range_y": 0,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "MeteorFalls_1F_1R_EventScript_ItemFullHeal",
+      "trainer_sight_or_berry_tree_id": "ITEM_FULL_HEAL",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_METEOR_FALLS_1F_1R_FULL_HEAL"
    },
    {
@@ -62,8 +62,8 @@
      "movement_range_x": 0,
      "movement_range_y": 0,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "MeteorFalls_1F_1R_EventScript_ItemPPUP",
+      "trainer_sight_or_berry_tree_id": "ITEM_PP_UP",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_METEOR_FALLS_1F_1R_PP_UP"
    },
    {
--- a/data/maps/MeteorFalls_B1F_2R/map.json
+++ b/data/maps/MeteorFalls_B1F_2R/map.json
@@ -23,8 +23,8 @@
      "movement_range_x": 1,
      "movement_range_y": 1,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "MeteorFalls_B1F_2R_EventScript_ItemTMDragonClaw",
+      "trainer_sight_or_berry_tree_id": "ITEM_TM_DRAGON_CLAW",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_METEOR_FALLS_B1F_2R_TM_DRAGON_CLAW"
    }
  ],
--- a/data/maps/MossdeepCity/map.json
+++ b/data/maps/MossdeepCity/map.json
@@ -104,8 +104,8 @@
      "movement_range_x": 0,
      "movement_range_y": 0,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "MossdeepCity_EventScript_ItemNetBall",
+      "trainer_sight_or_berry_tree_id": "ITEM_NET_BALL",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_MOSSDEEP_CITY_NET_BALL"
    },
    {
--- a/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc
+++ b/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc
@@ -257,14 +257,7 @@ MossdeepCity_SpaceCenter_2F_EventScript_ChoosePartyForMultiBattle::
 	goto MossdeepCity_SpaceCenter_2F_EventScript_ReadyForBattlePrompt

 MossdeepCity_SpaceCenter_2F_EventScript_DoStevenMultiBattle::
-	special ReducePlayerPartyToSelectedMons
-	frontier_set FRONTIER_DATA_SELECTED_MON_ORDER
-	setvar VAR_0x8004, SPECIAL_BATTLE_STEVEN
-	setvar VAR_0x8005, 0
-	special DoSpecialTrainerBattle
-	waitstate
-	frontier_saveparty
-	special LoadPlayerParty
+	multi_2_vs_2 TRAINER_MAXIE_MOSSDEEP, MossdeepCity_SpaceCenter_2F_Text_JustWantToExpandLand, TRAINER_TABITHA_MOSSDEEP, MossdeepCity_SpaceCenter_Text_TabithaDefeat, PARTNER_STEVEN, TRAINER_BACK_PIC_STEVEN
 	switch VAR_RESULT
 	case 1, MossdeepCity_SpaceCenter_2F_EventScript_DefeatedMaxieTabitha
 	fadescreen FADE_TO_BLACK
@@ -336,14 +329,6 @@ MossdeepCity_SpaceCenter_2F_EventScript_StevenFacePlayerWest::
 	turnobject LOCALID_STEVEN, DIR_EAST
 	return

-MossdeepCity_SpaceCenter_2F_EventScript_MaxieTrainer::
-	trainerbattle TRAINER_BATTLE_SET_TRAINER_A, TRAINER_MAXIE_MOSSDEEP, 0, MossdeepCity_SpaceCenter_2F_Text_JustWantToExpandLand, MossdeepCity_SpaceCenter_2F_Text_JustWantToExpandLand
-	end
-
-MossdeepCity_SpaceCenter_2F_EventScript_TabithaTrainer::
-	trainerbattle TRAINER_BATTLE_SET_TRAINER_B, TRAINER_TABITHA_MOSSDEEP, 0, MossdeepCity_SpaceCenter_Text_TabithaDefeat, MossdeepCity_SpaceCenter_Text_TabithaDefeat
-	end
-
 MossdeepCity_SpaceCenter_2F_EventScript_RivalRayquazaCall::
 	lockall
 	checkplayergender
--- a/data/maps/MtPyre_2F/map.json
+++ b/data/maps/MtPyre_2F/map.json
@@ -36,8 +36,8 @@
      "movement_range_x": 1,
      "movement_range_y": 1,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "MtPyre_2F_EventScript_ItemUltraBall",
+      "trainer_sight_or_berry_tree_id": "ITEM_ULTRA_BALL",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_MT_PYRE_2F_ULTRA_BALL"
    },
    {
--- a/data/maps/MtPyre_3F/map.json
+++ b/data/maps/MtPyre_3F/map.json
@@ -49,8 +49,8 @@
      "movement_range_x": 1,
      "movement_range_y": 1,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "MtPyre_3F_EventScript_ItemSuperRepel",
+      "trainer_sight_or_berry_tree_id": "ITEM_SUPER_REPEL",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_MT_PYRE_3F_SUPER_REPEL"
    },
    {
--- a/data/maps/MtPyre_4F/map.json
+++ b/data/maps/MtPyre_4F/map.json
@@ -36,8 +36,8 @@
      "movement_range_x": 1,
      "movement_range_y": 1,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "MtPyre_4F_EventScript_ItemSeaIncense",
+      "trainer_sight_or_berry_tree_id": "ITEM_SEA_INCENSE",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_MT_PYRE_4F_SEA_INCENSE"
    }
  ],
--- a/data/maps/MtPyre_5F/map.json
+++ b/data/maps/MtPyre_5F/map.json
@@ -36,8 +36,8 @@
      "movement_range_x": 1,
      "movement_range_y": 1,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "MtPyre_5F_EventScript_ItemLaxIncense",
+      "trainer_sight_or_berry_tree_id": "ITEM_LAX_INCENSE",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_MT_PYRE_5F_LAX_INCENSE"
    }
  ],
--- a/data/maps/MtPyre_6F/map.json
+++ b/data/maps/MtPyre_6F/map.json
@@ -36,8 +36,8 @@
      "movement_range_x": 1,
      "movement_range_y": 1,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "MtPyre_6F_EventScript_ItemTMShadowBall",
+      "trainer_sight_or_berry_tree_id": "ITEM_TM_SHADOW_BALL",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_MT_PYRE_6F_TM_SHADOW_BALL"
    },
    {
--- a/data/maps/MtPyre_Exterior/map.json
+++ b/data/maps/MtPyre_Exterior/map.json
@@ -23,8 +23,8 @@
      "movement_range_x": 0,
      "movement_range_y": 0,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "MtPyre_Exterior_EventScript_ItemMaxPotion",
+      "trainer_sight_or_berry_tree_id": "ITEM_MAX_POTION",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_MT_PYRE_EXTERIOR_MAX_POTION"
    },
    {
@@ -36,8 +36,8 @@
      "movement_range_x": 0,
      "movement_range_y": 0,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "MtPyre_Exterior_EventScript_ItemTMSkillSwap",
+      "trainer_sight_or_berry_tree_id": "ITEM_TM_SKILL_SWAP",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_MT_PYRE_EXTERIOR_TM_SKILL_SWAP"
    }
  ],
--- a/data/maps/NewMauville_Inside/map.json
+++ b/data/maps/NewMauville_Inside/map.json
@@ -23,8 +23,8 @@
      "movement_range_x": 0,
      "movement_range_y": 0,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "NewMauville_Inside_EventScript_ItemUltraBall",
+      "trainer_sight_or_berry_tree_id": "ITEM_ULTRA_BALL",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_NEW_MAUVILLE_ULTRA_BALL"
    },
    {
@@ -36,8 +36,8 @@
      "movement_range_x": 0,
      "movement_range_y": 0,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "NewMauville_Inside_EventScript_ItemEscapeRope",
+      "trainer_sight_or_berry_tree_id": "ITEM_ESCAPE_ROPE",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_NEW_MAUVILLE_ESCAPE_ROPE"
    },
    {
@@ -49,8 +49,8 @@
      "movement_range_x": 1,
      "movement_range_y": 1,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "NewMauville_Inside_EventScript_ItemThunderStone",
+      "trainer_sight_or_berry_tree_id": "ITEM_THUNDER_STONE",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_NEW_MAUVILLE_THUNDER_STONE"
    },
    {
@@ -62,8 +62,8 @@
      "movement_range_x": 1,
      "movement_range_y": 1,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "NewMauville_Inside_EventScript_ItemFullHeal",
+      "trainer_sight_or_berry_tree_id": "ITEM_FULL_HEAL",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_NEW_MAUVILLE_FULL_HEAL"
    },
    {
@@ -75,8 +75,8 @@
      "movement_range_x": 1,
      "movement_range_y": 1,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "NewMauville_Inside_EventScript_ItemParalyzeHeal",
+      "trainer_sight_or_berry_tree_id": "ITEM_PARALYZE_HEAL",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_NEW_MAUVILLE_PARALYZE_HEAL"
    },
    {
--- a/data/maps/PetalburgCity/map.json
+++ b/data/maps/PetalburgCity/map.json
@@ -99,8 +99,8 @@
      "movement_range_x": 0,
      "movement_range_y": 0,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "PetalburgCity_EventScript_ItemMaxRevive",
+      "trainer_sight_or_berry_tree_id": "ITEM_MAX_REVIVE",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_PETALBURG_CITY_MAX_REVIVE"
    },
    {
@@ -112,8 +112,8 @@
      "movement_range_x": 0,
      "movement_range_y": 0,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "PetalburgCity_EventScript_ItemEther",
+      "trainer_sight_or_berry_tree_id": "ITEM_ETHER",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_PETALBURG_CITY_ETHER"
    },
    {
--- a/data/maps/PetalburgWoods/map.json
+++ b/data/maps/PetalburgWoods/map.json
@@ -75,8 +75,8 @@
      "movement_range_x": 0,
      "movement_range_y": 0,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "PetalburgWoods_EventScript_ItemGreatBall",
+      "trainer_sight_or_berry_tree_id": "ITEM_GREAT_BALL",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_PETALBURG_WOODS_GREAT_BALL"
    },
    {
@@ -88,8 +88,8 @@
      "movement_range_x": 0,
      "movement_range_y": 0,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "PetalburgWoods_EventScript_ItemXAttack",
+      "trainer_sight_or_berry_tree_id": "ITEM_X_ATTACK",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_PETALBURG_WOODS_X_ATTACK"
    },
    {
@@ -101,8 +101,8 @@
      "movement_range_x": 0,
      "movement_range_y": 0,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "PetalburgWoods_EventScript_ItemEther",
+      "trainer_sight_or_berry_tree_id": "ITEM_ETHER",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_PETALBURG_WOODS_ETHER"
    },
    {
@@ -166,8 +166,8 @@
      "movement_range_x": 1,
      "movement_range_y": 1,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "PetalburgWoods_EventScript_ItemParalyzeHeal",
+      "trainer_sight_or_berry_tree_id": "ITEM_PARALYZE_HEAL",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_PETALBURG_WOODS_PARALYZE_HEAL"
    },
    {
--- a/data/maps/Route102/map.json
+++ b/data/maps/Route102/map.json
@@ -99,8 +99,8 @@
      "movement_range_x": 0,
      "movement_range_y": 0,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route102_EventScript_ItemPotion",
+      "trainer_sight_or_berry_tree_id": "ITEM_POTION",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_ROUTE_102_POTION"
    },
    {
--- a/data/maps/Route103/map.json
+++ b/data/maps/Route103/map.json
@@ -190,8 +190,8 @@
      "movement_range_x": 1,
      "movement_range_y": 1,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route103_EventScript_ItemGuardSpec",
+      "trainer_sight_or_berry_tree_id": "ITEM_GUARD_SPEC",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_ROUTE_103_GUARD_SPEC"
    },
    {
@@ -281,8 +281,8 @@
      "movement_range_x": 1,
      "movement_range_y": 1,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route103_EventScript_ItemPPUp",
+      "trainer_sight_or_berry_tree_id": "ITEM_PP_UP",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_ROUTE_103_PP_UP"
    }
  ],
--- a/data/maps/Route104/map.json
+++ b/data/maps/Route104/map.json
@@ -299,8 +299,8 @@
      "movement_range_x": 0,
      "movement_range_y": 0,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route104_EventScript_ItemPPUp",
+      "trainer_sight_or_berry_tree_id": "ITEM_PP_UP",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_ROUTE_104_PP_UP"
    },
    {
@@ -377,8 +377,8 @@
      "movement_range_x": 1,
      "movement_range_y": 1,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route104_EventScript_ItemPokeBall",
+      "trainer_sight_or_berry_tree_id": "ITEM_POKE_BALL",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_ROUTE_104_POKE_BALL"
    },
    {
@@ -403,8 +403,8 @@
      "movement_range_x": 1,
      "movement_range_y": 1,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route104_EventScript_ItemXAccuracy",
+      "trainer_sight_or_berry_tree_id": "ITEM_X_ACCURACY",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_ROUTE_104_X_ACCURACY"
    },
    {
@@ -429,8 +429,8 @@
      "movement_range_x": 1,
      "movement_range_y": 1,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route104_EventScript_ItemPotion",
+      "trainer_sight_or_berry_tree_id": "ITEM_POTION",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_ROUTE_104_POTION"
    },
    {
--- a/data/maps/Route105/map.json
+++ b/data/maps/Route105/map.json
@@ -91,8 +91,8 @@
      "movement_range_x": 0,
      "movement_range_y": 0,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route105_EventScript_ItemIron",
+      "trainer_sight_or_berry_tree_id": "ITEM_IRON",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_ROUTE_105_IRON"
    },
    {
--- a/data/maps/Route106/map.json
+++ b/data/maps/Route106/map.json
@@ -86,8 +86,8 @@
      "movement_range_x": 0,
      "movement_range_y": 0,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route106_EventScript_ItemProtein",
+      "trainer_sight_or_berry_tree_id": "ITEM_PROTEIN",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_ROUTE_106_PROTEIN"
    }
  ],
--- a/data/maps/Route108/map.json
+++ b/data/maps/Route108/map.json
@@ -112,8 +112,8 @@
      "movement_range_x": 1,
      "movement_range_y": 1,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route108_EventScript_ItemStarPiece",
+      "trainer_sight_or_berry_tree_id": "ITEM_STAR_PIECE",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_ROUTE_108_STAR_PIECE"
    }
  ],
--- a/data/maps/Route109/map.json
+++ b/data/maps/Route109/map.json
@@ -151,8 +151,8 @@
      "movement_range_x": 0,
      "movement_range_y": 0,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route109_EventScript_ItemPPUp",
+      "trainer_sight_or_berry_tree_id": "ITEM_PP_UP",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_ROUTE_109_PP_UP"
    },
    {
@@ -320,8 +320,8 @@
      "movement_range_x": 1,
      "movement_range_y": 1,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route109_EventScript_ItemPotion",
+      "trainer_sight_or_berry_tree_id": "ITEM_POTION",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_ROUTE_109_POTION"
    },
    {
--- a/data/maps/Route110/map.json
+++ b/data/maps/Route110/map.json
@@ -273,8 +273,8 @@
      "movement_range_x": 0,
      "movement_range_y": 0,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route110_EventScript_ItemDireHit",
+      "trainer_sight_or_berry_tree_id": "ITEM_DIRE_HIT",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_ROUTE_110_DIRE_HIT"
    },
    {
@@ -286,8 +286,8 @@
      "movement_range_x": 0,
      "movement_range_y": 0,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route110_EventScript_ItemRareCandy",
+      "trainer_sight_or_berry_tree_id": "ITEM_RARE_CANDY",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_ROUTE_110_RARE_CANDY"
    },
    {
@@ -481,8 +481,8 @@
      "movement_range_x": 1,
      "movement_range_y": 1,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route110_EventScript_ItemElixir",
+      "trainer_sight_or_berry_tree_id": "ITEM_ELIXIR",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_ROUTE_110_ELIXIR"
    },
    {
--- a/data/maps/Route110_TrickHousePuzzle1/map.json
+++ b/data/maps/Route110_TrickHousePuzzle1/map.json
@@ -179,8 +179,8 @@
      "movement_range_x": 0,
      "movement_range_y": 0,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route110_TrickHousePuzzle1_EventScript_ItemOrangeMail",
+      "trainer_sight_or_berry_tree_id": "ITEM_ORANGE_MAIL",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_1_ORANGE_MAIL"
    },
    {
--- a/data/maps/Route110_TrickHousePuzzle2/map.json
+++ b/data/maps/Route110_TrickHousePuzzle2/map.json
@@ -62,8 +62,8 @@
      "movement_range_x": 0,
      "movement_range_y": 0,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route110_TrickHousePuzzle2_EventScript_ItemWaveMail",
+      "trainer_sight_or_berry_tree_id": "ITEM_WAVE_MAIL",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_2_WAVE_MAIL"
    },
    {
@@ -75,8 +75,8 @@
      "movement_range_x": 0,
      "movement_range_y": 0,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route110_TrickHousePuzzle2_EventScript_ItemHarborMail",
+      "trainer_sight_or_berry_tree_id": "ITEM_HARBOR_MAIL",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_2_HARBOR_MAIL"
    }
  ],
--- a/data/maps/Route110_TrickHousePuzzle3/map.json
+++ b/data/maps/Route110_TrickHousePuzzle3/map.json
@@ -62,8 +62,8 @@
      "movement_range_x": 0,
      "movement_range_y": 0,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route110_TrickHousePuzzle3_EventScript_ItemWoodMail",
+      "trainer_sight_or_berry_tree_id": "ITEM_WOOD_MAIL",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_3_WOOD_MAIL"
    },
    {
@@ -75,8 +75,8 @@
      "movement_range_x": 0,
      "movement_range_y": 0,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route110_TrickHousePuzzle3_EventScript_ItemShadowMail",
+      "trainer_sight_or_berry_tree_id": "ITEM_SHADOW_MAIL",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_3_SHADOW_MAIL"
    },
    {
--- a/data/maps/Route110_TrickHousePuzzle4/map.json
+++ b/data/maps/Route110_TrickHousePuzzle4/map.json
@@ -62,8 +62,8 @@
      "movement_range_x": 0,
      "movement_range_y": 0,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route110_TrickHousePuzzle4_EventScript_ItemMechMail",
+      "trainer_sight_or_berry_tree_id": "ITEM_MECH_MAIL",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_4_MECH_MAIL"
    },
    {
--- a/data/maps/Route110_TrickHousePuzzle6/map.json
+++ b/data/maps/Route110_TrickHousePuzzle6/map.json
@@ -62,8 +62,8 @@
      "movement_range_x": 0,
      "movement_range_y": 0,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route110_TrickHousePuzzle6_EventScript_ItemGlitterMail",
+      "trainer_sight_or_berry_tree_id": "ITEM_GLITTER_MAIL",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_6_GLITTER_MAIL"
    }
  ],
--- a/data/maps/Route110_TrickHousePuzzle7/map.json
+++ b/data/maps/Route110_TrickHousePuzzle7/map.json
@@ -62,8 +62,8 @@
      "movement_range_x": 0,
      "movement_range_y": 0,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route110_TrickHousePuzzle7_EventScript_ItemTropicMail",
+      "trainer_sight_or_berry_tree_id": "ITEM_TROPIC_MAIL",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_7_TROPIC_MAIL"
    },
    {
--- a/data/maps/Route110_TrickHousePuzzle8/map.json
+++ b/data/maps/Route110_TrickHousePuzzle8/map.json
@@ -62,8 +62,8 @@
      "movement_range_x": 0,
      "movement_range_y": 0,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route110_TrickHousePuzzle8_EventScript_ItemBeadMail",
+      "trainer_sight_or_berry_tree_id": "ITEM_BEAD_MAIL",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_8_BEAD_MAIL"
    }
  ],
--- a/data/maps/Route111/map.json
+++ b/data/maps/Route111/map.json
@@ -260,8 +260,8 @@
      "movement_range_x": 0,
      "movement_range_y": 0,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route111_EventScript_ItemTMSandstorm",
+      "trainer_sight_or_berry_tree_id": "ITEM_TM_SANDSTORM",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_ROUTE_111_TM_SANDSTORM"
    },
    {
@@ -351,8 +351,8 @@
      "movement_range_x": 0,
      "movement_range_y": 0,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route111_EventScript_ItemStardust",
+      "trainer_sight_or_berry_tree_id": "ITEM_STARDUST",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_ROUTE_111_STARDUST"
    },
    {
@@ -364,8 +364,8 @@
      "movement_range_x": 0,
      "movement_range_y": 0,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route111_EventScript_ItemHPUp",
+      "trainer_sight_or_berry_tree_id": "ITEM_HP_UP",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_ROUTE_111_HP_UP"
    },
    {
@@ -572,8 +572,8 @@
      "movement_range_x": 1,
      "movement_range_y": 1,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route111_EventScript_ItemElixir",
+      "trainer_sight_or_berry_tree_id": "ITEM_ELIXIR",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_ROUTE_111_ELIXIR"
    },
    {
--- a/data/maps/Route112/map.json
+++ b/data/maps/Route112/map.json
@@ -182,8 +182,8 @@
      "movement_range_x": 0,
      "movement_range_y": 0,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route112_EventScript_ItemNugget",
+      "trainer_sight_or_berry_tree_id": "ITEM_NUGGET",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_ROUTE_112_NUGGET"
    },
    {
--- a/data/maps/Route113/map.json
+++ b/data/maps/Route113/map.json
@@ -104,8 +104,8 @@
      "movement_range_x": 0,
      "movement_range_y": 0,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route113_EventScript_ItemMaxEther",
+      "trainer_sight_or_berry_tree_id": "ITEM_MAX_ETHER",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_ROUTE_113_MAX_ETHER"
    },
    {
@@ -117,8 +117,8 @@
      "movement_range_x": 0,
      "movement_range_y": 0,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route113_EventScript_ItemSuperRepel",
+      "trainer_sight_or_berry_tree_id": "ITEM_SUPER_REPEL",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_ROUTE_113_SUPER_REPEL"
    },
    {
@@ -182,8 +182,8 @@
      "movement_range_x": 1,
      "movement_range_y": 1,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route113_EventScript_ItemHyperPotion",
+      "trainer_sight_or_berry_tree_id": "ITEM_HYPER_POTION",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_ROUTE_113_HYPER_POTION"
    },
    {
--- a/data/maps/Route114/map.json
+++ b/data/maps/Route114/map.json
@@ -138,8 +138,8 @@
      "movement_range_x": 0,
      "movement_range_y": 0,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route114_EventScript_ItemRareCandy",
+      "trainer_sight_or_berry_tree_id": "ITEM_RARE_CANDY",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_ROUTE_114_RARE_CANDY"
    },
    {
@@ -151,8 +151,8 @@
      "movement_range_x": 0,
      "movement_range_y": 0,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route114_EventScript_ItemProtein",
+      "trainer_sight_or_berry_tree_id": "ITEM_PROTEIN",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_ROUTE_114_PROTEIN"
    },
    {
@@ -359,8 +359,8 @@
      "movement_range_x": 1,
      "movement_range_y": 1,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route114_EventScript_ItemEnergyPowder",
+      "trainer_sight_or_berry_tree_id": "ITEM_ENERGY_POWDER",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_ROUTE_114_ENERGY_POWDER"
    },
    {
--- a/data/maps/Route115/map.json
+++ b/data/maps/Route115/map.json
@@ -151,8 +151,8 @@
      "movement_range_x": 0,
      "movement_range_y": 0,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route115_EventScript_ItemSuperPotion",
+      "trainer_sight_or_berry_tree_id": "ITEM_SUPER_POTION",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_ROUTE_115_SUPER_POTION"
    },
    {
@@ -164,8 +164,8 @@
      "movement_range_x": 0,
      "movement_range_y": 0,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route115_EventScript_ItemTMFocusPunch",
+      "trainer_sight_or_berry_tree_id": "ITEM_TM_FOCUS_PUNCH",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_ROUTE_115_TM_FOCUS_PUNCH"
    },
    {
@@ -177,8 +177,8 @@
      "movement_range_x": 0,
      "movement_range_y": 0,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route115_EventScript_ItemIron",
+      "trainer_sight_or_berry_tree_id": "ITEM_IRON",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_ROUTE_115_IRON"
    },
    {
@@ -229,8 +229,8 @@
      "movement_range_x": 1,
      "movement_range_y": 1,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route115_EventScript_ItemGreatBall",
+      "trainer_sight_or_berry_tree_id": "ITEM_GREAT_BALL",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_ROUTE_115_GREAT_BALL"
    },
    {
@@ -307,8 +307,8 @@
      "movement_range_x": 1,
      "movement_range_y": 1,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route115_EventScript_ItemPPUp",
+      "trainer_sight_or_berry_tree_id": "ITEM_PP_UP",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_ROUTE_115_PP_UP"
    },
    {
@@ -320,8 +320,8 @@
      "movement_range_x": 1,
      "movement_range_y": 1,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route115_EventScript_ItemHealPowder",
+      "trainer_sight_or_berry_tree_id": "ITEM_HEAL_POWDER",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_ROUTE_115_HEAL_POWDER"
    }
  ],
--- a/data/maps/Route116/map.json
+++ b/data/maps/Route116/map.json
@@ -112,8 +112,8 @@
      "movement_range_x": 0,
      "movement_range_y": 0,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route116_EventScript_ItemEther",
+      "trainer_sight_or_berry_tree_id": "ITEM_ETHER",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_ROUTE_116_ETHER"
    },
    {
@@ -125,8 +125,8 @@
      "movement_range_x": 0,
      "movement_range_y": 0,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route116_EventScript_ItemRepel",
+      "trainer_sight_or_berry_tree_id": "ITEM_REPEL",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_ROUTE_116_REPEL"
    },
    {
@@ -216,8 +216,8 @@
      "movement_range_x": 0,
      "movement_range_y": 0,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route116_EventScript_ItemHPUp",
+      "trainer_sight_or_berry_tree_id": "ITEM_HP_UP",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_ROUTE_116_HP_UP"
    },
    {
@@ -281,8 +281,8 @@
      "movement_range_x": 1,
      "movement_range_y": 1,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route116_EventScript_ItemXSpecial",
+      "trainer_sight_or_berry_tree_id": "ITEM_X_SPECIAL",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_ROUTE_116_X_SPECIAL"
    },
    {
@@ -346,8 +346,8 @@
      "movement_range_x": 1,
      "movement_range_y": 1,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route116_EventScript_ItemPotion",
+      "trainer_sight_or_berry_tree_id": "ITEM_POTION",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_ROUTE_116_POTION"
    },
    {
--- a/data/maps/Route117/map.json
+++ b/data/maps/Route117/map.json
@@ -203,8 +203,8 @@
      "movement_range_x": 0,
      "movement_range_y": 0,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route117_EventScript_ItemGreatBall",
+      "trainer_sight_or_berry_tree_id": "ITEM_GREAT_BALL",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_ROUTE_117_GREAT_BALL"
    },
    {
@@ -229,8 +229,8 @@
      "movement_range_x": 0,
      "movement_range_y": 0,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route117_EventScript_ItemRevive",
+      "trainer_sight_or_berry_tree_id": "ITEM_REVIVE",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_ROUTE_117_REVIVE"
    },
    {
--- a/data/maps/Route118/map.json
+++ b/data/maps/Route118/map.json
@@ -286,8 +286,8 @@
      "movement_range_x": 1,
      "movement_range_y": 1,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route118_EventScript_ItemHyperPotion",
+      "trainer_sight_or_berry_tree_id": "ITEM_HYPER_POTION",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_ROUTE_118_HYPER_POTION"
    },
    {
--- a/data/maps/Route119/map.json
+++ b/data/maps/Route119/map.json
@@ -242,8 +242,8 @@
      "movement_range_x": 0,
      "movement_range_y": 0,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route119_EventScript_ItemSuperRepel",
+      "trainer_sight_or_berry_tree_id": "ITEM_SUPER_REPEL",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_ROUTE_119_SUPER_REPEL"
    },
    {
@@ -255,8 +255,8 @@
      "movement_range_x": 0,
      "movement_range_y": 0,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route119_EventScript_ItemZinc",
+      "trainer_sight_or_berry_tree_id": "ITEM_ZINC",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_ROUTE_119_ZINC"
    },
    {
@@ -268,8 +268,8 @@
      "movement_range_x": 0,
      "movement_range_y": 0,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route119_EventScript_ItemElixir",
+      "trainer_sight_or_berry_tree_id": "ITEM_ELIXIR",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_ROUTE_119_ELIXIR_1"
    },
    {
@@ -281,8 +281,8 @@
      "movement_range_x": 0,
      "movement_range_y": 0,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route119_EventScript_ItemLeafStone",
+      "trainer_sight_or_berry_tree_id": "ITEM_LEAF_STONE",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_ROUTE_119_LEAF_STONE"
    },
    {
@@ -294,8 +294,8 @@
      "movement_range_x": 0,
      "movement_range_y": 0,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route119_EventScript_ItemRareCandy",
+      "trainer_sight_or_berry_tree_id": "ITEM_RARE_CANDY",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_ROUTE_119_RARE_CANDY"
    },
    {
@@ -307,8 +307,8 @@
      "movement_range_x": 0,
      "movement_range_y": 0,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route119_EventScript_ItemHyperPotion",
+      "trainer_sight_or_berry_tree_id": "ITEM_HYPER_POTION",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_ROUTE_119_HYPER_POTION_1"
    },
    {
@@ -437,8 +437,8 @@
      "movement_range_x": 1,
      "movement_range_y": 1,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route119_EventScript_ItemHyperPotion2",
+      "trainer_sight_or_berry_tree_id": "ITEM_HYPER_POTION",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_ROUTE_119_HYPER_POTION_2"
    },
    {
@@ -554,8 +554,8 @@
      "movement_range_x": 1,
      "movement_range_y": 1,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route119_EventScript_ItemNugget",
+      "trainer_sight_or_berry_tree_id": "ITEM_NUGGET",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_ROUTE_119_NUGGET"
    },
    {
@@ -567,8 +567,8 @@
      "movement_range_x": 1,
      "movement_range_y": 1,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route119_EventScript_ItemElixir2",
+      "trainer_sight_or_berry_tree_id": "ITEM_ELIXIR",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_ROUTE_119_ELIXIR_2"
    },
    {
--- a/data/maps/Route120/map.json
+++ b/data/maps/Route120/map.json
@@ -229,8 +229,8 @@
      "movement_range_x": 0,
      "movement_range_y": 0,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route120_EventScript_ItemNugget",
+      "trainer_sight_or_berry_tree_id": "ITEM_NUGGET",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_ROUTE_120_NUGGET"
    },
    {
@@ -307,8 +307,8 @@
      "movement_range_x": 0,
      "movement_range_y": 0,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route120_EventScript_ItemFullHeal",
+      "trainer_sight_or_berry_tree_id": "ITEM_FULL_HEAL",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_ROUTE_120_FULL_HEAL"
    },
    {
@@ -385,8 +385,8 @@
      "movement_range_x": 1,
      "movement_range_y": 1,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route120_EventScript_ItemNestBall",
+      "trainer_sight_or_berry_tree_id": "ITEM_NEST_BALL",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_ROUTE_120_NEST_BALL"
    },
    {
@@ -398,8 +398,8 @@
      "movement_range_x": 1,
      "movement_range_y": 1,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route120_EventScript_ItemHyperPotion",
+      "trainer_sight_or_berry_tree_id": "ITEM_HYPER_POTION",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_ROUTE_120_HYPER_POTION"
    },
    {
@@ -593,8 +593,8 @@
      "movement_range_x": 1,
      "movement_range_y": 1,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route120_EventScript_ItemRevive",
+      "trainer_sight_or_berry_tree_id": "ITEM_REVIVE",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_ROUTE_120_REVIVE"
    }
  ],
--- a/data/maps/Route121/map.json
+++ b/data/maps/Route121/map.json
@@ -299,8 +299,8 @@
      "movement_range_x": 1,
      "movement_range_y": 1,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route121_EventScript_ItemCarbos",
+      "trainer_sight_or_berry_tree_id": "ITEM_CARBOS",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_ROUTE_121_CARBOS"
    },
    {
@@ -390,8 +390,8 @@
      "movement_range_x": 1,
      "movement_range_y": 1,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route121_EventScript_ItemRevive",
+      "trainer_sight_or_berry_tree_id": "ITEM_REVIVE",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_ROUTE_121_REVIVE"
    },
    {
@@ -403,8 +403,8 @@
      "movement_range_x": 1,
      "movement_range_y": 1,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route121_EventScript_ItemZinc",
+      "trainer_sight_or_berry_tree_id": "ITEM_ZINC",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_ROUTE_121_ZINC"
    }
  ],
--- a/data/maps/Route123/map.json
+++ b/data/maps/Route123/map.json
@@ -294,8 +294,8 @@
      "movement_range_x": 0,
      "movement_range_y": 0,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route123_EventScript_ItemCalcium",
+      "trainer_sight_or_berry_tree_id": "ITEM_CALCIUM",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_ROUTE_123_CALCIUM"
    },
    {
@@ -437,8 +437,8 @@
      "movement_range_x": 1,
      "movement_range_y": 1,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route123_EventScript_ItemUltraBall",
+      "trainer_sight_or_berry_tree_id": "ITEM_ULTRA_BALL",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_ROUTE_123_ULTRA_BALL"
    },
    {
@@ -450,8 +450,8 @@
      "movement_range_x": 1,
      "movement_range_y": 1,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route123_EventScript_ItemElixir",
+      "trainer_sight_or_berry_tree_id": "ITEM_ELIXIR",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_ROUTE_123_ELIXIR"
    },
    {
@@ -541,8 +541,8 @@
      "movement_range_x": 1,
      "movement_range_y": 1,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route123_EventScript_ItemPPUp",
+      "trainer_sight_or_berry_tree_id": "ITEM_PP_UP",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_ROUTE_123_PP_UP"
    },
    {
@@ -580,8 +580,8 @@
      "movement_range_x": 1,
      "movement_range_y": 1,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route123_EventScript_ItemRevivalHerb",
+      "trainer_sight_or_berry_tree_id": "ITEM_REVIVAL_HERB",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_ROUTE_123_REVIVAL_HERB"
    }
  ],
--- a/data/maps/Route124/map.json
+++ b/data/maps/Route124/map.json
@@ -114,8 +114,8 @@
      "movement_range_x": 1,
      "movement_range_y": 1,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route124_EventScript_ItemRedShard",
+      "trainer_sight_or_berry_tree_id": "ITEM_RED_SHARD",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_ROUTE_124_RED_SHARD"
    },
    {
@@ -127,8 +127,8 @@
      "movement_range_x": 1,
      "movement_range_y": 1,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route124_EventScript_ItemBlueShard",
+      "trainer_sight_or_berry_tree_id": "ITEM_BLUE_SHARD",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_ROUTE_124_BLUE_SHARD"
    },
    {
@@ -140,8 +140,8 @@
      "movement_range_x": 1,
      "movement_range_y": 1,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route124_EventScript_ItemYellowShard",
+      "trainer_sight_or_berry_tree_id": "ITEM_YELLOW_SHARD",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_ROUTE_124_YELLOW_SHARD"
    },
    {
--- a/data/maps/Route125/map.json
+++ b/data/maps/Route125/map.json
@@ -156,8 +156,8 @@
      "movement_range_x": 1,
      "movement_range_y": 1,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route125_EventScript_ItemBigPearl",
+      "trainer_sight_or_berry_tree_id": "ITEM_BIG_PEARL",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_ROUTE_125_BIG_PEARL"
    }
  ],
--- a/data/maps/Route126/map.json
+++ b/data/maps/Route126/map.json
@@ -91,8 +91,8 @@
      "movement_range_x": 1,
      "movement_range_y": 1,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route126_EventScript_ItemGreenShard",
+      "trainer_sight_or_berry_tree_id": "ITEM_GREEN_SHARD",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_ROUTE_126_GREEN_SHARD"
    },
    {
--- a/data/maps/Route127/map.json
+++ b/data/maps/Route127/map.json
@@ -70,8 +70,8 @@
      "movement_range_x": 0,
      "movement_range_y": 0,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route127_EventScript_ItemZinc",
+      "trainer_sight_or_berry_tree_id": "ITEM_ZINC",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_ROUTE_127_ZINC"
    },
    {
@@ -83,8 +83,8 @@
      "movement_range_x": 0,
      "movement_range_y": 0,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route127_EventScript_ItemCarbos",
+      "trainer_sight_or_berry_tree_id": "ITEM_CARBOS",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_ROUTE_127_CARBOS"
    },
    {
@@ -174,8 +174,8 @@
      "movement_range_x": 0,
      "movement_range_y": 0,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route127_EventScript_ItemRareCandy",
+      "trainer_sight_or_berry_tree_id": "ITEM_RARE_CANDY",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_ROUTE_127_RARE_CANDY"
    }
  ],
--- a/data/maps/Route132/map.json
+++ b/data/maps/Route132/map.json
@@ -60,8 +60,8 @@
      "movement_range_x": 0,
      "movement_range_y": 0,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route132_EventScript_ItemRareCandy",
+      "trainer_sight_or_berry_tree_id": "ITEM_RARE_CANDY",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_ROUTE_132_RARE_CANDY"
    },
    {
@@ -151,8 +151,8 @@
      "movement_range_x": 1,
      "movement_range_y": 1,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route132_EventScript_ItemProtein",
+      "trainer_sight_or_berry_tree_id": "ITEM_PROTEIN",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_ROUTE_132_PROTEIN"
    }
  ],
--- a/data/maps/Route133/map.json
+++ b/data/maps/Route133/map.json
@@ -73,8 +73,8 @@
      "movement_range_x": 0,
      "movement_range_y": 0,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route133_EventScript_ItemBigPearl",
+      "trainer_sight_or_berry_tree_id": "ITEM_BIG_PEARL",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_ROUTE_133_BIG_PEARL"
    },
    {
@@ -86,8 +86,8 @@
      "movement_range_x": 0,
      "movement_range_y": 0,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route133_EventScript_ItemStarPiece",
+      "trainer_sight_or_berry_tree_id": "ITEM_STAR_PIECE",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_ROUTE_133_STAR_PIECE"
    },
    {
@@ -151,8 +151,8 @@
      "movement_range_x": 1,
      "movement_range_y": 1,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route133_EventScript_ItemMaxRevive",
+      "trainer_sight_or_berry_tree_id": "ITEM_MAX_REVIVE",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_ROUTE_133_MAX_REVIVE"
    }
  ],
--- a/data/maps/Route134/map.json
+++ b/data/maps/Route134/map.json
@@ -151,8 +151,8 @@
      "movement_range_x": 1,
      "movement_range_y": 1,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route134_EventScript_ItemCarbos",
+      "trainer_sight_or_berry_tree_id": "ITEM_CARBOS",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_ROUTE_134_CARBOS"
    },
    {
@@ -164,8 +164,8 @@
      "movement_range_x": 1,
      "movement_range_y": 1,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route134_EventScript_ItemStarPiece",
+      "trainer_sight_or_berry_tree_id": "ITEM_STAR_PIECE",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_ROUTE_134_STAR_PIECE"
    }
  ],
--- a/data/maps/RustboroCity/map.json
+++ b/data/maps/RustboroCity/map.json
@@ -182,8 +182,8 @@
      "movement_range_x": 0,
      "movement_range_y": 0,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "RustboroCity_EventScript_ItemXDefend",
+      "trainer_sight_or_berry_tree_id": "ITEM_X_DEFEND",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_RUSTBORO_CITY_X_DEFEND"
    },
    {
--- a/data/maps/RusturfTunnel/map.json
+++ b/data/maps/RusturfTunnel/map.json
@@ -49,8 +49,8 @@
      "movement_range_x": 0,
      "movement_range_y": 0,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "RusturfTunnel_EventScript_ItemPokeBall",
+      "trainer_sight_or_berry_tree_id": "ITEM_POKE_BALL",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_RUSTURF_TUNNEL_POKE_BALL"
    },
    {
@@ -62,8 +62,8 @@
      "movement_range_x": 0,
      "movement_range_y": 0,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "RusturfTunnel_EventScript_ItemMaxEther",
+      "trainer_sight_or_berry_tree_id": "ITEM_MAX_ETHER",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_RUSTURF_TUNNEL_MAX_ETHER"
    },
    {
--- a/data/maps/SafariZone_North/map.json
+++ b/data/maps/SafariZone_North/map.json
@@ -143,8 +143,8 @@
      "movement_range_x": 1,
      "movement_range_y": 1,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "SafariZone_North_EventScript_ItemCalcium",
+      "trainer_sight_or_berry_tree_id": "ITEM_CALCIUM",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_SAFARI_ZONE_NORTH_CALCIUM"
    }
  ],
--- a/data/maps/SafariZone_Northeast/map.json
+++ b/data/maps/SafariZone_Northeast/map.json
@@ -138,8 +138,8 @@
      "movement_range_x": 1,
      "movement_range_y": 1,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "SafariZone_Northeast_EventScript_ItemNugget",
+      "trainer_sight_or_berry_tree_id": "ITEM_NUGGET",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_SAFARI_ZONE_NORTH_EAST_NUGGET"
    }
  ],
--- a/data/maps/SafariZone_Northwest/map.json
+++ b/data/maps/SafariZone_Northwest/map.json
@@ -47,8 +47,8 @@
      "movement_range_x": 1,
      "movement_range_y": 1,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "SafariZone_Northwest_EventScript_ItemTMSolarBeam",
+      "trainer_sight_or_berry_tree_id": "ITEM_TM_SOLAR_BEAM",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_SAFARI_ZONE_NORTH_WEST_TM_SOLAR_BEAM"
    }
  ],
--- a/data/maps/SafariZone_Southeast/map.json
+++ b/data/maps/SafariZone_Southeast/map.json
@@ -73,8 +73,8 @@
      "movement_range_x": 1,
      "movement_range_y": 1,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "SafariZone_Southeast_EventScript_ItemBigPearl",
+      "trainer_sight_or_berry_tree_id": "ITEM_BIG_PEARL",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_SAFARI_ZONE_SOUTH_EAST_BIG_PEARL"
    },
    {
--- a/data/maps/SafariZone_Southwest/map.json
+++ b/data/maps/SafariZone_Southwest/map.json
@@ -47,8 +47,8 @@
      "movement_range_x": 1,
      "movement_range_y": 1,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "SafariZone_Southwest_EventScript_ItemMaxRevive",
+      "trainer_sight_or_berry_tree_id": "ITEM_MAX_REVIVE",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_SAFARI_ZONE_SOUTH_WEST_MAX_REVIVE"
    }
  ],
--- a/data/maps/ScorchedSlab/map.json
+++ b/data/maps/ScorchedSlab/map.json
@@ -23,8 +23,8 @@
      "movement_range_x": 0,
      "movement_range_y": 0,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "ScorchedSlab_EventScript_ItemTMSunnyDay",
+      "trainer_sight_or_berry_tree_id": "ITEM_TM_SUNNY_DAY",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_SCORCHED_SLAB_TM_SUNNY_DAY"
    }
  ],
--- a/data/maps/SeafloorCavern_Room9/map.json
+++ b/data/maps/SeafloorCavern_Room9/map.json
@@ -88,8 +88,8 @@
      "movement_range_x": 1,
      "movement_range_y": 1,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "SeafloorCavern_Room9_EventScript_ItemTMEarthquake",
+      "trainer_sight_or_berry_tree_id": "ITEM_TM_EARTHQUAKE",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_SEAFLOOR_CAVERN_ROOM_9_TM_EARTHQUAKE"
    },
    {
--- a/data/maps/ShoalCave_LowTideEntranceRoom/map.json
+++ b/data/maps/ShoalCave_LowTideEntranceRoom/map.json
@@ -23,8 +23,8 @@
      "movement_range_x": 1,
      "movement_range_y": 1,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "ShoalCave_LowTideEntranceRoom_EventScript_ItemBigPearl",
+      "trainer_sight_or_berry_tree_id": "ITEM_BIG_PEARL",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_SHOAL_CAVE_ENTRANCE_BIG_PEARL"
    },
    {
--- a/data/maps/ShoalCave_LowTideIceRoom/map.json
+++ b/data/maps/ShoalCave_LowTideIceRoom/map.json
@@ -23,8 +23,8 @@
      "movement_range_x": 1,
      "movement_range_y": 1,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "ShoalCave_LowTideIceRoom_EventScript_ItemTMHail",
+      "trainer_sight_or_berry_tree_id": "ITEM_TM_HAIL",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_SHOAL_CAVE_ICE_ROOM_TM_HAIL"
    },
    {
@@ -36,8 +36,8 @@
      "movement_range_x": 1,
      "movement_range_y": 1,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "ShoalCave_LowTideIceRoom_EventScript_ItemNeverMeltIce",
+      "trainer_sight_or_berry_tree_id": "ITEM_NEVER_MELT_ICE",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_SHOAL_CAVE_ICE_ROOM_NEVER_MELT_ICE"
    }
  ],
--- a/data/maps/ShoalCave_LowTideInnerRoom/map.json
+++ b/data/maps/ShoalCave_LowTideInnerRoom/map.json
@@ -23,8 +23,8 @@
      "movement_range_x": 1,
      "movement_range_y": 1,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "ShoalCave_LowTideInnerRoom_EventScript_ItemRareCandy",
+      "trainer_sight_or_berry_tree_id": "ITEM_RARE_CANDY",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_SHOAL_CAVE_INNER_ROOM_RARE_CANDY"
    }
  ],
--- a/data/maps/ShoalCave_LowTideStairsRoom/map.json
+++ b/data/maps/ShoalCave_LowTideStairsRoom/map.json
@@ -23,8 +23,8 @@
      "movement_range_x": 1,
      "movement_range_y": 1,
      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "ShoalCave_LowTideStairsRoom_EventScript_ItemIceHeal",
+      "trainer_sight_or_berry_tree_id": "ITEM_ICE_HEAL",
+      "script": "Common_EventScript_FindItem",
      "flag": "FLAG_ITEM_SHOAL_CAVE_STAIRS_ROOM_ICE_HEAL"
    }
  ],
--- a/Show More
+++ b/Show More