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
4,472 Commits 1 Branch 0 Tags 235 MiB
d90767c490
Commit Graph

4472 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
DizzyEggg
d90767c490 Switch effect and argument fields in BattleMove struct 2019-03-31 15:24:46 +02:00
DizzyEggg
17e74756cb Merge with master, add defines to atk49 and statbuffchange commands 2019-03-31 15:19:25 +02:00
DizzyEggg
35cffea987 Helpful macros for atk49 2019-03-30 08:29:56 -05:00
DizzyEggg
86e8bf0ecb Cursed Body PP check 2019-03-30 11:58:19 +01:00
DizzyEggg
e2268bd938 Imposter check for semi invulnerable 2019-03-30 11:56:15 +01:00
DizzyEggg
ea0049da89 Fix Spiky Shield 2019-03-30 11:50:55 +01:00
DizzyEggg
876be1d9cd
Merge pull request #104 from thechurchofcage/beta 
Spiky Shield
 2019-03-30 11:21:27 +01:00
huderlem
8184688330
Merge pull request #635 from huderlem/union_room_chat 
Union room chat
 2019-03-29 22:33:32 -05:00
Marcus Huderle
accc5ae8dd Merge remote-tracking branch 'upstream/master' into union_room_chat 
# Conflicts:
#	ld_script.txt
 2019-03-29 21:27:08 -05:00
Marcus Huderle
a978a6a624 Finish decompiling union_room_chat.c 2019-03-29 21:26:08 -05:00
DizzyEggg
567240b725
Merge pull request #107 from thechurchofcage/gamma 
Taunt fix etc.
 2019-03-29 22:24:03 +01:00
DizzyEggg
e92a0816fd
Merge pull request #110 from thechurchofcage/epsilon 
Minor Doubles ability fixes
 2019-03-29 22:20:04 +01:00
Marcus Huderle
519426f4e6 Decompile union_room_chat through sub_8020118 2019-03-28 20:20:52 -05:00
Marcus Huderle
8b8cc7a475 Decompile union_room_chat.s through sub_801FF08 2019-03-28 18:40:49 -05:00
PikalaxALT
7211f996a5 Address review comments, 1 
Use field names in WindowTemplate instances
Remove a leftover comment block
 2019-03-28 07:32:25 -05:00
PikalaxALT
7c45a7c443 port mevent_801BAAC from fire red 2019-03-28 07:32:25 -05:00
Marcus Huderle
aebc676913 Decompile union_room_chat.c up to sub_801F5B8 2019-03-27 19:09:12 -05:00
DizzyEggg
5dd653a89e Use constants in atk89_statbuffchange 2019-03-27 07:47:01 -05:00
scnorton
c6c0c9582f Port menews_jisan.c from FireRed 2019-03-27 07:40:08 -05:00
Marcus Huderle
af1baa89f1 Start decompiling union_room_chat.c 2019-03-26 21:58:20 -05:00
Papa Cancer
a3b4767dd2 Spiky Shield 
Created generic string "Atk was hurt by Def's BUFF" for use for both Spiky Shield and Rough Skin - can also be used for Aftermath and Rocky Helmet, when programmed
 2019-03-26 17:45:34 +00:00
Papa Cancer
408485263d Minor ability fixes 
Status moves that target both opponents will trigger a mon with Clear Body, White Smoke, Hyper Cutter etc. to prevent the loss of stats, but if its partner is targeted first, that partner gets the popup: https://drive.google.com/open?id=1dtTfgxvppD4s2ZL5scPDz9YDf4n7AhMW
This fixes that.
 2019-03-26 01:34:39 +00:00
Marcus Huderle
d7a9fcb975 Cleanup mevent2 2019-03-24 18:29:00 -05:00
Marcus Huderle
e6caf0ff10 Port mevent2.c from pokefirered 2019-03-24 18:29:00 -05:00
Kermalis
e8edddf33c Update se_z_search.mid 2019-03-24 16:37:27 -05:00
Kermalis
285608666b Match se_w043.mid 2019-03-24 16:37:27 -05:00
Kermalis
7cb1345cba Match se_w039.mid 2019-03-24 16:37:27 -05:00
Kermalis
f11ca86b46 Match se_w036.mid 2019-03-24 16:37:27 -05:00
Kermalis
85ec6ccf46 Match se_w030.mid 2019-03-24 16:37:27 -05:00
Kermalis
b6128b7e39 Match se_w029.mid 2019-03-24 16:37:27 -05:00
Kermalis
f40d36a564 Match se_w028.mid 2019-03-24 16:37:27 -05:00
Kermalis
08a565dadd Match se_w026.mid 2019-03-24 16:37:27 -05:00
Kermalis
4f1ba2c1ad Match se_w025b.mid 2019-03-24 16:37:27 -05:00
Kermalis
b949c7033d Match se_w025.mid 2019-03-24 16:37:27 -05:00
Kermalis
f46156a98c Match se_w020.mid 2019-03-24 16:37:27 -05:00
Kermalis
810cff0f21 Match se_w019.mid 2019-03-24 16:37:27 -05:00
Kermalis
3e53b505ee Match se_w017.mid 2019-03-24 16:37:27 -05:00
Kermalis
0a581cf1c6 Match se_w016b.mid 2019-03-24 16:37:27 -05:00
Kermalis
a2cb1991c5 Match se_w016.mid 2019-03-24 16:37:27 -05:00
Kermalis
d9b29ec549 Match se_w015.mid 2019-03-24 16:37:27 -05:00
Kermalis
2315bbfb8d Match se_w014.mid 2019-03-24 16:37:27 -05:00
Kermalis
f4b40d3220 Match se_w013b.mid 2019-03-24 16:37:27 -05:00
Kermalis
d9f8e253eb Match se_w013.mid 2019-03-24 16:37:27 -05:00
Kermalis
700ce03828 Match se_w011.mid 2019-03-24 16:37:27 -05:00
Kermalis
2ac7d8282b Match se_w010.mid 2019-03-24 16:37:27 -05:00
Kermalis
47c9bd4189 Match se_w007.mid 2019-03-24 16:37:27 -05:00
Kermalis
61c480634d Match se_w006.mid 2019-03-24 16:37:27 -05:00
Kermalis
d3899c5087 Match se_w004.mid 2019-03-24 16:37:27 -05:00
Kermalis
9d803b24a6 Match se_w003.mid 2019-03-24 16:37:27 -05:00
Kermalis
3f997ef4c2 Match se_ussoki.mid 2019-03-24 16:37:27 -05:00