Rooba
/
pokeemerald
mirror of https://github.com/pret/pokeemerald.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity
4,841 Commits 3 Branches 0 Tags 874 MiB
Commit Graph

4841 Commits

Author SHA1 Message Date
GriffinR c70162086b Split some smaller files from event_scripts 2019-10-21 17:22:19 -05:00
GriffinR 5b845bb0a0 Review changes for #852 2019-10-21 17:21:53 -05:00
GriffinR 973e6f9667 Document mauville_man.inc 2019-10-21 17:21:53 -05:00
Marcus Huderle 2f36bd62d7 Document Oldale scripts 2019-10-21 16:44:20 -05:00
Marcus Huderle 04ea8eea5a Document rest of Petalburg scripts 2019-10-20 12:36:35 -05:00
Sewef 41e952a668 battle_anims_effects_2 
Fixes
 2019-10-20 12:29:08 -05:00
Sewef e9675bdd24 battle_anims_effects_2 2019-10-20 12:29:08 -05:00
Sewef def7a4a18a more battle_anims_effects_2 2019-10-20 12:29:08 -05:00
Sewef 8531a17e10 battle_anims_effects_2 2019-10-20 12:29:08 -05:00
Sewef e90c708383 battle_anims_effects_2 2019-10-20 12:29:08 -05:00
Sewef 3b0d9e134f battle_anims_effects_2 2019-10-20 12:29:08 -05:00
Sewef 49ad6da8fb starting battle_anim_effects_2 2019-10-20 12:29:08 -05:00
GriffinR ac399ade4a Document safari zone scripts 2019-10-20 09:53:21 -05:00
GriffinR 0db188b487 Clean up berry_tree.inc and misc adjacent documentation 2019-10-20 09:46:46 -05:00
Marcus Huderle cefc31dd1e Document Petalburg City scripts 2019-10-19 15:05:15 -05:00
huderlem cb9f89925f
Merge pull request #841 from GriffinRichards/document-gyms2 
Document Petalburg, Fortree, Mossdeep, and Sootopolis Gyms
 2019-10-19 08:05:11 -05:00
huderlem 8b1df92aca
Merge pull request #840 from Sewef/patch-2 
battle_anim_affects_1.c labels
 2019-10-19 07:41:06 -05:00
Kermalis 7323b5b848 MIDI Parity with Fire Red 2019-10-19 07:37:40 -05:00
PikalaxALT 00fc8ec98a
Merge pull request #842 from PikalaxALT/song_vol 
Fix volume in mus_me_b_big.mid
 2019-10-17 11:47:20 -04:00
PikalaxALT dedff8ba06 Fix volume in mus_me_b_big.mid 2019-10-17 11:40:13 -04:00
Sewef 19fb0fb220
Merge branch 'master' into patch-2 2019-10-16 19:35:33 +02:00
Sewef ed1f5a7455 Conflits 3/2 
Nice one, git
 2019-10-16 19:32:02 +02:00
Sewef c280d0e00e Another fix, Conflicts 2/2 2019-10-16 19:26:08 +02:00
Sewef e7d36a76e1 Forgotten fix, conflits 1/2 2019-10-16 19:21:58 +02:00
Sewef 9dcfc5ba73 Fix labels 2019-10-16 19:10:39 +02:00
GriffinR b4a9298205
Merge branch 'master' into document-gyms2 2019-10-16 04:22:34 -04:00
GriffinR 20fa13616f Condense fallthrough script 2019-10-16 04:14:51 -04:00
GriffinR 0f15264595 Document rotating_tile_puzzle 2019-10-16 04:09:30 -04:00
GriffinR 60a592a2c3 Condense fallthrough scripts 2019-10-15 17:09:47 -05:00
GriffinR 348bb002a8 Document Gym scripts first half 2019-10-15 17:09:47 -05:00
huderlem a0b3f5d9e3
Merge pull request #833 from GriffinRichards/doc-inc2 
Document .incs split from event_scripts Round 2
 2019-10-15 16:30:27 -05:00
GriffinR 90a05cf824 Finish Mossdeep Gym doc, beging documenting rotating tile puzzle 2019-10-15 05:06:13 -04:00
GriffinR 1b41b8b7ca Document Petalburg, Fortree, Sootopolis, and some of Mossdeep Gyms 2019-10-15 05:05:57 -04:00
Sewef 07ac727c6d Document Oamdata in battle_anim (#838) 2019-10-14 18:26:47 -05:00
GriffinR 928cdf2531
Merge branch 'master' into doc-inc2 2019-10-14 19:25:10 -04:00
huderlem 26962b7725
Merge pull request #830 from GriffinRichards/doc-inc 
Document some .incs split from event_scripts
 2019-10-14 18:22:35 -05:00
garak 9b9b14ad0a remove empty groups from wild encounter fields json objects 2019-10-14 18:12:03 -05:00
garak 4a79081197 replace inja license text 2019-10-14 18:12:03 -05:00
garak 92d28c5daf add MIN_LEVEL define to pokemon constants 2019-10-14 18:12:03 -05:00
garak c73e20b6af add subgroups for fishing rods to encounter json 2019-10-14 18:12:03 -05:00
garak 74477471a6 update inja 2019-10-14 18:12:03 -05:00
Sewef 8dacb53029 Update battle_anim_effects_1.c 2019-10-14 23:31:29 +02:00
Sewef 975c0ce1d0 Label battle_anim_effects_1 2019-10-14 23:27:12 +02:00
Sewef 65b82d67c9 Revert "More battle_anim_effects_1 labels" 
This reverts commit 00331a644a.
 2019-10-14 23:22:44 +02:00
Sewef 5a366e8d72 More battle_anim_effects_1 labels 2019-10-14 22:51:45 +02:00
Sewef 00331a644a More battle_anim_effects_1 labels 2019-10-14 22:42:15 +02:00
Sewef 299166edee Document subs & AnimTask in battle_anim_effects_1 2019-10-14 22:08:03 +02:00
Sewef 46f2cc5449 battle_anim_effects_1 main callbacks 2019-10-14 21:17:38 +02:00
Sewef 63b5be9259 Ended battle_anims_effects_1 SpriteTemplates 2019-10-14 21:05:40 +02:00
Sewef a49756a8fe Update battle_anim_scripts.s 2019-10-13 22:37:39 +02:00