ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-18 04:27:38 +01:00
Code Issues Packages Projects Releases Wiki Activity
2,440 Commits 1 Branch 0 Tags 235 MiB
2218949d7c
Commit Graph

2440 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
DizzyEggg
1c95c36338 Healing Wish and Lunar Dance 2018-07-26 20:36:16 +02:00
Diegoisawesome
919e7b4387
Merge pull request #279 from Diegoisawesome/master 
Move strings to C, misc cleanup
 2018-07-25 08:10:18 -07:00
Diegoisawesome
7270e73fee Move strings to C 2018-07-25 01:15:36 -07:00
Diegoisawesome
e92e2cb0aa Merge branch 'master' of github.com:pret/pokeemerald 2018-07-24 21:18:36 -07:00
Diegoisawesome
156fb472e1 Clean up files and add entries to charmap 2018-07-24 21:18:23 -07:00
Diegoisawesome
5883f867f0
Merge pull request #278 from vblm12/trainer_data 
Move some trainer data into c structs
 2018-07-24 18:58:56 -07:00
Diegoisawesome
c47aac3538
Merge pull request #260 from DizzyEggg/decompile_union_room 
Decompile part of union room
 2018-07-24 18:48:23 -07:00
DizzyEggg
100ce73a12 Sticky Web done 2018-07-24 22:09:55 +02:00
DizzyEggg
f8b1f0a45c Stealth Rock and Toxic Spikes 2018-07-24 21:47:00 +02:00
DizzyEggg
45bc76d94c Side Status from u16 to u32 2018-07-24 20:13:02 +02:00
DizzyEggg
180047a511
Merge pull request #5 from LOuroboros/patch-2 
Update battle_message.c
 2018-07-23 23:08:55 +02:00
DizzyEggg
3f7e6e9fe0 Add U-turn effect 2018-07-23 22:43:05 +02:00
LOuroboros
74cac75a38
Update battle_message.c 
Assigned the abilities' In-Battle strings from Line 593 to Line 618.
 2018-07-23 17:32:34 -03:00
DizzyEggg
567a0240f3 Fix crits and do Worry Seed 2018-07-23 22:18:56 +02:00
DizzyEggg
6570324432 New crit calculator. 2018-07-23 21:36:05 +02:00
DizzyEggg
56120e35d4 Merge branch 'Tetrable-battle_engine_v2' into battle_engine_v2 2018-07-23 20:35:33 +02:00
DizzyEggg
41aecb14f5 Merge branch 'battle_engine_v2' of git://github.com/Tetrable/pokeemerald into Tetrable-battle_engine_v2 2018-07-23 20:35:16 +02:00
DizzyEggg
65c86fa957 merge with lunos 2018-07-23 20:25:12 +02:00
Tetrable
b2b416a2b1
add new move effects to battle_moves.h 2018-07-23 14:41:01 +01:00
LOuroboros
8f87dd7fac
Update battle_moves.h 
Assigned the FLAG_DMG_MINIMIZE to the relevant moves.
 2018-07-23 10:39:35 -03:00
LOuroboros
b790a75853
Update battle_moves.h 
Assigned the following flags to the relevant moves: FLAG_RECKLESS_BOOST, FLAG_IRON_FIST_BOOST, FLAG_SHEER_FORCE_BOOST, FLAG_STRONG_JAW_BOOST, FLAG_MEGA_LAUNCHER_BOOST, FLAG_DMG_UNDERGROUND and FLAG_DMG_UNDERWATER.

Assigned the effect EFFECT_SEMI_INVULNERABLE to MOVE_PHANTOM_FORCE and MOVE_SHADOW_FORCE.

The only flags that are not assigned yet, in theory, are FLAG_STAT_STAGES_IGNORED and FLAG_DMG_MINIMIZE.
 2018-07-23 08:45:59 -03:00
DizzyEggg
194adf0ab2 Abilities affected by weather conditions 2018-07-22 22:41:13 +02:00
DizzyEggg
831816e9b2 Switch-in abilities with a message 2018-07-22 22:21:47 +02:00
DizzyEggg
6a7d58003b Add Bad Dreams 2018-07-22 21:05:12 +02:00
DizzyEggg
fdd8765256 Add Storm Drain redirection 2018-07-22 19:34:13 +02:00
DizzyEggg
c2f8d176dc Trick Room, Stall, Lagging Tail 2018-07-22 19:02:41 +02:00
DizzyEggg
fee81d03ab A couple of gen4 abilities 2018-07-22 18:40:18 +02:00
DizzyEggg
51dc76c7e8 Captivate and new accuracy calc 2018-07-22 15:08:32 +02:00
DizzyEggg
1e9143e0b2 merge union room with master 2018-07-22 13:14:58 +02:00
DizzyEggg
c9d486a5d3 make union room compile i guess 2018-07-22 12:49:49 +02:00
DizzyEggg
4ec43cbed1 Gen 5 move names, telekinesis, power/guard split/swap 2018-07-21 23:12:10 +02:00
DizzyEggg
fcca2afc81 More gen4 move effects battlescrips. 2018-07-21 21:58:07 +02:00
DizzyEggg
b203cf4ca4 Add a couple of gen4 moves battlescripts 2018-07-21 16:34:43 +02:00
DizzyEggg
9d4d8c5dac Add new Sturdy effect 2018-07-21 15:11:13 +02:00
DizzyEggg
12bd67f0f9 Add PP modyfing to debug 2018-07-21 13:38:51 +02:00
DizzyEggg
6cffd5b045 Add new field end turn effects 2018-07-21 13:24:20 +02:00
DizzyEggg
66a3c13f49 Add new Side turn effects 2018-07-21 12:56:07 +02:00
DizzyEggg
f12bd79ee6 Merge Tetra with master 2018-07-21 12:21:55 +02:00
DizzyEggg
17ef60099e Merge branch 'battle_engine_v2' of git://github.com/Tetrable/pokeemerald into Tetrable-battle_engine_v2 2018-07-21 12:13:56 +02:00
DizzyEggg
382f640809 Start Side/Field end turn 2018-07-21 12:10:08 +02:00
vblm12
3d04105488 Remove unnecessary files. 2018-07-21 01:51:44 -05:00
vblm12
29276cc76c Move some trainer data from data2b.s to c structs. 2018-07-20 22:14:31 -05:00
vblm12
07ea34e4c2 Make TrainerMonPtr fields const 2018-07-20 22:08:38 -05:00
vblm12
c41b8123e3 Move trainer defines to one place in opponent.h... 
... to match pokeruby
 2018-07-20 22:03:22 -05:00
Tetrable
e411bad2f3
added more battle strings 2018-07-20 15:39:40 +01:00
DizzyEggg
1468107002 Add Roost endturn effect 2018-07-19 21:18:20 +02:00
DizzyEggg
ad6fa078c9 šFix BattleMove struct access in asm 2018-07-19 20:24:52 +02:00
DizzyEggg
e8f7699c2c Add five new statuses3 to debug. 2018-07-18 22:33:40 +02:00
DizzyEggg
f3be5ad22d Do new battler end turn effects. 2018-07-18 22:07:48 +02:00
DizzyEggg
81b29ae7c1 Merge with pokeemerald 2018-07-16 22:45:06 +02:00