Commit Graph

4773 Commits

Author SHA1 Message Date
PikalaxALT
f89f80daec Merge pull request #760 from PikalaxALT/match_current
Match sub_80D6874
2019-09-05 09:17:08 -04:00
Scott Norton
7a54497761 Match sub_80D6874 2019-08-30 14:22:02 -04:00
garak
0e8ccfc4fd name event object pointer indices 2019-08-29 16:38:23 -05:00
garak
06af013e50 allow CRLF line endings in asm files for preproc 2019-08-29 16:37:58 -05:00
Cameron Hall
bc159dbb03 Merge pull request #752 from camthesaxman/emerald_diff
resolve some Emerald differences
2019-07-30 21:31:27 -05:00
camthesaxman
cf0da4c3bb fix build 2019-07-29 21:25:10 -05:00
camthesaxman
ea0dfce3c4 gMPlay to gMPlayInfo 2019-07-29 21:17:54 -05:00
camthesaxman
db4af549fd resolve some Emerald differences 2019-07-29 20:44:18 -05:00
PikalaxALT
b8393b3a79 Merge pull request #751 from pret/revert-colordiff
Revert migration to `colordiff` in asmdiff.sh
2019-07-29 10:58:36 -04:00
PikalaxALT
61c433d5c3 Revert migration to colordiff in asmdiff.sh
`colordiff` breaks output piping and invokes an additional dependency that no one needs
2019-07-29 10:58:07 -04:00
Cameron Hall
3f477dae36 Merge pull request #750 from camthesaxman/filenames_1
emerald file names, part 1
2019-07-28 21:23:43 -05:00
camthesaxman
e03220c21d Merge branch 'master' into filenames_1 2019-07-28 20:36:33 -05:00
camthesaxman
00b44d5886 emerald file names, part 1 2019-07-28 20:33:25 -05:00
Revo
d442be1210 Merge pull request #749 from camthesaxman/vram
remove hardcoded VRAM and EWRAM addresses
2019-07-28 20:26:50 -04:00
camthesaxman
00b0b0bb90 remove hardcoded VRAM and EWRAM addresses 2019-07-28 19:17:39 -05:00
Revo
e8dda92d7b Merge pull request #748 from camthesaxman/match_atk49_moveend
match atk49_moveend
2019-07-28 20:00:05 -04:00
camthesaxman
6c9a628992 fix build 2019-07-28 18:52:37 -05:00
camthesaxman
92dd1f106b match atk49_moveend 2019-07-28 18:28:15 -05:00
PikalaxALT
bc09f81a9a Merge pull request #747 from camthesaxman/graphics_fix
combine graphics data that should be in the same object
2019-07-28 15:09:14 -04:00
camthesaxman
5b12c6f1e7 combine battle interface graphics files 2019-07-28 14:00:31 -05:00
camthesaxman
2b65a30c6a combine bg2.pal and blank_pal.pal 2019-07-28 13:37:19 -05:00
Revo
c9bf136d8a Merge pull request #745 from pret/PikalaxALT-patch-1
Fix signedness disagreement in sBigMonSizeTable
2019-07-24 12:46:37 -04:00
PikalaxALT
af28a90c89 Fix signedness disagreement in sBigMonSizeTable 2019-07-24 11:27:59 -04:00
PikalaxALT
1844977e0e Minor style fixes 2019-07-02 19:29:49 -05:00
PikalaxALT
770d4531dc Some more cleanup 2019-07-02 19:29:49 -05:00
PikalaxALT
498ff9ae1a Some cleanup 2019-07-02 19:29:49 -05:00
PikalaxALT
e3c0fb5a85 Fix building German Debug 2019-07-02 19:29:49 -05:00
PikalaxALT
ec5f42fd36 Extern unk_2039560 in roulette_gfx.c 2019-07-02 19:29:49 -05:00
PikalaxALT
8a5fe8781a Finish roulette data 2019-07-02 19:29:49 -05:00
PikalaxALT
a437045526 through gSpriteTemplate_83FA0DC 2019-07-02 19:29:49 -05:00
PikalaxALT
04abad96dd Split roulette on purported file boundary 2019-07-02 19:29:49 -05:00
PikalaxALT
a53802f331 Temp adjustment to compensate for suppression of static 2019-07-02 19:29:49 -05:00
PikalaxALT
10cc341f68 through gUnknown_Debug_0842510D 2019-07-02 19:29:49 -05:00
PikalaxALT
425461c54e through gUnknown_083F8EBC 2019-07-02 19:29:49 -05:00
PikalaxALT
282da768fa through gUnknown_083F8DF4 2019-07-02 19:29:49 -05:00
PikalaxALT
0eb4261793 Start roulette rodata decomp 2019-07-02 19:29:49 -05:00
PikalaxALT
4fedd5183b Attempt sub_809C664 2019-04-23 19:58:51 -05:00
PikalaxALT
d00b5ae399 match sub_809C464 2019-04-23 19:58:51 -05:00
PikalaxALT
900a1d32c1 BADGE_BOOST macro 2019-04-23 19:57:44 -05:00
PikalaxALT
6e6edda078 Define LINK_BATTLE_OPPONENT; other opponent constant substitutions 2019-04-23 19:57:44 -05:00
PikalaxALT
5c7c095bab gTrainerBattleOpponent = SECRET_BASE_OPPONENT 2019-04-23 19:57:44 -05:00
Gamer2020
b1a71de323 Fix type in CONTRIBUTING.md 2019-04-23 19:56:44 -05:00
PikalaxALT
1eb17b1921 Some documentation of contest_link_80C2020 2019-04-08 17:33:35 -05:00
PikalaxALT
fd4aa1ba8e Finish contest_link_80C2020 2019-04-08 17:33:35 -05:00
PikalaxALT
0c690920ab through sub_80C4A28 2019-04-08 17:33:35 -05:00
PikalaxALT
9ee4f4d65a sub_80C42C0 2019-04-08 17:33:35 -05:00
PikalaxALT
af4cb58798 Nonmatching sub_80C40D4 2019-04-08 17:33:35 -05:00
PikalaxALT
e70d09c6f1 sub_80C3F00 2019-04-08 17:33:35 -05:00
PikalaxALT
15e5d022da through sub_80C3EA4 2019-04-08 17:33:35 -05:00
PikalaxALT
0a0e88cde4 sub_80C3990 2019-04-08 17:33:35 -05:00