Commit Graph

116 Commits

Author SHA1 Message Date
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