Leahnaya/pokefirered
1
0
Fork 0
mirror of https://github.com/pret/pokefirered.git synced 2026-05-31 20:52:48 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity
4,492 Commits 2 Branches 0 Tags 366 MiB
89aafe292f
Commit Graph

354 Commits

Author SHA1 Message Date
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
GriffinR
515dde69af Use more LOCALID constants 2021-02-10 20:20:15 -05:00
Deokishisu
ee0fb9ea5a Fix TM34 Transposition Typo 
The script labels for being given TM34 from Lt. Surge are mistakenly typoed as TM43. This commit fixes this error.
 2021-02-03 19:54:45 -05: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
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
PikalaxALT
c78101535b Split quest_log.c 2020-04-06 17:58:24 -04:00
PikalaxALT
af32535610 Name all specials 2020-03-31 08:49:47 -04:00
PikalaxALT
0f618efb15 Finish overworld.c 2020-03-28 21:39:28 -04:00
PikalaxALT
9bcc82856d Merge branch 'master' of github.com:pret/pokefirered into overworld 2020-03-28 12:26:00 -04:00
PikalaxALT
816e7ad1f8 through ChooseAmbientCrySpecies 2020-03-28 10:42:23 -04:00
GriffinR
eebe7f2233 Use trainer type constants 2020-03-27 10:21:26 -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
5b3e9f376b through PlayerGetCopyableMovement 2020-03-23 21:42:35 -04:00
PikalaxALT
f9a3607824 through CheckForObjectEventCollision 2020-03-23 08:54:37 -04:00
PikalaxALT
e078e4b315 Some documentation of field_control_avatar and related routines 2020-03-19 08:45:32 -04:00
PikalaxALT
901fceec18 through GetInteractedObjectEventScript 2020-03-17 20:59:39 -04:00
GriffinR
d450d5d406 var_value to string 2020-03-13 01:21:46 -04:00
GriffinR
a0f951b09c trainer_type and trainer_sight_or_berry_tree_id to string 2020-03-11 12:08:08 -04:00
PikalaxALT
362cddc0f5
Merge pull request #285 from GriffinRichards/doc-scriptclean 
Clean up script documentation
 2020-03-05 06:06:51 -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
GriffinR
2e8570499d Sync event ticket flag names 2020-03-03 01:44:06 -05:00
GriffinR
42e6e9bd9c Remove interactwith from field move scripts 2020-03-02 14:55:20 -05:00
GriffinR
dd5f3c3c3d Add missing script labels 2020-03-02 13:52:16 -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
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
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
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
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
GriffinR
2d9327a1ff Document Four Island scripts, trainer_card.inc 2020-02-27 14:21:13 -05:00
GriffinR
d3adca3f9d Document Three Island scripts 2020-02-27 12:51:23 -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
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
GriffinR
1fc8db43b7 Sync object event gfx constants 2020-02-23 17:00:12 -05:00
PikalaxALT
2ed0c4b180 Remove outdated comment 2020-02-21 15:02:05 -05:00
PikalaxALT
93ee43a31a Finish trainer_see 2020-02-20 14:52:37 -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
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
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