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
2,973 Commits 2 Branches 0 Tags 366 MiB
f6565a15d4
Commit Graph

1990 Commits

Author SHA1 Message Date
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
GriffinR
bb56d4a3f4 Give songs meaningful english names 2020-08-29 03:11:03 -04:00
GriffinR
d8f858d04e Wrap asm statements in NONMATCHING 2020-08-18 09:09:25 -04:00
PokeCodec
e1848ef54d Match sub_80D1F64 2020-08-17 14:23:41 -04:00
PikalaxALT
7b2d1082cc
Bugfix for access violation in MapPreview_CreateMapNameWindow 2020-07-10 19:41:44 -04:00
luckytyphlosion
4672e05560 Fix sub_8137C18 nonmatching. 2020-07-08 15:41:54 -04:00
luckytyphlosion
ed4a703838 Apply static modifier to static functions in PSS. 2020-07-04 20:54:24 -04:00
luckytyphlosion
1bea05746e Fix prefixes of static variables in PSS. 2020-07-04 20:46:19 -04:00
luckytyphlosion
c4d7037f49 Declare some data as static. 2020-07-04 20:38:04 -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
aecf2dbf6e pokemon_summary_screen.c, part 13. 2020-07-04 17:15:04 -04:00
luckytyphlosion
db2fb7785d pokemon_summary_screen.c, part 12. 2020-07-04 16:07:40 -04:00
luckytyphlosion
4bf7e4f4fb pokemon_summary_screen.c, part 11. 2020-07-03 21:35:59 -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
6a55484130
Merge pull request #344 from Missingmew/master 
Decompile unused decompress function, as seen in ruby
 2020-05-27 07:54:48 -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
Missingmew
d632fb08b4 switch to pret short-types and tabs vs spaces 2020-05-21 00:26:10 +02:00
Missingmew
10d672da0d Decompile unused decompress function, as seen in ruby 2020-05-21 00:00:42 +02:00
GriffinR
7b18204a90
Merge branch 'master' into doc-inconnect 2020-05-14 19:27:02 -04:00
GriffinR
992fba2bc5 Fix nonmatching build 2020-05-14 19:14:34 -04:00
GriffinR
ea01b132b2 Label in_connection's field in ObjectEventTemplate 2020-05-14 16:29:19 -04: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
PikalaxALT
b9a5646210
Merge pull request #335 from jiangzhengwenjz/bg 
real match CopyTileMapEntry
 2020-04-27 19:08:44 -04:00
jiangzhengwenjz
57d561cd8f CopyTileMapEntry 2020-04-28 05:46:52 +08: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
6906c632f4 fix prefix typo 2020-04-24 08:40:25 -06:00
Evan
87ba2b8bde battle anim documentation 2020-04-23 22:40:13 -06:00
fieldy101
ec0aa8100d Add newline at EOF and set incbins as static 2020-04-23 10:47:26 +10:00
fieldy101
4c409fa343 Resolving PR review 2020-04-23 10:05:19 +10:00
fieldy101
ab826b9222 Add includes for nonmatching build 2020-04-22 23:30:44 +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
PikalaxALT
543434ea2d
Merge pull request #329 from GriffinRichards/doc-gcn 
Label GCN link flags field
 2020-04-14 15:54:46 -04:00
GriffinR
03ca7d8bb4 Label GCN link flags field 2020-04-13 08:42:56 -04:00
Petuuuhhh
1137346fca scroll 2020-04-12 22:37:49 -04:00
Petuuuhhh
355b210b02 init 2020-04-12 22:29:13 -04:00
Petuuuhhh
a046cf4f8e resume 2020-04-12 22:26:45 -04:00
Petuuuhhh
d715106cc2 move_relearner_state_machine_defines 2020-04-12 22:21:16 -04:00
PikalaxALT
7a562d6bae Update static labels in berry_crush_2.c 2020-04-12 08:54:02 -04:00
PikalaxALT
58f59a3491 Address review on misc documentation 2020-04-12 08:48:14 -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
2cb171b9fd Tidy up inline asm in main.c 2020-04-10 16:45:34 -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