Leahnaya/pokefirered
1
0
Fork 0
mirror of https://github.com/pret/pokefirered.git synced 2026-05-13 15:59:12 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity
2,972 Commits 2 Branches 0 Tags 366 MiB
d8b76e6fb5
Commit Graph

1402 Commits

Author SHA1 Message Date
Kurausukun
c94e5e9ab0 Merge remote-tracking branch 'upstream/master' into port_matchings 2021-03-19 14:34:58 -04:00
Kurausukun
c11710288a port moar fixes and documentation 2021-03-19 02:25:43 -04:00
Kurausukun
f41d7b222c [LEAK-INFORMED] match InitObjectEventStateFromTemplate 
additionally, port range fixes from emerald as well as a couple other
things
 2021-03-18 22:30:59 -04:00
PikalaxALT
c5aa5d3722 Fix faulty search&replace 2021-03-18 15:00:06 -04:00
PikalaxALT
18f1080882 Finish syncing pokemon.c with emerald 2021-03-18 14:33:43 -04:00
PikalaxALT
d864eb510e Sync DRAW_SPINDA_SPOTS from pokeemerald 2021-03-18 13:23:05 -04:00
PikalaxALT
c779411957 Sync EVO_MODE consts from emerald 2021-03-18 13:14:08 -04:00
PikalaxALT
d86c9b0976 Document battle_anim_mons, 1 2021-03-18 08:49:31 -04:00
PikalaxALT
5add6bc54f Name undocced syms in battle_transition 2021-03-17 12:50:25 -04:00
PikalaxALT
a172f0064c Fix accidental ++ deletion 2021-03-17 08:34:03 -04:00
PikalaxALT
4d86834d12 Document item use functions in pokemon.c 2021-03-16 21:16:31 -04:00
PikalaxALT
c4b61cc0ed Document FRLG-unique vars in main.c 2021-03-16 16:57:52 -04:00
PikalaxALT
783488aae5 Name nullsubs in battle ctlrs 2021-03-16 16:41:28 -04:00
PikalaxALT
7794570c71 Document pokedude battle controller, 1 2021-03-16 13:51:03 -04:00
PikalaxALT
6fc2bdf840 battle_controller_link_partner sync labels from emerald 2021-03-16 09:46:17 -04:00
PikalaxALT
10f0222d28 Battle controller opponent sync labels from emerald 2021-03-16 08:24:53 -04:00
Kurausukun
a2367448b8 sync berry crush with emerald 2021-03-16 03:49:48 -04:00
PikalaxALT
14aa5bf52f Remove unused, unneeded fields from BattleHealthboxInfo 2021-03-15 20:17:47 -04:00
PikalaxALT
81da6acff5 battle_gfx_sfx_util sync emerald names to unnamed syms 2021-03-15 19:32:49 -04:00
PikalaxALT
c6563b78c0 Sync new field name in BattleStruct 2021-03-15 16:19:15 -04:00
PikalaxALT
2f4f63afdb Document old man batttle controller 2021-03-15 14:27:50 -04:00
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
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
75b9fbc92f check __CLION_IDE__ predefine in global.h 2021-03-13 17:51:27 -05: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
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
GriffinR
28e3522acb Use NONMATCHING on modern for gcc-arm-none-eabi 2021-03-10 17:55:46 -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
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
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
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
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
9350e2d338 Sync mapjson with pokeemerald 2021-01-19 01:38:15 -05:00
GriffinR
9509797b98 Remove deadnaming, sync BgEvent 2020-12-31 14:24:30 -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
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