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

426 Commits

Author SHA1 Message Date
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
968ac4742a Sync trainer_card.c 2020-02-27 17:15:27 -05:00
GriffinR
2d9327a1ff Document Four Island scripts, trainer_card.inc 2020-02-27 14:21:13 -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
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
15dbc58959 Document teleporter and escalator anim 2020-02-25 02:47:28 -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
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
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
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
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
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
aa4a979334 More function documentation in union_room, link, link_rfu_2 2020-02-12 15:32:14 -05:00
GriffinR
b313f568a5 Fix DEX constant order 2020-02-10 17:03:55 -05:00
PikalaxALT
78caeff45b Name remaining funcs in union_room.c 2020-02-06 10:44:22 -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
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
GriffinR
4ab216f309 Rename generic building tilesets, SAFFRON_CITY_CLASSIC 2020-01-31 14:57:57 -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
017fa7e336 Trainer Hill --> Trainer Tower 2020-01-26 18:34:06 -05:00
GriffinR
91844cdfb2 Document Pokemon League scripts 2020-01-26 16:38:17 -05:00
PikalaxALT
a2c6174ee9
Merge pull request #241 from GriffinRichards/doc-viridian 
Document Viridian City scripts and adjacent routes
 2020-01-26 15:32:39 -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
ce9f821b4e Document Saffron City scripts 2020-01-25 22:31:36 -05:00
PikalaxALT
52fbc43d73 Address review comments 2020-01-25 21:00:51 -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
ce5bc554e5 Merge branch 'doc-ttower' of https://github.com/GriffinRichards/pokefirered into doc-ttower 2020-01-24 05:11:37 -05:00
GriffinR
c63a889bf4 Floor beaten --> floor cleared 2020-01-24 05:09:50 -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
PikalaxALT
85e5c57e8c
Merge pull request #237 from GriffinRichards/sync-ai 
Sync AI scripts
 2020-01-23 15:33:01 -05:00
PikalaxALT
5435bc4325
Merge pull request #232 from GriffinRichards/doc-cinnabar 
Document Cinnabar Island scripts
 2020-01-23 15:31:48 -05:00
GriffinR
a01d83a434
Merge branch 'master' into sync-ai 2020-01-23 10:24:11 -05:00
PikalaxALT
7824a413de Normalize union room UnkStruct arrays; remove STAT_STAGE_ defines 2020-01-23 10:10:57 -05:00
GriffinR
c2bf9898a5 Document Vermilion scripts 2020-01-23 02:03:40 -05:00
GriffinR
e7cd8c59f4 Remove unused BF battle types, clarify Ghost battle type flags 2020-01-22 21:02:25 -05:00
GriffinR
d084a5ca84 Sync AI scripts 2020-01-22 19:21:40 -05:00
PikalaxALT
401276242a through sub_811BDA8 2020-01-22 13:39:36 -05:00
PikalaxALT
2d4be89ee5 Merge branch 'master' of github.com:pret/pokefirered into union_room 2020-01-22 12:38:19 -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
PikalaxALT
c75296640d
Merge pull request #235 from GriffinRichards/doc-miscscript 
Document some misc small scripts
 2020-01-22 11:37:37 -05:00
PikalaxALT
9f9b4dd13d Data through gUnknown_84570C8 2020-01-21 14:36:13 -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
84c198ac76
Merge branch 'master' into doc-cinnabar 2020-01-19 17:00:39 -05:00
PikalaxALT
c365f58833 Address review comments 2020-01-19 16:19:35 -05:00
PikalaxALT
6e41dd7b21 Document item_menu 2020-01-19 14:47:23 -05:00
PikalaxALT
dfcfe6d8e1 through MoveItemSlotInList 2020-01-18 11:52:32 -05:00
GriffinR
009595b4df Finish Cinnabar Island scripts 2020-01-17 15:09:54 -05:00
GriffinR
a4f5f41e24 Document static mon scripts 2020-01-17 10:51:41 -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
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
0676e73286 Remove unused link groups, dead label 2020-01-12 16:53:55 -05:00
GriffinR
f276383293 Merge master into sync-script 2020-01-12 16:03:06 -05:00
GriffinR
6bcb508c3f Update some movement cmds 2020-01-11 01:00:50 -05:00
GriffinR
0bb7f18b8e Sync Cable Club scripts 2020-01-11 00:47:47 -05:00
GriffinR
91bf7665c6 Sync split scripts, more misc splits/doc 2020-01-10 15:01:50 -05:00
GriffinR
9fafa12285 More basic script constants 2020-01-10 03:50:11 -05:00
GriffinR
94fbc3ac48 Sync temp vars 2020-01-09 14:46:14 -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
jiangzhengwenjz
973cb394b2 librfu through 0x81E13F0 2020-01-09 12:38:57 +08: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
PikalaxALT
3535cf2ebc through sub_80C0E5C 2020-01-03 09:09:02 -05:00
PikalaxALT
59581b3c57 region_map through sub_80BFFD0 2019-12-23 13:33:06 -05:00
jiangzhengwenjz
84d9a1e723 sub_804C728; sub_804CF14 2019-12-19 13:43:11 +08:00
garak
8ee35bc615 *actual* final pass at unifying on object event 2019-12-17 21:35:09 -05:00
garak
cdd882f3cc disassemble movement type arrays 2019-12-17 15:05:23 -05:00
Evan
9806a60837 finish trainer card matching and data 2019-12-11 11:35:10 -05:00
PikalaxALT
bb8c712f75
Merge pull request #160 from jiangzhengwenjz/party_menu 
party_menu
 2019-11-24 08:44:21 -05:00
PikalaxALT
13e1ed54b2 battle_message 1 2019-11-23 16:51:05 -05:00
jiangzhengwenjz
972c044d71 party_menu fourth quarter 2019-11-24 03:03:29 +08:00
jiangzhengwenjz
5c1bdd0eb5 party_menu third quarter 2019-11-23 08:09:23 +08:00
jiangzhengwenjz
499c09a49f party_menu first quarter 2019-11-23 08:09:23 +08:00
jiangzhengwenjz
1d96920da0 party_menu data 2019-11-23 08:09:23 +08:00
PikalaxALT
e7cb5476c4 Port evolution_scene 2019-11-20 11:08:30 -05:00
PikalaxALT
807fe60b22 Document battle_tower.c 2019-11-09 14:53:30 -05:00
PikalaxALT
7f5db562cc Rename fldeff scripts 2019-11-08 11:27:22 -05:00
PikalaxALT
e97a442590 Dump Battle Tower data left over from R/S-J 2019-11-07 20:28:39 -05:00
PikalaxALT
64485f5cd1 TRAINER_SECRET_BASE propagation 2019-11-07 09:23:21 -05:00
PikalaxALT
d97eb6353d Sync battle script documentation with Emerald, 1 2019-11-06 15:52:58 -05:00
PikalaxALT
629cb532d8 Update macros for battle_scripts_2 2019-11-06 15:05:04 -05:00
PikalaxALT
f3be95d0c0 Dump battle_scripts_2.s 2019-11-06 14:06:51 -05:00
PikalaxALT
69edfecc16 Update battle scripts with more defines 2019-11-06 13:09:59 -05:00
PikalaxALT
95d19b8e88 Sync battle script commands with emerald 2019-11-06 11:26:22 -05:00
PikalaxALT
91e305255c Dump battle scripts 1 2019-11-05 21:27:47 -05:00
PikalaxALT
2100eb9d81 Document easy_chat 2019-11-01 16:40:31 -04:00
PikalaxALT
36bea47ea6 Static symbols in easy_chat 2019-11-01 15:59:24 -04:00
PikalaxALT
a8c2fecbd5 Redump easy chat to C 2019-11-01 13:36:16 -04:00
PikalaxALT
2c2c179eb9 Finish trade code 2019-10-30 12:49:16 -04:00
PikalaxALT
265f8b5b25 trade through sub_8053E1C; dynamic sys flags start idx 2019-10-30 11:16:26 -04:00
PikalaxALT
93f0703fcd Merge branch 'master' of github.com:pret/pokefirered into script_menu 2019-10-26 10:23:13 -04:00
jiangzhengwenjz
0ae4d58e98 resolve more review comments 2019-10-26 11:51:43 +08: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
00675eaafb script_menu data 2019-10-25 13:23:46 -04:00
jiangzhengwenjz
2f87855072 Merge branch 'master' into battle 2019-10-25 09:22:50 +08:00
jiangzhengwenjz
b8c2d14f6a battle_controller_oak_old_man 2019-10-25 08:51:14 +08:00
PikalaxALT
4fae71a4b0 Fix alignment in flags.h 2019-10-24 16:54:01 -04:00
PikalaxALT
a18e9c27e1 Rename specials according to Ruby 2019-10-24 16:31:38 -04:00
PikalaxALT
440d062936 fix erroneous var name reversion 2019-10-24 15:51:47 -04:00
PikalaxALT
7c3d9df380 Finish field_specials 2019-10-24 15:28:43 -04:00
PikalaxALT
779d6187c6 field_specials through sub_80CC534 2019-10-24 10:22:39 -04:00
jiangzhengwenjz
b469207121 rename BATTLE_TYPE_OLD_MAN_TUTORIAL 2019-10-24 14:05:20 +08:00
PikalaxALT
54d6414654 field_specials through sub_80CBDE8 2019-10-23 20:12:14 -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
jiangzhengwenjz
1dc0b25c1e Merge branch 'master' into battle 2019-10-24 01:42:52 +08:00
PikalaxALT
a5521e6b69 Remove incomplete menews_jison constant defs 2019-10-22 16:47:41 -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
6ee1bd0621 Decompile event_data.s 2019-10-21 21:15:54 -04:00
PikalaxALT
7e0956f459 SEAGALLOP constants in event scripts 2019-10-21 16:46:58 -04:00
PikalaxALT
c5db703229 Update hidden item json fields 2019-10-21 13:34:31 -04:00
PikalaxALT
d7d93b22d2 Trainer constants in vs_seeker.c 2019-10-21 13:03:30 -04:00
PikalaxALT
629b9268e1 Name massage step counter 2019-10-21 12:30:57 -04:00
PikalaxALT
3a910078c1 Rename routines and objects related to move tutor 2019-10-21 12:08:37 -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
2aeefdc5de update famechecker macro 2019-10-20 20:20:45 -04:00
jiangzhengwenjz
b0400ef6ba battle_setup funcs 2019-10-21 03:08:10 +08: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
5a956fd91a Annotate blocks of flags 2019-10-19 22:02:04 -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
d98d4d887c Set map.json files with map_obj_gfx constants 2019-10-19 15:05:51 -04:00
PikalaxALT
1449c71364 Dump map obj gfx 2019-10-19 14:46:50 -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
e363b0e2bf Split off renewable_hidden_items.c 2019-10-18 13:04:57 -04:00
PikalaxALT
4f15cb02d2 Rename map scene vars and partially document Oak's lab 2019-10-18 12:49:59 -04:00
PikalaxALT
4d8f66774e Merge branch 'master' into trainers 2019-10-18 10:20:01 -04:00
PikalaxALT
a7b278ac2d Restore documentation to mystery_event_msg 2019-10-18 10:14:39 -04:00
PikalaxALT
4bc284ff2c
Merge pull request #128 from garakmon/more_event_script_dump 
Final Event Script Dump
 2019-10-18 10:11:33 -04:00
PikalaxALT
c40fdc5eb6 Begin fresh dump of mystery_event_msg 2019-10-17 22:32:06 -04:00
PikalaxALT
2f0ae810f7 Merge branch 'master' into trainers 2019-10-17 21:26:00 -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
0b708aeade Initial trainers dump 2019-10-17 16:13:02 -04:00
ultima-soul
5f6672ee07 Rename trainer front pics and palettes. 2019-10-16 22:52:41 -07:00
garak
2ab9d19d34 use FLDEFF constants for dofieldeffect macro 2019-10-16 19:14:43 -04:00
garak
705138c224 dump more map event scripts 2019-10-16 19:09:52 -04:00
jiangzhengwenjz
f03807931f thru sub_8011B94 2019-10-17 02:01:07 +08:00
ultima-soul
29d7f1c737 Added TRAINER_PIC constants. 2019-10-16 00:04:07 -07:00
jiangzhengwenjz
a6c0088073 battle_main data decomp 2019-10-16 08:31:44 +08:00