Commit Graph

428 Commits

Author SHA1 Message Date
jiangzhengwenjz
16396b8ebb clean up 2019-12-22 03:37:13 +08:00
PikalaxALT
14dc160ae6 SUBALIGN rodata sections 2019-12-21 11:10:36 -05:00
PikalaxALT
deb58dfe5c Split librfu by function type (thumb/arm) 2019-12-21 09:33:44 -05:00
garak
46a8b0fb29 finish object event rename 2019-12-17 15:05:23 -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
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
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
PikalaxALT
7871a505b3 pokedex_screen through sub_810250C 2019-12-06 16:57:33 -05:00
Evan
9f2a53eec3 fix merge conflicts 2019-12-04 21:35:31 -07:00
Evan
5c40e5ea21 battle_anim_status_effects 2019-12-04 14:54:52 -07:00
Evan
0cc5446a2a init battle_anim_special 2019-12-04 14:54:52 -07:00
Evan
aa8d5fb557 b_anim_eff_3 2019-12-04 14:54:52 -07:00
Evan
2f3ad83711 start anim objtemplates 2019-12-04 14:54:52 -07:00
Evan
4f67dc41a4 port all to c 2019-12-04 14:54:51 -07:00
Evan
0b547dff4d start decompilation 2019-12-04 14:54:51 -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
jiangzhengwenjz
d89a2d791e party_menu data 2019-12-04 14:54:49 -07:00
PikalaxALT
2582f7e44b Dump tileset anims data 2019-12-04 14:54:49 -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
ultima-soul
e45aee1ff2 Port/dump dodrio_berry_picking data. 2019-12-02 22:47:45 -08:00
ultima-soul
385740fc14 Split out data/berry_powder.s 2019-12-02 13:18:19 -08:00
Evan
8cdc65a8e4 minor fixes 2019-11-30 15:19:34 -05:00
Evan
b626882708 all matching except Task_DoPokeballSendOutAnim 2019-11-30 10:50:58 -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
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
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
1d96920da0 party_menu data 2019-11-23 08:09:23 +08:00
Evan
b18ec47b13 fix conflicts 2019-11-21 10:23:49 -07:00
PikalaxALT
2d28465444
Merge pull request #162 from PikalaxALT/dism_more_data
Data: tileset_anims, field_ground_effect
2019-11-21 11:36:08 -05:00
Evan
407d22af8e fix PR merge conflicts 2019-11-21 09:31:40 -07:00
PikalaxALT
5142c037b6 Dump tileset anims data 2019-11-21 09:29:07 -05:00
PikalaxALT
e7cb5476c4 Port evolution_scene 2019-11-20 11:08:30 -05:00
Evan
f72d9cbe77 fix formatting on option menu 2019-11-19 14:21:00 -07:00
Evan
52f64335ed match baserom 2019-11-19 14:21:00 -07:00
Evan
a48e03b78c remove compile errors 2019-11-19 14:21:00 -07:00
Evan
3bf1f5e65d start shop.c 2019-11-19 12:57:11 -07:00
Evan
a50adf3a1b fix formatting on option menu 2019-11-19 10:04:40 -07:00
Evan
5bb5d38d22 match baserom 2019-11-19 10:04:40 -07:00
Evan
05724d3db1 remove compile errors 2019-11-19 10:04:40 -07:00