Commit Graph

292 Commits

Author SHA1 Message Date
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
GriffinR
729c224bf2 Name battle scene and map type constants 2020-02-18 16:16:03 -05:00
GriffinR
e94f9c1483 Name allow_escaping, allow_running, show_map_name header properties 2020-02-18 15:11:44 -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
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
GriffinR
8a8bb4fb02 Document Rock Tunnel scripts 2020-01-28 03:54:45 -05:00
GriffinR
91844cdfb2 Document Pokemon League scripts 2020-01-26 16:38:17 -05:00
GriffinR
f637ade6b3 Document Silph Co scripts 2020-01-26 05:41:22 -05:00
GriffinR
bf7bab92e2 Document Rocket Warehouse script 2020-01-26 02:26:19 -05:00
GriffinR
493c43f9b1 Document Rocket Hideout scripts 2020-01-26 01:50:14 -05:00
GriffinR
25092f500d Document Mt Moon scripts 2020-01-26 01:39:23 -05:00
GriffinR
ce9f821b4e Document Saffron City scripts 2020-01-25 22:31:36 -05:00
GriffinR
351d85f57d Update JP altar text comment 2020-01-25 14:56:58 -05:00
GriffinR
35c0e1f60a Document Celadon City scripts 2020-01-25 13:18:46 -05:00
GriffinR
97d2555fad
Merge branch 'master' into doc-viridian 2020-01-24 20:50:53 -05:00
GriffinR
c0be66fc2e Document Viridian City scripts and adjacent routes 2020-01-24 20:46:09 -05:00
PikalaxALT
a09e66b53f
Merge pull request #238 from GriffinRichards/doc-vermilion
Document Vermilion City and SS Anne scripts
2020-01-24 17:04:11 -05:00
GriffinR
39556605cd
Merge branch 'master' into doc-ttower 2020-01-24 03:03:45 -05:00
GriffinR
ef1f9ead0b Document Trainer Tower scripts 2020-01-24 02:57:45 -05:00
GriffinR
b47094bd12 Fix script var alignment 2020-01-23 15:41:20 -05:00
GriffinR
d4f32c10a8 Document SS Anne scripts 2020-01-23 02:52:56 -05:00
GriffinR
c2bf9898a5 Document Vermilion scripts 2020-01-23 02:03:40 -05:00
GriffinR
d58a5decde
Merge branch 'master' into doc-cinnabar 2020-01-22 11:41:40 -05:00
PikalaxALT
e97d3532d4
Merge pull request #231 from GriffinRichards/doc-staticmon
Document static mon scripts
2020-01-22 11:41:14 -05:00
PikalaxALT
6eec1c1cc9
Merge pull request #234 from GriffinRichards/doc-fuchsia
Document Fuchsia City and Safari Zone scripts
2020-01-22 11:40:46 -05:00
GriffinR
fbf0c4616c
Merge branch 'master' into doc-cinnabar 2020-01-22 11:38:44 -05:00
GriffinR
2908c9fa95 Document some misc small scripts 2020-01-20 15:17:34 -05:00
GriffinR
5b27d3d268 Document Safari Zone scripts 2020-01-20 01:32:25 -05:00
GriffinR
2cd1460cc5 Document Fuchsia City scripts 2020-01-19 23:41:58 -05:00
GriffinR
009595b4df Finish Cinnabar Island scripts 2020-01-17 15:09:54 -05:00
GriffinR
3101657e97 Sync pc_transfer 2020-01-17 14:08:46 -05:00
GriffinR
ad643af58a Document some Cinnabar scripts 2020-01-17 13:50:30 -05:00
GriffinR
a4f5f41e24 Document static mon scripts 2020-01-17 10:51:41 -05:00
GriffinR
8b2bf805ea Document Lavender Town scripts 2020-01-16 13:56:46 -05:00
GriffinR
fba3fc738a Document Pokemon Tower scripts 2020-01-16 13:05:26 -05:00
GriffinR
04d176334a Document some Quest Log 2020-01-15 16:00:45 -05:00
PikalaxALT
2f81b4a204
Merge pull request #222 from GriffinRichards/doc-mansion
Document Pokemon Mansion scripts
2020-01-14 20:30:32 -05:00
PikalaxALT
cdc04dfe9f
Merge pull request #221 from GriffinRichards/doc-cerulean
Document Cerulean City scripts
2020-01-14 20:29:03 -05:00
PikalaxALT
58935b17f7
Merge pull request #220 from GriffinRichards/doc-pewter
Document Pewter City scripts
2020-01-14 20:10:11 -05:00
GriffinR
8d85205158 Fix JP pokemon mansion text dump error 2020-01-14 19:07:22 -05:00
GriffinR
0999b55beb Document Pokemon Mansion scripts 2020-01-14 18:58:52 -05:00
GriffinR
f544f6e356 Document Cerulean City scripts 2020-01-14 16:41:38 -05:00
GriffinR
f5683ae4d8 Document Pewter City scripts 2020-01-14 02:56:19 -05:00
GriffinR
a5d8b98fde Sync macros to have Give/Take Add/Remove unity 2020-01-13 22:35:09 -05:00
GriffinR
8c560386ed Sync Colosseum map names 2020-01-13 20:34:30 -06:00
GriffinR
7f55319c00 Use movement type constants 2020-01-13 01:00:38 -05:00
GriffinR
f276383293 Merge master into sync-script 2020-01-12 16:03:06 -05:00
PikalaxALT
bcf07cb837 Merge branch 'master' of github.com:pret/pokefirered into script_pokemon_util 2020-01-12 14:18:34 -05:00
GriffinR
aa84a1d3a1 Name item ball scripts 2020-01-11 02:12:25 -05:00
GriffinR
0bb7f18b8e Sync Cable Club scripts 2020-01-11 00:47:47 -05:00
GriffinR
a537577671 Sync obtain item 2020-01-10 16:21:36 -05:00
GriffinR
388c40575d Sync Birth Island / Navel Rock scripts 2020-01-10 15:36:35 -05:00
GriffinR
91bf7665c6 Sync split scripts, more misc splits/doc 2020-01-10 15:01:50 -05:00
PikalaxALT
3f54c7caa1 Port script_pokemon_util_80A0058 2020-01-10 11:51:13 -05:00
jiangzhengwenjz
e300f2ece0 script_pokemon_util_80BF8FC 2020-01-10 22:28:20 +08:00
GriffinR
9fafa12285 More basic script constants 2020-01-10 03:50:11 -05:00
GriffinR
29e4446a03 Use MSGBOX constants 2020-01-10 03:00:38 -05:00
GriffinR
4a6f15ba24 Sync event macros 2020-01-10 01:26:20 -05:00
GriffinR
94fbc3ac48 Sync temp vars 2020-01-09 14:46:14 -05:00
GriffinR
0f5e3174d0 Split more file from event_scripts.s 2020-01-09 14:30:22 -05:00
GriffinR
d071f05504 Split more files from event_scripts.s 2020-01-09 14:01:45 -05:00
GriffinR
a40c63fe48 Use dir constants 2020-01-09 13:25:10 -05:00
GriffinR
c39d295386 Label used movement steps 2020-01-09 12:57:13 -05:00
GriffinR
16dc234d99 Some stdscript sync, start syncing cable_club.inc 2020-01-08 23:44:55 -05:00
GriffinR
33a4b68486 Use special obj event ids 2020-01-08 21:14:45 -05:00
GriffinR
7eb5464860 Sync some event_scripts.s, split files 2020-01-08 21:05:04 -05:00
GriffinR
2e5bf6c9ef Use map_script constants, name unique map_script labels 2020-01-08 19:16:57 -05:00
GriffinR
31d31d3260 Sync compare macros, some event_scripts.s doc, begin map_scripts constants 2020-01-08 18:09:24 -05:00
Martin Griffin
5c9114a245 Decompile field_tasks 2019-12-27 16:09:45 +00:00
PikalaxALT
6ba9836ca1 Match leafgreen script_data 2019-12-20 10:23:32 -05:00
garak
8ee35bc615 *actual* final pass at unifying on object event 2019-12-17 21:35:09 -05:00
PikalaxALT
6a33add748 hidemoneybox backwards compat with ruby 2019-11-07 14:37:46 -05:00
PikalaxALT
eb4bdaa9d7 hidemoneybox buries dummy args now 2019-11-07 12:01:21 -05:00
PikalaxALT
93f0703fcd Merge branch 'master' of github.com:pret/pokefirered into script_menu 2019-10-26 10:23:13 -04:00
jiangzhengwenjz
1481f9e819 resolve review comments 2019-10-26 06:03:42 +08:00
PikalaxALT
4b052a2040 Resolve review comments 2019-10-25 17:01:05 -04:00
PikalaxALT
359ec8dde1 Name multichoice menus 2019-10-25 14:52:54 -04:00
PikalaxALT
0a440d658b Finish script_menu code decomp 2019-10-25 11:10:08 -04:00
PikalaxALT
a18e9c27e1 Rename specials according to Ruby 2019-10-24 16:31:38 -04:00
PikalaxALT
7c3d9df380 Finish field_specials 2019-10-24 15:28:43 -04:00
PikalaxALT
54d6414654 field_specials through sub_80CBDE8 2019-10-23 20:12:14 -04:00
PikalaxALT
16ab70a12c through sub_80CBB28 2019-10-23 17:12:49 -04:00
PikalaxALT
f33f58eff7 Finish fixing SEAVAULT to SEVAULT 2019-10-23 15:32:23 -04:00
PikalaxALT
661e5d9221 field_specials through Task_AnimateElevatorWindowView 2019-10-23 15:31:23 -04:00
PikalaxALT
a5521e6b69 Remove incomplete menews_jison constant defs 2019-10-22 16:47:41 -04:00
PikalaxALT
1de8b7b197 Document overworld whiteout funcs 2019-10-22 13:09:47 -04:00
PikalaxALT
aabb95139d stab in the dark at documenting menews_jisan 2019-10-22 10:44:00 -04:00
PikalaxALT
d51915bb0d Document some variables 2019-10-22 09:50:49 -04:00
PikalaxALT
8df72e4da6 Document battle outcome checks in scripts 2019-10-21 19:03:38 -04:00
PikalaxALT
7679d53777 SEAGALLOP constants in event scripts, 2 2019-10-21 16:50:06 -04:00
PikalaxALT
7e0956f459 SEAGALLOP constants in event scripts 2019-10-21 16:46:58 -04:00
PikalaxALT
8efca06db2 Cut, Strength, Rock Smash script names 2019-10-21 15:54:50 -04:00
PikalaxALT
a41b6329e3 Fix name of a field special 2019-10-21 15:46:06 -04:00
PikalaxALT
10ef670608 Documentation for start-of-credits script 2019-10-21 15:44:09 -04:00
PikalaxALT
c5db703229 Update hidden item json fields 2019-10-21 13:34:31 -04:00
PikalaxALT
629b9268e1 Name massage step counter 2019-10-21 12:30:57 -04:00
PikalaxALT
7e8da8845b Rename rival trainer constants 2019-10-21 11:06:53 -04:00
PikalaxALT
85a033f350 escort --> guide 2019-10-21 10:49:19 -04:00
PikalaxALT
221259d0d6 sys flags 2019-10-21 10:42:24 -04:00
PikalaxALT
a1bddb8f8c Remaining story flags referenced in event scripts 2019-10-21 09:58:14 -04:00
PikalaxALT
3ab70c735e Story flags through mystic ticket 2019-10-20 22:14:22 -04:00
PikalaxALT
8654e828e4 More story flags 2019-10-20 21:38:52 -04:00
PikalaxALT
9aa5709329 use TRUE and FALSE for flag conditionals; more story flags 2019-10-20 21:24:16 -04:00
PikalaxALT
6b503e306d script switch/case; name script conditionals 2019-10-20 20:38:23 -04:00
PikalaxALT
2aeefdc5de update famechecker macro 2019-10-20 20:20:45 -04:00
PikalaxALT
b3951b48ec fix FLAG_DEFEATED_RIVAL to FLAG_DEFEATED_CHAMP 2019-10-20 09:25:55 -04:00
PikalaxALT
9d8c5b2250 Two additional script macros 2019-10-19 22:37:08 -04:00
PikalaxALT
26d8c4d04b Name all item ball hide/show flags 2019-10-19 21:52:38 -04:00
PikalaxALT
44a293d84c Name remaining NPC hide/show flags 2019-10-19 21:18:39 -04:00
PikalaxALT
2702aa2754 Remaining NPC hide/show flags 2019-10-19 21:10:29 -04:00
PikalaxALT
2ff8af13d5 Hide/show flags through 07F 2019-10-19 20:30:38 -04:00
PikalaxALT
a8b767965a auto-assign map object hide/show flags 2019-10-19 15:49:26 -04:00
PikalaxALT
42d732d266 variable objects in map scripts 2019-10-19 15:28:58 -04:00
PikalaxALT
d98d4d887c Set map.json files with map_obj_gfx constants 2019-10-19 15:05:51 -04:00
PikalaxALT
a16d9af699 Document renewable_hidden_items 2019-10-18 15:16:52 -04:00
PikalaxALT
a7bca8aa92 Hidden item flags 2019-10-18 15:02:34 -04:00
PikalaxALT
4f15cb02d2 Rename map scene vars and partially document Oak's lab 2019-10-18 12:49:59 -04:00
PikalaxALT
9903f7a77a Assign trainer consts to script cmd args 2019-10-18 10:37:48 -04:00
PikalaxALT
a7b278ac2d Restore documentation to mystery_event_msg 2019-10-18 10:14:39 -04:00
PikalaxALT
2435bcc09d sys flag rearrange 2019-10-17 21:24:47 -04:00
PikalaxALT
97dc0a6903 Trainer dump pass 2; flag refactoring 2019-10-17 17:11:34 -04:00
PikalaxALT
8fd0bc4245 Decompile start_menu 2019-10-13 22:04:51 -04:00
PikalaxALT
11b027d13c Decompile player_pc 2019-10-12 16:30:51 -04:00
PikalaxALT
855c052be0 Rename song constants using Japanese sound test menu 2019-10-09 20:02:59 -04:00
SatoMew
2c254082de Merge branch 'master' of https://github.com/pret/pokefirered 2019-10-08 22:46:32 +01:00
PikalaxALT
b01da1a592 link.c through InitLocalLinkPlayer 2019-10-05 15:49:05 -04:00