Feat/money payout onfaint

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,27 @@
+---
+name: Bug report
+about: Create a report about something that is not working.
+title: ''
+labels: bug
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Additional context**
+Add any other context about the problem here.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: enhancement
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

.github/pull_request_template.md

@@ -1,8 +1,12 @@
-<!--- Provide a general summary of your changes in the Title above -->
+---
+about: Use this template for tracking new features.
+labels: work in progress
+---
 
-## Description
-<!--- Describe your changes in detail -->
+### Description
+<!--A clear and concise description of what problem you are solving. Link to an issue if applicable.-->
 
-## **Discord contact info**
-<!--- formatted as name#numbers, e.g. PikalaxALT#5823 -->
-<!--- Contributors must join https://discord.gg/d5dubZ3 -->
+### Proposed changes
+<!--- List the changes you are making. Mark them as you get them done. -->
+- [ ] First change.
+- [ ] Second change.

CONTRIBUTING.md

@@ -0,0 +1,38 @@
+# Contribution guidelines
+
+Thanks for taking the time to contribute.
+
+Even if you are not a programmer, there are many things you can do to help with the development of Pokémon Renegade Emerald. The most valuable is playing the game and givin us some feedback:
+
+- If you find an error, submit a [bug report](https://github.com/rglezg/Renegade-Emerald/issues/new?template=bug_report.md). Before doing that, check if what you found is a [known bug](https://github.com/rglezg/Renegade-Emerald/labels/bug).
+- If you have an idea and think it fits well with this project, submit a [feature request](https://github.com/rglezg/Renegade-Emerald/issues/new?template=feature_request.md). Before doing that, check if it has already been [suggested](https://github.com/rglezg/Renegade-Emerald/labels/enhancement).
+- If you have a question or want to start a discussion, just use the [issue tracker](https://github.com/rglezg/Renegade-Emerald/issues).
+
+## Contributing code and content
+
+We accept fixes and new features, as long as they are not listed in the [What this is NOT](https://github.com/rglezg/Renegade-Emerald/blob/repo/readme/README.md#what-is-this-not) section of the readme.  
+
+### Getting started
+
+Here are some resources to help you get started on how to contribute code or new content.
+
+- Look at the [INSTALL.md](INSTALL.md) file to get started on building the source code on your own. You can also follow this [tutorial](https://www.pokecommunity.com/showthread.php?t=425246). Note it was wrote for the original pokeemerald repo.
+- Check the ["Help wanted" issues](https://github.com/rglezg/Renegade-Emerald/labels/help%20wanted). If you find something that you can fix, leave a comment.  
+- If you want to do a grammar/spelling or bug fix, feel free to start working in a fix.
+- If you are submitting a feature or substantial code contribution, please [discuss](https://github.com/rglezg/Renegade-Emerald/issues/new?template=feature_request.md) it with the team.  
+- You can check the [roadmap](https://github.com/rglezg/Renegade-Emerald/issues/7) and take whatever feature that is not completed or marked as WIP.
+
+### Submiting a pull request
+
+Pull requests are the best way to propose changes to the codebase. If you want to make a change:
+
+1. Fork the repo.
+2. Create a new branch:
+   - If your change is independent of other features implemented in Renegade Emerald, and you think it can be applied to any pokeemerald repo, create it from branch `base`.
+   - If it depends on any of the branches of the [rh-hidout expansion](https://github.com/rh-hideout/pokeemerald-expansion), (`pokemon_expansion` or `battle_engine`) create your branch from it.
+   - If don't meet any of the provious conditions, create your branch from `main`.
+
+3. Name the branch `feat/name_of_feature` if is a new feature, or `fix/name_of_problem` if is a bug or spelling fix.
+4. [Create the pull request](https://github.com/rglezg/Renegade-Emerald/compare) for merging your changes into `main`.
+5. Make your changes and test all of them.
+6. Once you get your work done, remove the `work in progress` label and wait for a review.

INSTALL.md

@@ -23,14 +23,14 @@ Install the devkitARM toolchain of devkitPro as per [the instructions on their w
 
 To set up the repository:
 
-	git clone https://github.com/pret/pokeemerald
+	git clone https://github.com/rglezg/Renegade-Emerald
 	git clone https://github.com/pret/agbcc
 
 	cd ./agbcc
 	./build.sh
-	./install.sh ../pokeemerald
+	./install.sh ../Renegade-Emerald
 
-	cd ../pokeemerald
+	cd ../Renegade-Emerald
 
 To build **pokeemerald.gba** for the first time and confirm it matches the official ROM image:
 

README.md

@@ -1,36 +1,48 @@
-# Pokémon Emerald
+# Pokémon Renegade Emerald
 
 [![Build Status][travis-badge]][travis]
 
 [travis]: https://travis-ci.org/pret/pokeemerald
 [travis-badge]: https://travis-ci.org/pret/pokeemerald.svg?branch=master
 
-This is a decompilation of Pokémon Emerald.
+This is a decompilation of Pokémon Emerald with many added features and gameplay changes.
 
-It builds the following ROM:
+The unmodiffied decomp repo can be found [here](https://github.com/pret/pokeemerald).
 
-* [**pokeemerald.gba**](https://datomatic.no-intro.org/index.php?page=show_record&s=23&n=1961) `sha1: f3ae088181bf583e55daf962a92bb46f4f1d07b7`
+This project also uses some features of the [RHH expansions](https://github.com/rh-hideout/pokeemerald-expansion).
 
 To set up the repository, see [INSTALL.md](INSTALL.md).
 
+## WARNING
 
-## See also
+This project is in an early stage of development. Most of the features have not been implemented yet. From time to time a preview version will be [released](https://github.com/rglezg/Renegade-Emerald/releases).
 
-Other disassembly and/or decompilation projects:
-* [**Pokémon Red and Blue**](https://github.com/pret/pokered)
-* [**Pokémon Gold and Silver (Space World '97 demo)**](https://github.com/pret/pokegold-spaceworld)
-* [**Pokémon Yellow**](https://github.com/pret/pokeyellow)
-* [**Pokémon Trading Card Game**](https://github.com/pret/poketcg)
-* [**Pokémon Pinball**](https://github.com/pret/pokepinball)
-* [**Pokémon Stadium**](https://github.com/pret/pokestadium)
-* [**Pokémon Gold and Silver**](https://github.com/pret/pokegold)
-* [**Pokémon Crystal**](https://github.com/pret/pokecrystal)
-* [**Pokémon Ruby and Sapphire**](https://github.com/pret/pokeruby)
-* [**Pokémon Pinball: Ruby & Sapphire**](https://github.com/pret/pokepinballrs)
-* [**Pokémon FireRed and LeafGreen**](https://github.com/pret/pokefirered)
-* [**Pokémon Mystery Dungeon: Red Rescue Team**](https://github.com/pret/pmd-red)
+## What is this
 
+Pokémon Renegade Emerald aims to be a more complex and difficult version of the original GBA game, with some unique machanics and an important number of QoL changes. The list of all planned/implemented features can be found [here](https://github.com/rglezg/Renegade-Emerald/issues/7), but the most important conditions the game must meet are the following:
 
-## Contacts
+- All Pokémon and items are obtainable an unlimited number of times without trading or cheating. This doesn't mean it will be easy to do so ;)
+- The game forces you to, literally, "catch 'em all" or almost all. That's because each HM is obtained by completing a speciffic amount of entries in the Pokédex.
+- Pokémon can use HM moves without learnig them. All you need is a Pokémon compatible with the move, the HM disk, and the badge that allows you to use it outside of battle. Also HM moves can be forgotten by learning new moves.
+- Friendship plays a bigger role in the evolution and trading of Pokémon. All evolutions methods are changed to be friendship-dependant. Of course, trading evolution methods have been removed.
+- Defeating a Pokémon does not gives yours EVs. Instead, every time a Pokémon levels up, you will be asked to select a stat to increase its EVs. The amount of points earned depends on factors as the friendship of your Pokémon, and the average level of enemies it have defeated from the last time it leveled up. This allows you to train your party while you progress in the game instead of force you to kill a lot of Poochyenas before battling the first trainer XD
+- All battles in the game (including wild encounters) are double battles.
+- Trainers are more difficult to beat and have more diverse teams.
+- Pokémon of newer generations have been added. This initialy include all evolutions and pre-evolutions of the original 386 that appeared in later games, but can include other species (?).
+- Pokémon stats and moves are balanced to make them all equally viable in battle.
 
-You can find us on [Discord](https://discord.gg/d5dubZ3) and [IRC](https://kiwiirc.com/client/irc.freenode.net/?#pret).
+## What is this NOT
+
+Instead of copy-pasting all Pokémon/items/mechanics found in the newer generations or in other Pokémon Hacks, I want to make this my own way, so Renegade Emerald will not have:  
+
+- Mega-evolutions, dynammax, etc..
+- All the existent Pokémon species
+- A new story with new characters
+- Reusable TMs, infinite steps in Safari Zone, or other ways of get for free something that have a cost in the original game.
+
+I will update this list as other unwanted features come to my mind.
+
+## How to contribute
+
+If you like this project and want to help, you are welcome!  
+Check the [guidelines](CONTRIBUTING.md) for more info.

data/battle_scripts_1.s

@@ -5129,11 +5129,19 @@ BattleScript_LocalBattleLost::
 	jumpifbattletype BATTLE_TYPE_EREADER_TRAINER, BattleScript_LocalBattleLostEnd
 	jumpifhalfword CMP_EQUAL, gTrainerBattleOpponent_A, TRAINER_SECRET_BASE, BattleScript_LocalBattleLostEnd
 BattleScript_LocalBattleLostPrintWhiteOut::
+    jumpifbattletype BATTLE_TYPE_TRAINER, BattleScript_LocalBattleLostEnd
 	printstring STRINGID_PLAYERWHITEOUT
-	waitmessage B_WAIT_TIME_LONG
+	waitmessage 0x40
+	getmoneyreward
 	printstring STRINGID_PLAYERWHITEOUT2
-	waitmessage B_WAIT_TIME_LONG
+	waitmessage 0x40
+	end2
 BattleScript_LocalBattleLostEnd::
+    printstring STRINGID_PLAYERFAINTLOSTMONEY
+	waitmessage 0x40
+	getmoneyreward
+	printstring STRINGID_PLAYERPAIDPRIZEMONEY
+	waitmessage 0x40  
 	end2
 BattleScript_CheckDomeDrew::
 	jumpifbyte CMP_EQUAL, gBattleOutcome, B_OUTCOME_DREW, BattleScript_LocalBattleLostEnd_

include/constants/battle_string_ids.h

@@ -1,6 +1,7 @@
 #ifndef GUARD_CONSTANTS_BATTLE_STRING_IDS_H
 #define GUARD_CONSTANTS_BATTLE_STRING_IDS_H
 
+
 #define BATTLESTRINGS_ID_ADDER  12 // all battlestrings have its ID + 12, because first 5 are reserved
 
 #define STRINGID_INTROMSG       0
@@ -570,8 +571,10 @@
 #define STRINGID_MICLEBERRYACTIVATES             566
 #define STRINGID_PKMNSHOOKOFFTHETAUNT            567
 #define STRINGID_PKMNGOTOVERITSINFATUATION       568
+#define STRINGID_PLAYERFAINTLOSTMONEY            569
+#define STRINGID_PLAYERPAIDPRIZEMONEY            570
 
-#define BATTLESTRINGS_COUNT                      569
+#define BATTLESTRINGS_COUNT                      571
 
 // The below IDs are all indexes into battle message tables,
 // used to determine which of a set of messages to print.

src/battle_main.c

@@ -226,6 +226,7 @@ EWRAM_DATA struct BattleHealthboxInfo *gBattleControllerOpponentFlankHealthboxDa
 EWRAM_DATA u16 gBattleMovePower = 0;
 EWRAM_DATA u16 gMoveToLearn = 0;
 EWRAM_DATA u8 gBattleMonForms[MAX_BATTLERS_COUNT] = {0};
+EWRAM_DATA u8 gMaxPartyLevel = 1;
 EWRAM_DATA u32 gFieldStatuses = 0;
 EWRAM_DATA struct FieldTimer gFieldTimers = {0};
 EWRAM_DATA u8 gBattlerAbility = 0;

src/battle_message.c

@@ -81,7 +81,7 @@ static const u8 sText_AttackerFainted[] = _("{B_ATK_NAME_WITH_PREFIX}\nfainted!\
 static const u8 sText_TargetFainted[] = _("{B_DEF_NAME_WITH_PREFIX}\nfainted!\p");
 static const u8 sText_PlayerGotMoney[] = _("{B_PLAYER_NAME} got ¥{B_BUFF1}\nfor winning!\p");
 static const u8 sText_PlayerWhiteout[] = _("{B_PLAYER_NAME} is out of\nusable POKéMON!\p");
-static const u8 sText_PlayerWhiteout2[] = _("{B_PLAYER_NAME} whited out!{PAUSE_UNTIL_PRESS}");
+static const u8 sText_PlayerWhiteout2[] = _("{B_PLAYER_NAME} fainted and lost ¥{B_BUFF1}...\p{PAUSE_UNTIL_PRESS}");
 static const u8 sText_PreventsEscape[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX} prevents\nescape with {B_SCR_ACTIVE_ABILITY}!\p");
 static const u8 sText_CantEscape2[] = _("Can't escape!\p");
 static const u8 sText_AttackerCantEscape[] = _("{B_ATK_NAME_WITH_PREFIX} can't escape!");
@@ -493,6 +493,8 @@ static const u8 sText_ItemAllowsOnlyYMove[] = _("{B_LAST_ITEM} allows the\nuse o
 static const u8 sText_PkmnHungOnWithX[] = _("{B_DEF_NAME_WITH_PREFIX} hung on\nusing its {B_LAST_ITEM}!");
 const u8 gText_EmptyString3[] = _("");
 static const u8 sText_YouThrowABallNowRight[] = _("You throw a BALL now, right?\nI… I'll do my best!");
+static const u8 sText_PlayerFaintLostMoney[] = _("911? Someone has fainted!\nCome and get it.\p{PAUSE_UNTIL_PRESS}");
+static const u8 sText_PlayerPaidPrizeMoney[] = _("{B_PLAYER_NAME} paid ¥{B_BUFF1} for being\n a loser…\p… … … …\p{B_PLAYER_NAME} fainted!{PAUSE_UNTIL_PRESS}");
 
 // early declaration of strings
 static const u8 sText_PkmnIncapableOfPower[];
@@ -1108,6 +1110,8 @@ const u8 *const gBattleStringsTable[BATTLESTRINGS_COUNT] =
     [STRINGID_PKMNBOXLANETTESPCFULL - 12] = gText_PkmnTransferredLanettesPCBoxFull,
     [STRINGID_TRAINER1WINTEXT - 12] = sText_Trainer1WinText,
     [STRINGID_TRAINER2WINTEXT - 12] = sText_Trainer2WinText,
+    [STRINGID_PLAYERFAINTLOSTMONEY - 12] = sText_PlayerFaintLostMoney,
+    [STRINGID_PLAYERPAIDPRIZEMONEY - 12] = sText_PlayerPaidPrizeMoney,    
     [STRINGID_ENDUREDSTURDY - 12] = sText_EnduredViaSturdy,
     [STRINGID_POWERHERB - 12] = sText_PowerHerbActivation,
     [STRINGID_HURTBYITEM - 12] = sText_HurtByItem,

src/battle_script_commands.c

@@ -59,6 +59,9 @@ extern struct MusicPlayerInfo gMPlayInfo_BGM;
 
 extern const u8* const gBattleScriptsForMoveEffects[];
 
+extern u8 gMaxPartyLevel;
+
+#define DEFENDER_IS_PROTECTED ((gProtectStructs[gBattlerTarget].protected) && (gBattleMoves[gCurrentMove].flags & FLAG_PROTECT_AFFECTED))
 // table to avoid ugly powing on gba (courtesy of doesnt)
 // this returns (i^2.5)/4
 // the quarters cancel so no need to re-quadruple them in actual calculation
@@ -1236,6 +1239,13 @@ static const u8 sBattlePalaceNatureToFlavorTextId[NUM_NATURES] =
     [NATURE_QUIRKY]  = B_MSG_EAGER_FOR_MORE,
 };
 
+static const u16 sBadgeFlags[8] = {
+FLAG_BADGE01_GET, FLAG_BADGE02_GET, FLAG_BADGE03_GET, FLAG_BADGE04_GET,
+FLAG_BADGE05_GET, FLAG_BADGE06_GET, FLAG_BADGE07_GET, FLAG_BADGE08_GET,
+};
+
+
+static const u16 sFaintBadgeMoney[9] = { 8, 16, 24, 36, 48, 60, 80, 100, 120 };
 bool32 IsBattlerProtected(u8 battlerId, u16 move)
 {
     if (!(gBattleMoves[move].flags & FLAG_PROTECT_AFFECTED))
@@ -6341,13 +6351,37 @@ static u32 GetTrainerMoneyToGive(u16 trainerId)
 
 static void Cmd_getmoneyreward(void)
 {
-    u32 moneyReward = GetTrainerMoneyToGive(gTrainerBattleOpponent_A);
-    if (gBattleTypeFlags & BATTLE_TYPE_TWO_OPPONENTS)
-        moneyReward += GetTrainerMoneyToGive(gTrainerBattleOpponent_B);
+    u32 money;
 
-    AddMoney(&gSaveBlock1Ptr->money, moneyReward);
-    PREPARE_WORD_NUMBER_BUFFER(gBattleTextBuff1, 5, moneyReward);
+if (gBattleOutcome == B_OUTCOME_WON)
+    {
+        money = GetTrainerMoneyToGive(gTrainerBattleOpponent_A);
+        if (gBattleTypeFlags & BATTLE_TYPE_TWO_OPPONENTS)
+            money += GetTrainerMoneyToGive(gTrainerBattleOpponent_B);
+        AddMoney(&gSaveBlock1Ptr->money, money);
+    }
+    else if(gBattleOutcome == B_OUTCOME_LOST)
+    {
+        s32 i, count;
+        for (i = 0; i < PARTY_SIZE; i++)
+        {
+            if (GetMonData(&gPlayerParty[i], MON_DATA_SPECIES2) != SPECIES_NONE
+             && GetMonData(&gPlayerParty[i], MON_DATA_SPECIES2) != SPECIES_EGG)
+            {
+                if (GetMonData(&gPlayerParty[i], MON_DATA_LEVEL) > gMaxPartyLevel)
+                    gMaxPartyLevel = GetMonData(&gPlayerParty[i], MON_DATA_LEVEL);
+            }
+        }
+        for (count = 0, i = 0; i < ARRAY_COUNT(sBadgeFlags); i++)
+        {
+            if (FlagGet(sBadgeFlags[i]) == TRUE)
+                ++count;
+        }
+        money = sFaintBadgeMoney[count] * gMaxPartyLevel;
+        RemoveMoney(&gSaveBlock1Ptr->money, money);
+    }
 
+    PREPARE_WORD_NUMBER_BUFFER(gBattleTextBuff1, 5, money);
     gBattlescriptCurrInstr++;
 }
 

src/overworld.c

@@ -368,10 +368,6 @@ static void (*const gMovementStatusHandler[])(struct LinkPlayerObjectEvent *, st
 void DoWhiteOut(void)
 {
     ScriptContext2_RunNewScript(EventScript_WhiteOut);
-    if ((gBattleOutcome & B_OUTCOME_WON) == 0)
-    {
-        SetMoney(&gSaveBlock1Ptr->money, GetMoney(&gSaveBlock1Ptr->money) / 2);
-    }
     HealPlayerParty();
     Overworld_ResetStateAfterWhiteOut();
     SetWarpDestinationToLastHealLocation();