Leahnaya/pokefirered
1
0
Fork 0
mirror of https://github.com/pret/pokefirered.git synced 2026-05-31 20:52:48 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity
3,353 Commits 2 Branches 0 Tags 366 MiB
102dc65fd1
Commit Graph

1540 Commits

Author SHA1 Message Date
PikalaxALT
d0f3c277a7 Corrections and augmentations to ttower docs 2021-04-29 09:56:44 -04:00
PikalaxALT
9a91476b81 Improve documentation of trainer tower sets 2021-04-28 20:44:15 -04:00
PikalaxALT
a60d6675d7 Trainer tower sets to C 2021-04-28 18:44:38 -04:00
GriffinR
75f2be2e29 Name map groups 2021-04-28 16:37:08 -04:00
GriffinR
d21090cf04
Merge pull request #406 from hjk321/index-graphics 
Document, Index, and Prettify Graphics, Part 1 (A-H)
 2021-04-23 14:01:11 -04:00
PikalaxALT
704dc2f913 Document Pokedex Screen 2021-04-21 10:34:15 -04:00
GriffinR
918ed2d31e
Merge pull request #417 from SatoMew/master 
Replace rival labels
 2021-04-18 18:23:00 -04:00
SatoMew
c128e68062 Replace rival labels 2021-04-17 16:32:55 +01:00
PikalaxALT
627402560c Name remaining symbols in pokemon_summary_screen.c 2021-04-13 09:17:12 -04:00
PikalaxALT
03b4ea32a9 Merge remote-tracking branch 'origin' into doc_pokesum 2021-04-12 16:18:38 -04:00
SatoMew
9b6469a7a3 Fix Record Corner labels 2021-04-10 18:43:10 +01:00
Kurausukun
4b182affb6 standardize "grey" to "gray" 2021-04-09 22:34:08 -04:00
Kurausukun
48fb5e9b45 correct text color variable names 2021-04-09 01:30:49 -04:00
PikalaxALT
c9632154ba Document pokemon summary screen, 2 2021-04-04 11:27:51 -04:00
PikalaxALT
c99894bc60 Document Pokemon Summary Screen, 1 2021-04-04 09:59:40 -04:00
PikalaxALT
a704592eb7 Merge branch 'master' of github.com:pret/pokefirered into fix_mvmt_types 2021-03-31 09:42:57 -04:00
PikalaxALT
f00b44699c Fix movement types; fix some math ops 2021-03-30 20:33:31 -04:00
hjk321
7d9bcc9f77 Document and index graphics/battle_anims and graphics/battle_interface 2021-03-30 17:13:37 -05:00
PikalaxALT
d9234adb00 Fix typos 2021-03-30 16:07:18 -04:00
PikalaxALT
8e82c291fd Document bike.c and fix weird goto 2021-03-30 15:45:42 -04:00
PikalaxALT
6b64fbc522 Merge branch 'master' of github.com:pret/pokefirered into misc_doc 2021-03-24 08:15:08 -04:00
PikalaxALT
877e09438b Fix alignment and typos 2021-03-23 15:58:16 -04:00
PikalaxALT
56b37fef8d Update some more names in help system 2021-03-23 13:52:14 -04:00
PikalaxALT
10a96540ff Rename help system C files 2021-03-23 11:43:46 -04:00
PikalaxALT
d1f62285b5 Document help system 2021-03-23 11:28:06 -04:00
PikalaxALT
ff7f7744b7 gGlyphInfo to struct 2021-03-23 09:17:23 -04:00
PikalaxALT
f6565a15d4 Style fixes; attempt to match help_system NONMATCHING 2021-03-21 20:28:42 -04:00
PikalaxALT
2edc21281e Document symbols reffed in field_control_avatar 2021-03-20 17:27:21 -04:00
PikalaxALT
95c7e3d067 Update player avatar state enums 2021-03-20 16:44:16 -04:00
PikalaxALT
64d781111c Document drought weather effect 2021-03-20 13:49:35 -04:00
PikalaxALT
cdfeb638f4 Document remaining routines in field_specials 2021-03-20 11:13:58 -04:00
PikalaxALT
f8932775cd Sync berry.c sym labels from Emerald 2021-03-19 15:51:50 -04:00
Kurausukun
c94e5e9ab0 Merge remote-tracking branch 'upstream/master' into port_matchings 2021-03-19 14:34:58 -04:00
PikalaxALT
45f75213c0 Some more quest log and field player avater documentation 2021-03-19 09:26:01 -04:00
PikalaxALT
8ccf95e502 Label unnamed symbols in trade_scene, 1 2021-03-19 08:51:05 -04:00
PikalaxALT
89faf387db Document remaining symbols in daycare.c 2021-03-19 08:29:25 -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
bf69c79b12 Name all syms in battle_anim_mons 2021-03-18 20:32:20 -04:00
PikalaxALT
815636f271 Document ShouldIgnoreDeoxysForm 2021-03-18 18:23:41 -04:00
PikalaxALT
014596dea5 Document and refactor AdjustFriendship 2021-03-18 17:50:55 -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
PokeCodec
26ac9c5faf Match Most of Remaining Functions 2020-09-01 11:42:28 -04:00
GriffinR
bb56d4a3f4 Give songs meaningful english names 2020-08-29 03:11:03 -04:00
luckytyphlosion
ed4a703838 Apply static modifier to static functions in PSS. 2020-07-04 20:54:24 -04:00
luckytyphlosion
1ad6f5270c Port over PSS data to src. 2020-07-04 20:32:44 -04:00
luckytyphlosion
d7df6bf6e3 Get rid of manual sym defines in sym_ewram.txt and ld_script_modern.txt 2020-07-04 18:14:40 -04:00
luckytyphlosion
db2fb7785d pokemon_summary_screen.c, part 12. 2020-07-04 16:07:40 -04:00
luckytyphlosion
7cb48a704a pokemon_summary_screen.c, part 10. 2020-07-03 19:40:10 -04:00
luckytyphlosion
f8247cdd79 pokemon_summary_screen.c, part 9. 2020-07-03 17:42:40 -04:00
luckytyphlosion
9453c154d7 pokemon_summary_screen.c, part 8. 2020-07-02 20:19:37 -04:00
luckytyphlosion
d9d3ac1c5d pokemon_summary_screen.c, part 7. 2020-07-02 16:45:49 -04:00
luckytyphlosion
91fea55a24 pokemon_summary_screen.c, part 6. 2020-06-25 12:59:37 -04:00
luckytyphlosion
114a5b9b6f pokemon_summary_screen.c, part 5. 2020-06-24 13:57:19 -04:00
luckytyphlosion
a04106a011 pokemon_summary_screen.c, part 4. 2020-06-23 22:06:21 -04:00
luckytyphlosion
d096f37d75 pokemon_summary_screen.c, part 3. 
Also commit hgrep.sh for searching in non-c files.
 2020-06-23 17:13:23 -04:00
luckytyphlosion
7cabc3d1a5 pokemon_summary_screen.c, part 2. 
Also fix prototype of MenuHelpers_CallLinkSomething.
 2020-06-14 19:04:24 -04:00
luckytyphlosion
bc143a695d Initial work on pokemon_summary_screen.c 2020-06-14 16:08:21 -04:00
PikalaxALT
85dbd6c93e
Merge pull request #342 from GriffinRichards/sync-mapdatasize 
Add MAX_MAP_DATA_SIZE alias
 2020-05-27 07:54:29 -04:00
PikalaxALT
e3769a2ee9
Merge pull request #340 from GriffinRichards/doc-inconnect 
Label in_connection's field in ObjectEventTemplate
 2020-05-27 07:53:11 -04:00
GriffinR
e055d3afa4 Add MAX_MAP_DATA_SIZE alias 2020-05-17 16:45:58 -04:00
GriffinR
7b18204a90
Merge branch 'master' into doc-inconnect 2020-05-14 19:27:02 -04:00
GriffinR
ea01b132b2 Label in_connection's field in ObjectEventTemplate 2020-05-14 16:29:19 -04:00
Evan
f5c694c5b4 alignment fix 2020-05-05 11:07:56 -06:00
Evan
5a5e68269d fix PLAYER_AVATAR_FLAG_WATERING define 2020-05-05 11:00:39 -06:00
Evan
fcb999beea document battle_message.c 2020-05-01 19:54:35 -06:00
PikalaxALT
ece62fa4ba
Merge pull request #333 from jiangzhengwenjz/librfu 
fix librfu issues
 2020-04-27 19:11:59 -04:00
PikalaxALT
9f8f350da3
Merge pull request #334 from jiangzhengwenjz/nonmatching 
fix remainSize field in librfu
 2020-04-27 19:11:39 -04:00
jiangzhengwenjz
2d0dace7e0 fix remainSize type 2020-04-28 04:45:15 +08:00
jiangzhengwenjz
151f583f0c librfu issues 2020-04-27 07:37:31 +08:00
Evan
87ba2b8bde battle anim documentation 2020-04-23 22:40:13 -06:00
fieldy101
4c409fa343 Resolving PR review 2020-04-23 10:05:19 +10:00
fieldy101
9634b58d7a Port emerald water functions into firered 2020-04-22 23:30:44 +10:00
GriffinR
cdc705f7e3 Label GCN link flags field 2020-04-22 23:30:44 +10:00
GriffinR
03ca7d8bb4 Label GCN link flags field 2020-04-13 08:42:56 -04:00
PikalaxALT
4e3b3cdd3c Berry Crush documentation, 2 2020-04-11 21:47:47 -04:00
PikalaxALT
8f8665e1dc Some documentation of berry_crush 2020-04-11 14:34:45 -04:00
PikalaxALT
ec0edfd198 Cleanup of main.c 2020-04-10 20:16:31 -04:00
PikalaxALT
c29408cbbb Use defines/enums in window.c, window_8bpp.c 2020-04-10 16:36:41 -04:00
PikalaxALT
aea30489fc Create COPYWIN defines for CopyWindowToVram calls 2020-04-10 16:17:46 -04:00
PikalaxALT
a205881ce2 Comment dma3 methods and create DMA3_*BIT macros 2020-04-10 15:57:08 -04:00
PikalaxALT
b22d3a821d Merge branch 'master' of github.com:pret/pokefirered into modern_gcc 2020-04-10 13:10:44 -04:00
PikalaxALT
5f7ed93363 Name as many symbols as I could in trade.c 2020-04-10 12:03:37 -04:00
PikalaxALT
fc7f04322d Address review comments, 3 2020-04-10 11:16:53 -04:00
PikalaxALT
fd66e15464 Address review comments, 2 2020-04-10 11:11:47 -04:00
PikalaxALT
61a06dffe7 Address review comments 2020-04-10 10:57:20 -04:00
PikalaxALT
d79a499d91 Attempt to doc trade 2020-04-09 14:43:08 -04:00
PikalaxALT
8626240b54 Finish naming item_pc routines 2020-04-09 11:50:23 -04:00
PikalaxALT
2073a56531 Finish naming objs in slot_machine 2020-04-08 12:51:31 -04:00
PikalaxALT
54559c2e08 More quest log documentation 2020-04-07 19:37:53 -04:00
PikalaxALT
fedb2f5c0b Merge branch 'master' of github.com:pret/pokefirered into modern_gcc 2020-04-07 11:05:48 -04:00
PikalaxALT
31ecdcdd0a Merge branch 'master' of github.com:pret/pokefirered into various_documentation 2020-04-07 07:50:06 -04:00
PikalaxALT
a7d74b1779 More quest log doccing 2020-04-06 20:43:53 -04:00
PikalaxALT
0394317ae4 Merge branch 'various_documentation' of github.com:PikalaxALT/pokefirered into various_documentation 2020-04-06 18:00:47 -04:00
PikalaxALT
c78101535b Split quest_log.c 2020-04-06 17:58:24 -04:00
PikalaxALT
c05ca373e0 Merge branch 'master' of github.com:pret/pokefirered into various_documentation 2020-04-06 15:27:10 -04:00
PikalaxALT
1f113498c9 Merge branch 'master' of github.com:pret/pokefirered into modern_gcc 2020-04-06 15:16:23 -04:00
PikalaxALT
b2e8e02364 Use actual filename/lineno in AGBAssert calls for modern 2020-04-06 15:13:47 -04:00
GriffinR
662c8db99e Fix tile encounter name 2020-04-06 12:53:53 -04:00
GriffinR
93d17ef7c8
Merge branch 'master' into doc-rm 2020-04-06 00:37:08 -04:00
GriffinR
5f1a4de374 Clean up region map doc 2020-04-06 00:35:20 -04:00
PikalaxALT
a622448029 More quest log documentation amid other stuff 2020-04-05 20:30:45 -04:00
PikalaxALT
f15a705021 Resolve compile warnings in modern 2020-04-05 13:07:40 -04:00
PikalaxALT
cc3419eff7 Get pokefirered_modern to build 2020-04-04 12:58:08 -04:00