Commit Graph

398 Commits

Author SHA1 Message Date
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
PikalaxALT ff3fb43622 Merge branch 'master' of github.com:pret/pokefirered into dism_more_data 2019-11-19 11:12:41 -05: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 e2005e194d Port field_door data to C 2019-11-12 14:34:14 -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 e560b55325 Port mevent scripts to C 2019-11-11 11:09:24 -05:00
PikalaxALT 012477cc5a Split data_8468C98 2019-11-11 10:27:23 -05:00
PikalaxALT ccaa934305 Decump SaveStatToString 2019-11-11 09:33:24 -05:00
PikalaxALT 89b1087c37 Decomp learn_move and start documentation 2019-11-09 22:06:56 -05:00
PikalaxALT 55bede6ca2 Finish decomp of battle_tower 2019-11-09 13:59:24 -05: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 71eb0fc9d8 battle_controller_pokedude data 2019-11-09 12:26:52 +08:00
PikalaxALT 4eb386f7c4 Port battle tower data to C (following pokeruby layout) 2019-11-08 19:49:05 -05:00
PikalaxALT 57b328ad40 Decomp hall_of_fame 2019-11-04 16:20:11 -05:00
PikalaxALT 0f4621c730 Split mevent_client from mevent_server 2019-11-04 09:07:15 -05:00
PikalaxALT 5b47585549 Split data_83FECCC 2019-11-03 13:36:05 -05:00
PikalaxALT accf183657 Disassemble battle_message 2019-11-03 12:00:43 -05:00
PikalaxALT 16ee97ad82 Name unknown ctrl codes; split data_83F5738 2019-11-02 20:49:47 -04:00
PikalaxALT ae97c32f7d Port mon_markings 2019-11-02 17:25:17 -04:00
PikalaxALT 36bea47ea6 Static symbols in easy_chat 2019-11-01 15:59:24 -04:00
PikalaxALT 486a3abf6b Finish splitting data_835B488 2019-11-01 13:56:32 -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