Leahnaya/pokefirered
1
0
Fork 0
mirror of https://github.com/pret/pokefirered.git synced 2026-05-10 14:01:52 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity
3,563 Commits 2 Branches 0 Tags 366 MiB
e78094de85
Commit Graph

1665 Commits

Author SHA1 Message Date
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
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
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
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
d8c9214e0a
Merge pull request #314 from jiangzhengwenjz/bike 
bike
 2020-03-28 16:32:09 -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
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
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
eebe7f2233 Use trainer type constants 2020-03-27 10:21: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
402f2643bd Merge branch 'master' of github.com:pret/pokefirered into field_player_avatar 2020-03-26 17:07:52 -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
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
PikalaxALT
8a85485cc2 through PlayerTurnInPlace 2020-03-24 18:17:18 -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
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
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
cce652dc9b Remove partial define 2020-03-22 14:44:32 -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
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
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
7610a2dfc2 Port field_weather_effects from emerald 2020-03-16 21:43:49 -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
PikalaxALT
f44f89a463
Merge pull request #300 from ultima-soul/event_object_movement 
Decompile/port event_object_movement
 2020-03-16 07:51:08 -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
39ef2a31a4 through AddMenu 2020-03-15 12:24:33 -04:00
PikalaxALT
1e959e036d through sub_8094D84 2020-03-15 11:57:01 -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
9ebfeb78bd Merge branch 'master' of github.com:pret/pokefirered into pokemon_storage_system 2020-03-15 09:45:08 -04:00
PikalaxALT
4a7c1d888a
Fix issues with cexplore 2020-03-15 09:39:08 -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
PikalaxALT
4facdc6747
Merge pull request #298 from LOuroboros/patch-1 
Removed unused defines in include/battle_script_commands.h
 2020-03-11 09:06:13 -04:00
LOuroboros
3f3efc293e
Removed unused defines in include/battle_script_commands.h 
These are already present in include/constants/battle_script_commands.h

I tend to screw things up a lot, so if anyone sees anything wrong here please let me know.
 2020-03-11 09:25:21 -03:00
GriffinR
cbe6e27f37 region_map.h to region_map_sections.h 2020-03-11 01:04:27 -04:00
PikalaxALT
4594c5dac9 Port field_camera from Emerald 2020-03-10 15:19:50 -04:00
PikalaxALT
0454ce25d3 Rename keyboard_text header 2020-03-10 13:26:31 -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
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
02aed8fc8e Fix arg type decl in MapHasPreviewScreen 2020-03-09 09:56:00 -04:00
PikalaxALT
884c000028 Use FADE_ defines in field_fadetransition 2020-03-09 09:38:58 -04:00
PikalaxALT
1a8023c465 Update MapPreviewScreen.type 2020-03-09 09:30:13 -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
5d7c0e9bb0 Remove duplicate decl; use EASY_CHAT_TYPE define in mystery_event_club.inc 2020-03-08 12:55:16 -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
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
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
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
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
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
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
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
PikalaxALT
c2f85a5326 Address review comments 2020-03-03 15:42:14 -05:00
GriffinR
1aa1f18972 Sync trainer_battle.inc 2020-03-03 14:52:32 -05:00
GriffinR
4c4b19da7e Label help system text 2020-03-03 14:02:34 -05:00
PikalaxALT
89e5082d51 Merge branch 'master' of github.com:pret/pokefirered into berry_crush 2020-03-03 13:47:35 -05:00
PikalaxALT
dd22d97814
Merge pull request #283 from GriffinRichards/fix-eventticket 
Sync event ticket flag names
 2020-03-03 13:47:29 -05:00
PikalaxALT
8a7c2ded11 Port berry_crush_3 from Emerald 2020-03-03 12:24:18 -05:00
GriffinR
2e8570499d Sync event ticket flag names 2020-03-03 01:44:06 -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
f5011a27d6
Merge pull request #282 from PikalaxALT/field_effect_helpers 
port field_effect_helpers from emerald
 2020-03-02 14:11:32 -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
GriffinR
6191739a4d Label sign bg events 2020-03-02 12:24:05 -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
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
a1995d8029 Fix alignment 2020-03-02 10:36:46 -05:00
GriffinR
8ff7977b89 Merge branch 'master' into doc-fourisland 2020-03-02 10:34:35 -05:00
PikalaxALT
d758ae0dc2 Merge branch 'master' of github.com:pret/pokefirered into field_effect 2020-03-02 10:15:07 -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
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
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
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
GriffinR
948b695ad4 Document Six Island scripts 2020-02-28 09:54:01 -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
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
435fe59621
Merge pull request #270 from GriffinRichards/doc-oneisland 
Document One Island scripts
 2020-02-26 14:08:19 -05:00
PikalaxALT
e3447d2366
Merge pull request #269 from GriffinRichards/doc-pallet 
Document Pallet Town scripts
 2020-02-26 14:07:48 -05:00
GriffinR
e3ffb01912
Merge branch 'master' into doc-oneisland 2020-02-26 13:58:26 -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
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
GriffinR
ad4f363a58 Document One Island scripts 2020-02-26 00:26:05 -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
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
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
93b05b4e42 Fix typo 2020-02-21 16:13:35 -05:00
PikalaxALT
58382e8af8 Remove defunct header 2020-02-21 16:05:22 -05:00
PikalaxALT
540c33405a Remove constants/movement_commands.h 2020-02-21 15:46:19 -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
5c530e1330 Finish porting pokemon_jump from Emerald 2020-02-18 16:39:44 -05:00
GriffinR
753e894b6a Move map type/battle scene constants for porymap 2020-02-18 16:22:43 -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
PikalaxALT
e4d15a2338 Move GameFreak structs out of LinkManager header 2020-02-16 14:52:13 -05:00
PikalaxALT
8989bcd6aa fix alignment in AgbRfu_LinkManager.h 2020-02-16 14:35:14 -05:00
PikalaxALT
13357596b7
Merge pull request #256 from GriffinRichards/fix-species 
Fix DEX constant order
 2020-02-16 12:25:06 -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
GriffinR
01de877fc8
Merge branch 'master' into doc-tilesets 2020-02-16 12:07:24 -05:00
PikalaxALT
3b40ec23c7
Merge pull request #246 from GriffinRichards/doc-pokemonleague 
Document Pokemon League scripts
 2020-02-16 12:07:20 -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
PikalaxALT
b6899a0de1
Merge pull request #245 from GriffinRichards/doc-rockets 
Document Team Rocket scripts
 2020-02-16 12:05:13 -05:00
GriffinR
b4fce4020d
Merge branch 'master' into doc-tilesets 2020-02-16 11:29:06 -05:00
GriffinR
fd0fc184d6 Merge branch 'master' of https://github.com/pret/pokefirered into doc-pokemonleague 2020-02-16 11:28:03 -05:00
PikalaxALT
4e07002d13
Merge pull request #244 from GriffinRichards/doc-saffron 
Document Saffron City scripts
 2020-02-16 11:23:34 -05: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
aa4a979334 More function documentation in union_room, link, link_rfu_2 2020-02-12 15:32:14 -05:00
PikalaxALT
32dc21b634 Remove defunct macros and move trainer tower pointers and dummy header 2020-02-11 16:56:09 -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
fafcdf3c60 Multiversion support for api buff size 2020-02-11 08:57:39 -05:00
GriffinR
b313f568a5 Fix DEX constant order 2020-02-10 17:03:55 -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
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
GriffinR
34deceb136 Remove old references to battle pyramid 2020-02-03 12:08:27 -05:00
PikalaxALT
aed9c28dc3 Document rfu_union_tool 2020-02-03 11:02:02 -05:00
PikalaxALT
2b5b956936 Merge branch 'master' of github.com:pret/pokefirered into add_arm_agbcc 2020-02-03 10:08:43 -05:00
PikalaxALT
ceeed6247d Port object event flags from emerald 2020-02-02 11:23:04 -05:00
PikalaxALT
ba7403c74e Document event_object_80688E4 2020-02-02 11:10:07 -05:00