ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-17 20:17:38 +01:00
Code Issues Packages Projects Releases Wiki Activity
3,828 Commits 1 Branch 0 Tags 235 MiB
27b1d74dad
Commit Graph

3828 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
garak
73cce79753 Merge remote-tracking branch 'upstream/master' into frontier-data 2018-11-27 11:35:19 -05:00
garak
091b5194e7 frontier pike and pyramid data 2018-11-27 11:21:48 -05:00
Diegoisawesome
c909aa92de
Merge pull request #403 from nullableVoidPtr/master 
Clean up aligned variables in src/
 2018-11-27 10:11:29 -06:00
nullableVoidPtr
556bdd52e1 Clean up aligned variables in src/ 2018-11-27 19:37:29 +08:00
Diegoisawesome
977e0bc345
Merge pull request #402 from Slawter666/pokedex-data 
Convert pokédex data to C
 2018-11-27 03:18:28 -06:00
Slawter666
deb7adbad5 Convert pokédex data to C 2018-11-27 04:00:38 +00:00
Marcus Huderle
382ff45452
Merge pull request #396 from DizzyEggg/attempt 
Match some functions
 2018-11-26 16:58:19 -06:00
Marcus Huderle
c233dbb220
Merge pull request #400 from DizzyEggg/util 
Match sub_080F8970
 2018-11-26 16:57:36 -06:00
Marcus Huderle
65622d34cd
Merge pull request #401 from PlatinumMaster/patch-1 
Fix labels, shifted off by one.
 2018-11-26 16:57:22 -06:00
Jefferson Steelflex
af08f3bb13
Update back_pic_coordinates.h 2018-11-26 16:55:37 -05:00
Jefferson Steelflex
8e5e4c2304
Fix labels, shifted off by one. 2018-11-26 16:51:08 -05:00
DizzyEggg
132a486169 Match 0x0F8970 2018-11-26 21:54:51 +01:00
DizzyEggg
c9b3f3e3cb Fix indentation 2018-11-26 20:19:52 +01:00
Marcus Huderle
2425a14b19 Decompile fight.c 2018-11-26 10:25:51 -06:00
Marcus Huderle
35c0fb5154 Decompile ground.c 2018-11-26 09:55:31 -06:00
Marcus Huderle
839c629d5b Decompile dragon.c 2018-11-26 09:31:03 -06:00
Marcus Huderle
9b1f2ccf5e Decompile poison.c 2018-11-26 09:13:45 -06:00
Marcus Huderle
2c2431aa4c
Decopmile bug.c (#399) 2018-11-26 09:03:50 -06:00
Marcus Huderle
c2d3606f39
Merge pull request #398 from huderlem/rock 
Decompile rock
 2018-11-25 17:05:15 -06:00
Marcus Huderle
5947e0d229 Decompile rock 2018-11-25 17:00:18 -06:00
Marcus Huderle
19e235867a
Merge pull request #395 from Slawter666/battle-ui-doc 
Document some battle ui
 2018-11-25 15:58:37 -06:00
Marcus Huderle
65c4d49859
Merge pull request #397 from huderlem/script_pokemon_util 
Script pokemon util
 2018-11-25 15:58:23 -06:00
Marcus Huderle
fb6120da5b Fixup some names 2018-11-25 15:50:54 -06:00
Marcus Huderle
256bfc3caa Decompile script_pokemon_util_80F87D8 2018-11-25 15:32:22 -06:00
DizzyEggg
8e10d7c0e5 Match some functions 2018-11-25 20:16:41 +01:00
DizzyEggg
a0699dba52 Add Aromatic Mist 2018-11-25 12:59:22 +01:00
DizzyEggg
d8063e66ad
Merge pull request #41 from Kurausukun/battle_engine_v2 
oops, forgot Igglybuff
 2018-11-25 11:56:31 +01:00
Kurausukun
690f2671cb oops, forgot Igglybuff 2018-11-25 05:54:32 -05:00
DizzyEggg
d68323832f
Merge pull request #40 from Kurausukun/battle_engine_v2 
change pokemon types to use fairy type
 2018-11-25 11:10:52 +01:00
Kurausukun
13ea841e32 change pokemon types to use fairy type 2018-11-24 21:16:32 -05:00
DizzyEggg
434e257943 Add Acupressure 2018-11-24 21:06:53 +01:00
DizzyEggg
194139a35b Add Move Effect - Feint 2018-11-24 19:37:10 +01:00
DizzyEggg
cc635c5e6d Custom wild multi battles functionality 2018-11-24 17:31:45 +01:00
DizzyEggg
1c8e574646 Custom Multi Battles - fix defeat msg 2018-11-24 17:06:48 +01:00
DizzyEggg
d52016bc31 Mon creation in custom multi battles 2018-11-24 13:29:10 +01:00
DizzyEggg
539b05ff73 Begin working on custom multi battles 2018-11-24 01:02:02 +01:00
DizzyEggg
10671a4f32 Fix split icons - hm cant forget 2018-11-23 23:16:48 +01:00
DizzyEggg
5fea7e3216 Fix overworld weather 2018-11-23 23:07:02 +01:00
DizzyEggg
c6a207c37b Fix Teleport in double wild battles 2018-11-23 22:26:36 +01:00
DizzyEggg
573c1f888f
Merge pull request #33 from LOuroboros/patch-16 
Update battle_anim_scripts.s
 2018-11-23 21:49:59 +01:00
DizzyEggg
2216d49890 Merge branch 'master' into battle_engine_v2 2018-11-23 21:40:06 +01:00
Slawter666
3b501cb470 Document battle ui 2018-11-22 01:10:50 +00:00
Diegoisawesome
dc7764f60c
Merge pull request #394 from DizzyEggg/text 
DecompressGlyphTile - cleaner code
 2018-11-21 18:25:28 -06:00
DizzyEggg
a900a51a59 match DecompressGlyphTile nicer 2018-11-21 23:30:50 +01:00
DizzyEggg
d70c3a94c5 match DecompressGlyphTile nicer 2018-11-21 23:30:04 +01:00
Diegoisawesome
0b59dbf2b8
Merge pull request #393 from DizzyEggg/text 
Match one function in text.c
 2018-11-21 16:11:03 -06:00
LOuroboros
9d93817319
Update battle_anim_scripts.s 2018-11-21 18:27:35 -03:00
DizzyEggg
c7ca38ccf3 Match DecompressGlyphTile 2018-11-21 21:58:35 +01:00
Diegoisawesome
3c77ce5b5b
Merge pull request #392 from Kermalis/master 
Sound Effects Part 3/6
 2018-11-20 17:18:58 -06:00
Kermalis
27d46fa3a8 Match se_t_ooame_e.mid 2018-11-20 18:10:25 -05:00