Commit Graph

911 Commits

Author SHA1 Message Date
PikalaxALT
e38355d255 through sub_8104EC0 2019-12-13 10:50:31 -05:00
PikalaxALT
2b2e3dc3e7 through sub_8104C2C 2019-12-13 09:37:46 -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
PikalaxALT
0d586d304d sub_8103AC8 2019-12-11 17:06:27 -05:00
Evan
b0623a44bd update TrainerCardData struct 2019-12-11 14:35:09 -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
6645ad8ccf Merge branch 'master' of github.com:pret/pokefirered into pokedex_screen 2019-12-10 14:13:41 -05:00
jiangzhengwenjz
c609b533d4 sub_815A1F8 2019-12-11 02:47:33 +08: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
PikalaxALT
efb171875c Nonmatching sub_810287C; annotate rodata 2019-12-09 16:26:22 -05:00
PikalaxALT
9d70b8a4d9 Merge branch 'master' of github.com:pret/pokefirered into pokedex_screen 2019-12-09 08:59:59 -05:00
PikalaxALT
f21b113bc6
Merge pull request #177 from ghoulslash/battle-anim
battle_anim*
2019-12-07 20:20:57 -05:00
Evan
cb1e4ab326 update static declarations 2019-12-06 22:44:15 -07:00
PikalaxALT
7871a505b3 pokedex_screen through sub_810250C 2019-12-06 16:57:33 -05:00
Evan
ebd1037036 update header file 2019-12-05 19:18:32 -07:00
Evan
66cf904343 data type fixes 2019-12-05 14:18:45 -07:00
Evan
9f2a53eec3 fix merge conflicts 2019-12-04 21:35:31 -07:00
Evan
c8b22e2680 format fixes 2019-12-04 21:18:40 -07:00
Evan
bc36d1cb2a fix merge conflicts 2019-12-04 18:58:55 -07:00
Evan
6581fdb69d almost all matching 2019-12-04 18:53:21 -07:00
Evan
661a581176 matching up battle_anim_special 2019-12-04 14:54:52 -07:00
Evan
2453b88b9d resolve compiler errors 2019-12-04 14:54:52 -07:00
Evan
f1bd7a41cc resolve compiler errors 2019-12-04 14:54:52 -07:00
Evan
2f3ad83711 start anim objtemplates 2019-12-04 14:54:52 -07:00
Evan
9bc5170673 resolve data/battle_anim.s 2019-12-04 14:54:52 -07:00
Evan
45ff887858 anim particle gfx graphics names 2019-12-04 14:54:51 -07:00
Evan
4f67dc41a4 port all to c 2019-12-04 14:54:51 -07:00
jiangzhengwenjz
251b0ee0c4 resolve change requests 2019-12-04 14:54:51 -07:00
jiangzhengwenjz
03ab807aaa clean up 2019-12-04 14:54:51 -07:00
PikalaxALT
058999f49b Address review comments 2019-12-04 14:54:50 -07:00
PikalaxALT
8742161431 battle_message 2 2019-12-04 14:54:50 -07:00
PikalaxALT
aa0d8cdaa0 battle_message 1 2019-12-04 14:54:50 -07:00
jiangzhengwenjz
1ffe7f78cb party_menu fourth quarter 2019-12-04 14:54:50 -07:00
PikalaxALT
98be2d1805 fldeff_sweetscent ewram 2019-12-04 14:54:50 -07:00
jiangzhengwenjz
17743fe0e6 party_menu third quarter 2019-12-04 14:54:50 -07:00
jiangzhengwenjz
27ff20d31d party_menu second quarter 2019-12-04 14:54:50 -07:00
jiangzhengwenjz
069eb2baed party_menu first quarter 2019-12-04 14:54:50 -07:00
jiangzhengwenjz
d89a2d791e party_menu data 2019-12-04 14:54:49 -07:00
jiangzhengwenjz
622fcd2cb9 document some symbols 2019-12-04 14:54:49 -07:00
Evan
aa272d1e51 matching up battle_anim_special 2019-12-04 14:49:35 -07:00
ultima-soul
58cf331340 Merge branch 'master' into data_dump 2019-12-04 11:44:52 -08:00
PikalaxALT
3362b7f671
Merge pull request #173 from ghoulslash/pokeball
Pokeball
2019-12-04 13:06:48 -05:00
Evan
aacb202f81 resolve compiler errors 2019-12-03 10:54:47 -07:00
ultima-soul
e45aee1ff2 Port/dump dodrio_berry_picking data. 2019-12-02 22:47:45 -08:00
Evan
f2eb137154 resolve compiler errors 2019-12-02 20:58:12 -07:00
Evan
86e62e24c1 start anim objtemplates 2019-12-01 20:23:36 -05:00
Evan
1bdeb05793 resolve data/battle_anim.s 2019-12-01 13:00:24 -05:00
Evan
7de43f7249 anim particle gfx graphics names 2019-12-01 11:49:27 -05:00
Evan
98c3bb201f port all to c 2019-11-30 15:09:08 -05:00
Evan
b626882708 all matching except Task_DoPokeballSendOutAnim 2019-11-30 10:50:58 -05:00
Evan
52013cf052 remove errors 2019-11-28 11:13:26 -05:00
Evan
d81a67ea2d fix nonmatchings 2019-11-28 11:04:49 -05:00
Evan
cba5ebbd5a remove pokeball.s 2019-11-27 07:14:33 -07:00
Evan
31d8bfb048 fix merge conflicts 2019-11-26 13:55:24 -07:00
Evan
d1142b4290 extract graphics data 2019-11-26 11:47:12 -07:00
Evan
c73f061cc6 update ewram 2019-11-25 15:04:38 -07:00
Evan
e6a882cc92 separate sea cottage anim functions 2019-11-24 17:22:02 -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
jiangzhengwenjz
0ca414959b resolve change requests 2019-11-24 09:31:04 +08:00
jiangzhengwenjz
7817546781 clean up 2019-11-24 08:57:57 +08: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
PikalaxALT
5579507837 fldeff_sweetscent ewram 2019-11-23 10:55:30 -05: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
PikalaxALT
a1b2110052 Address review comments 2019-11-20 16:36:38 -05:00
PikalaxALT
19212151e2 Add missing files; documentation 2019-11-20 14:18:08 -05: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
9f7c34d645 match Task_OptionMenu 2019-11-19 19:51:03 -07:00
Evan
30d967a51a pr fixes 2019-11-19 14:21:00 -07:00
Evan
31d3df51f1 fix tab vs space format 2019-11-19 14:21:00 -07:00
Evan
ec2673ebe5 update option menu const structs 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
422533386d matching up to sub_8088D8C 2019-11-19 14:21:00 -07:00
Evan
a48e03b78c remove compile errors 2019-11-19 14:21:00 -07:00
PikalaxALT
789eb58882 Address review comments 2019-11-19 11:49:21 -05:00
PikalaxALT
ff3fb43622 Merge branch 'master' of github.com:pret/pokefirered into dism_more_data 2019-11-19 11:12:41 -05:00
jiangzhengwenjz
63f8834b6b resolve review comments 2019-11-19 23:45:59 +08:00
jiangzhengwenjz
1d3ae2fe78 Merge branch 'master' into battle 2019-11-19 10:26:40 +08:00
PikalaxALT
b2070e0681 Decompile evolution_graphics.c 2019-11-18 15:16:08 -05:00
PikalaxALT
f04e6737b2 remove declaration of nonexistent map_name_popup routine 2019-11-12 15:30:48 -05:00
PikalaxALT
f6e8873892 Resolve comments on map_name_popup 2019-11-12 15:24:36 -05:00
PikalaxALT
4c61bead05 Document field_door code 2019-11-12 13:53:47 -05:00
PikalaxALT
3cbc312130 Dump field_door data; start field_door decomp 2019-11-12 11:21:49 -05: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
36c159f7fa SAVE_STAT_ enums 2019-11-11 14:20:02 -05:00
PikalaxALT
e560b55325 Port mevent scripts to C 2019-11-11 11:09:24 -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
PikalaxALT
aba284d3be Update comment on BattleStruct.field_DA 2019-11-09 15:59:49 -05:00
PikalaxALT
807fe60b22 Document battle_tower.c 2019-11-09 14:53:30 -05:00
PikalaxALT
55bede6ca2 Finish decomp of battle_tower 2019-11-09 13:59:24 -05:00
jiangzhengwenjz
17b55f50db clean up 2019-11-09 23:41:45 +08:00
jiangzhengwenjz
a4a44dd18e fire; update constants 2019-11-09 12:26:53 +08:00
jiangzhengwenjz
ab9ce0e641 electric 2019-11-09 12:26:53 +08:00
jiangzhengwenjz
94c1924ed8 ice 2019-11-09 12:26:53 +08:00
jiangzhengwenjz
7e4a3697cd fighting 2019-11-09 12:26:53 +08:00
jiangzhengwenjz
253ffec035 poison 2019-11-09 12:26:53 +08:00
jiangzhengwenjz
5fa2f4f18b battle_controller_pokedude remaining stuff 2019-11-09 12:26:53 +08:00
jiangzhengwenjz
378e85d00b thru sub_8159824 2019-11-09 12:26:52 +08:00
jiangzhengwenjz
a937f72283 thru PokedudeHandleSetRawMonData 2019-11-09 12:26:52 +08:00
jiangzhengwenjz
71eb0fc9d8 battle_controller_pokedude data 2019-11-09 12:26:52 +08:00
PikalaxALT
d25196154f Sync Ruby/Sapphire Battle Tower structs 2019-11-08 16:55:44 -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
2b521f243a Get rid of a knizz comment 2019-11-07 10:56:35 -05:00
PikalaxALT
64485f5cd1 TRAINER_SECRET_BASE propagation 2019-11-07 09:23:21 -05:00
PikalaxALT
4cad26157e Rename ghost battle scripts 2019-11-06 18:32:17 -05:00
PikalaxALT
f14f13b312 Document battle_scripts_2.s 2019-11-06 18:25:36 -05:00
PikalaxALT
60b75e85c9 Finish documentation of battle_scripts_1 2019-11-06 18:15:43 -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
2ed15a3bb5 Fix whitespace in battle_string_ids.h 2019-11-05 21:29:46 -05:00
PikalaxALT
91e305255c Dump battle scripts 1 2019-11-05 21:27:47 -05:00
PikalaxALT
eff10f0e50 Battle message buffers; review comments 2019-11-04 20:32:10 -05:00
PikalaxALT
2fa08605b8 Propagate save status, type, and sector defines 2019-11-04 17:12:02 -05:00
PikalaxALT
57b328ad40 Decomp hall_of_fame 2019-11-04 16:20:11 -05:00
PikalaxALT
d16532c262 Some more documentation 2019-11-04 09:33:19 -05:00
PikalaxALT
0f4621c730 Split mevent_client from mevent_server 2019-11-04 09:07:15 -05:00
PikalaxALT
89e0168cce Document mevent scripts 2019-11-03 19:16:53 -05:00
PikalaxALT
977925a9ee Exported function prototypes to mon_markings.h 2019-11-03 14:30:34 -05:00
PikalaxALT
8013fa861c Sync charmap with Emerald 2019-11-02 21:10:42 -04:00
PikalaxALT
ae97c32f7d Port mon_markings 2019-11-02 17:25:17 -04:00
PikalaxALT
2100eb9d81 Document easy_chat 2019-11-01 16:40:31 -04:00
PikalaxALT
115fd2aa9b Remove nonexistant easy_chat prototypes 2019-11-01 16:13:54 -04:00
PikalaxALT
36bea47ea6 Static symbols in easy_chat 2019-11-01 15:59:24 -04:00
PikalaxALT
6a90a57318 Disassemble bike data 2019-11-01 13:51:30 -04:00
PikalaxALT
a8c2fecbd5 Redump easy chat to C 2019-11-01 13:36:16 -04:00
PikalaxALT
5913bcf0e9 Port pokemon_size_record from Emerald 2019-11-01 09:55:25 -04:00
PikalaxALT
079310c70b Finish decomp of wild_encounter 2019-10-31 18:45:07 -04:00
PikalaxALT
b07b36c6d2 wild_encounter through sub_8082C98 2019-10-31 14:31:21 -04:00
PikalaxALT
2b0bcdcad9 Resolve externed prototypes in C files 2019-10-31 09:19:33 -04:00