Commit Graph

2453 Commits

Author SHA1 Message Date
PikalaxALT df9bed0548 Revert HERE and USED macros 2021-03-15 08:33:37 -04:00
PikalaxALT 37537e38f9 Merge branch 'master' of github.com:pret/pokefirered into battle_multi_buffer 2021-03-14 21:04:11 -04:00
PikalaxALT 5075067ecd Merge pull request #402 from GriffinRichards/nonmatch-fix
Use global symbols for assembly on modern
2021-03-14 20:52:30 -04:00
PikalaxALT 31f4edbe50 Document more symbols in battle 2021-03-14 20:10:19 -04:00
GriffinR 077faeb1bd Use global symbols for assembly on modern 2021-03-14 19:13:23 -04:00
PikalaxALT 99ec579deb Name symbols in battle_anim_special.c 2021-03-14 16:29:33 -04:00
PikalaxALT d87e2e2fc2 Merge branch 'master' of github.com:pret/pokefirered into battle_multi_buffer 2021-03-13 17:50:30 -05:00
Seth Barberee 6bcf9e64b1 backport 2 nonmatching fixes from emerald 2021-03-12 16:16:57 -06:00
PikalaxALT f7f7e9a70d More documentation in battle_main 2021-03-12 16:56:09 -05:00
PikalaxALT b38a5a85d4 Resolve link comm buffers in gBattleStruct 2021-03-12 15:37:28 -05:00
GriffinR 4d1e074514 Fix Son/Daughter name swap 2021-03-12 12:47:51 -05:00
Deokishisu 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
Deokishisu 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
GriffinR 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
hjk321 fc16ee9498 Fix storage magic numbers
I could *kinda* understand missing SendMonToPc, but IN THE STRUCT ITSELF?!
2021-02-22 10:04:27 -06:00
GriffinR b4c5559613 Merge pull request #393 from Kurausukun/text_printer
[LEAK-INFORMED] match rest of text_printer
2021-02-19 19:44:11 -05:00
Kurausukun b061e68f21 oops forgot one 2021-02-19 17:50:00 -05:00
Kurausukun 885f4a8871 remove redundant parentheses 2021-02-19 17:47:56 -05:00
Deokishisu 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
Kurausukun 616200ee66 [LEAK-INFORMED] match rest of text_printer 2021-02-16 02:32:41 -05:00
Deokishisu 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
GriffinR 8c66bde715 Merge pull request #388 from GriffinRichards/constants-localids
Use more LOCALID constants
2021-02-14 14:07:32 -05:00
GriffinR b422fd4a49 Merge pull request #389 from Kurausukun/dexmatching
[LEAK-INFORMED] match the rest of pokedex_screen
2021-02-14 11:18:46 -05:00
GriffinR 1b84bd395d Fix warning about gMonPaletteTable section 2021-02-12 17:18:14 -05:00
Kurausukun ccd75ad32e words are hard 2021-02-11 23:12:55 -05:00
Kurausukun 2ff02b3c5a fix whitespace, update dex category macro 2021-02-11 23:06:33 -05:00
Kurausukun 6c77c7a714 [LEAK-INFORMED] match the rest of pokedex_screen 2021-02-11 21:50:39 -05:00
GriffinR 515dde69af Use more LOCALID constants 2021-02-10 20:20:15 -05:00
Deokishisu 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
Deokishisu 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
GriffinR 1f6dc0e86b Use trainer constants in flags, automatically update flags/vars count 2021-01-29 15:50:01 -05:00
GriffinR 9d20f55a58 Move 'source' asm files to src 2021-01-19 01:54:14 -05:00
Deokishisu 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
SatoMew e5d0a4f35c Document the unused battle strings for downpour and rain weather 2021-01-01 14:38:25 +00:00
Deokishisu 6e77eef0cd Fix Missed Magic Numbers in main_menu.c
There were two lines where magic numbers were used instead of the constant for MAIN_MENU_WINDOW_ERROR, so I filled them in.
2020-12-31 11:36:27 -05:00
GriffinR f8a1bf14fb Merge pull request #371 from GriffinRichards/data-pokedex
Move pokedex_screen data from asm to C
2020-11-27 11:12:05 -05:00
Ashley Coleman 06b6853fb8 Rename farfetchd graphics to match define 2020-11-26 11:26:05 -08:00
Ashley Coleman 83fe4e5dd8 Rename unknown trainer party variables 2020-11-12 21:06:49 -08:00
GriffinR f2e7684b17 Fix modern build 2020-11-12 00:53:57 -05:00
GriffinR 1d820d4e0f Clean up pokedex screen text 2020-11-12 00:06:22 -05:00
GriffinR 66e9059578 Move pokedex_screen data from asm to C 2020-11-11 23:44:30 -05:00
Kurausukun feb10af9f8 Match FadeOutBody (ported from pokeemerald) 2020-11-01 23:35:10 -05:00
GriffinR 0f21fc13ef Fix hang when releasing after adding new moves 2020-10-11 16:10:03 -04:00
PikalaxALT a0fbb82a7c Match sub_8159AB8 2020-09-08 15:00:41 -04:00
BigBahss abc2915eb0 Add "MAP_" prefix missing from 76e126a35b 2020-09-06 23:51:51 -04:00
BigBahss 76e126a35b Add "MAP_" prefix to LeafGreen "map" fields 2020-09-06 22:56:49 -04:00
PikalaxALT ecc3da6e2f Fix agb_flash in modern frlg 2020-09-03 15:55:52 -04:00
tianmaru 1b5d054e0b fix wrong file names 2020-09-02 23:04:54 +02:00
tianmaru 7042c996c4 renamed title screen sprites 2020-09-02 22:25:39 +02:00
PokeCodec 26ac9c5faf Match Most of Remaining Functions 2020-09-01 11:42:28 -04:00