Commit Graph

1229 Commits

Author SHA1 Message Date
PikalaxALT
d6741335d6 Rename title screen assets and remove dummied standalone pal 2019-12-20 15:35:40 -05:00
PikalaxALT
0f60c1239c Merge branch 'master' of github.com:pret/pokefirered into leafgreen 2019-12-20 14:52:50 -05:00
PikalaxALT
9f604fe56c
Merge pull request #189 from jiangzhengwenjz/nonmatching
fake match sub_815DC8C
2019-12-20 14:52:34 -05:00
PikalaxALT
9bdd62d651
Merge pull request #190 from jiangzhengwenjz/sub_8113AE8
fake match sub_8113AE8
2019-12-20 14:50:33 -05:00
PikalaxALT
32c41f0ec0 MILESTONE: Match LeafGreen 1.0 and 1.1 2019-12-20 14:19:13 -05:00
PikalaxALT
7ab5390c79 Match slot machine gfx in rodata 2019-12-20 14:11:50 -05:00
PikalaxALT
67cf45f7b3 Match player name choices in LG 2019-12-20 13:53:56 -05:00
PikalaxALT
d0e15e34c5 Dump LeafGreen encounters 2019-12-20 13:30:27 -05:00
PikalaxALT
981c0dd398 Match title_screen .rodata 2019-12-20 12:37:09 -05:00
PikalaxALT
9046fa900d Match LG in-game trades 2019-12-20 11:24:29 -05:00
PikalaxALT
5f2865f026 Merge level-up learnsets 2019-12-20 11:11:17 -05:00
PikalaxALT
fd2d0ca2ae Match LG level-up learnsets 2019-12-20 10:58:41 -05:00
PikalaxALT
ba5861e452 leafgreen match .text 2019-12-20 10:05:25 -05:00
PikalaxALT
5f62529525 Match alignment of slot_machine.c in leafgreen 2019-12-20 09:06:52 -05:00
jiangzhengwenjz
a36b4dde1f sub_804F284 2019-12-20 10:07:14 +08:00
PikalaxALT
c8944b1adc lg pokedex text; lg slot_machine gfx 1 2019-12-19 20:10:48 -05:00
PikalaxALT
53396e7957 Alignment get in title_screen rodata 2019-12-19 19:24:44 -05:00
jiangzhengwenjz
a34882f454 sub_8113AE8 2019-12-20 07:54:39 +08:00
jiangzhengwenjz
487d45ce89 sub_815DC8C 2019-12-20 07:20:35 +08:00
PikalaxALT
d5c4f4429a More LG matching 2019-12-19 15:27:35 -05:00
PikalaxALT
18139c4aa4 Resolve remaining FRLG code differences 2019-12-19 14:51:18 -05:00
PikalaxALT
f6cdd87633 Match LG title_screen code maybe 2019-12-19 14:42:33 -05:00
PikalaxALT
969efabaf5
Merge pull request #184 from jiangzhengwenjz/nonmatching
fake match sub_804C728 & sub_804CF14; fix build with NONMATCHING defined
2019-12-19 13:39:38 -05:00
PikalaxALT
dd0da2484f Match FireRed Rev1 2019-12-19 10:23:05 -05:00
jiangzhengwenjz
84d9a1e723 sub_804C728; sub_804CF14 2019-12-19 13:43:11 +08:00
PikalaxALT
1226dfd946 Match rev1 intro.c maybe 2019-12-18 22:17:14 -05:00
PikalaxALT
ae881a3623 Start implementing LG and 1.1 2019-12-18 16:43:24 -05:00
garak
f30a6c7ac6 use new gfx constants for fldeffs 2019-12-17 22:26:38 -05:00
garak
8ee35bc615 *actual* final pass at unifying on object event 2019-12-17 21:35:09 -05:00
garak
fabe354c01 final pass at unifying on object event 2019-12-17 20:16:40 -05:00
garak
ddaa88390e eventobject -> objectevent take 3 2019-12-17 18:49:34 -05:00
garak
4668d17866 dump leftover subsprite tables 2019-12-17 15:05:23 -05:00
garak
7a0edab573 fix rebase conflicts 2019-12-17 15:05:23 -05:00
garak
46a8b0fb29 finish object event rename 2019-12-17 15:05:23 -05:00
garak
36b2301fd2 mostly standardize to object event to prep for disassembly 2019-12-17 15:05:23 -05:00
PikalaxALT
3301c8ff1d address review comments 2019-12-14 21:57:25 -05:00
PikalaxALT
a4e9475709 sub_81052D0 2019-12-14 11:16:59 -05:00
PikalaxALT
6ea4a7a40c sub_81051F0 2019-12-13 15:15:48 -05:00
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
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
1f1b8191e7 through sub_810491C 2019-12-12 16:37:32 -05:00
PikalaxALT
cfd4b0a5da nonmatching sub_8104664 2019-12-12 16:07:18 -05:00
PikalaxALT
e2a4da3a01 through sub_81042EC 2019-12-11 20:30:09 -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
b43c48202b trainer card strings definition 2019-12-11 17:10:19 -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