Commit Graph

245 Commits

Author SHA1 Message Date
PikalaxALT
f65e07fb1f pokemon_jump_3,4 2020-02-18 15:52:45 -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
2e934469b8
Merge pull request #242 from jiangzhengwenjz/field
field_screen_effect
2020-01-26 15:33:56 -05:00
jiangzhengwenjz
5b36288064 field_screen_effect 2020-01-26 09:27:55 +08:00
PikalaxALT
c0b05784d6 Finish union_room_chat_display 2020-01-25 13:35:34 -05:00
PikalaxALT
c99246fccf through sub_81298F8 2020-01-25 08:52:18 -05:00
PikalaxALT
12d12e70a1 union_room_battle 2020-01-22 15:46:48 -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
4c62d0f35f through InitTutorialBag 2020-01-18 22:14:54 -05:00
PikalaxALT
0ed743a582 through sub_810A554 2020-01-18 19:54:25 -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
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
GriffinR
fba3fc738a Document Pokemon Tower scripts 2020-01-16 13:05:26 -05:00
GriffinR
f276383293 Merge master into sync-script 2020-01-12 16:03:06 -05:00
GriffinR
d071f05504 Split more files from event_scripts.s 2020-01-09 14:01:45 -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
f8e911bcf5 Partial documentation of region map 2020-01-08 16:03:42 -05:00
PikalaxALT
f257e2006a Port region_map rodata to C 2020-01-07 20:51:12 -05:00
PikalaxALT
2c825017e6 through sub_80C1A94 2020-01-04 13:12:22 -05:00
PikalaxALT
e58e6689b8 through sub_80C1920 2020-01-03 16:04:43 -05:00
PikalaxALT
e2fb677742 through sub_80C144C 2020-01-03 11:00:37 -05:00
PikalaxALT
20c5160bf7 through sub_80C1058 2020-01-03 10:22:37 -05:00
PikalaxALT
5a4ffc9a8e sub_80C04E4 2020-01-02 10:48:43 -05:00
PikalaxALT
67cf45f7b3 Match player name choices in LG 2019-12-20 13:53:56 -05:00
PikalaxALT
be8b7a6f13 through sub_81051D0 2019-12-13 14:55:19 -05:00
PikalaxALT
e38355d255 through sub_8104EC0 2019-12-13 10:50:31 -05:00
PikalaxALT
5df43761c0 through sub_8104A34 2019-12-12 19:00:42 -05:00
PikalaxALT
af1c24b751 Merge branch 'master' of github.com:pret/pokefirered into pokedex_screen 2019-12-11 19:51:51 -05:00
PikalaxALT
f12824e3b1
Merge pull request #180 from ghoulslash/trainer-card
Trainer card
2019-12-11 18:20:58 -05:00
Evan
9806a60837 finish trainer card matching and data 2019-12-11 11:35:10 -05:00
PikalaxALT
f55abfddc5 through sub_8103A40 2019-12-11 11:02:42 -05:00
PikalaxALT
30f74d1c37 through sub_810345C 2019-12-10 13:27:37 -05:00
PikalaxALT
d4314287ae through sub_8102F80 2019-12-10 12:33:19 -05:00
ultima-soul
58cf331340 Merge branch 'master' into data_dump 2019-12-04 11:44:52 -08:00
ultima-soul
e45aee1ff2 Port/dump dodrio_berry_picking data. 2019-12-02 22:47:45 -08:00
Evan
31d8bfb048 fix merge conflicts 2019-11-26 13:55:24 -07:00
Evan
2cc4db0c78 remove .s files 2019-11-24 16:23:06 -07:00
PikalaxALT
bb8c712f75
Merge pull request #160 from jiangzhengwenjz/party_menu
party_menu
2019-11-24 08:44:21 -05:00
PikalaxALT
14725e1592 Address review comments 2019-11-23 19:21:31 -05:00
PikalaxALT
e3bc9c44cd battle_message 2 2019-11-23 18:12:33 -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
49eb350462 party_menu second 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
jiangzhengwenjz
a4e7a35960 document some symbols 2019-11-23 08:09:22 +08:00
Evan
407d22af8e fix PR merge conflicts 2019-11-21 09:31:40 -07:00
Evan
39a71e64d1 fix nonmatching 2019-11-20 09:57:19 -07:00
PikalaxALT
e7cb5476c4 Port evolution_scene 2019-11-20 11:08:30 -05:00
Evan
30d967a51a pr fixes 2019-11-19 14:21:00 -07:00
Evan
52f64335ed match baserom 2019-11-19 14:21:00 -07:00
Evan
a26885c755 matching rom 2019-11-19 14:21:00 -07:00
Evan
a48e03b78c remove compile errors 2019-11-19 14:21:00 -07:00
jiangzhengwenjz
1d3ae2fe78 Merge branch 'master' into battle 2019-11-19 10:26:40 +08:00
PikalaxALT
734cbfdb20 Decomp map_name_popup 2019-11-11 21:46:57 -05:00
PikalaxALT
f316b22f96 Move gText_Decimal to strings.h; dump box_party_pokemon_dropdown rodata 2019-11-11 17:08:21 -05:00
PikalaxALT
451310c0c8 Address review comments 2019-11-10 20:25:41 -05:00
PikalaxALT
fa91b511b9 Finish documentation of learn_move syms 2019-11-10 19:43:47 -05:00
PikalaxALT
89b1087c37 Decomp learn_move and start documentation 2019-11-09 22:06:56 -05:00
jiangzhengwenjz
71eb0fc9d8 battle_controller_pokedude data 2019-11-09 12:26:52 +08:00
PikalaxALT
57b328ad40 Decomp hall_of_fame 2019-11-04 16:20:11 -05:00
PikalaxALT
8013fa861c Sync charmap with Emerald 2019-11-02 21:10:42 -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
1ba6cb2245 Some renaming; resolve trade bss 2019-10-30 16:51:43 -04:00
PikalaxALT
f6d768d5ed Trade data; split off trade_scene 2019-10-30 14:20:32 -04:00
PikalaxALT
2c2c179eb9 Finish trade code 2019-10-30 12:49:16 -04:00
PikalaxALT
e7a66b2941 port sub_8050F3C 2019-10-29 21:29:10 -04:00
PikalaxALT
efe914a5ba trade through sub_804E944 2019-10-28 15:55:57 -04:00
PikalaxALT
93f0703fcd Merge branch 'master' of github.com:pret/pokefirered into script_menu 2019-10-26 10:23:13 -04:00
PikalaxALT
2fce740005 Name strings used in field_specials 2019-10-25 14:59:46 -04:00
PikalaxALT
359ec8dde1 Name multichoice menus 2019-10-25 14:52:54 -04:00
PikalaxALT
15298c6cd1 Fix some string names 2019-10-25 14:01:40 -04:00
PikalaxALT
d33509ec93 script_menu name strings 2019-10-25 13:56:01 -04:00
PikalaxALT
00675eaafb script_menu data 2019-10-25 13:23:46 -04:00
PikalaxALT
0a440d658b Finish script_menu code decomp 2019-10-25 11:10:08 -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
jiangzhengwenjz
631eccb92d thru OakOldManHandleSwitchInAnim 2019-10-25 05:57:26 +08:00
PikalaxALT
0d73967f6c field_specials through Special_BattleCardAction; field_specials rodata 2019-10-24 11:42:45 -04:00
PikalaxALT
661e5d9221 field_specials through Task_AnimateElevatorWindowView 2019-10-23 15:31:23 -04:00
PikalaxALT
9a431dae99 Decompile mail 2019-10-14 14:59:31 -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
99bd3d9154 Finish main menu decomp 2019-10-08 10:31:33 -04:00
PikalaxALT
0f67a952a3 main_menu through sub_800CE70 2019-10-07 17:06:11 -04:00
PikalaxALT
2fe6b6db8c main menu through sub_800C780 2019-10-07 14:06:47 -04:00
PikalaxALT
e73e1172aa link through ResetSerial 2019-10-06 21:08:53 -04:00
PikalaxALT
afd5f1f52f itemfinder through sub_813F004 2019-10-02 21:26:01 -04:00
PikalaxALT
beedb8d73f Tidy global namespace and document 2019-09-30 20:58:29 -04:00
PikalaxALT
89be71dcb8 berry_pouch through sub_813E8D4 2019-09-30 18:06:49 -04:00
PikalaxALT
e65487716a berry_pouch through sub_813E2B8 2019-09-30 16:59:39 -04:00
PikalaxALT
b843b55292 berry_pouch through sub_813D940 2019-09-28 21:35:20 -04:00
PikalaxALT
0993cb64f7 Berry_pouch through sub_813D5BC 2019-09-28 20:27:41 -04:00
PikalaxALT
0e217e22d8
Merge branch 'master' into battle 2019-09-25 13:49:16 -04:00
PikalaxALT
e0b3642edc Rename credits strings and document script 2019-09-25 13:41:43 -04:00
PikalaxALT
d66767ed9a Documentation and cleanup 2019-09-25 11:09:28 -04:00
PikalaxALT
7f0c7528f7 Finish credits decomp and data dump 2019-09-24 14:00:40 -04:00
PikalaxALT
89c98f2ab7 Start credits (nonmatching sub_80F3BD0) 2019-09-24 14:00:30 -04:00
jiangzhengwenjz
184066d1c1 thru atk6B 2019-08-26 14:38:40 +08:00
jiangzhengwenjz
b9d547a02f ported battle_controller_player from pokeem and matched several new functions 2019-08-05 08:15:58 +08:00
jiangzhengwenjz
26a7192186 Merge branch 'master' into battle 2019-08-03 06:59:28 +08:00
jiangzhengwenjz
a4263a6bd8 ported battle_controller_safari from pokeem 2019-07-31 07:58:08 +08:00
PikalaxALT
a74d770de1 Move string decls to strings.h 2019-07-29 21:56:42 -04:00
jiangzhengwenjz
c7d3ad06b0 Merge branch 'master' into pokemon 2019-07-16 23:22:52 +08:00
jiangzhengwenjz
96fa1a23ed Merge branch 'master' into pokemon 2019-07-15 00:04:06 +08:00
PikalaxALT
939bd127bb Merge branch 'master' into battle_records 2019-07-14 11:29:23 -04:00
PikalaxALT
97b4bb41b7 Name functions in battle_records.c 2019-07-13 19:51:30 -04:00
PikalaxALT
40c3cf3da7 Finish battle_records.s and assoc. data 2019-07-13 19:31:19 -04:00
jiangzhengwenjz
1caed4e632 updated headers 2019-07-14 05:31:17 +08:00
jiangzhengwenjz
0985206a29 marked all static functions in pokemon.c 2019-07-14 04:49:21 +08:00
jiangzhengwenjz
000bbba77c resolved wrong typing in diploma 2019-07-13 11:31:40 +08:00
PikalaxALT
7ec965bd24 Port diploma data to C 2019-07-12 22:21:10 -04:00
jiangzhengwenjz
e0e81c5fbe finished menu (1 failed attempt) 2019-07-13 05:26:18 +08:00
jiangzhengwenjz
559ddb05e7 thru CheckBattleTypeGhost() 2019-07-12 13:39:33 +08:00
jiangzhengwenjz
d97925df0e finished field_poison 2019-07-07 01:46:05 +08:00
PikalaxALT
7abbe42763 Finish item_use 2019-06-20 20:00:13 -04:00
PikalaxALT
12f3ceb0f7 item_use: through sub_80A16D0 2019-06-20 11:02:09 -04:00
PikalaxALT
649a351c4c item: through sub_809A584 2019-06-19 21:41:43 -04:00
PikalaxALT
7eeba327bd Dump items and start decomp item_use 2019-06-19 18:28:55 -04:00
PikalaxALT
2b750cf444 Rename Item PC symbols 2019-06-17 10:21:32 -04:00
PikalaxALT
632a7e8c08 finish item_pc 2019-06-16 21:14:16 -04:00
PikalaxALT
105716d701 item_pc: through sub_810E548 2019-06-16 19:37:28 -04:00
PikalaxALT
d681d7f727 item_pc: through sub_810E200 2019-06-16 18:12:11 -04:00
PikalaxALT
d0633593e8 item_pc: through sub_810DBD0 2019-06-16 15:14:57 -04:00
PikalaxALT
4f4b03af60 item_pc: sub_810D878 2019-06-16 12:36:34 -04:00
PikalaxALT
decd15a458 unk_815EDDC 2019-06-15 12:56:14 -04:00
PikalaxALT
9aac6112a2 Some symbol renaming 2019-06-13 16:34:18 -04:00
PikalaxALT
e30052e271 help_system: through sub_813C3AC 2019-06-13 13:45:46 -04:00
PikalaxALT
63b2153402 help_system: sub_813B870 2019-06-13 09:56:44 -04:00
PikalaxALT
85aeb8d476 help_system_812B1E0: through sub_812BDEC 2019-06-12 16:43:34 -04:00
PikalaxALT
12c62c656b Decompile help system rodata 2019-06-12 14:46:42 -04:00
PikalaxALT
75a89830a9 Cleanup and documentation of teachy_tv 2019-06-11 10:11:23 -04:00
jiangzhengwenjz
20a09555ea fixed lots of stuff 2019-06-11 05:20:42 +08:00
PikalaxALT
dfbddec062 tm_case and peripheral documentation 2019-04-15 13:17:19 -04:00
PikalaxALT
d5504aefae tm_case documentation, 1 2019-04-15 08:49:52 -04:00
PikalaxALT
931f19d2ea Port mystery_event_script 2018-12-03 20:21:35 -05:00
PikalaxALT
d6233c5b3b Fix C/C++ errors generated by CLion IDE 2018-11-09 12:33:20 -05:00
sceptillion
b849ce93db decompile main 2017-12-17 13:22:46 -08:00