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
5,594 Commits 1 Branch 0 Tags 235 MiB
cafb0c3b6a
Commit Graph

230 Commits

Author SHA1 Message Date
LOuroboros
ae3ed962d1 Fixed the file extensions of the new item sprites. 2019-03-02 01:20:16 -03:00
LOuroboros
9564de6edb Implemented the sprites for the Gen. 4 and 5 items. 2019-03-01 00:06:31 -03:00
DizzyEggg
cebada80d0 Merge with master 2019-02-28 20:56:52 +01:00
Marcus Huderle
4b9e93850c Document easy chat screen types 2019-02-27 12:55:29 -06:00
DizzyEggg
b5d0253890 Merge with master 2019-02-10 18:17:33 +01:00
Marcus Huderle
4570e3b6a5 Document battle arena 2019-02-08 09:41:36 -06:00
DizzyEggg
7bc4a3b3f7 Merge with master 2019-01-29 22:12:53 +01:00
Marcus Huderle
8f832434e5 Change drought colors table files to .bin 2019-01-29 14:36:02 -06:00
Marcus Huderle
e81838dba3 Misc. documentation and move some data into .c files 2019-01-29 14:36:02 -06:00
Karathan
832c0d6333 add toxic spike animation 2019-01-12 17:02:24 +01:00
DizzyEggg
4827776a3c Merge with master 2019-01-05 10:14:20 +01:00
Marcus Huderle
fb2d1591c1 Document more battle anim effects 2018-12-31 16:53:38 -06:00
Marcus Huderle
c17f7d73fa Merge remote-tracking branch 'origin/battle_engine_v2' into features 
# Conflicts:
#	ld_script.txt
#	src/effects_1.c
 2018-12-23 17:24:14 -06:00
DizzyEggg
e54dd6a02b Merge with master 2018-12-22 13:53:07 +01:00
Marcus Huderle
ecda59a406 Add Poison Jab animation 2018-12-20 11:58:21 -06:00
Marcus Huderle
0369780db9 Add Rock Polish animation 2018-12-20 10:18:17 -06:00
Marcus Huderle
d2b5a0e83f Convert battle_anim_815A0D4 data to .c 2018-12-18 19:15:59 -06:00
DizzyEggg
8f8e6fb88b Merge branch 'master' into battle_engine_v2 2018-12-02 16:59:38 +01:00
Melody
b9cf4f27b5 renames the winstrate graphics names to pokefan 2018-12-02 00:47:04 -05:00
DizzyEggg
7fa55704b2 merge with master 2018-11-30 20:46:09 +01:00
Marcus Huderle
0148e38973
Decompile pokedex_cry_screen.c (#406) 2018-11-28 10:14:32 -06:00
Slawter666
3b501cb470 Document battle ui 2018-11-22 01:10:50 +00:00
DizzyEggg
e9965dd341 merge with master 2018-11-02 22:55:32 +01:00
Deokishisu
d7ba8a306c Rename OW Sprites 
Rename OW Sprites to be more descriptive where possible. If an OW sprite was used by only one Trainer class, it was renamed. Additionally, some non-Trainer sprites were renamed.

Renamed:
LittleBoy1 -> NinjaBoy
LittleGirl1 -> Twin
Woman2 -> PokefanF
OldMan1 -> ExpertM
OldWoman1 -> ExpertF
Man3 -> PokefanM
Woman6 -> LinkReceptionist
Man7 -> DevonEmployee
Boy4 -> RichBoy
Boy5 -> GameboyKid (Consistent with pokecrystal)
ContestOldMan -> ContestJudge

Renamed Because of Numbering Changes:
LittleBoy2 -> LittleBoy
LittleGirl2 -> LittleGirl
OldWoman2 -> OldWoman
OldMan2 -> OldMan
Man4 -> Man3
Man5 -> Man4
Man6 -> Man5
Woman3 -> Woman2
Woman4 -> Woman3
Woman5 -> Woman4
Woman7 -> Woman5
 2018-10-14 15:49:55 -04:00
Deokishisu
2bd86dad2f Rename Boy4 to RichBoy 2018-10-14 12:26:48 -04:00
DizzyEggg
731ff38067 Ability pop-up functionality is done 2018-09-29 12:47:35 +02:00
DizzyEggg
6b7a171dbe Ability pop-up fail, maybe will do something about it later 2018-09-23 14:24:06 +02:00
DizzyEggg
a69af8f2f5 Merge with master 2018-09-22 00:22:13 +02:00
DizzyEggg
bf64333299 Give labels to healthbox gfx 2018-09-20 21:42:38 +02:00
DizzyEggg
d05875dd04 New mega trigger sprite 2018-09-20 20:59:00 +02:00
DizzyEggg
add1f4910c Add mega trigger png 2018-09-17 22:40:49 +02:00
DizzyEggg
cd0934a399 Add Fairy Type icon 2018-09-16 10:45:22 +02:00
DizzyEggg
0800a44f7a Merge branch 'master' into battle_engine_v2 2018-09-16 09:22:05 +02:00
Marcus Huderle
ba125b23fd Remove transparency from event object spritesheets 2018-09-11 17:18:10 -05:00
DizzyEggg
c6c8b7b0fd Merge branch 'master' into battle_engine_v2 2018-09-10 14:49:24 +02:00
Slawter666
9dec2bdef8 Merge branch 'master' of https://github.com/pret/pokeemerald into spritesheet 2018-09-07 11:50:23 +01:00
DizzyEggg
490a4f993b Merge with master 2018-09-01 12:38:38 +02:00
DizzyEggg
cc145a45f7 merge with master 2018-08-12 22:37:28 +02:00
Diegoisawesome
a000eb4f36 Merge branch 'learn_move' of git://github.com/Edwearth/pokeemerald into Edwearth-learn_move 2018-08-11 19:03:38 -07:00
Diegoisawesome
12ff59f9c1 Continue decompiling field_specials 2018-08-10 00:42:06 -07:00
Slawter666
bc42c5054c Merge remaining overworld frames 2018-08-10 00:20:19 +01:00
Slawter666
877a80d3bc Merge berry tree frames 2018-08-09 23:19:45 +01:00
Slawter666
dea0bba64e Merge "pokemon" frames 2018-08-09 00:55:32 +01:00
Slawter666
ab2cc59629 Merge remaining "people" overworld frames 2018-08-07 22:16:03 +01:00
Slawter666
5917f7d108 Merge frontier brains, team magma and team aqua frames 2018-08-02 00:34:28 +01:00
DizzyEggg
0663c142b7 Add split icons 2018-07-29 19:54:23 +02:00
Slawter666
52aa9cedcf Merge May frames into sprite sheets 
Plus fix Brendan's surfing and watering frame order.
 2018-07-29 17:29:36 +01:00
Slawter666
d5825230e5 Merge "brendan" frames into sprite sheets 2018-07-28 18:11:28 +01:00
DizzyEggg
3bcd30969a cut field effect is decompiled and documented 2018-06-16 14:04:29 +02:00
Marcus Huderle
aa9a45c16f Rebrand 'map object' and 'field object' to 'event object' 2018-06-11 19:11:48 -05:00
Diegoisawesome
416d67c832 Finish porting/decompiling field_effect.c 2018-05-10 18:36:57 -05:00
Edouard Veyrier
75b07292c9 Translate first functions of learn move 2018-03-28 19:20:20 +02:00
Diegoisawesome
387dbf48d0
Merge pull request #202 from DizzyEggg/move_mon_data 
Move data from asm to pokemon_1.c
 2018-02-08 14:06:57 -06:00
Diegoisawesome
772fd47564 Merge branch 'master' of https://github.com/pret/pokeemerald into menu 2018-02-07 18:06:59 -06:00
DizzyEggg
4b7d778a5c move mon data fix conflicts 2018-02-07 20:17:55 +01:00
camthesaxman
3ec68d5f79 reorganize berry graphics files 2018-02-06 11:51:43 -06:00
camthesaxman
89e6170748 remove some redundant .pal files 2018-02-06 11:46:34 -06:00
DizzyEggg
ae8e89a10d move some pokemon data to c 2018-02-05 17:39:26 +01:00
Diegoisawesome
3793152bc3 More work on menu 2018-01-29 17:26:36 -06:00
Diegoisawesome
5a57485ece Decompile naming_screen.c 2018-01-23 21:30:13 -06:00
Devin
8f1bfcbf3a Fix more of them sneaky executables 2018-01-21 15:25:18 -05:00
Devin
35cc20c9aa Merge branch 'master' of https://github.com/pret/pokeemerald into fix_perms 2018-01-21 15:22:05 -05:00
DizzyEggg
ad2ef517bd option menu fix conflicts 2018-01-21 12:46:19 +01:00
golem galvanize
bce63b3694 REMOVE BASEROM 2018-01-20 22:41:02 -05:00
golem galvanize
f22d295cfc Merge branch 'master' of https://github.com/pret/pokeemerald into dump_small_baseroms 2018-01-20 21:37:47 -05:00
Diegoisawesome
28c9f40b3e Extract data from fossil_special_fldeff_groundshake 2018-01-20 19:18:03 -06:00
golem galvanize
33ebcabc3a Merge branch 'master' of https://github.com/pret/pokeemerald into dump_small_baseroms 2018-01-20 19:45:38 -05:00
golem galvanize
bdc8cf6ac4 fixing conflicts 2018-01-20 19:44:34 -05:00
Diegoisawesome
8d7a830151 Extract data from field_effect_misc 2018-01-20 18:30:33 -06:00
Diegoisawesome
ed8269889b Extract data from pokedex.s 2018-01-20 17:17:51 -06:00
golem galvanize
59e1aacd26 DIEGO SEND HELP 2018-01-20 17:26:30 -05:00
Diegoisawesome
b47b9e5758 Extract data from starter_choose 2018-01-20 16:22:16 -06:00
Diegoisawesome
d10c91f1b0 Extract data from item_menu_icons.s 2018-01-20 15:37:37 -06:00
Diegoisawesome
971b47755d Extract data from naming screen 2018-01-20 14:16:01 -06:00
Diegoisawesome
2ef7467951 Extract data from pokemon_summary_screen 2018-01-20 02:37:28 -06:00
Diegoisawesome
098671750b Extract data from text window 2018-01-20 00:49:21 -06:00
Diegoisawesome
7abfc6a989 Extract data from trainer card 2018-01-19 23:42:30 -06:00
Diegoisawesome
fbb51bc24b Extract baseroms from party_menu.s 2018-01-19 21:38:57 -06:00
Diegoisawesome
b22a800581 Extract data from trade.s 
Also rename window_template_terminator to null_window_template, in keeping with naming conventions
 2018-01-19 19:52:46 -06:00
Devin
c408110319 Fix file permissions. 2018-01-19 15:06:49 -05:00
Diegoisawesome
fd544ba438 Start extracting data from trade.s 2018-01-19 12:38:09 -06:00
Diegoisawesome
4c6511c8f9 Extract data from field_screen.s 
Also move files incorrectly placed in interface dir
 2018-01-18 22:36:24 -06:00
Diegoisawesome
6445394929 Extract rotating_gate.s 2018-01-18 15:38:31 -06:00
Diegoisawesome
b7ee548897 Merge remote-tracking branch 'Bird/dump_pokenav.s' 2018-01-18 14:38:45 -06:00
Diegoisawesome
7086bf0048 Merge remote-tracking branch 'Bird/dump_slot_machine.s' 2018-01-18 14:19:13 -06:00
Diegoisawesome
dcdf91c111 Merge remote-tracking branch 'Bird/dump_learn_move.s' 2018-01-18 13:46:34 -06:00
Diegoisawesome
b806ee8bed Finish extracting pokemon storage system data 2018-01-18 12:52:37 -06:00
Diegoisawesome
ec8594fd10 Extract Wanda PC box wallpapers 2018-01-18 04:06:43 -06:00
golem galvanize
c9a3ef7a6e dump pokenav.s 2018-01-17 23:01:33 -05:00
Diegoisawesome
184fedc870 Extract PC box background images 2018-01-17 20:57:19 -06:00
golem galvanize
173c5923cb clean up reel_time_gfx 2018-01-17 19:19:47 -05:00
golem galvanize
442398261e fix tabs and add forgotten image 2018-01-17 14:48:50 -05:00
golem galvanize
84c6a97429 dump slot_machine.s 2018-01-17 14:44:38 -05:00
golem galvanize
820c11358d dump learn_move.s 2018-01-16 15:31:43 -05:00
DizzyEggg
4dd06dbcd3 optiom menu move data to C 2018-01-16 19:39:35 +01:00
golem galvanize
5a5eb4ff59 dumped most of pokenav.s 2018-01-15 23:38:10 -05:00
Diegoisawesome
90c175b73f Extract baseroms from field_effect.s 2018-01-15 02:49:52 -06:00
Diegoisawesome
79451b5bb4 Extract data around Deoxys icon 2018-01-14 23:40:55 -06:00
Diegoisawesome
75f9c16504 Merge branch 'master' of https://github.com/pret/pokeemerald 2018-01-07 18:47:05 -06:00
Diegoisawesome
efe19e95c8 Extract door animations 2018-01-07 01:29:26 -06:00