Commit Graph

1333 Commits

Author SHA1 Message Date
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
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
GriffinR
47f6e9f973 Document missed Vermilion house script 2020-02-28 23:01:37 -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
GriffinR
948b695ad4 Document Six Island scripts 2020-02-28 09:54:01 -05:00
GriffinR
7d7c51973c Document Five Island scripts 2020-02-28 00:22:34 -05:00
PikalaxALT
e07c771f18 through Task_FallWarpFieldEffect 2020-02-27 16:59:05 -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
GriffinR
d3adca3f9d Document Three Island scripts 2020-02-27 12:51:23 -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
43f66fce55
Merge pull request #271 from GriffinRichards/doc-twoisland
Document Two Island scripts
2020-02-26 14:08:45 -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
84d7206b5b
Merge pull request #266 from GriffinRichards/doc-routes3
Document Routes 15-19 scripts
2020-02-26 13:56:35 -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
e80ddc4675 Document Two Island scripts 2020-02-26 01:46:21 -05:00
GriffinR
ad4f363a58 Document One Island scripts 2020-02-26 00:26:05 -05:00
GriffinR
44c9109c2a Document Pallet Town scripts 2020-02-25 15:46:07 -05:00
GriffinR
20118dbc31 Finish Route 24/25 2020-02-25 02:53:14 -05:00
GriffinR
15dbc58959 Document teleporter and escalator anim 2020-02-25 02:47:28 -05:00
GriffinR
52da723afb Document Routes 20-21, 24-25 scripts 2020-02-25 01:19:28 -05:00
GriffinR
d1b1709ef9 Document Routes 15-19 scripts 2020-02-24 15:46:45 -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
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
93b05b4e42 Fix typo 2020-02-21 16:13:35 -05:00
PikalaxALT
2ed0c4b180 Remove outdated comment 2020-02-21 15:02:05 -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
4280723f0e
Merge pull request #260 from GriffinRichards/doc-connection
Split connection field from graphics id in object events
2020-02-19 14:49:14 -05:00
PikalaxALT
9d44bc0bda Merge branch 'master' of github.com:pret/pokefirered into pokemon_jump 2020-02-19 08:47:50 -05:00
PikalaxALT
71fec599bb
Merge pull request #252 from GriffinRichards/doc-routes2
Document Routes 10-14 scripts
2020-02-19 08:47:39 -05:00
PikalaxALT
ea7d665938
Merge pull request #251 from GriffinRichards/doc-routes1
Document Routes 3-9 scripts
2020-02-19 08:47:26 -05:00
GriffinR
3e80641915 in_connection to bool 2020-02-18 19:52:37 -05:00
GriffinR
2a2db28e57 Split connection field from graphics id in object events 2020-02-18 18:13:31 -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
GriffinR
e94f9c1483 Name allow_escaping, allow_running, show_map_name header properties 2020-02-18 15:11:44 -05:00
PikalaxALT
af6f99b931 Port pokemon_jump from emerald, 1 2020-02-18 14:50:24 -05:00
GriffinR
4643330fdd Name allow_cycling, floor_number header properties 2020-02-18 14:08:29 -05:00
GriffinR
c1d17b2df1
Merge branch 'master' into doc-routes2 2020-02-16 13:57:05 -05:00
GriffinR
058d30fe80
Merge branch 'master' into doc-routes1 2020-02-16 13:53:31 -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
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
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
32dc21b634 Remove defunct macros and move trainer tower pointers and dummy header 2020-02-11 16:56:09 -05:00
PikalaxALT
354d837d6f document digit_obj_util 2020-02-11 10:49:36 -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
708fa70823 event_object_80688E4 2020-02-01 21:39:02 -05:00
GriffinR
4ab216f309 Rename generic building tilesets, SAFFRON_CITY_CLASSIC 2020-01-31 14:57:57 -05:00
GriffinR
1cfeae9ffa Document Routes 10-14 scripts 2020-01-31 03:54:14 -05:00
GriffinR
a1ea8cc829 Document Routes 3-9 scripts 2020-01-29 21:03:07 -05:00
GriffinR
f6af394f2a Label tilesets and remaining layouts 2020-01-29 03:59:03 -05:00
GriffinR
30f01c7df6 Document Sevii Island caves 2020-01-28 14:26:34 -05:00
GriffinR
0ddd7ebb1d Sync STEB_CB, WEATHER_SHADE 2020-01-28 14:26:18 -05:00
GriffinR
eae373576d Document Victory Road scripts 2020-01-28 04:21:03 -05:00