ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-30 14:20:42 +01:00
Code Issues Packages Projects Releases Wiki Activity
4,357 Commits 1 Branch 0 Tags 235 MiB
717c3350c4
Commit Graph

4357 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
huderlem
08c8ca8287
Merge pull request #630 from PikalaxALT/dodrio_berry_picking 
Dodrio berry picking
 2019-05-12 07:09:16 -05:00
PikalaxALT
539d472796 Merge branch 'master' into dodrio_berry_picking 2019-05-11 21:22:09 -04:00
PikalaxALT
fc72b74e6c Fix building 2019-05-08 17:06:39 -05:00
PikalaxALT
657068359d Better dependency handling for wild_encounters 2019-05-08 17:06:39 -05:00
Marcus Huderle
0babaa8c07 Convert wild encounter data to JSON 2019-05-08 17:06:39 -05:00
Marcus Huderle
483648e372 Create jsonproc tool 
Add custom function hooks to jsonproc

Add jsonproc to build_tools.sh

Newer g++
 2019-05-08 17:06:39 -05:00
huderlem
fe59902b8a Fix indentation 2019-05-03 18:21:11 -05:00
hjk321
26114d4579 Update comparison 2019-05-03 18:21:11 -05:00
hjk321
ee4049d93e Fix indentation Error 2019-05-03 18:21:11 -05:00
hjk321
438c5432aa Document MON_DATA_10 2019-05-03 18:21:11 -05:00
hjk321
106a89eace Document magic number from atk04_critcalc 2019-05-03 18:21:11 -05:00
Fontbane
901a83d249 Fix some labels and include decorations.h 
Include decorations.h in shop.c

Include decorations.h in event_scripts.s
 2019-04-22 17:23:59 -05:00
Fontbane
6cf06d5f95 Doc some event scripts 
Doc decoration shops

Revert "Doc decoration shops"

This reverts commit 64d935ea0dc942c32b89487137e5703fce34b435.

Document through comments

Un-revert decor documentation
 2019-04-22 17:23:59 -05:00
Fontbane
2c076f1f3e Doc most OnTransitions 2019-04-22 17:23:59 -05:00
AJ Fontaine
dbdb51e1a5 Start documenting event scripts 2019-04-22 17:23:59 -05:00
Marcus Huderle
b8d5c5fb76 Match sub_81D199C 2019-04-16 18:15:03 -05:00
Marcus Huderle
90e555d23e Match sub_81A1224 2019-04-16 16:11:59 -05:00
Marcus Huderle
9915a3fd7f Decompile pokenav_unk_5.c 2019-04-16 14:29:00 -05:00
DizzyEggg
912b87564f Compact item data, make descriptions easier to read 2019-04-16 11:25:26 -05:00
DizzyEggg
b4e1375bb6 Document pokemon item effects 2019-04-16 11:23:09 -05:00
Marcus Huderle
f9f5f34b0c Finish decompiling pokenav_unk_4.c 2019-04-16 11:21:13 -05:00
Marcus Huderle
c7954e1212 Decompile pokenav_unk_4.c through sub_81CB678() 2019-04-16 11:21:13 -05:00
Marcus Huderle
394c0f5546 Start decompiling pokenav_unk_4.c 2019-04-16 11:21:13 -05:00
Marcus Huderle
f40f2c5e9c Decompile all of pokenav_unk_3.c 2019-04-14 13:44:44 -05:00
Marcus Huderle
e3bdb08efa Start decompiling pokenav_unk_3.c 2019-04-14 13:44:44 -05:00
DizzyEggg
19fdfaa5f2 Use constants for ball particles 2019-04-14 10:19:50 -05:00
DizzyEggg
59797e4801 Use constants in battle_anim_special.c 2019-04-14 10:19:50 -05:00
DizzyEggg
dc764698c9 Use implicilt berry indexes in arrays 2019-04-14 10:15:18 -05:00
Marcus Huderle
065c60544d Cleanup some pokenav code 2019-04-13 16:18:04 -05:00
Marcus Huderle
1268691410 Finish decompiling pokenav_unk_1.c 2019-04-13 16:18:04 -05:00
Marcus Huderle
cb9d471a2a Decompile pokemon_jump through sub_802CE48() 2019-04-13 11:37:50 -05:00
Phlosioneer
8338e29279 Pokenav unk 1 almost done 2019-04-13 11:34:53 -05:00
Phlosioneer
2b740b46e8 About halfway done with pokenav_unk_1.s 2019-04-13 11:34:53 -05:00
Phlosioneer
ee2edb068a Start decomp of pokenav_unk_1 
Looks like it's the Ribbons menu, based on the first function.
 2019-04-13 11:34:53 -05:00
DizzyEggg
518f9c0638 Some nonmatchings 2019-04-11 07:02:48 -05:00
DizzyEggg
5bc640da9b nonmatchings 2019-04-11 07:02:48 -05:00
Marcus Huderle
a65cffef42 Decompile more pokemon_jump.c 2019-04-10 20:34:17 -05:00
Marcus Huderle
8a617c3d94 Decompile more pokemon_jump.c 2019-04-09 19:48:21 -05:00
DizzyEggg
382a29ad40 Update battle_anim_script.inc 2019-04-09 07:19:03 -05:00
huderlem
ce93d3ab9a
Merge pull request #661 from Phlosioneer/contest-ai-cleanup 
contest & contest_ai cleanup
 2019-04-08 17:30:28 -05:00
Sewef
c8ce1a0a1f Two labels from pokeruby. 2019-04-08 17:30:10 -05:00
Sewef
fff1679bcf Update .gitignore 2019-04-08 17:30:10 -05:00
Sewef
608245058b Update charmap.txt 
French is beautiful. (Lie)
 2019-04-08 17:30:10 -05:00
ultima-soul
21722d9931 Fix formatting 2019-04-08 17:29:44 -05:00
ultima-soul
2c432c314a Match sub_8159308 2019-04-08 17:29:44 -05:00
Phlosioneer
92851ba4e6 Trim headers from pokenav.c 2019-04-08 17:29:07 -05:00
Marcus Huderle
a518810c17 Decompile more pokemon_jump.c 2019-04-07 19:23:14 -05:00
Phlosioneer
50350cc2e1 Merge branch 'master' into contest-ai-cleanup 2019-04-07 20:20:22 -04:00
Phlosioneer
be925a438e Remove debug printing 2019-04-07 19:18:42 -05:00
Phlosioneer
29c986e21e Fix nonmatching MatchCall_MoveWindow function 2019-04-07 19:18:32 -05:00