ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-18 20:47:40 +01:00
Code Issues Packages Projects Releases Wiki Activity
2,851 Commits 1 Branch 0 Tags 235 MiB
6b5c52e926
Commit Graph

2851 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
DizzyEggg
66fd9b2ddf Label trainer hill battle type 2018-09-20 22:00:00 +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
0755240fbc link battles mega evo fix hopefully????? 2018-09-20 17:59:17 +02:00
DizzyEggg
2bae70a66b Convert mega related struct fields to a seperate struct 2018-09-20 17:33:27 +02:00
DizzyEggg
13e434f874 Fix trainer name getter function 2018-09-20 17:22:16 +02:00
DizzyEggg
c7ca7b6e8e Fix mega evolution allowing to evolve two mons in doubles 2018-09-20 12:55:12 +02:00
DizzyEggg
a181900141 Merge branch 'master' into battle_engine_v2 2018-09-20 11:58:23 +02:00
DizzyEggg
e4b7ba0977 Document some not labeled battle things 2018-09-20 11:55:35 +02:00
DizzyEggg
602c1322e4 almost full support for link battles mega evolution 2018-09-20 11:23:12 +02:00
DizzyEggg
facd838112 Add debug controller to all controllers 2018-09-18 21:51:10 +02:00
Diegoisawesome
25e469b664
Merge pull request #333 from Diegoisawesome/master 
Add defines for tile, metatile, and palette count
 2018-09-18 10:15:26 -05:00
Diegoisawesome
8a05bf82ec Merge branch 'master' of github.com:pret/pokeemerald 2018-09-18 10:03:57 -05:00
Diegoisawesome
899ae7a59a Add defines for tile, metatile, and palette count 2018-09-18 10:03:24 -05:00
LOuroboros
49cf3eb396
Update move_descriptions.h 
Descriptions for Roar of Time and Magma Storm. I think that I did things correctly, but please check before merging, just in case.
 2018-09-18 00:26:22 -03:00
DizzyEggg
add1f4910c Add mega trigger png 2018-09-17 22:40:49 +02:00
DizzyEggg
abebf479a6 Tweak mega evo to hopefully be compatibile with recorded battles. 2018-09-17 20:37:33 +02:00
DizzyEggg
1018b8f2a8
Merge pull request #13 from Tetrable/battle_engine_v2 
Add periods to the end of ability descriptions.
 2018-09-17 20:03:32 +02:00
DizzyEggg
e7e110de55 Merge with master 2018-09-17 20:02:49 +02:00
Diegoisawesome
7f2d52d9e0
Merge pull request #332 from DizzyEggg/patch-5 
Use defines for BattleAI_ChooseMoveOrAction
 2018-09-17 10:11:25 -05:00
Diegoisawesome
6978a896d1
Merge pull request #331 from DizzyEggg/patch-3 
Use pokeruby's formatting for move descriptions
 2018-09-17 10:11:12 -05:00
Diegoisawesome
28f410737e
Merge pull request #330 from DizzyEggg/patch-2 
Make it easier to edit ability text
 2018-09-17 10:10:33 -05:00
DizzyEggg
2042788fdc Mega Evolution done except sprites. 2018-09-16 21:08:49 +02:00
DizzyEggg
55f21c1776 Mega Evolution support is mostly done. 2018-09-16 18:55:32 +02:00
Marcus Huderle
f2a76b54bd Re-dump tileset images as RGB-indexed, rather than greyscale 2018-09-16 11:07:48 -05:00
Tetrable
967eb2a276 Accidentally got rid of move defines, added them back 2018-09-16 16:41:52 +01:00
Tetrable
9397618d9d Missed a description 2018-09-16 16:40:02 +01:00
Tetrable
8d4d5b501c Add periods to the end of ability descriptions. 2018-09-16 16:36:47 +01:00
DizzyEggg
5164215c91
Use defines for BattleAI_ChooseMoveOrAction 2018-09-16 17:06:35 +02:00
DizzyEggg
33b6ec8c0a Add move descriptions for moves 2018-09-16 15:59:17 +02:00
DizzyEggg
94bbfa7fa0
Use pokeruby's formatting for move descriptions 2018-09-16 15:58:13 +02:00
DizzyEggg
cd0934a399 Add Fairy Type icon 2018-09-16 10:45:22 +02:00
DizzyEggg
c3a5001945 Add Ability Descriptions: credits to BluRose :3 2018-09-16 10:18:35 +02:00
DizzyEggg
de65ddf4b6
Make it easier to edit ability text 2018-09-16 10:17:10 +02:00
DizzyEggg
0800a44f7a Merge branch 'master' into battle_engine_v2 2018-09-16 09:22:05 +02:00
Diegoisawesome
6a8f27c1ac
Merge pull request #326 from DizzyEggg/cablecarutil 
Decompile cable_car_util.c
 2018-09-16 01:06:33 -05:00
Diegoisawesome
2bba2f91d6
Merge pull request #328 from DizzyEggg/slotmachine 
Decompile/Port slot_machine.c
 2018-09-16 00:59:53 -05:00
Diegoisawesome
3303c416d4 Merge remote-tracking branch 'Egg/slotmachine' 2018-09-15 20:42:58 -05:00
DizzyEggg
4d2637883a Slot machine is decompiled. 2018-09-15 23:19:37 +02:00
Diegoisawesome
b183b99694
Merge pull request #327 from Diegoisawesome/master 
Update mid2agb source
 2018-09-15 16:12:25 -05:00
DizzyEggg
db248dada2 slot machine is decompiled 2018-09-15 22:59:45 +02:00
Diegoisawesome
3028fdc353 Update mid2agb source 
Credit to @camthesaxman
 2018-09-15 15:49:31 -05:00
DizzyEggg
0547e260a4 More of slot machine 2018-09-15 18:01:20 +02:00
DizzyEggg
ff13cb6352 decompile cable car util which has nothing to do with actual cable car 2018-09-15 13:50:23 +02:00
Diegoisawesome
48586660fd Merge branch 'master' of github.com:Diegoisawesome/pokeemerald 2018-09-14 22:35:18 -05:00
Diegoisawesome
e8be47abb8 Add running status to mid2agb 2018-09-14 22:35:04 -05:00
Diegoisawesome
b8c9d9a980
Merge pull request #324 from Diegoisawesome/master 
Document main_menu
 2018-09-14 12:17:11 -05:00
Diegoisawesome
b860d583e4 Document main_menu 2018-09-14 12:15:46 -05:00
Diegoisawesome
095cbbc5c2
Merge pull request #321 from Slawter666/data 
Move more data to C
 2018-09-11 22:10:26 -05:00
Slawter666
f40fa37398 Move battle_bg data to C 2018-09-11 23:37:47 +01:00