Commit Graph

1070 Commits

Author SHA1 Message Date
Evan
52013cf052 remove errors 2019-11-28 11:13:26 -05:00
Evan
cba5ebbd5a remove pokeball.s 2019-11-27 07:14:33 -07:00
Evan
4b33546727 DoPokeballSendOutAnimation 2019-11-26 16:54:55 -07:00
Evan
dd6239fe26 init branch 2019-11-26 12:36:27 -07:00
PikalaxALT
bb8c712f75
Merge pull request #160 from jiangzhengwenjz/party_menu
party_menu
2019-11-24 08:44:21 -05:00
jiangzhengwenjz
2b2dfa7e49 GetBattleEntryEligibility 2019-11-24 14:40:28 +08: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
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
81e1efbd9e Fix review comments 2019-11-21 10:59:22 -05:00
Evan
e6bc189a03 remove unecessary cast 2019-11-21 08:24:42 -07:00
PikalaxALT
3e12bd8e07 Minor refactor of tileset_anims 2019-11-21 09:48:20 -05:00
PikalaxALT
5142c037b6 Dump tileset anims data 2019-11-21 09:29:07 -05:00
Evan
c39dcbc602 cast fixes 2019-11-20 15:10:56 -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
80e84c2f48 Merge branch 'options_menu' 2019-11-20 10:17:41 -07:00
Evan
39a71e64d1 fix nonmatching 2019-11-20 09:57:19 -07:00
PikalaxALT
e1bdb76ab0 ID --> Id 2019-11-20 11:34:37 -05: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
4a3d7ad972 minor style fixes 2019-11-19 17:41:20 -07:00
Evan
ad6d1cb73b attempt to match Task_OptionMenu 2019-11-19 16:03:35 -07:00
Evan
d52bd495b1 various format fixes 2019-11-19 15:02:58 -07:00
Evan
30d967a51a pr fixes 2019-11-19 14:21:00 -07:00
Evan
f72d9cbe77 fix formatting on option menu 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
1849ad778d
Merge pull request #158 from jiangzhengwenjz/nonmatching
real match OakSpeechNidoranFSetup
2019-11-19 14:05:42 -05:00
PikalaxALT
009732cb4c EvoGraphicsTaskEvoStop 2019-11-19 11:54:21 -05:00
Evan
486ea736cf fix formatting on option menu 2019-11-19 09:53:23 -07:00
PikalaxALT
789eb58882 Address review comments 2019-11-19 11:49:21 -05:00
Evan
9b81c95564 update option menu const structs 2019-11-19 09:46:10 -07:00
PikalaxALT
ff3fb43622 Merge branch 'master' of github.com:pret/pokefirered into dism_more_data 2019-11-19 11:12:41 -05:00
PikalaxALT
89dc26755a
Merge pull request #138 from jiangzhengwenjz/battle
battle (4th take)
2019-11-19 10:58:44 -05:00
jiangzhengwenjz
63f8834b6b resolve review comments 2019-11-19 23:45:59 +08:00