077faeb1bd
Use global symbols for assembly on modern
2021-03-14 19:13:23 -04:00
4d1e074514
Fix Son/Daughter name swap
2021-03-12 12:47:51 -05:00
1c03a923b7
Merge pull request #399 from Deokishisu/patch-1000
...
Fix Typos / Use Box Constants / Name an Unknown
2021-03-11 15:11:53 -05:00
651b59d631
Update calcrom ignore path
2021-03-10 18:11:47 -05:00
28e3522acb
Use NONMATCHING on modern for gcc-arm-none-eabi
2021-03-10 17:55:46 -05:00
bf6e80850c
Sync Berry Fix makefiles with pokeemerald
2021-03-10 17:19:11 -05:00
b2f0efc6f7
Replace Travis CI with Github workflow
2021-03-10 16:45:38 -05:00
a7233dcd0c
Use GENDER_COUNT Constants & Rename an Unknown in field_player_avatar.c
...
`gUnknown_835B882` has been cleaned up and renamed to `sPlayerAvatarGfxToStateFlag` to match pokeemerald.
2021-03-10 16:45:11 -05:00
0589bd5827
Fix Typos / Use Box Constants
...
The Celadon City scripts that give Eevee misspelled it as Eeevee. Fixed.
The comment explaining `boxRSEggsUnlocked` in the `ExternalEventFlags` struct had an incorrect deposit requirement listed and was fixed.
Also, replaced the literals with the `TOTAL_BOXES_COUNT` and `IN_BOX_COUNT` constants in `pokemon.c`'s `IsPokemonStorageFull` function. Thanks hjk321 for pointing that out.
2021-03-10 16:22:08 -05:00
42b93f8359
Merge pull request #398 from SethBarberee/patch-1
...
Add -DINFO Option to Makefile
2021-03-03 19:56:49 -05:00
897290a93e
Add -DINFO
...
Popped up in discord channel so adding it here
2021-03-03 16:41:50 -08:00
12c7dab219
Merge pull request #396 from hjk321/storage-magic
...
Change embarassing magic numbers that should have been fixed a long time ago
2021-02-22 11:26:52 -05:00
fc16ee9498
Fix storage magic numbers
...
I could *kinda* understand missing SendMonToPc, but IN THE STRUCT ITSELF?!
2021-02-22 10:04:27 -06:00
5351028d7e
Merge pull request #394 from GriffinRichards/calcrom100
...
Celebratory change to calcrom.pl
2021-02-19 20:35:04 -05:00
003d6b95d9
Celebratory change to calcrom.pl
2021-02-19 20:09:01 -05:00
b4c5559613
Merge pull request #393 from Kurausukun/text_printer
...
[LEAK-INFORMED] match rest of text_printer
2021-02-19 19:44:11 -05:00
b061e68f21
oops forgot one
2021-02-19 17:50:00 -05:00
885f4a8871
remove redundant parentheses
2021-02-19 17:47:56 -05:00
33126a0633
Merge pull request #392 from Deokishisu/ExternalEvents-doc
...
Mirror pokeemerald PR#1329 & PR#1335 to pokefirered
2021-02-16 17:55:56 -05:00
57e3f5e0f8
Mirror pokeemerald PR#1329 & PR#1335 to pokefirered
...
The `giftRibbons` field in `SaveBlock1` has been split out into proper subfields. The new ExternalEvent structs deal with interconnectivity between external games/peripherals and FRLG. US & JP Colosseum Bonus Discs', Colosseum and XD's, Pokémon Channel's, and PokémonBox: Ruby & Sapphire's interactions with these fields has been documented.
The `giftRibbon#` fields in `PokemonSubstruct3` have also been renamed to their appropriate ribbons, and commented with distribution info if applicable. The previous `fatefulEncounter` field was actually filler, and relabeled as such, while the `obedient` bit was renamed `eventLegal`. All relevant constants and functions dealing with the Pokémon data structure were renamed with these changes in mind.
I still maintain that `eventLegal` is a misnomer and it should be called `fatefulEncounter` in all three repos.
2021-02-16 16:56:31 -05:00
616200ee66
[LEAK-INFORMED] match rest of text_printer
2021-02-16 02:32:41 -05:00
bc4f88d72c
Merge pull request #391 from Deokishisu/movement_type-rename
...
Rename "Hidden" Movement Type to "Buried"
2021-02-14 21:48:36 -05:00
fc623d2abf
Rename "Hidden" Movement Type to "Buried"
...
This commit mirrors the change to pokeemerald that renames `MOVEMENT_TYPE_HIDDEN` to `MOVEMENT_TYPE_BURIED` to avoid confusion between it and `MOVEMENT_TYPE_INVISIBLE`.
As the files and function labels are not synced between the two repos, only the necessary changes were made based on what pokefirered calls its functions. More syncing of labels with pokeemerald will need to be done in the future.
2021-02-14 14:59:10 -05:00
8c66bde715
Merge pull request #388 from GriffinRichards/constants-localids
...
Use more LOCALID constants
2021-02-14 14:07:32 -05:00
b422fd4a49
Merge pull request #389 from Kurausukun/dexmatching
...
[LEAK-INFORMED] match the rest of pokedex_screen
2021-02-14 11:18:46 -05:00
43033ec97c
Merge pull request #390 from GriffinRichards/fix-constwarning
...
Fix warning about gMonPaletteTable section
2021-02-12 19:17:24 -05:00
1b84bd395d
Fix warning about gMonPaletteTable section
2021-02-12 17:18:14 -05:00
ccd75ad32e
words are hard
2021-02-11 23:12:55 -05:00
2ff02b3c5a
fix whitespace, update dex category macro
2021-02-11 23:06:33 -05:00
6c77c7a714
[LEAK-INFORMED] match the rest of pokedex_screen
2021-02-11 21:50:39 -05:00
515dde69af
Use more LOCALID constants
2021-02-10 20:20:15 -05:00
a34c9d09b6
Merge pull request #385 from Deokishisu/patch-3
...
Fix Trainer Tower Magic Number
2021-02-09 13:13:52 -05:00
60b9b0add2
Fix Trainer Tower Magic Number
...
A magic number was missed that will lead to edited projects breaking the Trainer Tower if new map layouts are added. This commit fixes it.
2021-02-09 11:20:52 -05:00
efba18bb0b
Merge pull request #384 from Deokishisu/patch-2
...
Fix "Compatibility" Misspelling
2021-02-05 07:18:01 -05:00
b423d06cd9
Fix "Compatibility" Misspelling
...
Someone misspelled "compatibility" as "compatability" in pokeemerald and the error was brought over to pokefirered.
2021-02-05 01:17:54 -05:00
8a0294f9f1
Merge pull request #383 from Deokishisu/patch-2
...
Fix Vermilion Gym Script Label Transposition Typos
2021-02-03 20:49:41 -05:00
ee0fb9ea5a
Fix TM34 Transposition Typo
...
The script labels for being given TM34 from Lt. Surge are mistakenly typoed as TM43. This commit fixes this error.
2021-02-03 19:54:45 -05:00
80b2c0eee6
Merge pull request #382 from GriffinRichards/relativeconstants
...
Use trainer constants in flags, automatically update flags/vars count
2021-02-01 14:57:18 -05:00
1f6dc0e86b
Use trainer constants in flags, automatically update flags/vars count
2021-01-29 15:50:01 -05:00
419c897292
Merge pull request #380 from GriffinRichards/sync-scaninc
...
Sync tools with pokeemerald
2021-01-19 02:17:21 -05:00
a52d6e4379
Fix modern ld_script
2021-01-19 02:06:27 -05:00
9d20f55a58
Move 'source' asm files to src
2021-01-19 01:54:14 -05:00
9350e2d338
Sync mapjson with pokeemerald
2021-01-19 01:38:15 -05:00
393a6bd5b6
Sync gbagfx with pokeemerald
2021-01-19 01:28:49 -05:00
538c1d0efd
Sync preproc with pokeemerald
2021-01-19 01:19:32 -05:00
8e8677f1e4
Update Makefile for scaninc
2021-01-19 01:19:19 -05:00
cd67c5e240
Sync scaninc with pokeemerald
2021-01-18 23:39:05 -05:00
ac62e8e563
Merge pull request #377 from Deokishisu/master
...
Fix Egregious Magic Numbers in GetBattleBGM
2021-01-08 08:11:13 -05:00
90e5a5ff7e
Fix Egregious Magic Numbers in GetBattleBGM
...
Whoever originally decomped this function must've been really fed up with this file.
Renamed GetMUS_ForBattle to GetBattleBGM to be consistent with pokeemerald.
This entire function was magic numbers, so I replaced them with the appropriate constants.
2021-01-08 04:09:59 -05:00
135fd3948a
Merge pull request #376 from SatoMew/master
...
Document the unused battle strings for downpour and rain weather
2021-01-07 00:35:31 -05:00
GriffinR