dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #443 from LOuroboros/patch-1

Browse Source 
Informative note about PewterCity_Gym_Text_BrockDefeat
This commit is contained in:
PikalaxALT
2021-06-26 08:49:26 -04:00
committed by GitHub
parent 4c26116d1a 92dccca2ee
commit 8116790c08
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/maps/PewterCity_Gym/text.inc
+3
View File
@@ -14,6 +14,9 @@ PewterCity_Gym_Text_BrockIntro:: @ 8190CD4
.string "Fine, then!\n"
.string "Show me your best!{PLAY_BGM}{MUS_ENCOUNTER_GYM_LEADER}$"
@ NOTE: This defeat text actually causes a buffer overflow. It's too long for the gDisplayedStringBattle
@ buffer that it's put into, and it stomps all over the gBattleTextBuffs after, as well as the otherwise
@ unused array after that, gUnknown_2022AE8. Perhaps that's the reason why said array exists.
PewterCity_Gym_Text_BrockDefeat:: @ 8190E4F
.string "I took you for granted, and so\n"
.string "I lost.\p"
src/battle_main.c
+1 -1
View File
@@ -125,7 +125,7 @@ EWRAM_DATA u8 gDisplayedStringBattle[300] = {0};
EWRAM_DATA u8 gBattleTextBuff1[TEXT_BUFF_ARRAY_COUNT] = {0};
EWRAM_DATA u8 gBattleTextBuff2[TEXT_BUFF_ARRAY_COUNT] = {0};
EWRAM_DATA u8 gBattleTextBuff3[TEXT_BUFF_ARRAY_COUNT] = {0};
static EWRAM_DATA u32 gUnknown_2022AE8[25] = {0};
static EWRAM_DATA u32 gUnknown_2022AE8[25] = {0}; // Note: This shouldn't be removed without adjusting the size of gDisplayedStringBattle.
EWRAM_DATA u32 gBattleTypeFlags = 0;
EWRAM_DATA u8 gBattleTerrain = 0;
EWRAM_DATA u32 gUnknown_2022B54 = 0;