Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Feat/money payout onfaint #40

Open
wants to merge 47 commits into
base: main
Choose a base branch
from
Open

Feat/money payout onfaint #40

wants to merge 47 commits into from

Conversation

SoyNegro
Copy link
Collaborator

Player will lose an amount of money according to his current badges. Formula and numbers from BULBAPEDIA

rglezg and others added 27 commits November 4, 2020 17:24
@rglezg
Update README.md
e36700b
@rglezg
Updated repo name in INSTALL.md
e9f46ca
@rglezg
Completed README.md
5eef85a
@rglezg
Merge branch 'repo/readme' of https://github.com/rglezg/Renegade-Emerald
0d796bf 
 into repo/readme
@rglezg
Added CONTRIBUTING.md
2ce01b1
@rglezg
Fixed link to README.md
204e654
@rglezg
Update pull request template.
b19fe3b
@rglezg
Update issue templates
3e994ca
@rglezg
Merge pull request #1 from rglezg/repo/readme
cd0bdc1 
Update README.md
@rglezg
Specified pull request target.
c68813b
@rglezg
Added label WIP to pull request template.
0c92f71
@rglezg
Merge remote-tracking branch 'origin/repo/readme'
d7b742a
@SoyNegro
meowth galarian
3bcb78c
@SoyNegro
added stringid for lost money
6a52204
@SoyNegro
money lost messages
30801db
@SoyNegro
added faint reference in gBattleStringsTable
39f788a
@SoyNegro
added player lost money at faint macro
a29aa1c
@SoyNegro
modified sText_PlayerWhiteout2 to show lost money
6f6bd53
@SoyNegro
added badge flags
18c8f18
@SoyNegro
modified cmd_getmoneyreward
956ef08
@SoyNegro
clean
c341db4
@SoyNegro
flag mend
eb5f886
@SoyNegro
clean
425abba
@SoyNegro
added max party lvl
2ededaf
@SoyNegro
ewramdata gMaxPartyLevel
80cf70d
@SoyNegro
delete money halver
2143d0f
@SoyNegro
changed fainting message
54fa4cd
rglezg
rglezg requested changes Jul 24, 2021
View reviewed changes
Copy link
Collaborator

@rglezg rglezg left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This doesn't meet the requirements yet, see the comments.

Also, you included here the commit of the Galarian Meowth. Revert it.

src/battle_message.c Outdated Show resolved Hide resolved
src/battle_message.c Outdated Show resolved Hide resolved
src/battle_script_commands.c Outdated Show resolved Hide resolved
src/battle_script_commands.c Outdated Show resolved Hide resolved
src/data/pokemon/base_stats.h Outdated Show resolved Hide resolved
@SoyNegro SoyNegro force-pushed the feat/money_payout_onfaint branch from c2b9de1 to 10ce9f1 Compare July 24, 2021 04:59
@SoyNegro SoyNegro closed this Jul 24, 2021
@SoyNegro SoyNegro reopened this Jul 24, 2021
@SoyNegro
Copy link
Collaborator Author

fixed

rglezg
rglezg requested changes Jul 24, 2021
View reviewed changes
src/battle_script_commands.c Outdated Show resolved Hide resolved
data/battle_scripts_1.s Outdated Show resolved Hide resolved
@SoyNegro
Copy link
Collaborator Author

The check in Cmd_getmoneyreward for B_OUTCOME_LOST in else if statement cause the function to crash... remeoved a call to getmoneyreward on BattleScripts which caused wild battles to make player lost money

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rglezg rglezg rglezg requested changes

Requested changes must be addressed to merge this pull request.

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@SoyNegro @rglezg