Commit Graph

202 Commits

Author SHA1 Message Date
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
382a29ad40 Update battle_anim_script.inc 2019-04-09 07:19:03 -05:00
Fontbane
90e32f4ec5 Document landmark setting and item balls 2019-04-04 19:34:35 -05:00
PikalaxALT
4fadbaf161 Minor fixes
gotoram --> returnram
cmdCF/execram --> gotoram
fix indentation in sym_ewram.txt
fix mevent_client.h guard name
2019-04-03 17:04:42 -05:00
DizzyEggg
1aa95a1821 Document a bit of anims 2019-04-02 07:31:06 -05:00
DizzyEggg
35cffea987 Helpful macros for atk49 2019-03-30 08:29:56 -05:00
Phlosioneer
4ea5e85bed Fix typos
This is an updated version of #554, since it hasn't been updated in two
weeks.
2019-03-03 09:31:47 -06:00
huderlem
ee9694d9ba
Merge pull request #587 from Phlosioneer/document-all-event-vars
Document all event vars
2019-03-02 08:24:46 -06:00
Phlosioneer
da0687987d Pick better names for constants 2019-02-28 22:21:16 -06:00
Phlosioneer
189d387f01 Add macros for metatile manipulation 2019-02-28 22:21:16 -06:00
Phlosioneer
e77e7844ea Name several vars, document some related events 2019-02-27 20:25:09 -05:00
DizzyEggg
cb57044531
Fix two battle scripting macros 2019-02-14 13:05:49 +01:00
Diegoisawesome
449fb25f23 Clear up misnamed time-based flags and functions 2019-02-12 00:40:34 -06:00
Diegoisawesome
900f294011 Add var const prefix for some missed var numbers 2019-01-21 22:34:01 -06:00
Marcus Huderle
a1ea3b5e39
Use map_header_flags macro (#483) 2018-12-26 12:20:15 -06:00
Melody
55005f1588 improve call_if macros 2018-12-21 21:32:45 -05:00
Melody
ac2e4adf2d improve goto_if macros 2018-12-21 20:28:24 -05:00
Deokishisu
e15c7fc7cf
Fix deleted line 2018-12-19 12:28:37 -05:00
Deokishisu
8edbad78e5
Add requirements to the fields of the object_event macro
With these changes, the compiler will yell at you if you screw up the number of fields for your event objects while manually editing a map's events.inc. Making these fields required will prevent event corruption of all map events that are included after the map with the messed up fields.
2018-12-19 12:20:38 -05:00
DizzyEggg
6068495619 Document trainer battle scripts (#430) 2018-12-07 16:50:56 -06:00
Melody
a2a99bde11 adds req for macro arguments 2018-12-02 15:14:29 -05:00
Melody
10725def8e trainerbattle_normal → trainerbattle_single
* trainerbattle_normal → trainerbattle_single
* TRAINER_BATTLE_NORMAL → TRAINER_BATTLE_SINGLE
* improves the macro documentation a little
2018-12-02 15:08:19 -05:00
Melody
bad5323642 cleans up trainer battle scripts
* adds battle type macros
* adds `trainerbattle_normal` macro
* adds `trainerbattle_double` macro
* adds rematch macros
* adds no intro macro
2018-12-02 15:08:19 -05:00
DizzyEggg
9828e0e97b Merge with master 2018-12-02 19:38:05 +01:00
DizzyEggg
725f99a1bf Use :req macros 2018-12-02 19:24:06 +01:00
Melody
862265b73a defines register_matchcall macro 2018-12-02 06:04:59 -05:00
Melody
c557ac61ae adds constants, cleans up callstd and msgbox code
* adds some constants for standard script names and messagebox types
* replaces some callstd calls with msgbox calls where equivalent
* replaces msgbox and callstd calls using raw digits with versions that use the constants
2018-12-02 03:37:46 -05:00
Diegoisawesome
032dd251e6
Merge pull request #383 from garakmon/createsprite
Update createsprite macro and rename BANK to BATTLER
2018-11-15 14:45:13 -06:00
garak
c6833c903c remove extra macro and shorten names 2018-11-13 16:19:52 -05:00
garak
269aebaca7 update createsprite macro and rename BANK to BATTLER 2018-11-13 15:35:46 -05:00
DizzyEggg
a4235c9ff8 Document battle arena 2018-11-11 18:33:16 +01:00
garak
113a8d1efd clean flags and remove temp macro 2018-10-19 14:59:18 -04:00
garak
d1b7f32b0a begin event flag names, add temporary hidden item macro 2018-10-17 22:07:23 -04:00
Marcus Huderle
b9e38a569e
Merge pull request #320 from DizzyEggg/anims
Document battle animation scripts
2018-10-06 08:20:41 -05:00
DizzyEggg
611360c29e calledattack to calledmove 2018-09-22 19:08:41 +02:00
DizzyEggg
e362c06aea gRandomMove to gCalledMove 2018-09-22 18:41:00 +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
38c89b9d0f Bank to battler 2018-09-01 18:36:08 +02:00
DizzyEggg
2b7c138cbe Some labels 2018-08-25 21:04:12 +02:00
DizzyEggg
ea5ffa3375 Merge with master 2018-07-16 20:23:05 +02:00
Marcus Huderle
7d375972ba Sync bg_event macros with pokeruby 2018-07-11 11:12:26 -05:00
DizzyEggg
30c85a5128 more battle documentation 2018-06-30 14:12:17 +02:00
DizzyEggg
272b98da6c document party status summary 2018-06-28 21:06:32 +02:00
Marcus Huderle
f807eb1f2d Split out movement radius in object_event macro 2018-06-15 07:49:21 -05:00
Marcus Huderle
2807abe3ba Remove filler bytes from object_event macro 2018-06-15 07:49: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
e01dd90bb3 Update applymovement actions to reflect movement action names 2018-06-13 18:19:19 -05:00
PikalaxALT
ea347199a2 Merge branch 'master' into link 2018-02-11 19:22:06 -05:00
DizzyEggg
96290f4ee3 pokemon and battle constants 2018-02-08 11:17:41 +01:00
camthesaxman
663ecd0014 Merge branch 'master' of https://github.com/pret/pokeemerald into battle_refactor 2018-01-21 22:29:35 -06:00
PikalaxALT
d4e8c20f84 Merge branch 'master' into link 2018-01-21 23:20:13 -05: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
PikalaxALT
772f0aa3fd Merge branch 'master' into link 2018-01-20 22:08:41 -05:00
Diegoisawesome
b22a800581 Extract data from trade.s
Also rename window_template_terminator to null_window_template, in keeping with naming conventions
2018-01-19 19:52:46 -06:00
scnorton
c6ff1a6ce3 Merge branch 'master' into link 2018-01-18 12:53:31 -05:00
camthesaxman
c3c13d0acf more renaming 2018-01-16 15:12:38 -06:00
Diegoisawesome
dcdb5d7693 Create sound data files 2018-01-08 01:30: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
sceptillion
d6987ee9b9 dump songs 2017-12-21 14:30:11 -08:00
Diegoisawesome
eb65458b67 Fix setvaddress params 2017-12-21 16:06:12 -06:00
Marcus Huderle
66f9d4c266 Revert initclock arg sizes 2017-12-21 16:02:42 -06:00
Marcus Huderle
173761a5a1 Port generic event script macros from pokeruby 2017-12-21 13:47:52 -06:00
DizzyEggg
54dccc8512 give batter script command names 2017-12-17 20:38:01 +01:00
DizzyEggg
44abbae60b nerge with master, fix conflicts 2017-12-16 01:08:55 +01:00
camthesaxman
c681b482c2 convert more constants 2017-12-11 12:27:51 -06:00
DizzyEggg
d75e7ace1d label battle stuff 2017-12-02 14:08:55 +01:00
DizzyEggg
273474d57a give names to some battlescripts 2017-12-02 00:03:46 +01:00
DizzyEggg
646664ff29 battle setup file is decompiled 2017-12-01 21:25:13 +01:00
DizzyEggg
77a6c30bd4 make various macros 2017-11-26 21:04:00 +01:00
DizzyEggg
9886eeb5d8 fix, rename, label battle labels and battlescripts 2017-11-26 13:26:58 +01:00
DizzyEggg
cc572f7c00 clear battle code and battlescripts 2017-11-26 11:55:17 +01:00
DizzyEggg
938d346b6d fixes and labels 2017-11-26 01:19:57 +01:00
DizzyEggg
847bfa1540 add more battlescript macros 2017-11-25 21:32:17 +01:00
DizzyEggg
fe658cc2fd create setword macro 2017-11-25 21:11:20 +01:00
DizzyEggg
9151a6d094 dump battlescripts, rename battlescripts 2017-11-25 18:42:31 +01:00
Diegoisawesome
2e40384fa2 Extract baseroms from event_scripts 2017-11-10 18:12:18 -06:00
Diegoisawesome
de8a058714 Extract more baseroms from maps 2017-11-10 02:52:05 -06:00
Diegoisawesome
29079c4b99 Dump numerous baseroms, begin moving data to proper files 2017-11-10 01:49:12 -06:00
Diegoisawesome
49c88e6343 Merge branch 'master' of github.com:pret/pokeemerald into dump_maps 2017-10-27 02:02:36 -05:00
Diegoisawesome
431e737453 Final predump fixes 2017-10-27 00:26:34 -05:00
Diegoisawesome
7827feaa2f Final fixes before dump 2017-10-26 18:03:19 -05:00
Diegoisawesome
32bf0849d2 Test 2017-10-24 14:35:06 -05:00
Diegoisawesome
17303d963e More prep 2017-10-24 00:11:26 -05:00
Diegoisawesome
26f9776f6f Fix some stuff 2017-10-23 22:18:35 -05:00
Diegoisawesome
c23a633a44 Prepare for dumping 2017-10-23 21:18:49 -05:00
PikalaxALT
70eaf5d1be port def_special 2017-10-14 16:28:22 -04:00
Diegoisawesome
6f230848f6 Add window_template_terminator macro 2017-09-25 20:24:14 -05:00
YamaArashi
a793e62d83 .s -> .inc 2016-11-01 08:29:13 -07:00
YamaArashi
6874afafe5 contest AI 2016-09-03 15:27:28 -07:00
YamaArashi
92fa2f05f4 update pokedex entries for preproc 2016-09-02 22:10:43 -07:00
YamaArashi
7bef2a2783 convert comments (; -> @) 2016-09-02 19:51:16 -07:00
YamaArashi
f7a92b9a95 string ref charmap consts and field effect script macros 2015-11-24 18:04:56 -08:00
YamaArashi
832b0b525f wild pokemon data
- Thanks to Sanqui for many Ruby/Sapphire names. https://github.com/Sanqui/romhacking/blob/master/pokemon/location-area-names
2015-10-25 22:56:06 -07:00
yenatch
316be8337a truncate nonexistent command macros 2015-10-20 10:21:48 -07:00
yenatch
cd857e0e84 fix a broken comment and a repeated command name 2015-10-20 09:55:59 -07:00
yenatch
8fb91c74b2 add event script macros 2015-10-19 09:42:57 -07:00