Bassforte Trait system

README.md

@@ -1,3 +1,38 @@
+<img width="480" height="320" alt="image" src="https://github.com/user-attachments/assets/68460785-37b4-4562-bea1-d85ceed3b8ff" />
+
+# Trait System (Release 1.14.2)
+
+This is the full release of the Multi-Ability function I'm calling the Trait System!
+Currently updated to Pokeemerald Expansion 1.14.2
+
+The Trait System allows you to assign more than one ability to each pokemon for more complex and more interesting setups.
+
+- General terminology I'm going for is:
+   - Ability = Same as vanilla.
+   - Innate = Additional abilities that are the same for all members of a species.
+   - Trait = Encompassing term for either one
+  Note: for the sake of making merging a little easier, "Ability" is still used in many places when "Trait" is intended.
+- Abilities work exactly the same as vanilla where a pokemon could have one of 3 ability options, however Innates are fixed to each species and don't change.
+- To add Innates you just need to add a new .innates parameter underneath the existing .abilities one using the same formatting.  Example innate setups have been included commented out for all pokemon in the Gen 1 families.
+   - ex: .innates = { ABILITY_PROTEAN, ABILITY_ROUGH_SKIN, ABILITY_CLEAR_BODY },
+- Uses the MAX_MON_INNATES variable to control how many Innates are available, default is 3 totaling up to 4 active abilities per pokemon.  If you assign more innates than the max, surplus entries will simply be ignored.  This means you could even set MAX_MON_INATES to 0 and you would functionally just get the original vanilla system.
+- There is a new Summary Page "Traits" to display the four slots along with some color changes across the vanilla pages for color balance.
+- Most effects that target Abilities still only target a pokemon's primary Ability, ignoring their Innates.  Neutralizing Gas, Worry Seed, Trace, and Mummy for example all only affect Abilities but not Innates.  Mold Breaker type Traits however work on everything, including Innates.  (NOTE: Trace is also not designed to be an Innate since it replaces itself as part of its effect.  Trace in particular should ALWAYS be assigned as an Ability or else you'll get an infinite loop lock.)
+- The basic code design is all Ability checks have been replaced with Trait checks, reading all passives a pokemon has whenever an Ability is looked for.  All previously mutually exclusive abilities like the weather ones which use a Switch Case format has been replaced with If statements so that they can all be called anyway (though natually any abilities that actually conflict will overwrite by code order, Drought and Snow Warning will both activate, but Snow Warning is later in the list so ultimately the weather will be snow/hail.  Really this is only a consideration for future randomizer settings.)
+- Reffer to the AbilityEffect enum table for a more detailed list of how timing interactions work.  Most abilities will interact fine but there are exceptions such as abilities which activate during a terrain or weather change where only one ability in that timing window will activate at a time.
+- If activated at the same time, Harvest, Pickup, and Ball Fetch will activate in that respective priority order.
+- Ability popups have been modified into a Stack system so that when multiple abilities are triggered at once, they are stored then read out in the correct order.  Battle Message logic has also been updated to account for the new timings.
+- Make Test system updated to account for Innates as well, all vanilla tests involving Abilities are given a second copy suffixed (Multi) where the tested Ability is instead an Innate.  There is also a new multi_abilities.c test file which contains more intensive innate specific tests such as potential conflicts in Traits or timings.
+- A useful template for organizing pokemon and assigning Traits can be found here: https://docs.google.com/spreadsheets/d/1pNtGGapXx20svfM0PpztHYHJnbgvXHS8tc_i-h0a0Po/edit?gid=0#gid=0
+Note that the Data sheet includes a collumn for automatically generating the .innate line to be added into Expansion's lists based on how you fill out the Pokemon's innate list.
+
+- The AI system largely works the same just with Innates added on top and fixed.  This means the AI can still treat Abilities as unknown until they learn what the Ability is directly, but Innates will always be treated as known.
+
+Basic code bedrock design comes from old Emerald Redux code with permission.
+
+Huge thanks to the RH Hideout discord community for their help, advice, and testing, especially Alex, Surskitty, Kleem, Meister_anon, and MGriffin who helped make this possible.
+
+
 # About `pokeemerald-expansion`
 
 ![Gif that shows debugging functionality that is unique to pokeemerald-expansion such as rerolling Trainer ID, Cheat Start, PC from Debug Menu, Debug PC Fill, Pokémon Sprite Visualizer, Debug Warp to Map, and Battle Debug Menu](https://github.com/user-attachments/assets/cf9dfbee-4c6b-4bca-8e0a-07f116ef891c) ![Gif that shows overworld functionality that is unique to pokeemerald-expansion such as indoor running, BW2 style map popups, overworld followers, DNA Splicers, Gen 1 style fishing, OW Item descriptions, Quick Run from Battle, Use Last Ball, Wild Double Battles, and Catch from EXP](https://github.com/user-attachments/assets/383af243-0904-4d41-bced-721492fbc48e) ![Gif that shows off a number of modern Pokémon battle mechanics happening in the pokeemerald-expansion engine: 2 vs 1 battles, modern Pokémon, items, moves, abilities, fully customizable opponents and partners, Trainer Slides, and generational gimmicks](https://github.com/user-attachments/assets/50c576bc-415e-4d66-a38f-ad712f3316be)

asm/macros/battle_script.inc

@@ -1252,8 +1252,9 @@
 	.4byte \jumpInstr
 	.endm
 
-	.macro tryrecycleitem failInstr:req
+	.macro tryrecycleitem type:req, failInstr:req
 	.byte 0xea
+	.byte \type
 	.4byte \failInstr
 	.endm
 
@@ -2469,3 +2470,9 @@
 	.macro tryabsorbtoxicspikesonfaint
 	callnative BS_TryAbsorbToxicSpikesOnFaint
 	.endm
+
+	.macro pushtraitstack battler:req, ability:req
+	callnative BS_PushTraitStack
+	.byte \battler
+	.2byte \ability
+	.endm

charmap.txt

@@ -426,6 +426,10 @@ B_PARTNER_NAME_WITH_CLASS = FD 44
 B_ATK_TRAINER_NAME_WITH_CLASS = FD 45
 B_EFF_TEAM1 = FD 46
 B_EFF_TEAM2 = FD 47
+B_EFF2_TEAM1 = FD 48
+B_EFF2_TEAM2 = FD 49
+B_DEF_ABILITY2 = FD 4A
+B_ATK_PARTNER_NAME_WITH_PREFIX = FD 4B
 
 @ indicates the end of a town/city name (before " TOWN" or " CITY")
 NAME_END = FC 00