Commit Graph

1179 Commits

Author SHA1 Message Date
GriffinR
1aa1f18972 Sync trainer_battle.inc 2020-03-03 14:52:32 -05:00
PikalaxALT
8a7c2ded11 Port berry_crush_3 from Emerald 2020-03-03 12:24:18 -05:00
PikalaxALT
8594e7f72d Port berry_crush_2 from emerald 2020-03-02 21:36:30 -05:00
PikalaxALT
f77b0feba6 Port berry_crush.c part 1 from Emerald 2020-03-02 16:57:00 -05:00
GriffinR
42e6e9bd9c Remove interactwith from field move scripts 2020-03-02 14:55:20 -05:00
PikalaxALT
6363d39e99 port field_effect_helpers from emerald 2020-03-02 13:34:34 -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
d758ae0dc2 Merge branch 'master' of github.com:pret/pokefirered into field_effect 2020-03-02 10:15:07 -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
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
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
PikalaxALT
db12644f00 FallWarpEffect funcs 2020-02-28 09:06:19 -05:00
PikalaxALT
e07c771f18 through Task_FallWarpFieldEffect 2020-02-27 16:59:05 -05:00
PikalaxALT
9c03c850a2 Fly field effect 2020-02-27 16:35:06 -05:00
PikalaxALT
701d4635b4 Pokecenter heal and HOF field effects 2020-02-27 16:19:33 -05:00
PikalaxALT
0d88e2d1de through MultiplyPaletteRGBComponents 2020-02-27 14:08:26 -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
e3447d2366
Merge pull request #269 from GriffinRichards/doc-pallet
Document Pallet Town scripts
2020-02-26 14:07:48 -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
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
PikalaxALT
41644b283a through sub_8097A20 2020-02-25 16:52:16 -05:00
PikalaxALT
565114625f fldeff_cut through SetUpFieldMove_Cut 2020-02-25 16:35:38 -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
3666a47d1c Port script_movement 2020-02-24 15:32:19 -05:00
PikalaxALT
890d85ff02 battle_bg 2020-02-23 16:26:33 -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
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
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
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
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
PikalaxALT
9ff146b0bc document minigame_countdown.c 2020-02-11 13:43:14 -05:00
PikalaxALT
354d837d6f document digit_obj_util 2020-02-11 10:49:36 -05:00
PikalaxALT
78caeff45b Name remaining funcs in union_room.c 2020-02-06 10:44:22 -05:00
PikalaxALT
4770fac9eb More mevent documentation 2020-02-04 14:16:45 -05:00
PikalaxALT
7bd0a83d35 I'm so original with these commit names 2020-02-03 16:41:25 -05:00
GriffinR
34deceb136 Remove old references to battle pyramid 2020-02-03 12:08:27 -05:00
PikalaxALT
2b5b956936 Merge branch 'master' of github.com:pret/pokefirered into add_arm_agbcc 2020-02-03 10:08:43 -05:00
PikalaxALT
ba7403c74e Document event_object_80688E4 2020-02-02 11:10:07 -05:00
PikalaxALT
708fa70823 event_object_80688E4 2020-02-01 21:39:02 -05:00
PikalaxALT
7d77b93123 Use SIO_ defines in librfu_intr 2020-01-31 13:27:10 -05:00
PikalaxALT
7e894aa4d0 Decompile librfu_intr against agbcc_arm 2020-01-31 09:26:00 -05:00
PikalaxALT
517f8fc9ef Start doccing help system 2020-01-28 16:05:15 -05:00
PikalaxALT
e38f52e435 Nuke asm/smokescreen.s 2020-01-27 12:46:13 -05:00
PikalaxALT
367b86463e Port smokescreen.c from emerald 2020-01-27 12:38:34 -05:00
GriffinR
017fa7e336 Trainer Hill --> Trainer Tower 2020-01-26 18:34:06 -05:00
PikalaxALT
2e934469b8
Merge pull request #242 from jiangzhengwenjz/field
field_screen_effect
2020-01-26 15:33:56 -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
jiangzhengwenjz
5b36288064 field_screen_effect 2020-01-26 09:27:55 +08:00
PikalaxALT
1f47b6ae4f union_room_chat_objects 2020-01-25 16:10:18 -05:00
PikalaxALT
c0b05784d6 Finish union_room_chat_display 2020-01-25 13:35:34 -05:00
PikalaxALT
f249df41e3 union_room_chat_display through sub_812A1B8 2020-01-25 10:47:17 -05:00
PikalaxALT
c99246fccf through sub_81298F8 2020-01-25 08:52:18 -05:00
GriffinR
c0be66fc2e Document Viridian City scripts and adjacent routes 2020-01-24 20:46:09 -05:00
PikalaxALT
d22dd0f08b through sub_8129560 2020-01-24 17:03:03 -05:00
PikalaxALT
14b7ed7a5f through sub_8128FB8 2020-01-24 13:07:41 -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
4ff5769f42 union_room_chat through sub_81287B4 2020-01-23 16:52:41 -05:00
GriffinR
a01d83a434
Merge branch 'master' into sync-ai 2020-01-23 10:24:11 -05:00
GriffinR
d084a5ca84 Sync AI scripts 2020-01-22 19:21:40 -05:00
PikalaxALT
12d12e70a1 union_room_battle 2020-01-22 15:46:48 -05:00
PikalaxALT
c4626ec296 Finish rfu_union_tool decomp 2020-01-22 13:47:30 -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
PikalaxALT
0495cce904 start decomping rfu_union_tool 2020-01-22 12:38:17 -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
c75296640d
Merge pull request #235 from GriffinRichards/doc-miscscript
Document some misc small scripts
2020-01-22 11:37:37 -05:00
PikalaxALT
70bb1a99e2 union_room_player_avatar --> rfu_union_tool (by assert statements) 2020-01-22 10:35:47 -05:00
PikalaxALT
d873b1c6aa rodata through gUnknown_8456D34 2020-01-20 20:53:50 -05:00
PikalaxALT
5e0a845fc4 finish union_room.s code decomp 2020-01-20 20:21:58 -05:00
PikalaxALT
1fd20be8e1 sub_81186E0 2020-01-20 17:08:24 -05:00
PikalaxALT
a083f0f57f through sub_81186C8 2020-01-20 15:24:36 -05:00
GriffinR
2908c9fa95 Document some misc small scripts 2020-01-20 15:17:34 -05:00
PikalaxALT
ac5bfcf1ce through sub_8117A0C 2020-01-20 14:46:01 -05:00
PikalaxALT
8d5af53329 through sub_8116738 2020-01-20 12:14:55 -05:00
PikalaxALT
bc0fbb5d6e through sub_81165E8 2020-01-20 10:00:19 -05:00
PikalaxALT
8a5386899a through sub_81163B0 2020-01-20 09:33:46 -05:00
PikalaxALT
cedebf15ee sub_8115A68 2020-01-20 09:09:02 -05:00
PikalaxALT
44337a41db through TryBecomeLinkLeader 2020-01-19 20:23:15 -05:00
PikalaxALT
6e41dd7b21 Document item_menu 2020-01-19 14:47:23 -05:00
PikalaxALT
a698f43f26 Finish dism of item_menu 2020-01-19 11:04:37 -05:00
PikalaxALT
4c62d0f35f through InitTutorialBag 2020-01-18 22:14:54 -05:00
PikalaxALT
c9cb5d931c through sub_810A834 2020-01-18 20:40:33 -05:00
PikalaxALT
0ed743a582 through sub_810A554 2020-01-18 19:54:25 -05:00
PikalaxALT
3a235a4fc0 through sub_8109890 2020-01-18 16:12:55 -05:00
PikalaxALT
39dcda73c4 through sub_810967C 2020-01-18 14:59:07 -05:00
PikalaxALT
24e199fdfd through sub_81090DC 2020-01-18 12:59:26 -05:00
PikalaxALT
dfcfe6d8e1 through MoveItemSlotInList 2020-01-18 11:52:32 -05:00
PikalaxALT
1c3f865acf through ItemMenu_StartFadeToExitCallback 2020-01-18 10:26:51 -05:00
PikalaxALT
2ce545fc21 through sub_810899C 2020-01-18 09:23:48 -05:00
PikalaxALT
881199142c through bag_menu_print_cursor 2020-01-17 22:23:20 -05:00
PikalaxALT
dbf3ac402d through sub_8108560 2020-01-17 16:40:53 -05:00
PikalaxALT
f6e050cf35 through sub_81081AC 2020-01-17 15:11:46 -05:00
GriffinR
a4f5f41e24 Document static mon scripts 2020-01-17 10:51:41 -05:00
PikalaxALT
29ef170879 Finish save_failed_screen 2020-01-17 10:49:57 -05:00
PikalaxALT
fc9a008481 through sub_80F5334 2020-01-17 09:51:32 -05:00
PikalaxALT
4d0f46f0cd box_party_pokemon_dropdown 2020-01-16 15:41:01 -05:00
PikalaxALT
fad3674028
Merge pull request #225 from GriffinRichards/doc-questlog
Document some quest log
2020-01-16 09:53:08 -05:00
GriffinR
153858af60 Merge master into doc-questlog 2020-01-15 16:27:36 -05:00
GriffinR
04d176334a Document some Quest Log 2020-01-15 16:00:45 -05:00
PikalaxALT
e03a61e239 Use librfu consts in link_rfu_*.c 2020-01-15 13:54:06 -05:00
PikalaxALT
feeb96f20f Revert agbcc dependency to pret master 2020-01-15 11:32:24 -05:00
PikalaxALT
411f4852c6
Merge pull request #216 from PikalaxALT/link_rfu
Port link_rfu from Emerald
2020-01-15 11:07:17 -05:00
PikalaxALT
a97ef533d2 union_room_player_avatar split 2020-01-14 21:14:01 -05:00
PikalaxALT
69994e89ca Rename files: link_rfu_3 --> union_room, link_rfu_4 --> link_rfu_3 2020-01-14 20:57:31 -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
f3e8f6c65f Finish link_rfu_4 2020-01-14 18:42:05 -05:00
PikalaxALT
de939451d7 link_rfu_4 mostly 2020-01-14 17:07:43 -05:00
GriffinR
f544f6e356 Document Cerulean City scripts 2020-01-14 16:41:38 -05:00
PikalaxALT
5ef7bf7bf4 data/link_rfu.s --> data/easy_chat_2.s 2020-01-14 14:57:41 -05:00
PikalaxALT
97b4865fec Remove link_rfu_2 asm files 2020-01-14 12:43:46 -05:00
PikalaxALT
b76b38c257 Finish porting link_rfu_2 2020-01-14 12:27:56 -05:00
GriffinR
a5d8b98fde Sync macros to have Give/Take Add/Remove unity 2020-01-13 22:35:09 -05:00
PikalaxALT
d9ea5a0815 link_rfu_2 through rfufunc_80FA020 2020-01-13 22:08:11 -05:00
GriffinR
8c560386ed Sync Colosseum map names 2020-01-13 20:34:30 -06:00
PikalaxALT
36306a82d1 link_rfu_2 through sub_80F8F5C 2020-01-13 20:40:47 -05:00
PikalaxALT
eec9e0d914 Split link_rfu_2 2020-01-13 17:03:36 -05:00
PikalaxALT
fcf0e62d1f MODE_PARENT; collapse gUnknown_3005450 --> Rfu 2020-01-13 16:38:08 -05:00
PikalaxALT
2a5cde336b Address review comments 2020-01-13 14:04:02 -05:00