Leahnaya/pokeruby
1
0
Fork 0
mirror of https://github.com/pret/pokeruby.git synced 2026-10-01 22:38:48 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity
4,790 Commits 2 Branches 0 Tags
00fef26c523fcebd068483e793e9df95a76e1d4e
Commit Graph

4790 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
PikalaxALT
00fef26c52 Merge pull request #744 from garakmon/pokenav-data 
Pokenav Data Decomp (take 2)
 2019-09-08 12:41:48 -04:00
PikalaxALT
1d9088d2a8 Merge pull request #753 from ultima-soul/synchronize 
Synchronize bard_music data organization with pokeemerald
 2019-09-08 12:40:12 -04:00
PikalaxALT
c33effb95c Configure Travis to build nonmatching (#746) 
* Configure Travis to build nonmatching
 2019-09-05 16:03:17 -04:00
PikalaxALT
082093aa36 Merge pull request #755 from garakmon/encounter_json 
Wild Encounters to Json
 2019-09-05 10:47:39 -04:00
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
garak
d4dc5c755a use encounter slot constants, fix some gfx 2019-08-01 22:25:09 -04:00
garak
ca6b89f5ff fix build 2019-08-01 18:59:29 -04:00
garak
7f55a6ce86 revert makefile changes 2019-08-01 18:24:07 -04:00
garak
c73de8bed7 convert wild encounters to json 2019-08-01 18:13:42 -04:00
ultima-soul
dee6732764 Finish synchronizing bard_music data organization. 2019-07-31 00:01:20 -07:00
ultima-soul
9ee6622f83 Start bard_music synchronization. 2019-07-30 19:49:31 -07:00
Cameron Hall
bc159dbb03 Merge pull request #752 from camthesaxman/emerald_diff 
resolve some Emerald differences
 2019-07-30 21:31:27 -05:00
garak
02f4d3e420 add jsonproc tool 2019-07-30 16:20:20 -04: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
garak
e1854c665d name trainers eye messages, use constants in some pokenav rodata 2019-07-29 12:07:18 -04: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
garak
e74b92a581 change tilemaps to u32 2019-07-19 23:11:27 -04:00
garak
6c27c89086 fix build 2019-07-18 22:16:54 -04:00
garak
dcac22cef9 finish pokenav data decomp 2019-07-18 21:57:19 -04:00
garak
a27c727e8b continue pokenav data decompile 2019-07-18 21:33:33 -04:00
garak
b2ed63d8df start decompiling pokenav data 2019-07-18 20:15:12 -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