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

2520 Commits

Author SHA1 Message Date
hjk321
ea68ec3fd7 Merge battle graphics into battle_terrain and remove un-included files 
The previous battle folder contained the used (and until recently undocumented) battle terrain graphics, while everything in the previous battle_terrain folder contained unused data (which is now at battle_terrain/unused, minus the files that never get included in the rom).
 2021-03-30 23:34:31 -05: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
hjk321
05521b0668 Document and index graphics/battle 2021-03-29 01:25:27 -05:00
PikalaxALT
7f70b570dd Improve some names in field_player_avatar 2021-03-24 13:19:07 -04:00
PikalaxALT
6b64fbc522 Merge branch 'master' of github.com:pret/pokefirered into misc_doc 2021-03-24 08:15:08 -04:00
PikalaxALT
a925d2b7b0 Document vars in CopyGlyphToWindow 2021-03-23 16:12:50 -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
Kurausukun
b280105f52 [LEAK-INFORMED] fix sub_8113AE8 fakematching 2021-03-23 02:53:00 -04:00
Kurausukun
0f1acd595e [LEAK-INFORMED] fix sub_812E768 fakematching 2021-03-23 02:05:15 -04:00
Kurausukun
3e9ccb4b77 [LEAK-INFORMED] fix clear_save_data_screen fakematch 2021-03-23 00:51:34 -04:00
Kurausukun
64e3ba9964 [LEAK-INFORMED] fix vs_seeker fakematchings 2021-03-23 00:19:34 -04:00
Kurausukun
646c443221 [LEAK-INFORMED] fix Task_UseItem_OutwardSpiralDots fakematching 2021-03-22 23:56:38 -04:00
Kurausukun
3f236d09c6 [LEAK-INFORMED] fix InitItemIconSpriteState fakematch 2021-03-22 23:44:08 -04:00
PikalaxALT
bccdee5299 Fakematch HelpSystem_RenderText 2021-03-22 21:15:57 -04:00
PikalaxALT
f6565a15d4 Style fixes; attempt to match help_system NONMATCHING 2021-03-21 20:28:42 -04:00
PikalaxALT
30c265118c Fix fakematch in clear_save_data_screen 2021-03-21 08:23:38 -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
301ef72cf8 Use CpuCopy macros instead of CpuSet directly 2021-03-20 14:11:43 -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
Kurausukun
fcd39ec726 won't be needing this anymore 2021-03-19 16:25:12 -04:00
Kurausukun
37e5dd9c33 match RollCredits, with thanks to shoomer 2021-03-19 16:24:22 -04:00
PikalaxALT
f8932775cd Sync berry.c sym labels from Emerald 2021-03-19 15:51:50 -04:00
PikalaxALT
b5d9fb3c7e Match SetEnigmaBerry 2021-03-19 15:45:29 -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
0643255c85 port task00_mystery_gift matching from emerald 2021-03-19 05:12:21 -04:00
Kurausukun
31a32c955e fakematch sub_805EE3C 
I have no idea why this won't actually match, but thanks to pidgey for figuring out this fakematch
 2021-03-19 04:53:28 -04:00
Kurausukun
c11710288a port moar fixes and documentation 2021-03-19 02:25:43 -04:00
Kurausukun
f18aeb187d [LEAK-INFORMED] fix cut nonmatchings 2021-03-18 23:47:39 -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
d95cdf42f5 Document ShouldIgnoreDeoxysForm, 2 2021-03-18 18:24:10 -04:00
PikalaxALT
815636f271 Document ShouldIgnoreDeoxysForm 2021-03-18 18:23:41 -04:00
PikalaxALT
27897b0581 <minor> Fix visual alignment in sFriendshipEventDeltas 2021-03-18 17:53:32 -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
fa6b2c4615 nvalidmons -> nValidMons 2021-03-16 14:56:43 -04:00
PikalaxALT
aedd30e104 Remove unneeded pokedude macros 2021-03-16 14:30:30 -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
67cdab24f8 Use macro in BufferPartyVsScreenHealth_AtEnd 2021-03-15 08:37:11 -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
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
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
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
a42e4134af Merge branch 'master' of github.com:pret/pokefirered into modern_gcc 2020-04-09 11:25:47 -04:00
PikalaxALT
a53ad6c565 Merge branch 'master' of github.com:pret/pokefirered into various_documentation 2020-04-09 10:22:21 -04:00
ultima-soul
c79f1f1c80 Document Roamer Roar bug. 2020-04-08 20:13:38 -07:00
PikalaxALT
ea207f6334 Clean up includes 2020-04-08 17:03:26 -04:00
PikalaxALT
5f00cffaac Fix alignment 2020-04-08 15:42:41 -04:00
PikalaxALT
2073a56531 Finish naming objs in slot_machine 2020-04-08 12:51:31 -04:00
PikalaxALT
d7c165d8fe Start documenting slot machines 2020-04-08 08:55:39 -04:00
PikalaxALT
54559c2e08 More quest log documentation 2020-04-07 19:37:53 -04:00
PikalaxALT
eba370ac3b Merge branch 'master' into modern_gcc 2020-04-07 13:45:59 -04:00
PikalaxALT
a538befd55 Merge branch 'various_documentation' of github.com:PikalaxALT/pokefirered into various_documentation 2020-04-07 13:45:40 -04:00
PikalaxALT
6451143b3b Merge branch 'master' of github.com:pret/pokefirered into various_documentation 2020-04-07 13:45:25 -04:00
PikalaxALT
8a1c3b1362 Match atk7C_trymirrormove 2020-04-07 13:13:27 -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
7693c90e67
Merge pull request #324 from GriffinRichards/move-gfx 
Move gfx out of data
 2020-04-06 20:51:18 -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
PikalaxALT
bbeef52a01 Timestamp modern build 2020-04-06 13:20:36 -04:00
GriffinR
662c8db99e Fix tile encounter name 2020-04-06 12:53:53 -04:00
GriffinR
1536737da4 Fix some static labels 2020-04-06 10:51:07 -04:00
GriffinR
f3919ab5c3 Drop missed prefixes 2020-04-06 10:10:12 -04:00
GriffinR
100188ac43 Move gfx out of data 2020-04-06 10:02:14 -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
GriffinR
fabcbc16ec Document more region map 2020-04-05 17:30:31 -04:00
PikalaxALT
f15a705021 Resolve compile warnings in modern 2020-04-05 13:07:40 -04:00
PikalaxALT
585a1170c9 Partially unroll IWRAM clear loop 2020-04-05 08:36:10 -04:00
PikalaxALT
ca8580ddd9 Merge branch 'master' of github.com:pret/pokefirered into modern_gcc 2020-04-04 16:14:11 -04:00
PikalaxALT
cc3419eff7 Get pokefirered_modern to build 2020-04-04 12:58:08 -04:00
PikalaxALT
feede54edd
Merge pull request #319 from garakmon/encounterinjafix 
Fix encounter groups with neither a FireRed nor LeafGreen label
 2020-04-04 12:54:16 -04:00
PikalaxALT
c47eca8a18
Merge pull request #316 from PikalaxALT/various_documentation 
Various documentation
 2020-04-03 19:25:01 -04:00
PikalaxALT
8f74dda3e4 Minor cleanup 2020-04-03 19:18:55 -04:00
garakmon
791e30c90b fix encounter groups with neither a FireRed or LeafGreen label 2020-04-03 15:04:49 -04:00
PikalaxALT
898bd24438 gflib propagation, 1 2020-04-02 20:40:15 -04:00
PikalaxALT
58e8bad37b intro.c includes gflib.h 2020-04-02 20:20:09 -04:00
PikalaxALT
1e5150742e Apply pals to bg tiles in intro.c 2020-04-02 18:14:18 -04:00
PikalaxALT
c60821d3fb Name remaining subroutines in intro.c 2020-04-01 20:37:25 -04:00
GriffinR
250f955ae6 Start documenting region map 2020-04-01 17:32:22 -04:00
PikalaxALT
1d399a41dd Fix intro gfx and start doccing intro methods 2020-04-01 08:57:03 -04:00
PikalaxALT
af32535610 Name all specials 2020-03-31 08:49:47 -04:00
PikalaxALT
4134baf3eb Some more docs in battle anims 2020-03-31 07:55:32 -04:00
PikalaxALT
24ae03ff30 Fix accidental space 2020-03-30 18:14:11 -04:00
PikalaxALT
bfd4165ca0 Use bool constants with map_name_popup task fields 2020-03-30 17:51:54 -04:00
PikalaxALT
b31317889d Partial doc of battle anim utility funcs 2020-03-30 08:52:49 -04:00
PikalaxALT
1bed74a6a1 doc option_menu 2020-03-29 17:45:11 -04:00
PikalaxALT
8c23bd7c96 Document bike.c 2020-03-29 17:29:52 -04:00
PikalaxALT
200c82e01a
Merge pull request #317 from GriffinRichards/fix-spritelayout 
Reorient object event sprites to horizontal
 2020-03-29 12:30:47 -04:00
GriffinR
55f9028383 Reorient object event sprites to horizontal 2020-03-29 11:48:01 -04:00
PikalaxALT
19812c9d18 Decoration data to C 2020-03-29 11:42:08 -04:00
PikalaxALT
20b7967049 Some doc in shop, quest_log 2020-03-29 11:00:02 -04:00
PikalaxALT
581ec47ae2 Document map_name_popup task fields 2020-03-29 10:42:31 -04:00
PikalaxALT
9cfc34f2ec Address review comments 2020-03-29 08:56:38 -04:00
PikalaxALT
a027218bc6 Credits overworld pan sequence doc 2020-03-28 22:15:12 -04:00
PikalaxALT
935fd18898 overworld static syms 2020-03-28 21:50:01 -04:00
PikalaxALT
0f618efb15 Finish overworld.c 2020-03-28 21:39:28 -04:00
PikalaxALT
781aa8949c Merge branch 'master' of github.com:pret/pokefirered into overworld 2020-03-28 18:04:45 -04:00
PikalaxALT
f3a632156b through sub_8057854 2020-03-28 18:00:52 -04:00
PikalaxALT
f5f4d6bc1f through InitCurrentFlashLevelScanlineEffect 2020-03-28 14:40:25 -04:00
PikalaxALT
f0fe4904d0 through sub_8056918 2020-03-28 14:03:51 -04:00
jiangzhengwenjz
20d11187cf name R/S leftover from bike.c 2020-03-29 00:31:23 +08:00
PikalaxALT
9bcc82856d Merge branch 'master' of github.com:pret/pokefirered into overworld 2020-03-28 12:26:00 -04:00
PikalaxALT
24ac46856a through sub_805644C 2020-03-28 12:20:20 -04:00
PikalaxALT
9c62fd51aa sub_8056126 2020-03-28 11:06:04 -04:00
PikalaxALT
816e7ad1f8 through ChooseAmbientCrySpecies 2020-03-28 10:42:23 -04:00
jiangzhengwenjz
fd7abb3d73 bike 2020-03-28 10:11:45 +08:00
PikalaxALT
fe9c3d3b58 through sub_8055B38 2020-03-27 18:08:28 -04:00
PikalaxALT
a03906a1a3 through SetContinueGameWarpToDynamicWarp 2020-03-27 17:21:00 -04:00
GriffinR
e68c165d71 Label oam tables 2020-03-27 09:14:26 -04:00
PikalaxALT
71c003dcdb through LoadSaveblockMapHeader 2020-03-26 21:30:58 -04:00
PikalaxALT
012f8ed12f through sub_8054F38 2020-03-26 19:59:05 -04:00
PikalaxALT
84a69bf140 through Overworld_ResetStateAfterFly 2020-03-26 18:29:48 -04:00
PikalaxALT
9130579f14 Resolve off-by-one error in evobjmv.c 2020-03-26 17:37:14 -04:00
PikalaxALT
b0878acc98 Address review comments 2020-03-26 17:17:11 -04:00
PikalaxALT
402f2643bd Merge branch 'master' of github.com:pret/pokefirered into field_player_avatar 2020-03-26 17:07:52 -04:00
GriffinR
73503e3e4d Use directional movement action constants 2020-03-26 13:54:42 -04:00
GriffinR
6cf4bc4101 Label object event graphics 2020-03-26 13:39:40 -04:00
PikalaxALT
9cb08e3475 Document player avatar fields 2020-03-25 20:40:44 -04:00
PikalaxALT
adc7a0b65a Document field teleport anim 2020-03-25 19:40:34 -04:00
PikalaxALT
3a29f9be95 static syms in field_player_avatar 2020-03-25 18:12:07 -04:00
PikalaxALT
302c6bfe6b finish field_player_avatar 2020-03-25 18:00:26 -04:00
PikalaxALT
c032dc0231 through AlignFishingAnimationFrames 2020-03-25 17:37:07 -04:00
PikalaxALT
f1841ef24d through sub_805D1A8 2020-03-25 08:57:52 -04:00
GriffinR
89c4e3229e Review static evobjmv data 2020-03-25 03:22:12 -04:00
GriffinR
f6d0a14e7f Move remaining event_object_movement data to src 2020-03-25 01:21:31 -04:00
GriffinR
0da7681d8f Move object event graphics to src 2020-03-25 01:14:16 -04:00
GriffinR
5b612393eb Move data up to object event graphics to src 2020-03-25 00:57:23 -04:00
GriffinR
970717ee2c Move object event graphics info pointers to src 2020-03-25 00:46:27 -04:00
PikalaxALT
6c964a6350 through InitPlayerAvatar 2020-03-24 20:59:37 -04:00
GriffinR
d50ce48776 Move field effect object template pointers to src 2020-03-24 20:36:52 -04:00
GriffinR
936529b3cb Move object event pic tables to src 2020-03-24 20:31:12 -04:00
GriffinR
8214c6a91f Move object event anims to src 2020-03-24 18:49:38 -04:00
PikalaxALT
8a85485cc2 through PlayerTurnInPlace 2020-03-24 18:17:18 -04:00
GriffinR
db50454973 Move base oam to src 2020-03-24 18:16:41 -04:00
GriffinR
badb380861 Move object event subsprites to src 2020-03-24 17:24:29 -04:00
GriffinR
5d0ababb58 Move object event graphics info to src 2020-03-24 16:58:47 -04:00
GriffinR
671a5d3273 Move palette tags to src 2020-03-24 14:44:21 -04:00
GriffinR
b021ce35b7 Move field effect objects to src 2020-03-24 14:16:49 -04:00
PikalaxALT
87b2c7f34b through PlayerSetAnimId; some quest log doc 2020-03-24 08:56:14 -04:00
GriffinR
68e942065a Move movement type func tables to src 2020-03-23 22:42:36 -04:00
PikalaxALT
58535acf88 better match for TryPushBoulder 2020-03-23 21:46:52 -04:00
PikalaxALT
5b3e9f376b through PlayerGetCopyableMovement 2020-03-23 21:42:35 -04:00
GriffinR
b607821bf6 Move evobjmv data up to movement type func tables to src 2020-03-23 17:34:12 -04:00
GriffinR
b76d8f569c Move movement action func tables to src 2020-03-23 16:39:46 -04:00
PikalaxALT
f9a3607824 through CheckForObjectEventCollision 2020-03-23 08:54:37 -04:00
PikalaxALT
dbac777d95 through CheckMovementInputNotOnBike 2020-03-22 20:17:47 -04:00
PikalaxALT
4f65d54095
Merge pull request #309 from PikalaxALT/pokemon_special_anim 
Pokemon special anim
 2020-03-22 14:50:33 -04:00
PikalaxALT
77a6b8a820 Address review comments; doc round 2 2020-03-22 14:26:44 -04:00
PikalaxALT
faab53204c Start doccing PSA 2020-03-21 20:52:44 -04:00
PikalaxALT
41704d7054 Finish pokemon_special_anim_scene.s 2020-03-21 19:46:43 -04:00
PikalaxALT
d0be58d077 through sub_811E040 2020-03-21 16:55:56 -04:00
PikalaxALT
218555e72c through sub_811D5C0 2020-03-21 10:48:55 -04:00
PikalaxALT
47fe2cb9ce through sub_811D2D0 2020-03-20 20:33:25 -04:00
PikalaxALT
73b04853e9 through sub_811D178 2020-03-20 19:59:20 -04:00
PikalaxALT
fafb252543 through sub_811CF88 2020-03-20 08:37:58 -04:00
PikalaxALT
b36ea2db98 through sub_811CA20 2020-03-19 20:40:26 -04:00
GriffinR
9c1a8011d9 Move heal location data 2020-03-19 19:32:13 -04:00
PikalaxALT
a8403c0779 Address review comments (cleanup) 2020-03-19 10:25:17 -04:00
PikalaxALT
e078e4b315 Some documentation of field_control_avatar and related routines 2020-03-19 08:45:32 -04:00
PikalaxALT
15a3adefa0 Static syms in field_control_avatar 2020-03-18 21:32:09 -04:00
PikalaxALT
7074900712 Finish field_control_avatar 2020-03-18 21:20:42 -04:00
PikalaxALT
4516c63652 through TryStartWarpEventScript 2020-03-18 08:49:31 -04:00
PikalaxALT
ba7e4acfee through CheckStandardWildEncounter 2020-03-17 22:08:02 -04:00
PikalaxALT
901fceec18 through GetInteractedObjectEventScript 2020-03-17 20:59:39 -04:00
PikalaxALT
715c2ff3ad
Merge pull request #304 from GriffinRichards/fix-tilesetname 
Standardize tileset folder names
 2020-03-17 08:54:38 -04:00
PikalaxALT
0b1ddd5842
Merge pull request #303 from GriffinRichards/doc-metatr 
Label used metatile attributes
 2020-03-17 08:53:50 -04:00
PikalaxALT
39587fe2bc Address review comments 2020-03-17 08:28:09 -04:00
PikalaxALT
2c0a5be745 Static syms in field_weather_* 2020-03-16 21:48:54 -04:00
PikalaxALT
7610a2dfc2 Port field_weather_effects from emerald 2020-03-16 21:43:49 -04:00
GriffinR
98942449be Standardize tileset folder names 2020-03-16 20:52:12 -04:00
PikalaxALT
51eac4e14b field_weather_util 2020-03-16 20:37:51 -04:00
PikalaxALT
6e00e82210 Port field_weather from Emerald 2020-03-16 20:12:37 -04:00
GriffinR
ebf2f04d91 Label used metatile attributes 2020-03-16 19:09:13 -04:00
PikalaxALT
db3e992fc3 Address review comments; doc pc_screen_effect 2020-03-16 08:23:01 -04:00
PikalaxALT
160df58342 Merge branch 'master' of github.com:pret/pokefirered into pokemon_storage_system 2020-03-16 07:59:43 -04:00
PikalaxALT
2c7387951b
Merge pull request #301 from GriffinRichards/doc-borderdim 
Label border dimension fields
 2020-03-16 07:59:31 -04:00
PikalaxALT
0367cc7d78 Merge branch 'master' of github.com:pret/pokefirered into pokemon_storage_system 2020-03-16 07:51:21 -04:00
ultima-soul
e1f7efb8e6 Document some metatile behaviors and address review comments. 2020-03-15 19:44:47 -07:00
PikalaxALT
9c2e157123 Start documenting PSS 2020-03-15 20:31:31 -04:00
PikalaxALT
d30e2597a0 pss 9; static symbols 2020-03-15 18:25:20 -04:00
PikalaxALT
c996ca85bc pokemon_storage_system_8 2020-03-15 17:29:02 -04:00
PikalaxALT
be742e6741 pokemon_storage_system_7 2020-03-15 15:11:51 -04:00
PikalaxALT
8908b7d47a finish pokemon_storage_system_6 2020-03-15 13:24:40 -04:00
PikalaxALT
39ef2a31a4 through AddMenu 2020-03-15 12:24:33 -04:00
PikalaxALT
1e959e036d through sub_8094D84 2020-03-15 11:57:01 -04:00
GriffinR
090591b71d Remove unnecessary border tile macro 2020-03-15 11:29:12 -04:00
ultima-soul
dd24bd3116 Fix fakematch and match nonmatching. 2020-03-15 08:12:39 -07:00
PikalaxALT
e445a42a5b through HandleInput 2020-03-15 10:26:42 -04:00
PikalaxALT
f45c229453 Real match InBoxInput_Normal 2020-03-15 09:45:22 -04:00
GriffinR
de53dabab2 Label border dimension fields 2020-03-15 01:24:31 -04:00
PikalaxALT
09b90247ee through nonmatching InBoxInput_Normal 2020-03-14 21:19:56 -04:00
PikalaxALT
5471590f77 through RunCanReleaseMon 2020-03-14 20:37:48 -04:00
PikalaxALT
8faf63a97c split off pokemon_storage_system_4 2020-03-14 14:23:40 -04:00
PikalaxALT
5f7738672a through sub_809223C 2020-03-14 13:52:50 -04:00
ultima-soul
96b7836d48 Finish rest of event_object_movement 2020-03-13 19:44:09 -07:00
PikalaxALT
6753e18db0 through sub_8090FC4 2020-03-13 20:53:22 -04:00
PikalaxALT
a89e8474fd Through sub_808FE54 2020-03-13 16:52:47 -04:00
ultima-soul
99e4de062a Merge branch 'master' into event_object_movement 2020-03-13 00:32:04 -07:00
PikalaxALT
50e0630320 Through GiveChosenBagItem 2020-03-12 16:43:23 -04:00
ultima-soul
339c2914af Decompile/port event_object_movement 2020-03-12 12:46:40 -07:00
PikalaxALT
68c48a0cc3 through Cb_ReleaseMon 2020-03-12 15:39:41 -04:00
PikalaxALT
748b4eafac through Cb_MainPSS 2020-03-12 14:14:16 -04:00
PikalaxALT
5422315db5 through sub_808CF10 2020-03-11 17:03:57 -04:00
PikalaxALT
6b4b6a54af Make sub_808BDE8 call signature more sane 2020-03-11 14:21:43 -04:00
PikalaxALT
3aeb294572 Port pokemon_storage_2 from emerald 2020-03-11 13:32:30 -04:00
PikalaxALT
d2b0f36b7d Port PSS utility functions 2020-03-11 09:55:45 -04:00
GriffinR
cbe6e27f37 region_map.h to region_map_sections.h 2020-03-11 01:04:27 -04:00
PikalaxALT
9486d21b8d Address review comments 2020-03-10 15:31:41 -04:00
PikalaxALT
4594c5dac9 Port field_camera from Emerald 2020-03-10 15:19:50 -04:00
PikalaxALT
7209db3397 gNamingScreenData --> sNamingScreenData 2020-03-10 14:20:35 -04:00
PikalaxALT
0454ce25d3 Rename keyboard_text header 2020-03-10 13:26:31 -04:00
PikalaxALT
bbaa60ab1c Address review comments 2020-03-10 13:23:32 -04:00
PikalaxALT
b81dd6de22 Static symbols in naming_screen.c 2020-03-10 11:33:51 -04:00
PikalaxALT
9aa9c22a7f Finish naming_screen 2020-03-10 11:32:18 -04:00
PikalaxALT
98d63a5268 through NamingScreen_CreateRivalIcon 2020-03-10 09:55:29 -04:00
PikalaxALT
1689cb55a7 through sub_809EC54 2020-03-09 16:58:40 -04:00
PikalaxALT
3a83a987b4 through sub_809E6E0 2020-03-09 16:19:16 -04:00
PikalaxALT
0fdffabbc8 through pokemon_store 2020-03-09 14:28:13 -04:00
PikalaxALT
6676e5bcb8 Use FADE_TO_BLACK define in other files 2020-03-09 09:43:37 -04:00
PikalaxALT
884c000028 Use FADE_ defines in field_fadetransition 2020-03-09 09:38:58 -04:00
PikalaxALT
8955f1fa5f Use MPS_TYPE_ defines in field_fadetransition and fldeff_flash 2020-03-09 09:32:17 -04:00
PikalaxALT
1a8023c465 Update MapPreviewScreen.type 2020-03-09 09:30:13 -04:00
PikalaxALT
926b7c975d Name fldeff_flash gfx 2020-03-08 20:03:12 -04:00
PikalaxALT
73e6280144 Document fldeff_flash and map_preview_screen 2020-03-08 19:54:02 -04:00
PikalaxALT
9f4f0df4d7 fldeff_flash.c 2020-03-08 18:38:30 -04:00
PikalaxALT
ddef816f7d struct pointer style patch 2020-03-08 13:28:35 -04:00
PikalaxALT
7a7aaab5d9 Address review comments 2020-03-08 13:26:19 -04:00
PikalaxALT
42c00ee3f3 Delete unneeded field 2020-03-08 12:33:21 -04:00
PikalaxALT
a9b72fbd7f Document Easy Chat 2/3 2020-03-08 12:32:34 -04:00
PikalaxALT
e1537a1d72 easy_chat_3 finish decomp 2020-03-08 09:49:07 -04:00
PikalaxALT
c81edda795 through sub_8101F80 2020-03-07 21:29:31 -05:00
PikalaxALT
40e4ef8f77 through sub_8101BA8 2020-03-07 20:46:29 -05:00
PikalaxALT
1346f7287c through sub_8101A5C 2020-03-07 18:24:35 -05:00
PikalaxALT
ab1d075682 through sub_8101558 2020-03-07 18:05:54 -05:00
PikalaxALT
6ce70985eb through sub_8100B70 2020-03-07 12:37:18 -05:00
PikalaxALT
ecf7cf9835 through sub_80FFF80 2020-03-06 17:07:36 -05:00
PikalaxALT
19698ff65d Annotate undumped symbols in sym_ewram.txt 2020-03-06 11:34:18 -05:00
PikalaxALT
3581ce9ba2 Decomp and doc clear_save_data_screen 2020-03-06 10:57:42 -05:00
PikalaxALT
f483a93bea
Merge pull request #290 from PikalaxALT/field_message_box 
Decompile field_message_box
 2020-03-06 09:59:23 -05:00
PikalaxALT
fef3383c6c Address review comments; struct pointer style fix in scrcmd.c 2020-03-06 09:06:44 -05:00
GriffinR
bd18148cb0 Fix typo 2020-03-05 21:46:35 -05:00
GriffinR
4e67eb8a18 Combine animated door frames 2020-03-05 21:38:09 -05:00
GriffinR
1bb4b48024 Label field door metatiles 2020-03-05 21:24:36 -05:00
PikalaxALT
113a817a56 Decompile field_message_box 2020-03-05 21:10:14 -05:00
jiangzhengwenjz
876278a1cc sub_815A61C 2020-03-06 05:29:54 +08:00
PikalaxALT
2e8d5d6279 Address remaining review comments 2020-03-05 16:14:40 -05:00
PikalaxALT
3dc2acc32d Address review comments except 2 2020-03-05 15:56:53 -05:00
PikalaxALT
4a24826e0a Clarify the data/dodrio_berry_picking.h include 2020-03-05 15:00:43 -05:00
PikalaxALT
3a894f7b08 Static symbols in dbp 2020-03-05 14:50:53 -05:00
PikalaxALT
83137b4005 Merge branch 'master' of github.com:pret/pokefirered into dodrio_berry_picking 2020-03-05 14:38:26 -05:00
GriffinR
5ab4af2d0e Fix some JP character mapping 2020-03-05 14:26:48 -05:00
GriffinR
eb4327a714 Move strings.s to src 2020-03-05 14:20:02 -05:00
PikalaxALT
7f81fdc8df Port dodrio_berry_picking_3 from emerald 2020-03-05 14:03:23 -05:00
PikalaxALT
b56c2b75b4 Finish dodrio_berry_picking_2.c 2020-03-05 13:58:14 -05:00
PikalaxALT
cb99443c51 through sub_81556E0 2020-03-05 10:31:31 -05:00
PikalaxALT
362cddc0f5
Merge pull request #285 from GriffinRichards/doc-scriptclean 
Clean up script documentation
 2020-03-05 06:06:51 -05:00
GriffinR
102744163b Use explicit initializers for help text 2020-03-05 01:12:29 -05:00
GriffinR
a82a7b5fcb Lowercase new pokedude labels 2020-03-04 18:29:32 -05:00
GriffinR
4df660dc76 Add enums for help system text, label help context 2020-03-04 18:26:54 -05:00
PikalaxALT
e9c3b78d9f through sub_8154A2C; reorganize dbp files a bit 2020-03-04 17:21:41 -05:00
PikalaxALT
ff13649f47 through sub_81537AC 2020-03-04 15:14:59 -05:00
PikalaxALT
6871f3dd33 through sub_8153048 2020-03-04 14:58:44 -05:00
PikalaxALT
171e4bbea4 through sub_815184C 2020-03-04 13:56:54 -05:00
PikalaxALT
8dcae92a5f port/decomp through sub_8150FDC 2020-03-04 11:19:39 -05:00
GriffinR
13e06bf7f8 Combine special prefixes, drop more 2020-03-04 10:42:16 -05:00
GriffinR
4c1d30a832 Add more metatile labels 2020-03-03 22:23:40 -05:00
GriffinR
7af1b35d17 Sync some specials/drop unnecessary prefixes 2020-03-03 17:45:25 -05:00
jiangzhengwenjz
d6352f7429 sub_814DFA4 2020-03-04 05:50:07 +08:00
PikalaxALT
c2f85a5326 Address review comments 2020-03-03 15:42:14 -05:00
PikalaxALT
11ce98c7ac Remove empty data/berry_crush.s 2020-03-03 15:19:33 -05:00
GriffinR
1aa1f18972 Sync trainer_battle.inc 2020-03-03 14:52:32 -05:00
PikalaxALT
df08e8645b Port some standalone rodata objects to C 2020-03-03 14:05:38 -05:00
GriffinR
4c4b19da7e Label help system text 2020-03-03 14:02:34 -05:00
PikalaxALT
d047e66310 Duplicate data in dodrio_berry_picking.c 2020-03-03 13:59:54 -05:00
PikalaxALT
8a7c2ded11 Port berry_crush_3 from Emerald 2020-03-03 12:24:18 -05:00
PikalaxALT
8594e7f72d Port berry_crush_2 from emerald 2020-03-02 21:36:30 -05:00
PikalaxALT
f77b0feba6 Port berry_crush.c part 1 from Emerald 2020-03-02 16:57:00 -05:00
GriffinR
63e0b54f96 Label pokedude text 2020-03-02 16:35:52 -05:00
PikalaxALT
fdc2a0b40e Fix undetected issue in #282 2020-03-02 14:46:42 -05:00
PikalaxALT
f5011a27d6
Merge pull request #282 from PikalaxALT/field_effect_helpers 
port field_effect_helpers from emerald
 2020-03-02 14:11:32 -05:00
PikalaxALT
e2a29e9db9 Address review comments 2020-03-02 13:59:38 -05:00
GriffinR
dd5f3c3c3d Add missing script labels 2020-03-02 13:52:16 -05:00
PikalaxALT
6363d39e99 port field_effect_helpers from emerald 2020-03-02 13:34:34 -05:00
GriffinR
4ab3d77d80 Fix special var names 2020-03-02 12:57:54 -05:00
PikalaxALT
0169a98c68
Merge pull request #278 from GriffinRichards/doc-miscscript 
Split/label some common event scripts
 2020-03-02 12:19:18 -05:00
PikalaxALT
e8504c7a3f
Merge pull request #276 from GriffinRichards/doc-sixisland 
Document Six and Seven Island scripts
 2020-03-02 12:17:52 -05:00
PikalaxALT
ae08a40290
Merge pull request #279 from PikalaxALT/field_effect 
Field effect
 2020-03-02 12:11:22 -05:00
PikalaxALT
2d820809d7 Revert erroneous use of SPRITE_INVALID_TAG 2020-03-02 12:01:57 -05:00
PikalaxALT
b3803dcc99 Address review comments, 2 2020-03-02 11:53:08 -05:00
PikalaxALT
d12dd578b8 Address review comments 2020-03-02 11:16:34 -05:00
GriffinR
6280a3786b
Merge branch 'master' into doc-sixisland 2020-03-02 10:48:56 -05:00
PikalaxALT
5198a05272
Merge pull request #275 from GriffinRichards/doc-fiveisland 
Document Five Island scripts
 2020-03-02 10:48:13 -05:00
GriffinR
8ff7977b89 Merge branch 'master' into doc-fourisland 2020-03-02 10:34:35 -05:00
PikalaxALT
d975572a6a Fix some extern declarations 2020-03-02 10:26:42 -05:00
PikalaxALT
d758ae0dc2 Merge branch 'master' of github.com:pret/pokefirered into field_effect 2020-03-02 10:15:07 -05:00
PikalaxALT
2f8ac698c8 Static symbols in field_effect.c 2020-03-02 09:57:54 -05:00
PikalaxALT
875dde7a0c Rename remaining field effect callbacks 2020-03-02 09:51:21 -05:00
PikalaxALT
a7966b5047 Finish field_effect.c 2020-03-02 09:47:33 -05:00
PikalaxALT
a506860558 field effect 0x43 2020-03-02 09:18:32 -05:00
GriffinR
62100376b7 Split/label some common event scripts 2020-03-02 00:19:11 -05:00
PikalaxALT
c36ef94a0d address review comments 2020-02-29 21:00:31 -05:00
PikalaxALT
cbd380f2bf Name many functions in cable_club.c 2020-02-29 17:01:03 -05:00
PikalaxALT
13687bb97f Static symbols in cable_club.c 2020-02-29 16:35:23 -05:00
PikalaxALT
21dddd5760 Finish cable_club.c 2020-02-29 16:31:57 -05:00
PikalaxALT
9b9ae3d337 through sub_8080E6C 2020-02-29 14:30:01 -05:00
GriffinR
575e8da6a9 Document Seven Island scripts 2020-02-28 20:24:19 -05:00
PikalaxALT
fb064f17ba Fly field effect 2020-02-28 17:10:06 -05:00
PikalaxALT
f825186655 Use VS Seeker field effect 2020-02-28 15:55:12 -05:00
PikalaxALT
80e5031619 Use Surf field effect 2020-02-28 15:29:16 -05:00
PikalaxALT
0c492c087e Show Mon field effect 2020-02-28 15:19:50 -05:00
PikalaxALT
410aaa00ff Teleport field effect 2020-02-28 14:26:54 -05:00
PikalaxALT
fb56341fe4 Escape Rope field effect 2020-02-28 14:14:34 -05:00
PikalaxALT
8f42b7b56d Lavaridge Gym 1F Warp field effect 2020-02-28 13:23:51 -05:00
PikalaxALT
9cf19244fa Port Lavaridge Gym B1F Warp from Emerald 2020-02-28 13:18:21 -05:00
PikalaxALT
8a09273846 Unused dive field effect 2020-02-28 11:16:03 -05:00
PikalaxALT
c117bc6864 Waterfall field effect 2020-02-28 10:19:34 -05:00
PikalaxALT
1779aedbf0 Escalator field effect 2020-02-28 10:02:40 -05:00
PikalaxALT
db12644f00 FallWarpEffect funcs 2020-02-28 09:06:19 -05:00
GriffinR
7d7c51973c Document Five Island scripts 2020-02-28 00:22:34 -05:00
GriffinR
968ac4742a Sync trainer_card.c 2020-02-27 17:15:27 -05:00
PikalaxALT
e07c771f18 through Task_FallWarpFieldEffect 2020-02-27 16:59:05 -05:00
PikalaxALT
9c03c850a2 Fly field effect 2020-02-27 16:35:06 -05:00
PikalaxALT
701d4635b4 Pokecenter heal and HOF field effects 2020-02-27 16:19:33 -05:00
GriffinR
2d9327a1ff Document Four Island scripts, trainer_card.inc 2020-02-27 14:21:13 -05:00
PikalaxALT
0d88e2d1de through MultiplyPaletteRGBComponents 2020-02-27 14:08:26 -05:00
PikalaxALT
c93915120f Port many field_effect.c names from Emerald 2020-02-27 11:45:08 -05:00
PikalaxALT
456c817338 Decompile fldeff hooks 2020-02-27 09:18:54 -05:00
PikalaxALT
e3447d2366
Merge pull request #269 from GriffinRichards/doc-pallet 
Document Pallet Town scripts
 2020-02-26 14:07:48 -05:00
PikalaxALT
13f14218e1
Merge pull request #268 from GriffinRichards/doc-routes4 
Document Routes 20-25, teleporter/escalator anim
 2020-02-26 13:57:36 -05:00
PikalaxALT
cac0681b2c Name cut grass metatiles 2020-02-26 13:15:21 -05:00
PikalaxALT
933bc3c01a fieldmap.c static symbols; CUT_GRASS_SPRITE_COUNT 2020-02-26 11:17:10 -05:00
PikalaxALT
4747fcb629 Name methods in fldeff_cut 2020-02-26 09:21:49 -05:00
PikalaxALT
51e2b99b9d Finish fldeff_cut 2020-02-26 09:11:24 -05:00
PikalaxALT
41644b283a through sub_8097A20 2020-02-25 16:52:16 -05:00
PikalaxALT
565114625f fldeff_cut through SetUpFieldMove_Cut 2020-02-25 16:35:38 -05:00
GriffinR
44c9109c2a Document Pallet Town scripts 2020-02-25 15:46:07 -05:00
GriffinR
15dbc58959 Document teleporter and escalator anim 2020-02-25 02:47:28 -05:00
PikalaxALT
3666a47d1c Port script_movement 2020-02-24 15:32:19 -05:00
PikalaxALT
a0fa06a066
Merge pull request #265 from GriffinRichards/sync-objgfx 
Sync object event gfx constants
 2020-02-24 09:02:25 -05:00
PikalaxALT
9dd88ac940 use RGB here 2020-02-23 21:22:07 -05:00
PikalaxALT
97408b18a3 Reformat battle terrain table and name assets 2020-02-23 21:19:34 -05:00
PikalaxALT
9e1b0319b2 Name battle terrains; address review comments 2020-02-23 21:06:59 -05:00
GriffinR
1fc8db43b7 Sync object event gfx constants 2020-02-23 17:00:12 -05:00
PikalaxALT
890d85ff02 battle_bg 2020-02-23 16:26:33 -05:00
GriffinR
8c02668a19 Rename tileset pals for porymap 2020-02-22 17:08:29 -05:00
GriffinR
9f138f0e13 Move remainder of graphics to src 2020-02-22 15:51:32 -05:00
GriffinR
707e0db049 Move graphics through mail to src 2020-02-22 14:28:19 -05:00
GriffinR
ad17ce193d Move item icons/pals to src 2020-02-22 14:08:05 -05:00
GriffinR
5d1303c3f3 Move graphics up to item icons to src 2020-02-22 13:49:42 -05:00
GriffinR
2d733fb993 Move trainer pics/pals and battle terrain to src 2020-02-22 13:09:23 -05:00
GriffinR
f66d0dfce3 Move graphics.s through pokemon to src 2020-02-22 11:49:09 -05:00
PikalaxALT
7624b5e5c0 Fix typo; use constants in some data/field_player_avatar arrays 2020-02-21 16:44:36 -05:00
PikalaxALT
58382e8af8 Remove defunct header 2020-02-21 16:05:22 -05:00
PikalaxALT
54fe6e3e62 Remove redundant include which was somehow missed by the earlier scan 2020-02-21 15:49:32 -05:00
PikalaxALT
540c33405a Remove constants/movement_commands.h 2020-02-21 15:46:19 -05:00
PikalaxALT
b7c28c4be7 Remove redundant include lines 2020-02-21 15:00:56 -05:00
PikalaxALT
69d8833b31 Prelim names for mvmt actions; merge field_ground_effect into evobjmv 2020-02-21 13:41:18 -05:00
PikalaxALT
14a599bbc2 Address review comments; name some methods in event_object_movement 2020-02-21 09:02:06 -05:00
PikalaxALT
93ee43a31a Finish trainer_see 2020-02-20 14:52:37 -05:00
PikalaxALT
abc39d86f3 Decomp all trainer see funcs 2020-02-20 14:03:29 -05:00
PikalaxALT
0125c1440e trainer_see through CheckPathBetweenTrainerAndPlayer 2020-02-19 15:43:59 -05:00
PikalaxALT
c0b6148640 Address review comments 2020-02-19 14:22:26 -05:00
PikalaxALT
9d44bc0bda Merge branch 'master' of github.com:pret/pokefirered into pokemon_jump 2020-02-19 08:47:50 -05:00
PikalaxALT
9397d6d23a Match sub_8149930 (see pret/pokeemerald#982) 2020-02-19 08:46:53 -05:00
PikalaxALT
5c530e1330 Finish porting pokemon_jump from Emerald 2020-02-18 16:39:44 -05:00
GriffinR
729c224bf2 Name battle scene and map type constants 2020-02-18 16:16:03 -05:00
PikalaxALT
f65e07fb1f pokemon_jump_3,4 2020-02-18 15:52:45 -05:00
PikalaxALT
af6f99b931 Port pokemon_jump from emerald, 1 2020-02-18 14:50:24 -05:00
GriffinR
2c92f89adc
Merge branch 'master' into doc-tilesets 2020-02-16 12:16:04 -05:00
PikalaxALT
9addd6a6b6
Merge pull request #248 from GriffinRichards/doc-caves 
Document remaining cave scripts
 2020-02-16 12:14:55 -05:00
GriffinR
6bee17b4ce
Merge branch 'master' into doc-tilesets 2020-02-16 12:09:13 -05:00
PikalaxALT
6c52359bcb
Merge pull request #257 from jiangzhengwenjz/librfu 
match RFU SDK v1.0.26
 2020-02-16 12:06:26 -05:00
jiangzhengwenjz
6ffc10a1c4 resolve review comments 2020-02-17 01:01:12 +08:00
GriffinR
659afd708b
Merge branch 'master' into doc-tilesets 2020-02-16 11:18:30 -05:00
PikalaxALT
51b7b11a55
Merge pull request #243 from GriffinRichards/doc-celadon 
Document Celadon City scripts
 2020-02-16 11:16:02 -05:00
GriffinR
1d006c2661
Merge branch 'master' into doc-tilesets 2020-02-16 11:13:58 -05:00
GriffinR
533df93dc1
Merge branch 'master' into doc-caves 2020-02-16 11:08:43 -05:00
jiangzhengwenjz
fb8ac4af93 match RFU SDK v1.0.26 2020-02-16 13:57:02 +08:00
GriffinR
a4cd331634
Merge branch 'master' into doc-ttower 2020-02-15 20:44:57 -05:00
PikalaxALT
b3167d579b use uroom size/count macros; travis reverts back to agbcc master 2020-02-15 14:49:27 -05:00
PikalaxALT
57c2ea74a8 Address review comments 2020-02-12 17:02:45 -05:00
PikalaxALT
aa4a979334 More function documentation in union_room, link, link_rfu_2 2020-02-12 15:32:14 -05:00
PikalaxALT
5953064c03 Use ST_OAM defines in DUMMY_OAM_DATA definition 2020-02-12 08:51:34 -05:00
PikalaxALT
325c5b3f11 Document ereader_helpers.c 2020-02-11 16:26:50 -05:00
PikalaxALT
11af7a0751 Rename unk headers 2020-02-11 13:49:19 -05:00
PikalaxALT
9ff146b0bc document minigame_countdown.c 2020-02-11 13:43:14 -05:00
PikalaxALT
354d837d6f document digit_obj_util 2020-02-11 10:49:36 -05:00
PikalaxALT
c5424acc11 Use lman local symbols for link recovery 2020-02-11 09:53:03 -05:00
PikalaxALT
bb7f1f1ff7 Some version differences in librfu_rfu 2020-02-11 09:36:32 -05:00
PikalaxALT
fd1f45ceae More symbol docs in librfu, link_rfu_2 2020-02-11 08:57:39 -05:00
PikalaxALT
2130218645 Cleaner copy loop in rfu_initializeAPI 2020-02-11 08:57:39 -05:00
PikalaxALT
371f9fda6e Annotate AgbRfu_LinkManager.c with local defines 2020-02-10 12:20:55 -05:00
PikalaxALT
b9f1132aa6 link_rfu.c --> AgbRfu_LinkManager.c 2020-02-10 12:07:22 -05:00
PikalaxALT
c0373e9e93 Address review comments 2020-02-10 11:11:25 -05:00
PikalaxALT
78caeff45b Name remaining funcs in union_room.c 2020-02-06 10:44:22 -05:00
PikalaxALT
6af7391add More renaming in union_room.c 2020-02-04 17:01:57 -05:00
PikalaxALT
4770fac9eb More mevent documentation 2020-02-04 14:16:45 -05:00
PikalaxALT
e0d25c3289 Document wireless_communication_status_screen 2020-02-03 20:09:14 -05:00
PikalaxALT
d187a96ca2 Document sTextColorTable 2020-02-03 16:59:36 -05:00
PikalaxALT
7bd0a83d35 I'm so original with these commit names 2020-02-03 16:41:25 -05:00
PikalaxALT
d522588538 Some more documentation of array sizes 2020-02-03 13:51:38 -05:00
PikalaxALT
46a3ca5134 Union room activity documentation 2020-02-03 13:42:57 -05:00