ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-27 04:04:17 +01:00
Code Issues Packages Projects Releases Wiki Activity
8,449 Commits 1 Branch 0 Tags 235 MiB
468ee66cd8
Commit Graph

2410 Commits

Author SHA1 Message Date
Kurausukun
b9644e9583 Update Audio Macros 
Information: Our current audio macros preclude the definition of root
key and pan (applicable when used in drumsets, aka "keysplit_all") for
GB channels. However, this functionality does exist in m4a--Pokemon
Emerald just happens not to use it. However, for the sake of people
working with custom music, I believe these values should be modifiable
by users.

Additionally, given the recent events that have occurred with this repo,
I would like to make something fully clear: I have indeed looked at the
GBA SDK before, which contains notes on how these sounds are defined;
therefore, I cannot blame you if you reject this PR on the grounds that
the information is "tainted." However, this information is readily
available and matches the same macros used for directsound--it's hardly
information that one would need the source to know.
 2020-09-17 03:12:19 -04:00
DizzyEggg
f70a9ce153 Merge with master 2020-08-27 12:01:28 +02:00
GriffinR
fbb70b3727 Document contest AI scripts 2020-08-21 14:57:17 -04:00
GriffinR
469ec5f248 Document contest AI commands 2020-08-21 02:36:48 -04:00
GriffinR
65bd2faf94 Merge branch 'master' of https://github.com/pret/pokeemerald into doc-contest 2020-08-16 05:59:10 -04:00
DizzyEggg
0066640a1e Merge with master 2020-07-27 14:51:39 +02:00
DizzyEggg
3a220d0733 ai tweaks 2020-07-26 13:48:25 +02:00
GriffinR
aca50c87be Continue new contest documentation 2020-07-24 00:14:53 -04:00
GriffinR
af09e73d67
Merge branch 'master' into doc-overworld 2020-07-18 20:24:09 -04:00
GriffinR
aba42513d3 Clean up some battle scr cmd data 2020-07-18 18:10:15 -04:00
DizzyEggg
ec4c73711e Rest Sleep Talk wake up awaraness 2020-07-15 21:30:24 +02:00
DizzyEggg
1a94d27fe6 Emergency Exit 2020-07-15 17:21:12 +02:00
GriffinR
e129d04b93
Merge branch 'master' into doc-overworld 2020-07-15 00:40:47 -04:00
DizzyEggg
4c3f40a361 Merge with master 2020-07-11 12:59:23 +02:00
Ryuhouji
8e2128f22c
Fix indentation 2020-07-09 15:36:22 -04:00
Ryuhouji
d261374044
Made documentation more readable 
This change will make the script command documentation more user-friendly to read.
Additionally, provided the information on the 'delay' macro. I have confirmed that this
is indeed Frames and not Milliseconds. Updated the macro respectively.
 2020-07-09 15:16:37 -04:00
GriffinR
4ea6992172 Continue documenting overworld/field effects 2020-06-29 01:26:29 -04:00
Eduardo Alvaro Quezada D'Ottone
9fb073ca23
Some cleanup (#454) 
* Toxic Thread doesn't have power.

* Added missing commas.

* Autotomize typo.

It wasn't until today that I learned that autotomize was a word.
 2020-06-27 11:21:13 +02:00
DizzyEggg
548a43f8d9 Rocky Helmet before Knock Off 2020-06-25 16:15:11 +02:00
DizzyEggg
19699bee23
Merge pull request #390 from ghoulslash/battle_engine 
add animations for all moves
 2020-05-29 12:53:17 +02:00
Eduardo Alvaro Quezada D'Ottone
8d848997c9
Battle Configs: The Revenge (#363) 
* Turns for Uproar

* Chances for the amount of hits with multi-hit moves.

* Electric type mon's immunity to paralysis

* (Hi) Jump Kick to always do 1/2 of maxHP when crashing

* Turns for Disable.

* Minimized mons can always be hit by moves like Stomp

* Grass types immune to powder and spore moves.

* Psywave's damage formula

* Fixed random usage.
 2020-05-28 10:38:27 +02:00
Evan
6c20a49dc6 animations for all moves 2020-05-25 00:37:32 -06:00
ultima-soul
9ee5db6a96 Expand ability ids to u16. Thanks to ghoulslash for some assistance! 2020-05-18 14:54:12 -07:00
DizzyEggg
4fc88d18aa Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into battle_engine_v2 2020-04-29 09:17:25 +02:00
GriffinR
b1d26e10a8 Sync map header property names with pokefirered 2020-04-28 19:59:08 -05:00
DizzyEggg
738d92e39d Infiltrator affects mist safeguard 2020-04-23 11:29:19 +02:00
DizzyEggg
40ce053ce1 Adrenaline Orb 2020-04-22 15:12:25 +02:00
DizzyEggg
d56aaf7c0b Destiny Knot 2020-04-22 14:40:44 +02:00
DizzyEggg
c8ba013539 Power Herb 2020-04-22 10:44:19 +02:00
Eduardo Alvaro Quezada D'Ottone
c5a6acc7db
Corrosion (#306) 
* Status move poisoning for Steel and Poison types.

* Can poison itself with Toxic Orb.

* Secondary effect poisoning now working.

* Created a function that checks if abilities can bypass type immunities.

* Created macro to handle typeimmunity

* Applied review changes.

* Applied review requests.

* Left more readable version of HOLD_EFFECT_TOXIC_ORB.
 2020-04-21 15:59:19 +02:00
DizzyEggg
328e951afa Ally Switch, tbd 2020-04-20 20:05:04 +02:00
DizzyEggg
0f628c8ff2 Fairy Lock 2020-04-20 19:41:07 +02:00
DizzyEggg
5d412d37d8 More Ai tweaks 2020-04-20 14:47:00 +02:00
DizzyEggg
dd17360ab0 Zen Mode and Shields Down 2020-04-19 21:18:39 +02:00
DizzyEggg
6a3944d27c Frisk, would be easier if it didnt scan 2 opponents 2020-04-19 13:37:56 +02:00
DizzyEggg
e62f1475d4 Beast Boost and Receiver 2020-04-19 12:07:56 +02:00
DizzyEggg
e42ead10c9 Soul Heart 2020-04-18 19:59:09 +02:00
DizzyEggg
34f5d9e2ae Burn Up And Purify 2020-04-17 21:14:26 +02:00
Eduardo Alvaro Quezada D'Ottone
2b9eb00486
Mind blown (#302) 
* Mind Blown Part 1 (Definition and self-damage)

* Mind Blown Part 2 (Damp interaction)
 2020-04-14 09:27:29 +02:00
DizzyEggg
cb5b673f8a Big Root and STRENGTH Sap 2020-04-13 15:00:17 +02:00
DizzyEggg
108f6b711f Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into battle_engine_v2 2020-02-23 10:58:26 +01:00
PikalaxALT
91dd7f5cc3 Port librfu from firered 2020-02-16 13:49:36 -05:00
DizzyEggg
017f65de59 Add easy to use macros for custom multi battles 2020-02-16 15:45:54 +01:00
GriffinR
4c12ad00d2 Merge branch 'master' into fix-eventobj 2020-01-19 21:57:29 -05:00
DizzyEggg
d8aab3d112 Merge with master 2020-01-18 18:17:25 +01:00
jiangzhengwenjz
46b00b11d4 match all the functions 2020-01-16 08:14:27 -06:00
jiangzhengwenjz
8a5f292618 document symbols 2020-01-16 08:14:27 -06:00
GriffinR
e92cc7752b Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj 2020-01-13 20:41:57 -05:00
huderlem
6d6c57f383
Merge pull request #953 from GriffinRichards/sync-script 
Port some macro/script fixes from pokefirered
 2020-01-13 19:33:47 -06:00
GriffinR
c19289596d Give/Take to Add/Remove for silent script macros 2020-01-12 23:24:52 -05:00
GriffinR
655910a16f
Merge branch 'master' into fix-eventobj 2020-01-12 22:42:43 -05:00
GriffinR
e497fc64e3 if_undefeated macro to if_not_defeated 2020-01-12 20:20:02 -05:00
GriffinR
f2e7b1507e Port some macro/script fixes from pokefirered 2020-01-11 14:12:31 -05:00
GriffinR
ef67f2d33b Merge master into ObjEvent rename and prune accidental inclusions 2020-01-08 05:43:06 -05:00
GriffinR
e5df61e362
Merge branch 'master' into doc-dome 2020-01-08 01:15:36 -05:00
GriffinR
fb5bea98ce More battle_dome.c doc 2020-01-07 22:30:37 -05:00
DizzyEggg
39e3b0b740 Form changes layout and Stance Change Aegi 2019-12-31 19:11:53 +01:00
DizzyEggg
4c9ea32d19 Merge with master 2019-12-30 18:52:23 +01:00
GriffinR
3efc8199d4 More battle_dome.c documentation 2019-12-25 22:27:33 -08:00
huderlem
ee61726136
Merge pull request #936 from GriffinRichards/doc-tower 
Document Battle Tower scripts
 2019-12-25 11:39:20 -06:00
DizzyEggg
e4a9a228c5
Merge pull request #210 from ultima-soul/battle_engine 
Implement Leaf Guard.
 2019-12-23 17:15:51 +01:00
DizzyEggg
9e3d5672e6 Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into battle_engine_v2 2019-12-23 16:40:21 +01:00
GriffinR
68cdd7b1cb Merge master into ObjEvent rename 2019-12-21 05:19:27 -05:00
Diegoisawesome
026e1108b2
Merge pull request #935 from GriffinRichards/doc-warp 
Document some warp/field screen effect
 2019-12-20 23:44:56 -08:00
Diegoisawesome
d42ea06dc5
Merge pull request #939 from GriffinRichards/fix-compare 
Use constants in compare macro
 2019-12-20 23:40:12 -08:00
GriffinR
324a81ed5d Reword yesnobox comment 2019-12-20 18:53:58 -05:00
GriffinR
63c8cf97d1 Document Battle Dome scripts and some battle_dome.c 2019-12-20 16:53:33 -05:00
GriffinR
7628019952 Remove references to LASTRESULT 2019-12-20 08:51:58 -05:00
GriffinR
9e08cfe55f Remove uses of compare_var_to 2019-12-18 19:22:39 -05:00
GriffinR
d137a1a0c1 Use constants in compare macro 2019-12-18 19:12:09 -05:00
GriffinR
949509aade
Merge branch 'master' into fix-eventobj 2019-12-18 13:16:38 -05:00
GriffinR
23f952b34e Merge master into doc-tower 2019-12-17 21:17:46 -05:00
GriffinR
ddfa0c6298 Document Battle Tower scripts 2019-12-17 20:56:13 -05:00
huderlem
f8cef9a6a8
Merge pull request #932 from jiangzhengwenjz/berry_crush 
berry crush
 2019-12-17 19:35:00 -06:00
jiangzhengwenjz
5bec27aa34 nonmatch sub_8024604 2019-12-18 03:36:51 +08:00
jiangzhengwenjz
67690df65f sub_8023CAC 2019-12-17 23:12:01 +08:00
GriffinR
d1cf9006fb Document some warp/field screen effect 2019-12-17 05:23:07 -05:00
jiangzhengwenjz
50c48d7ef6 sub_8023BC0 2019-12-17 14:49:57 +08:00
ultima-soul
029ab67ff4 Implement Leaf Guard. 2019-12-16 00:29:20 -08:00
jiangzhengwenjz
3f858c1c26 sub_8022F04 2019-12-16 14:17:29 +08:00
GriffinR
96ec5e1b84 Use fadescreen constants 2019-12-15 11:42:50 -05:00
GriffinR
82f55f2381 Merge master into ObjEvent rename 2019-12-15 02:00:00 -05:00
GriffinR
6967caefb2 Split finditem_std from giveitem_std 2019-12-14 08:41:46 -06:00
GriffinR
75b0c9d7a9 Document Battle Pyramid scripts 2019-12-14 08:38:26 -06:00
GriffinR
aa72c0ada3 Document Battle Factory scripts 2019-12-14 08:32:32 -06:00
GriffinR
6556b556dd
Merge branch 'master' into fix-eventobj 2019-12-11 01:09:06 -05:00
GriffinR
49f1a90534 Document Battle Pike scripts 2019-12-10 19:31:27 -06:00
GriffinR
ed1ff0ad77 Document misc strings and text colors 2019-12-10 19:29:23 -06:00
DizzyEggg
ac499bc896 Merge with master 2019-12-09 08:16:18 +01:00
GriffinR
c51e0f3bae
Merge branch 'master' into fix-eventobj 2019-12-06 02:34:54 -05:00
GriffinR
49c6ae1ac6 Add some macro comments 2019-12-05 21:11:17 -06:00
GriffinR
467a103bcc Set up Battle Tent macros 2019-12-05 21:11:17 -06:00
GriffinR
fdae25eab2 Set up Battle Pyramid macros 2019-12-05 21:11:17 -06:00
GriffinR
9fcfbdbef5 Set up Battle Factory macros 2019-12-05 21:11:17 -06:00
GriffinR
41c1c9ca8a Set up Battle Pike macros 2019-12-05 21:11:17 -06:00
GriffinR
9b3d1cfab6 Set up Battle Dome and Tower macros 2019-12-05 21:11:17 -06:00
GriffinR
be17c1602d Set up remaining facility script doc, use Palace macros 2019-12-05 21:11:17 -06:00
DizzyEggg
dcb5d16cb3 Merge with master 2019-11-29 21:47:31 +01:00
GriffinR
cb90f22c5e Merge master into ObjEvent rename 2019-11-27 12:51:10 -05:00
GriffinR
70d1f54ab9 Remove TODO comment for battle arena macros 2019-11-26 18:47:48 -06:00
GriffinR
8d870d94c9 Document Battle Arena scripts 2019-11-26 18:47:48 -06:00
GriffinR
f559fa3fe2 Merge master into ObjEvent rename 2019-11-25 20:00:04 -05:00
GriffinR
cc81b5032b Split frontier macros and comment frontier_util.inc 2019-11-25 18:37:48 -06:00
GriffinR
63ee15fc28 Document Frontier Util 2019-11-25 18:37:48 -06:00
GriffinR
08a8dc46e3 Use macros for Trainer Hill 2019-11-25 18:37:48 -06:00
GriffinR
4dfa959fa2 Begin documenting Battle Pike and Frontier Util 2019-11-25 18:37:48 -06:00
GriffinR
2bf1e0600e Consolidate apprentice_buff macros 2019-11-23 08:09:25 -05:00
DizzyEggg
8cc0439182 merge master 2019-11-22 22:47:19 +01:00
GriffinR
ec3e86f1d2 Standardize Event Object to Object Event 2019-11-20 22:55:44 -05:00
GriffinR
a05006421b Document Apprentice 2019-11-20 17:36:52 -05:00
GriffinR
4e6a69c297 WIP Document Apprentice 2019-11-19 11:36:38 -05:00
GriffinR
6ac7efb54f Document Scotts House and begin frontier macros 2019-11-17 08:16:28 -06:00
GriffinR
5e01871f8b Document Trainer Hill 2019-11-16 13:02:35 -06:00
GriffinR
c0ae1cbc1c Document Lilycove scripts 2019-11-13 18:20:55 -06:00
DizzyEggg
b4ac979600 Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into battle_engine_v2 2019-11-10 12:09:43 +01:00
DizzyEggg
ea6736cd8d merge 2019-11-10 12:09:14 +01:00
GriffinR
a38bff8c17 Document Slateport scripts 2019-11-09 08:37:06 -06:00
GriffinR
702ef745d9 Add comments to hidemoneybox macro 2019-11-07 11:07:49 -05:00
GriffinR
d5685db19a Fold nops into hidemoneybox 2019-11-07 10:37:15 -05:00
GriffinR
dba94e3971 Update fldeff sparkle macro 2019-11-06 16:41:56 -06:00
GriffinR
6730df2321 Document Abandoned Ship scripts 2019-11-06 16:41:56 -06:00
GriffinR
58dcd6d99d Clean up mystery event msg 2019-11-06 16:38:02 -06:00
huderlem
a4b4ecd470
Merge pull request #787 from GriffinRichards/rename-tablecmds 
Rename table cmds
 2019-11-04 16:31:27 -06:00
DizzyEggg
1d8cc9b741 Fix merge conflicts 2019-11-03 19:55:19 +01:00
GriffinR
8055548fa4 Document legendary scripts 2019-10-31 18:28:34 -05:00
GriffinR
a4d6ce417d Fix resetintimidatetracebits typo 2019-10-22 15:54:11 -05:00
DizzyEggg
e736c369d6 Merge with master 2019-10-19 17:47:55 +02:00
GriffinR
b4a9298205
Merge branch 'master' into document-gyms2 2019-10-16 04:22:34 -04:00
GriffinR
0f15264595 Document rotating_tile_puzzle 2019-10-16 04:09:30 -04:00
GriffinR
90a05cf824 Finish Mossdeep Gym doc, beging documenting rotating tile puzzle 2019-10-15 05:06:13 -04:00
Marcus Huderle
e47b3efdfe Unify showmonpic and hidemonpic script command names with their function names 2019-10-12 18:58:54 -05:00
DizzyEggg
bae5d2038f Update with master 2019-10-10 16:18:48 +02:00
Marcus Huderle
799edaf3e6 Document hide/show reflection movement actions 2019-10-06 14:17:34 -05:00
GriffinR
3bf8129396 Clean up new Cmd macro names 2019-09-27 02:54:28 -04:00
GriffinR
b6dffcf8b7 Clean up script_menu documentation 2019-09-19 19:23:24 -04:00
GriffinR
06af24bce5 Use misc ScrCmd constants 2019-09-16 19:44:47 -05:00
DizzyEggg
a41ecf7101 more ai stuff, baton pass perish song strats 2019-08-30 17:57:19 +02:00
DizzyEggg
e96e98a8de Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into battle_engine_v2 2019-08-25 13:10:32 +02:00
PikalaxALT
a4d5624ad6 Move asm srcs to src 2019-08-21 17:08:40 -05:00
DizzyEggg
e4787bacbc merge 2019-08-19 14:50:47 +02:00
Tustin2121
18dee14170 Review fixes 2019-08-17 23:26:46 -04:00
Tustin2121
f4d4424618 Folded nops into hidemoneybox and updatemoneybox 
The nops are essential to the hidemoneybox and updatemoneybox commands when using vanilla versions of those commands. Even though they're not actually used parameters in the command implementation, they are still consumed, which means if someone were to get rid of the nops (as I did in TriHard) it causes the commands to consume bytecode that are not theirs, resulting in undefined behavior usually leading to softlocks. Folding the extra bytes into the macros means there's no chance of the extra bytes getting losts in scripts.
 2019-08-17 13:25:36 -04:00
Tustin2121
6508469259 Rename movobjectoffscreen to copyobjectxytoperm 
Renaming the command to something that makes more sense as to what the command actually does. The command copies the current xy of the instantiated object back to its template, so that the object remains in the same place if the player walks away and despawns the object, and then comes back. "moveobjectoffscreen" implies that it might be taking the object and moving it physically to an off-screen location somehow.
 2019-08-17 13:18:56 -04:00
DizzyEggg
fabbc9ae31 Merge with master 2019-08-14 11:48:08 +02:00
DizzyEggg
c9de753ecc Illusion 2019-08-08 13:06:55 +02:00
PikalaxALT
b05df0377e Finish pokenav_unk_9 2019-08-05 17:17:05 -04:00
PikalaxALT
e2e667d4b5 Finish pokenav_unk_8 2019-08-05 13:47:04 -04:00
PikalaxALT
330fc46df8 through sub_81CF3F8 2019-08-05 12:21:45 -04:00
PikalaxALT
18f29c566a through sub_81CF278 2019-08-05 10:54:56 -04:00
PikalaxALT
51d5ee771d Merge branch 'master' into pokenav_unk_2 2019-08-05 08:33:45 -04:00