Commit Graph

1333 Commits

Author SHA1 Message Date
GriffinR
66e9059578 Move pokedex_screen data from asm to C 2020-11-11 23:44:30 -05:00
Ashley Coleman
2745ac3445 Give meaningfull names to globals in pokedex_screen.s 2020-11-11 13:40:18 -08:00
GriffinR
b7a88180d3 Fix Fuchsica typo 2020-08-31 21:37:59 -04:00
GriffinR
bb56d4a3f4 Give songs meaningful english names 2020-08-29 03:11:03 -04:00
luckytyphlosion
1ad6f5270c Port over PSS data to src. 2020-07-04 20:32:44 -04:00
luckytyphlosion
91fea55a24 pokemon_summary_screen.c, part 6. 2020-06-25 12:59:37 -04:00
PikalaxALT
94b68c54e8
Merge pull request #337 from GriffinRichards/fix-scriptlabel
Fix mislabeled starter script
2020-05-27 07:51:13 -04:00
GriffinR
d6a494551a Fix corresponding mislabeled rival script 2020-05-04 14:45:07 -04:00
GriffinR
5bd2c0ef5c Fix mislabeled starter script 2020-05-04 14:34:45 -04:00
Evan
87ba2b8bde battle anim documentation 2020-04-23 22:40:13 -06:00
fieldy101
9634b58d7a Port emerald water functions into firered 2020-04-22 23:30:44 +10:00
PikalaxALT
b22d3a821d Merge branch 'master' of github.com:pret/pokefirered into modern_gcc 2020-04-10 13:10:44 -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
c78101535b Split quest_log.c 2020-04-06 17:58:24 -04:00
GriffinR
100188ac43 Move gfx out of data 2020-04-06 10:02:14 -04:00
PikalaxALT
a622448029 More quest log documentation amid other stuff 2020-04-05 20:30:45 -04:00
PikalaxALT
98c2df354f Fix alignment-related crashes 2020-04-04 15:09:22 -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
19812c9d18 Decoration data to C 2020-03-29 11:42:08 -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
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
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
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
84a69bf140 through Overworld_ResetStateAfterFly 2020-03-26 18:29:48 -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
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
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
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
GriffinR
68e942065a Move movement type func tables to src 2020-03-23 22:42:36 -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
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
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
e078e4b315 Some documentation of field_control_avatar and related routines 2020-03-19 08:45:32 -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
8a64f8b431 Remove data/field_weather.s 2020-03-17 08:29:24 -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
PikalaxALT
923129a948 Merge branch 'master' of github.com:pret/pokefirered into pokemon_storage_system 2020-03-16 07:54:00 -04:00
PikalaxALT
77c133e6a1
Merge pull request #299 from GriffinRichards/fix-porymapttype
Sync trainer_type/trainer_sight/var_value data type. Please reference this PR when fixing the issues raised above.
2020-03-16 07:52:45 -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
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
PikalaxALT
e445a42a5b through HandleInput 2020-03-15 10:26:42 -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
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
GriffinR
d450d5d406 var_value to string 2020-03-13 01:21:46 -04:00
ultima-soul
339c2914af Decompile/port event_object_movement 2020-03-12 12:46:40 -07:00
PikalaxALT
5422315db5 through sub_808CF10 2020-03-11 17:03:57 -04:00
PikalaxALT
3aeb294572 Port pokemon_storage_2 from emerald 2020-03-11 13:32:30 -04:00
GriffinR
a0f951b09c trainer_type and trainer_sight_or_berry_tree_id to string 2020-03-11 12:08:08 -04:00
GriffinR
cbe6e27f37 region_map.h to region_map_sections.h 2020-03-11 01:04:27 -04:00
PikalaxALT
bbaa60ab1c Address review comments 2020-03-10 13:23:32 -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
0fdffabbc8 through pokemon_store 2020-03-09 14:28:13 -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
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
3b88ba6637 Remove data/clear_save_data_screen.s 2020-03-06 12:17:56 -05:00
PikalaxALT
3581ce9ba2 Decomp and doc clear_save_data_screen 2020-03-06 10:57:42 -05:00
GriffinR
eb4327a714 Move strings.s to src 2020-03-05 14:20:02 -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
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
GriffinR
13e06bf7f8 Combine special prefixes, drop more 2020-03-04 10:42:16 -05:00
GriffinR
ce3e1b8af0 Add missing movement type constant use 2020-03-03 22:25:48 -05:00
GriffinR
4c1d30a832 Add more metatile labels 2020-03-03 22:23:40 -05:00
GriffinR
9fbe7e14a8 Label remaining JP script text 2020-03-03 17:50:24 -05:00
GriffinR
7af1b35d17 Sync some specials/drop unnecessary prefixes 2020-03-03 17:45:25 -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
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
GriffinR
63e0b54f96 Label pokedude text 2020-03-02 16:35:52 -05:00
GriffinR
42e6e9bd9c Remove interactwith from field move scripts 2020-03-02 14:55:20 -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
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
PikalaxALT
55e00e0c13
Merge pull request #274 from GriffinRichards/doc-fourisland
Document Four Island scripts, trainer_card.inc, sync trainer_card.c
2020-03-02 10:43:01 -05:00
GriffinR
8ff7977b89 Merge branch 'master' into doc-fourisland 2020-03-02 10:34:35 -05:00
PikalaxALT
ff0034d597
Merge pull request #273 from GriffinRichards/doc-threeisland
Document Three Island scripts
2020-03-02 10:28:59 -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
358f785a03 Resolve some JP text 2020-03-02 00:53:22 -05:00
GriffinR
62100376b7 Split/label some common event scripts 2020-03-02 00:19:11 -05:00