Allow users to increase MAX_MONEY #4943
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Replaced use of PrintMoneyAmount
Removed GetMaxNumMoneyDigits Converted uses of ConvertIntToDecimalStringN that called for 7 money digits to use MAX_MONEY_DIGITS Replaced 6 money digits in PrintMoneyAmount with MAX_MONEY_DIGITS
…MoneyAmount to use MAX_MONEY_DIGITS
…MoneyAmount to use MAX_MONEY_DIGITS
Fixed PrintMoneyAmount to work with large digits
|
Explicitly requesting the eyes of @DizzyEggg and @mrgriffin , and I'm happy to wait until they have time or they refuse. |
|
You have tabs instead of spaces in the vast majority of your files |
|
Bassoonian
approved these changes
Jul 13, 2024
mrgriffin
reviewed
Jul 13, 2024
Comment on lines
+159
to
+160
| if (numDigits > 8) | ||
| PrependFontIdToFit(gStringVar4, txtPtr + 1 + numDigits, FONT_NORMAL, 54); |
There was a problem hiding this comment.
Initially I was going to say that PrependFontIdToFit should work for any number of digits (it just doesn't do anything if the text already fits), but perhaps I'm wrong due to the alignment?
There was a problem hiding this comment.
Yeah the spaces fuck it all up, and when I remove the spaces and try to manually align, the text doesn't get overwritten if you change the number of digits mid transaction
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
MAX_MONEYto any number up toINT_MAX, while menus and texts will adjust to match.CountDigitsto work with values greater than 100M.Usage
MAX_MONEYIn
include/money.h, developers can changeMAX_MONEYto any integer less than2147483648.Testing
Clean Branch
You can recreate this branch by applying a patch or pulling the repo. From a clean version of expansion's upcoming, you can either:
Patch
wget https://files.catbox.moe/1urr6w.patch -O increaseMoney.patch ; git apply increaseMoney.patch ; rm increaseMoney.patchRepo
git remote add psf-expansion https://github.com/PokemonSanFran/pokeemerald-expansion/ ; git pull psf-expansion increaseMoneyManual Tests
After replicating the branch, to recreate my testing environment, you can either directly download the debug script and config file, or manually create the changes.
Download
MAX_MONEY9wget https://files.catbox.moe/ourb5p.h -O include/money.h && wget https://files.catbox.moe/0kor2h.h -O src/data/items.h && wget https://files.catbox.moe/wsd3z6.inc -O data/scripts/debug.inc99wget https://files.catbox.moe/pbkxuj.h -O include/money.h && wget https://files.catbox.moe/0kor2h.h -O src/data/items.h && wget https://files.catbox.moe/wsd3z6.inc -O data/scripts/debug.inc999wget https://files.catbox.moe/l0gyte.h -O include/money.h && wget https://files.catbox.moe/0kor2h.h -O src/data/items.h && wget https://files.catbox.moe/wsd3z6.inc -O data/scripts/debug.inc9999wget https://files.catbox.moe/l1n9g8.h -O include/money.h && wget https://files.catbox.moe/0kor2h.h -O src/data/items.h && wget https://files.catbox.moe/wsd3z6.inc -O data/scripts/debug.inc99999wget https://files.catbox.moe/2b4bw0.h -O include/money.h && wget https://files.catbox.moe/0kor2h.h -O src/data/items.h && wget https://files.catbox.moe/wsd3z6.inc -O data/scripts/debug.inc999999wget https://files.catbox.moe/e831bv.h -O include/money.h && wget https://files.catbox.moe/0kor2h.h -O src/data/items.h && wget https://files.catbox.moe/wsd3z6.inc -O data/scripts/debug.inc9999999wget https://files.catbox.moe/4ehple.h -O include/money.h && wget https://files.catbox.moe/0kor2h.h -O src/data/items.h && wget https://files.catbox.moe/wsd3z6.inc -O data/scripts/debug.inc99999999wget https://files.catbox.moe/9yhna4.h -O include/money.h && wget https://files.catbox.moe/0kor2h.h -O src/data/items.h && wget https://files.catbox.moe/wsd3z6.inc -O data/scripts/debug.inc999999999wget https://files.catbox.moe/g5yanb.h -O include/money.h && wget https://files.catbox.moe/0kor2h.h -O src/data/items.h && wget https://files.catbox.moe/wsd3z6.inc -O data/scripts/debug.incINT_MAXwget https://files.catbox.moe/f82nww.h -O include/money.h && wget https://files.catbox.moe/0kor2h.h -O src/data/items.h && wget https://files.catbox.moe/wsd3z6.inc -O data/scripts/debug.incManual Testing
MAX_MONEYto its desired value ininclude/money.hdata/scripts/debug.incto match the one providedsrc/data/items.hto match the one providedVerified Scenarios
All videos show the player:
MAX_MONEY == 99.mp4
MAX_MONEY == 9999.mp4
MAX_MONEY == 999999.mp4
MAX_MONEY == 99999999.mp4
MAX_MONEY == 9999999999.mp4
MAX_MONEY == 999999999999.mp4
MAX_MONEY == 9999999999999.mp4
MAX_MONEY == 999999999999999.mp4
MAX_MONEY == 99999999999999999.mp4
MAX_MONEY == INT_MAXint.mp4
People who collaborated with me in this PR
This feature was originally written by @DizzyEggg.
Features this PR does NOT handle:
n/a
Discord Contact Info
I am
pkmnsnfrnon Discord.