ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-28 04:34:28 +01:00
Code Issues Packages Projects Releases Wiki Activity
13,455 Commits 1 Branch 0 Tags 235 MiB
b0b6e16042
Commit Graph

2407 Commits

Author SHA1 Message Date
DizzyEggg
549b669f2a battle tower, match sth and dumb loop instead of goto 2018-10-24 23:14:45 +02:00
garak
6cf39e8a6e clean up sprite tags 2018-10-22 10:51:40 -04:00
garak
d267fcbfb1 name remaining tags 2018-10-22 10:36:43 -04:00
garak
f2363f5982 more tag names 2018-10-21 19:30:27 -04:00
garak
7a9c7e5f06
Merge branch 'master' into sprite-tags 2018-10-21 15:12:18 -04:00
garak
2bb286ab4e begin ANIM_TAG port 2018-10-21 15:07:10 -04:00
DizzyEggg
0ab27e44b1 more tower, fail 2018-10-21 20:13:12 +02:00
Diegoisawesome
2a3ba78831
Merge pull request #369 from garakmon/pan-constants 
Use sound pan constants in data/battle_anim_scripts.s
 2018-10-19 20:27:54 -05:00
garak
38fcc46abb Merge remote-tracking branch 'upstream/master' into pan-constants 2018-10-19 16:05:14 -04:00
garak
901f3ff557 use sound panning constants in battle_anim_scripts 2018-10-19 15:57:19 -04:00
garak
113a8d1efd clean flags and remove temp macro 2018-10-19 14:59:18 -04:00
garak
1441ee6bc3 finish event object flags 2018-10-19 13:04:47 -04:00
garak
cb5981cdf2 name more event flags 2018-10-18 21:32:21 -04:00
garak
c27043bd3c more event flags 2018-10-18 15:28:59 -04:00
garak
d1b7f32b0a begin event flag names, add temporary hidden item macro 2018-10-17 22:07:23 -04:00
garak
7d88b9647f
Merge branch 'master' into event-flags 2018-10-17 12:30:45 -04:00
garak
ff97873c30 label temp flags, test replace script 2018-10-17 12:25:12 -04:00
Diegoisawesome
e75f0b4f80 Port/decompile field_control_avatar 2018-10-16 21:47:08 -05:00
DizzyEggg
d3215ff96f Fix wild double battle issues 2018-10-16 22:19:53 +02:00
Deokishisu
78a912a039
Fix "Vigaroth" misspelling to "Vigoroth" 2018-10-16 12:06:38 -04:00
Deokishisu
bf2063cc1a Update All EVENT_OBJ_GFX References 
Didn't realize that this needed to be done as well for renaming OW sprites. The event_objects.h file has had its corresponding defines renamed and all references in all files to those defines have been relabeled.
 2018-10-14 19:09:18 -04:00
DizzyEggg
b3ad32bbe6 Merge with master 2018-10-14 20:51:34 +02:00
DizzyEggg
145df49063 Document more of apprentice 2018-10-14 14:35:51 +02:00
DizzyEggg
b4a42a6832 Decompile apprentice 2018-10-14 11:37:44 +02:00
DizzyEggg
7925000a54 merge with master 2018-10-06 16:05:58 +02:00
DizzyEggg
6b5c52e926 Flower Shield and protect moves 2018-10-06 15:50:35 +02:00
Marcus Huderle
b9e38a569e
Merge pull request #320 from DizzyEggg/anims 
Document battle animation scripts
 2018-10-06 08:20:41 -05:00
DizzyEggg
17c5b4089a Label most of the anim tags 2018-10-06 09:37:52 +02:00
Tetrable
61ab631dec
Fixed a small error 2018-10-05 23:02:04 +01:00
Tetrable
e80a53060b Start anim tags 2018-10-05 23:00:07 +01:00
Marcus Huderle
ec0d350137 Move metatile behavior constants to include/constants and sync closer to pokeruby 2018-10-04 17:57:07 -05:00
DizzyEggg
de9e9072fc Rototiller and 2 turn moves 2018-09-30 14:04:46 +02:00
DizzyEggg
162c83fcff Bestow 2018-09-30 12:27:51 +02:00
DizzyEggg
7623eabdee After you 2018-09-29 19:37:39 +02:00
DizzyEggg
b9cf1fdcfe Psycho Shift, Power Trick, Flame Burst 2018-09-29 18:40:14 +02:00
DizzyEggg
dddefbb0e3 Full support for moves hitting all battlers 2018-09-29 16:41:25 +02:00
DizzyEggg
ada76cbe4f Synchronoise and Smack Down 2018-09-29 15:43:56 +02:00
DizzyEggg
597299136f Add Pollen Puff effect 2018-09-29 14:10:53 +02:00
DizzyEggg
cbaae44f9f Add pop-up to battlescripts 2018-09-29 13:36:33 +02:00
DizzyEggg
3f2beff554 Defog 2018-09-23 19:03:53 +02:00
DizzyEggg
6b7a171dbe Ability pop-up fail, maybe will do something about it later 2018-09-23 14:24:06 +02:00
DizzyEggg
19e1606595 Add Copycat 2018-09-22 18:37:03 +02:00
DizzyEggg
db44a7e25a Techno Blast and Autotomize 2018-09-22 17:27:51 +02:00
DizzyEggg
9474254e4d Final Gambit, Dragon Tail 2018-09-22 16:15:00 +02:00
DizzyEggg
fd15e23419 Placeholder entries for gen7 moves 2018-09-22 14:04:15 +02:00
DizzyEggg
bf11c35eaf Add gen7 learsnets for pokemon 2018-09-22 13:52:38 +02:00
DizzyEggg
ca9876b0b4 Updated Wrap Mechanics, Infestation, stat changing move effects 2018-09-22 12:20:33 +02:00
DizzyEggg
f455f663f4 Shell Smash move effect 2018-09-22 11:13:17 +02:00
DizzyEggg
1284bb94f1 Last Resort, Fangs and Flare Blitz/Volt Tackle 2018-09-22 10:45:43 +02:00
DizzyEggg
23a06c0836 Close combat effect 2018-09-22 01:12:27 +02:00
DizzyEggg
7b60a654b2 Growth gen6 effect 2018-09-22 01:01:13 +02:00
DizzyEggg
a69af8f2f5 Merge with master 2018-09-22 00:22:13 +02:00
DizzyEggg
66fd9b2ddf Label trainer hill battle type 2018-09-20 22:00:00 +02:00
DizzyEggg
e4b7ba0977 Document some not labeled battle things 2018-09-20 11:55:35 +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
55f21c1776 Mega Evolution support is mostly done. 2018-09-16 18:55:32 +02: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
0800a44f7a Merge branch 'master' into battle_engine_v2 2018-09-16 09:22:05 +02:00
DizzyEggg
8a81bd1bce Sync battle anim labels with pokeruby 2018-09-12 22:58:03 +02:00
DizzyEggg
10b479a3ca Document battle animation scripts. 2018-09-10 21:19:19 +02:00
DizzyEggg
c6c8b7b0fd Merge branch 'master' into battle_engine_v2 2018-09-10 14:49:24 +02:00
Slawter666
1ba17e1666 Merge branch 'decompile_frontier_2' of https://github.com/DizzyEggg/pokeemerald into factory-data 2018-09-09 15:51:13 +01:00
ultima-soul
857ac33adb Fixed a typo. 2018-09-05 17:25:44 +00:00
ultima-soul
f505ba1bc7 Implemented gRegionMapSectionId_To_PopUpThemeIdMapping array to be dependent on Map Section ID enum rather than order dependent. 2018-09-05 01:13:17 +00:00
DizzyEggg
10eb952db5 Start battle factory 2018-09-02 18:10:36 +02:00
DizzyEggg
f9af3bec9b merge with master 2018-09-02 00:07:19 +02:00
DizzyEggg
44ba432dad Label various battle scripts 2018-09-01 20:00:13 +02:00
DizzyEggg
ead21250a6 Label all battle ai scripts 2018-09-01 19:05:06 +02:00
DizzyEggg
490a4f993b Merge with master 2018-09-01 12:38:38 +02:00
DizzyEggg
2b7c138cbe Some labels 2018-08-25 21:04:12 +02:00
DizzyEggg
447e65860c Merge branch 'master' into decompile_battle_frontier_1 2018-08-25 20:02:09 +02:00
DizzyEggg
edcf04b665 Document battle dome. 2018-08-25 19:59:47 +02:00
DizzyEggg
fb19a8fc59 battle dome cards sensibly renamed 2018-08-19 01:06:10 +02:00
DizzyEggg
e4649245ba this file is too much 2018-08-18 19:52:25 +02:00
Diegoisawesome
13dc7a4170 Merge branch 'master' of github.com:pret/pokeemerald 2018-08-15 16:22:54 -07:00
Tetrable
8896b54e8f Add national/hoenn dex defines, update dex arrays 2018-08-15 20:10:28 +01:00
Diegoisawesome
0bc975bf57 Document and cleanup pokemon_summary_screen 2018-08-15 01:44:20 -07:00
DizzyEggg
cc145a45f7 merge with master 2018-08-12 22:37:28 +02:00
DizzyEggg
f1daf7442d event data review changes 2018-08-12 22:04:49 +02:00
Diegoisawesome
18d5186630 Merge remote-tracking branch 'garakmon/heal-loc-2' 2018-08-11 16:57:46 -07:00
Diegoisawesome
b54793be91 Finish decompiling field_specials 2018-08-11 14:51:54 -07:00
DizzyEggg
4cb1e880da Reflect Type and SOAK 2018-08-11 13:30:34 +02:00
DizzyEggg
e259000dc3 Coil and Quiver Dance 2018-08-11 12:29:01 +02:00
DizzyEggg
674d35861c Couple bug fixes 2018-08-11 12:16:00 +02:00
garak
c3512e3b39 port larger heal location changes from poke ruby pr 2018-08-10 10:45:15 -04:00
Diegoisawesome
90896e38c9 Begin porting/decompiling field_specials 2018-08-08 01:37:12 -07:00
DizzyEggg
d230d986fa Me First. 2018-08-05 16:43:07 +02:00
DizzyEggg
de85f88bbb Support for two typed moves. 2018-08-05 13:57:37 +02:00
DizzyEggg
5fbeef860c Bulletproof and a couple of new moves 2018-08-05 13:39:22 +02:00
DizzyEggg
065032bf35 Moves changing terrains 2018-08-05 12:43:57 +02:00
DizzyEggg
2218949d7c Topsy Turvy and Ion Deluge. 2018-08-04 23:34:29 +02:00
DizzyEggg
222ea7269d Rapid Spin blews all hazards, Quash and a couple of new move effects 2018-08-04 22:23:07 +02:00
DizzyEggg
9ff7b0e849 Effect to u16, Lucky Chant, Sucker Punch, Sticky Web and Metal Burst 2018-08-04 20:36:24 +02:00
DizzyEggg
39f9b1ddf0 Experience on caught mon 2018-08-03 18:01:14 +02:00
DizzyEggg
320120d529 Merge with master 2018-08-03 00:20:34 +02:00
DizzyEggg
c7baa71a5e Add placeholder string for not done moves. 2018-08-02 20:32:13 +02:00
DizzyEggg
198a1a8646 Proper Sound moves and substitute 2018-08-02 20:24:18 +02:00
DizzyEggg
b73075f822 Update Unusable Moves 2018-07-31 23:09:47 +02:00
DizzyEggg
44a454ecb4 Moves with accuracy 0 bypass accuracy checks; Heal Block move effect done 2018-07-30 20:41:16 +02:00
DizzyEggg
68145cd002 Document atk48 2018-07-29 15:33:16 +02:00
DizzyEggg
3d93da7133 Add Imposter 2018-07-29 12:21:28 +02:00
DizzyEggg
d628d1f5fd Move Weather Ball, Hidden power, AI support for dynamic type moves and AI debug support 2018-07-29 11:32:40 +02:00
DizzyEggg
ec9693c797 ate abilities 2018-07-28 18:41:57 +02:00
DizzyEggg
43fc4b6933 Add Magic Bounce 2018-07-28 10:41:20 +02:00
DizzyEggg
a452661cb9 Prankster and Gale Wings 2018-07-28 00:25:02 +02:00
DizzyEggg
0148cc8b0c merge with master, gen6 move names 2018-07-28 00:01:34 +02:00
DizzyEggg
9088c0bdb5 Introduce battle config; Snow Warning Done. 2018-07-27 23:40:10 +02:00
DizzyEggg
f51812d0fe Add Fell Stinger 2018-07-26 23:40:55 +02:00
DizzyEggg
d991d669da Add Moxie 2018-07-26 22:52:13 +02:00
DizzyEggg
16d38f5343 Add a couple of gen5 abilities 2018-07-26 21:56:23 +02:00
DizzyEggg
1c95c36338 Healing Wish and Lunar Dance 2018-07-26 20:36:16 +02: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
3f7e6e9fe0 Add U-turn effect 2018-07-23 22:43:05 +02: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
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
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
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
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
vblm12
c41b8123e3 Move trainer defines to one place in opponent.h... 
... to match pokeruby
 2018-07-20 22:03:22 -05: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
DizzyEggg
bf0178238a Battle files - review changes 2018-07-16 20:47:30 +02:00
DizzyEggg
ea5ffa3375 Merge with master 2018-07-16 20:23:05 +02:00
DizzyEggg
5318cc656a Add some new battlestrings. 2018-07-15 18:53:43 +02:00
DizzyEggg
5a38bb61db Basic damage calc is ready. 2018-07-14 22:56:03 +02:00
DizzyEggg
2ebf14a83d Get rid of scripting dmg multiplier 2018-07-14 18:58:45 +02:00
DizzyEggg
939127bfff Important battle util functions 2018-07-14 16:41:14 +02:00
DizzyEggg
b24427f3bf Introduce Field Statuses 2018-07-14 13:17:10 +02:00
DizzyEggg
3a10ae9a94 Crit changes accomodated to ai scripts 2018-07-14 12:54:12 +02:00
DizzyEggg
c9d1ee3c4a Move high crit to a flag and update move table 2018-07-14 10:11:38 +02:00
DizzyEggg
e94a0e2ddf Add new gen constants. 2018-07-13 23:31:00 +02:00
DizzyEggg
626b80106e Basic Battle Debug Menu is done 2018-07-13 23:00:56 +02:00
Marcus Huderle
546819bc72 Use map type constants in map headers 2018-07-12 22:39:38 -05:00
Marcus Huderle
7d375972ba Sync bg_event macros with pokeruby 2018-07-11 11:12:26 -05:00
Marcus Huderle
d675b7578c Move movement type constants into include/constants/event_object_movement_constants.h 2018-07-10 18:04:41 -05:00
DizzyEggg
1c48e58574 small fixes 2018-07-07 14:24:19 +02:00
DizzyEggg
f35c0abe80 merge with battle tent update 2018-07-01 12:16:52 +02:00
DizzyEggg
d2e47323fe document frontier related 2018-07-01 11:15:42 +02:00
DizzyEggg
30c85a5128 more battle documentation 2018-06-30 14:12:17 +02:00
Marcus Huderle
5e00c0bfcf Fix map constants 2018-06-20 19:54:21 -05:00
Marcus Huderle
acc1a5d446 Get all map constants from include/ rather than constants/ 2018-06-15 07:49:21 -05:00
Marcus Huderle
aa9a45c16f Rebrand 'map object' and 'field object' to 'event object' 2018-06-11 19:11:48 -05:00
DizzyEggg
d1798d0ed9 decompile field tasks 2018-05-19 18:02:43 +02:00
PikalaxALT
58200616d5
Merge branch 'master' into trader 2018-05-04 17:45:50 -04:00
PikalaxALT
4acbcf5759 Port trader from Ruby 2018-05-01 15:19:24 -04:00
DizzyEggg
25c669e36b decompile item 2018-04-29 13:36:26 +02:00
PikalaxALT
df128cbfed Merge branch 'master' into pokenav_match_call 2018-03-02 21:49:09 -05:00
PikalaxALT
988be1ab86 Carve out Match Call functions 2018-02-28 22:47:50 -05:00
Diegoisawesome
bcef4e7d1c
Merge pull request #221 from DizzyEggg/data_to_c 
Move some data to C
 2018-02-28 16:55:45 -06:00
Diegoisawesome
a57e04e14d
Merge pull request #220 from PikalaxALT/trainer_rematch 
Decompile trainer_rematch
 2018-02-28 16:41:54 -06:00
DizzyEggg
305a4fa744 match two functions 2018-02-28 19:37:48 +01:00
PikalaxALT
1616f998fc Rename some flags relevant to the conditions under which Wattson becomes available for rematch 2018-02-26 08:42:15 -05:00
PikalaxALT
f46e941f30 Name functions, variables, and that one flag constant 2018-02-26 08:23:17 -05:00
DizzyEggg
919f803214 correct move target defines 2018-02-26 13:24:46 +01:00
DizzyEggg
90fa97f810 merge overworld with master 2018-02-15 12:41:32 +01:00
golem galvanize
c3c30417ef fixes 2018-02-14 20:45:27 -05:00
DizzyEggg
f22be4d010 more overworld work 2018-02-12 18:26:26 +01:00
DizzyEggg
382442c4c8 start decompiling overworld.s 2018-02-12 15:01:43 +01:00
DizzyEggg
5e781f5b3f change some constants to male and female 2018-02-12 00:11:10 +01:00
DizzyEggg
2736c0fd4a add more const pokemon data, clear include 2018-02-11 23:46:50 +01:00
DizzyEggg
1a1bad3129 decompile pokemon_item_effect 2018-02-09 18:46:00 +01:00
DizzyEggg
bce01bc518 battle labels merge with master 2018-02-09 00:43:07 +01: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
DizzyEggg
96290f4ee3 pokemon and battle constants 2018-02-08 11:17:41 +01:00
DizzyEggg
a10fd5a7c4 create more battle constants 2018-02-08 00:35:13 +01:00
DizzyEggg
5ac6cc4860 move battle vars to c file 2018-02-07 22:53:40 +01:00
DizzyEggg
4b7d778a5c move mon data fix conflicts 2018-02-07 20:17:55 +01:00
DizzyEggg
c5e2092e8b title screen with master 2018-02-07 20:10:56 +01:00
DizzyEggg
a61dc815b0 bag arrow to item count plus 1 2018-02-07 19:51:41 +01:00
DizzyEggg
541fef5368 move wild data to C 2018-02-05 22:27:29 +01:00
DizzyEggg
ae8e89a10d move some pokemon data to c 2018-02-05 17:39:26 +01:00
DizzyEggg
0c60ffe22a decompile title screen 2018-02-04 16:11:00 +01:00
DizzyEggg
e13eacda39 decompile item icon 2018-02-02 16:06:20 +01:00
DizzyEggg
9fbedcc41c coord weather fix conflicts 2018-01-31 00:02:16 +01:00
DizzyEggg
e6fb626c1f decompile_coord_event_weather 2018-01-29 16:46:56 +01:00
DizzyEggg
78728ae454 add rgb constants 2018-01-29 14:36:13 +01:00
DizzyEggg
f53a39e7a2 mystery event labels 2018-01-21 19:30:01 +01:00
DizzyEggg
0bc7fb92db start decompiling mystery event script 2018-01-21 12:36:11 +01:00
Devin
9c84e8fd56 Fix typos in songs.h and song_table.inc again, and made the comments match. 
I'm sorry if I sound like a brolen record. ;)
 2018-01-16 19:36:34 -05:00
Devin
200aea1b09 Fixed typos 2018-01-15 14:10:07 -05:00
Devin
694f7f45bf Add most English song and SFX names as comments in songs.h and song_table.inc 2018-01-15 04:41:24 -05:00
Diegoisawesome
e852700954 Merge remote-tracking branch 'origin/avara-opponent-constants' 2017-12-31 17:40:28 -06:00
Diegoisawesome
31140b10c5 Merge remote-tracking branch 'Egg/dump_battle_anim_scripts' 2017-12-31 13:35:14 -06:00
DizzyEggg
4f950d698c dump battle animation scripts 2017-12-31 16:28:57 +01:00
DizzyEggg
ca29ad22e8 dump trainer ai scripts 2017-12-30 16:04:31 +01:00
Diegoisawesome
2d04eb22ab Split rom_81370FC and port function names 2017-12-28 02:09:11 -06:00
Diegoisawesome
f9a9391ff3 Split/extract/port landmark 2017-12-26 21:20:29 -06:00
sceptillion
e675043558 phoneme constants 2017-12-22 00:14:56 -08:00
sceptillion
96511dc214 use internal song names 2017-12-22 00:10:20 -08:00
DizzyEggg
720bd555bc add constants trainers file 2017-12-17 21:19:08 +01:00
DizzyEggg
7517f6a030 fix battle setup conflicts 2017-12-17 20:26:13 +01:00
PikalaxALT
6d73bb4b57 Import function labels from Ruby 2017-12-16 10:23:05 -05:00
DizzyEggg
44abbae60b nerge with master, fix conflicts 2017-12-16 01:08:55 +01:00
Avara
c8ac4e8ce4 Opponents fixed and moved~ 2017-12-12 02:58:57 +00:00
camthesaxman
c681b482c2 convert more constants 2017-12-11 12:27:51 -06:00
camthesaxman
caa13f8777 convert some constants to C headers 2017-12-05 11:55:48 -06:00