fix merge conflicts

1 files changed, 291 insertions, 417 deletions

diff --git a/asm/macros/event.inc b/asm/macros/event.inc
index 960b300b7..738c2418e 100644
--- a/asm/macros/event.inc
+++ b/asm/macros/event.inc
@@ -80,20 +80,20 @@
 	.byte 0x0d
 	.endm
 
-	@ Sets mystery event status
+	@ Sets some status related to Mystery Event.
 	.macro setmysteryeventstatus value
 	.byte 0x0e
 	.byte \value
 	.endm
 
-	@ Sets the specified script bank to immediate value.
+	@ Sets the specified script bank to value.
 	.macro loadword destination, value
 	.byte 0x0f
 	.byte \destination
 	.4byte \value
 	.endm
 
-	@ Sets the specified script bank to immediate value.
+	@ Sets the specified script bank to value.
 	.macro loadbyte destination, value
 	.byte 0x10
 	.byte \destination
@@ -219,7 +219,7 @@
 	.2byte \value
 	.endm
 
-	@ Compares the value of `var` to the value of `var2`.
+	@ Compares the value of `var1` to the value of `var2`.
 	.macro compare_var_to_var var1, var2
 	.byte 0x22
 	.2byte \var1
@@ -250,7 +250,7 @@
 	.4byte \func
 	.endm
 
-	@ Calls a special function; that is, a piece of ASM code designed for use by scripts and listed in a table of pointers.
+	@ Calls a special function; that is, a function designed for use by scripts and listed in a table of pointers.
 	.macro special function
 	.byte 0x25
 	.2byte SPECIAL_\function
@@ -292,19 +292,19 @@
 	.2byte \a
 	.endm
 
-	@ In FireRed, this command is a nop.
-	.macro initclock hour minute
+	@ Initializes the RTC`s local time offset to the given hour and minute. In FireRed, this command is a nop.
+	.macro initclock hour, minute
 	.byte 0x2c
-	.byte \hour
-	.byte \minute
+	.2byte \hour
+	.2byte \minute
 	.endm
 
-	@ In FireRed, this command is a nop.
+	@ Runs time based events. In FireRed, this command is a nop.
 	.macro dodailyevents
 	.byte 0x2d
 	.endm
 
-	@ Resets the values of variables 0x8000, 0x8001, and 0x8002. Related to RTC in RSE?
+	@ Sets the values of variables 0x8000, 0x8001, and 0x8002 to the current hour, minute, and second. In FRLG, this command sets those variables to zero.
 	.macro gettime
 	.byte 0x2e
 	.endm
@@ -315,7 +315,7 @@
 	.2byte \sound_number
 	.endm
 
-	@ Blocks script execution until the currently-playing sound (triggered by sound) finishes playing.
+	@ Blocks script execution until the currently-playing sound (triggered by playse) finishes playing.
 	.macro waitse
 	.byte 0x30
 	.endm
@@ -338,7 +338,7 @@
 	.byte \unknown
 	.endm
 
-	@ Plays the specified (song_number) song.
+	@ Saves the specified (song_number) song to be played later.
 	.macro savebgm song_number
 	.byte 0x34
 	.2byte \song_number
@@ -361,7 +361,7 @@
 	.byte \speed
 	.endm
 
-	@ Fades the currently-playing song back in.
+	@ Fades the previously-playing song back in.
 	.macro fadeinbgm speed
 	.byte 0x38
 	.byte \speed
@@ -385,7 +385,7 @@
 	.2byte \Y
 	.endm
 
-	@ Clone of warp that uses "a walking effect".
+	@ Clone of warp that plays a door opening animation before stepping upwards into it.
 	.macro warpdoor map, warp, X, Y
 	.byte 0x3b
 	map \map
@@ -400,7 +400,7 @@
 	map \map
 	.endm
 
-	@ Clone of warp that uses a teleport effect. It is apparently only used in R/S/E.[source]
+	@ Clone of warp that uses a teleport effect. It is apparently only used in R/S/E.
 	.macro warpteleport map, warp, X, Y
 	.byte 0x3d
 	map \map
@@ -409,7 +409,7 @@
 	.2byte \Y
 	.endm
 
-	@ Clone of warp. Used by an (unused?) Safari Zone script to return the player to the gatehouse and end the Safari Game.
+	@ Sets the warp destination to be used later.
 	.macro setwarp map, warp, X, Y
 	.byte 0x3e
 	map \map
@@ -418,7 +418,7 @@
 	.2byte \Y
 	.endm
 
-	@ Sets a default warp place. If a warp tries to send the player to Warp 127 on Map 127.127, they will instead be sent here. Useful when a map has warps that need to go to script-controlled locations (i.e. elevators).
+	@ Sets the warp destination that a warp to Warp 127 on Map 127.127 will connect to. Useful when a map has warps that need to go to script-controlled locations (i.e. elevators).
 	.macro setdynamicwarp map, warp, X, Y
 	.byte 0x3f
 	map \map
@@ -427,7 +427,7 @@
 	.2byte \Y
 	.endm
 
-	@ Clone of warp3, except that this writes data to different offsets...
+	@ Sets the destination that diving or emerging from a dive will take the player to.
 	.macro setdivewarp map, warp, X, Y
 	.byte 0x40
 	map \map
@@ -436,7 +436,7 @@
 	.2byte \Y
 	.endm
 
-	@ Clone of warp3, except that this writes data to different offsets...
+	@ Sets the destination that falling into a hole will take the player to.
 	.macro setholewarp map, warp, X, Y
 	.byte 0x41
 	map \map
@@ -452,20 +452,20 @@
 	.2byte \Y
 	.endm
 
-	@ Retrieves the number of Pokmon in the player's party, and stores that number in variable 0x800D (LASTRESULT).
-	.macro countpokemon
+	@ Retrieves the number of Pokemon in the player's party, and stores that number in variable 0x800D (LASTRESULT).
+	.macro getpartysize
 	.byte 0x43
 	.endm
 
 	@ Attempts to add quantity of item index to the player's Bag. If the player has enough room, the item will be added and variable 0x800D (LASTRESULT) will be set to 0x0001; otherwise, LASTRESULT is set to 0x0000.
-	.macro additem index, quantity
+	.macro giveitem index, quantity
 	.byte 0x44
 	.2byte \index
 	.2byte \quantity
 	.endm
 
 	@ Removes quantity of item index from the player's Bag.
-	.macro removeitem index, quantity
+	.macro takeitem index, quantity
 	.byte 0x45
 	.2byte \index
 	.2byte \quantity
@@ -492,7 +492,7 @@
 	.endm
 
 	@ Adds a quantity amount of item index to the player's PC. Both arguments can be variables.
-	.macro addpcitem index, quantity
+	.macro givepcitem index, quantity
 	.byte 0x49
 	.2byte \index
 	.2byte \quantity
@@ -505,32 +505,32 @@
 	.2byte \quantity
 	.endm
 
-	@ In FireRed, this command is a nop. (The argument is read, but not used for anything.)
-	.macro adddecor a
+	@ Adds decoration to the player's PC. In FireRed, this command is a nop. (The argument is read, but not used for anything.)
+	.macro givedecoration decoration
 	.byte 0x4b
-	.2byte \a
+	.2byte \decoration
 	.endm
 
-	@ In FireRed, this command is a nop. (The argument is read, but not used for anything.)
-	.macro removedecor a
+	@ Removes a decoration from the player's PC. In FireRed, this command is a nop. (The argument is read, but not used for anything.)
+	.macro takedecoration decoration
 	.byte 0x4c
-	.2byte \a
+	.2byte \decoration
 	.endm
 
-	@ In FireRed, this command is a nop. (The argument is read, but not used for anything.)
-	.macro hasdecor a
+	@ Checks for decoration in the player's PC. In FireRed, this command is a nop. (The argument is read, but not used for anything.)
+	.macro checkdecor decoration
 	.byte 0x4d
-	.2byte \a
+	.2byte \decoration
 	.endm
 
-	@ In FireRed, this command is a nop. (The argument is read, but not used for anything.)
-	.macro checkdecor a
+	@ Checks if the player has enough space in their PC to hold decoration. Sets variable 0x800D (LASTRESULT) to 0x0001 if there is room, or 0x0000 is there is no room. In FireRed, this command is a nop. (The argument is read, but not used for anything.)
+	.macro checkdecorspace decoration
 	.byte 0x4e
-	.2byte \a
+	.2byte \decoration
 	.endm
 
-	@ Applies the movement data at movements to the specified (index) Person event. Also closes any standard message boxes that are still open.
-	@ This command in fact uses variables to access the Person event ID. So, for example, if you setvar 0x8000 to 0x3, and then use applymovementpos 0x8000 @move1, Person event 3 will have the movements at @move1 applied to them. Thank you Shiny Quagsire for bringing this to my attention.
+	@ Applies the movement data at movements to the specified (index) Object event. Also closes any standard message boxes that are still open.
+	@ This command in fact uses variables to access the Object event ID. So, for example, if you setvar 0x8000 to 0x3, and then use applymovementpos 0x8000 @move1, Object event 3 will have the movements at @move1 applied to them.
 	.macro applymovement index, movements, mapGroup, mapNum
 		.ifb \mapGroup
 			.byte 0x4f
@@ -545,7 +545,7 @@
 		.endif
 	.endm
 
-	@ Blocks script execution until the movements being applied to the specified (index) Person event finish. If the specified Person event is 0x0000, then the command will block script execution until all Person events affected by applymovement finish their movements. If the specified Person event is not currently being manipulated with applymovement, then this command does nothing.
+	@ Blocks script execution until the movements being applied to the specified (index) Object event finish. If the specified Object event is 0x0000, then the command will block script execution until all Object events affected by applymovement finish their movements. If the specified Object event is not currently being manipulated with applymovement, then this command does nothing.
 	.macro waitmovement index, mapBank, mapNum
 		.ifb \mapBank
 			.byte 0x51
@@ -558,7 +558,7 @@
 		.endif
 	.endm
 
-	@ Attempts to hide the specified (local_ID, a local ID) Person event on the specified map, by setting its visibility flag if it has a valid one. If the Person does not have a valid visibility flag, this command does nothing.
+	@ Attempts to hide the specified (local_ID, a local ID) Object event on the specified map, by setting its visibility flag if it has a valid one. If the Object does not have a valid visibility flag, this command does nothing.
 	@ If no map is specified, then the current map is used
 	.macro removeobject localId, mapGroup, mapNum
 		.ifb \mapGroup
@@ -584,92 +584,92 @@
 		.endif
 	.endm
 
-	.macro setobjectxy word1, word2, word3
-		.byte 0x57
-		.2byte \word1
-		.2byte \word2
-		.2byte \word3
+	@ Sets the specified (index) Object's position on the current map.
+	.macro setobjectxy index, x, y
+	.byte 0x57
+	.2byte \index
+	.2byte \x
+	.2byte \y
 	.endm
 
-	.macro showobject word, byte1, byte2
-		.byte 0x58
-		.2byte \word
-		.byte \byte1
-		.byte \byte2
+	.macro showobjectat index, map
+	.byte 0x58
+	.2byte \index
+	map \map
 	.endm
 
-	.macro hideobject word, byte1, byte2
-		.byte 0x59
-		.2byte \word
-		.byte \byte1
-		.byte \byte2
+	.macro hideobjectat index, map
+	.byte 0x59
+	.2byte \index
+	map \map
 	.endm
 
-	@ If the script was called by a Person event, then that Person will turn to face toward the tile that the player is stepping off of.
+	@ If the script was called by a Object event, then that Object will turn to face toward the tile that the player is stepping off of.
 	.macro faceplayer
-		.byte 0x5a
+	.byte 0x5a
 	.endm
 
-	.macro turnobject word, byte
-		.byte 0x5b
-		.2byte \word
-		.byte \byte
+	.macro turnobject index, direction
+	.byte 0x5b
+	.2byte \index
+	.byte \direction
 	.endm
 
 	@ If the Trainer flag for Trainer index is not set, this command does absolutely nothing.
 	.macro trainerbattle type, trainer, word, pointer1, pointer2, pointer3, pointer4
-		.byte 0x5c
-		.byte \type
-		.2byte \trainer
-		.2byte \word
-		.if \type == 0
-			.4byte \pointer1 @ text
-			.4byte \pointer2 @ text
-		.elseif \type == 1
-			.4byte \pointer1 @ text
-			.4byte \pointer2 @ text
-			.4byte \pointer3 @ event script
-		.elseif \type == 2
-			.4byte \pointer1 @ text
-			.4byte \pointer2 @ text
-			.4byte \pointer3 @ event script
-		.elseif \type == 3
-			.4byte \pointer1 @ text
-		.elseif \type == 4
-			.4byte \pointer1 @ text
-			.4byte \pointer2 @ text
-			.4byte \pointer3 @ text
-		.elseif \type == 5
-			.4byte \pointer1 @ text
-			.4byte \pointer2 @ text
-		.elseif \type == 6
-			.4byte \pointer1 @ text
-			.4byte \pointer2 @ text
-			.4byte \pointer3 @ text
-			.4byte \pointer4 @ event script
-		.elseif \type == 7
-			.4byte \pointer1 @ text
-			.4byte \pointer2 @ text
-			.4byte \pointer3 @ text
-		.elseif \type == 8
-			.4byte \pointer1 @ text
-			.4byte \pointer2 @ text
-			.4byte \pointer3 @ text
-			.4byte \pointer4 @ event script
-		.endif
+	.byte 0x5c
+	.byte \type
+	.2byte \trainer
+	.2byte \word
+	.if \type == 0
+		.4byte \pointer1 @ text
+		.4byte \pointer2 @ text
+	.elseif \type == 1
+		.4byte \pointer1 @ text
+		.4byte \pointer2 @ text
+		.4byte \pointer3 @ event script
+	.elseif \type == 2
+		.4byte \pointer1 @ text
+		.4byte \pointer2 @ text
+		.4byte \pointer3 @ event script
+	.elseif \type == 3
+		.4byte \pointer1 @ text
+	.elseif \type == 4
+		.4byte \pointer1 @ text
+		.4byte \pointer2 @ text
+		.4byte \pointer3 @ text
+	.elseif \type == 5
+		.4byte \pointer1 @ text
+		.4byte \pointer2 @ text
+	.elseif \type == 6
+		.4byte \pointer1 @ text
+		.4byte \pointer2 @ text
+		.4byte \pointer3 @ text
+		.4byte \pointer4 @ event script
+	.elseif \type == 7
+		.4byte \pointer1 @ text
+		.4byte \pointer2 @ text
+		.4byte \pointer3 @ text
+	.elseif \type == 8
+		.4byte \pointer1 @ text
+		.4byte \pointer2 @ text
+		.4byte \pointer3 @ text
+		.4byte \pointer4 @ event script
+	.endif
 	.endm
 
-
 	@ Starts a trainer battle using the battle information stored in RAM (usually by trainerbattle, which actually calls this command behind-the-scenes), and blocks script execution until the battle finishes.
-	.macro battlebegin
+	.macro trainerbattlebegin
 	.byte 0x5d
 	.endm
 
-	.macro ontrainerbattleend
+	@ Goes to address after the trainerbattle command (called by the battle functions, see battle_setup.c) 
+	.macro gotopostbattlescript
 	.byte 0x5e
 	.endm
 
-	.macro ontrainerbattleendgoto
+	@ Goes to address specified in the trainerbattle command (called by the battle functions, see battle_setup.c)
+	.macro gotobeatenscript
 	.byte 0x5f
 	.endm
 
@@ -679,28 +679,28 @@
 	.2byte \trainer
 	.endm
 
-	@ Sets Flag (trainer + 0x500). (I didn't make a mistake. The command names actually are backwards.)
+	@ Sets Flag (trainer + 0x500).
 	.macro settrainerflag trainer
 	.byte 0x61
 	.2byte \trainer
 	.endm
 
-	@ Clears Flag (trainer + 0x500). (I didn't make a mistake. The command names actually are backwards.)
+	@ Clears Flag (trainer + 0x500).
 	.macro cleartrainerflag trainer
 	.byte 0x62
 	.2byte \trainer
 	.endm
 
-	.macro setobjectxyperm word1, word2, word3
+	.macro setobjectxyperm index, x, y
 	.byte 0x63
-	.2byte \word1
-	.2byte \word2
-	.2byte \word3
+	.2byte \index
+	.2byte \x
+	.2byte \y
 	.endm
 
-	.macro moveobjectoffscreen word
+	.macro moveobjectoffscreen index
 	.byte 0x64
-	.2byte \word
+	.2byte \index
 	.endm
 
 	.macro setobjectmovementtype word, byte
@@ -720,67 +720,67 @@
 	.4byte \text
 	.endm
 
-	@ Holds the current message box open until the player presses a key. The message box is then closed.
+	@ Closes the current message box.
 	.macro closemessage
 	.byte 0x68
 	.endm
 
-	@ Ceases movement for all OWs on-screen.
+	@ Ceases movement for all Objects on-screen.
 	.macro lockall
 	.byte 0x69
 	.endm
 
-	@ If the script was called by a Person event, then that Person's movement will cease.
+	@ If the script was called by an Object, then that Object's movement will cease.
 	.macro lock
 	.byte 0x6a
 	.endm
 
-	@ Resumes normal movement for all OWs on-screen, and closes any standard message boxes that are still open.
+	@ Resumes normal movement for all Objects on-screen, and closes any standard message boxes that are still open.
 	.macro releaseall
 	.byte 0x6b
 	.endm
 
-	@ If the script was called by a Person event, then that Person's movement will resume. This command also closes any standard message boxes that are still open.
+	@ If the script was called by an Object, then that Object's movement will resume. This command also closes any standard message boxes that are still open.
 	.macro release
 	.byte 0x6c
 	.endm
 
 	@ Blocks script execution until the player presses any key.
-	.macro waitbutton
+	.macro waitbuttonpress
 	.byte 0x6d
 	.endm
 
 	@ Displays a YES/NO multichoice box at the specified coordinates, and blocks script execution until the user makes a selection. Their selection is stored in variable 0x800D (LASTRESULT); 0x0000 for "NO" or if the user pressed B, and 0x0001 for "YES".
-	.macro yesnobox X, Y
+	.macro yesnobox x, y
 	.byte 0x6e
-	.byte \X
-	.byte \Y
+	.byte \x
+	.byte \y
 	.endm
 
-	@ Displays a multichoice box from which the user can choose a selection, and blocks script execution until a selection is made. Lists of options are predefined and the one to be used is specified with list. If B is set to a non-zero value, then the user will not be allowed to back out of the multichoice with the B button.
-	.macro multichoice X, Y, list, B
+	@ Displays a multichoice box from which the user can choose a selection, and blocks script execution until a selection is made. Lists of options are predefined and the one to be used is specified with list. If b is set to a non-zero value, then the user will not be allowed to back out of the multichoice with the B button.
+	.macro multichoice x, y, list, b
 	.byte 0x6f
-	.byte \X
-	.byte \Y
+	.byte \x
+	.byte \y
 	.byte \list
-	.byte \B
+	.byte \b
 	.endm
 
-	@ Displays a multichoice box from which the user can choose a selection, and blocks script execution until a selection is made. Lists of options are predefined and the one to be used is specified with list. The default argument determines the initial position of the cursor when the box is first opened; it is zero-indexed, and if it is too large, it is treated as 0x00. If B is set to a non-zero value, then the user will not be allowed to back out of the multichoice with the B button.
-	.macro multichoicedefault X, Y, list, default, B
+	@ Displays a multichoice box from which the user can choose a selection, and blocks script execution until a selection is made. Lists of options are predefined and the one to be used is specified with list. The default argument determines the initial position of the cursor when the box is first opened; it is zero-indexed, and if it is too large, it is treated as 0x00. If b is set to a non-zero value, then the user will not be allowed to back out of the multichoice with the B button.
+	.macro multichoicedefault x, y, list, default, b
 	.byte 0x70
-	.byte \X
-	.byte \Y
+	.byte \x
+	.byte \y
 	.byte \list
 	.byte \default
-	.byte \B
+	.byte \b
 	.endm
 
 	@ Displays a multichoice box from which the user can choose a selection, and blocks script execution until a selection is made. Lists of options are predefined and the one to be used is specified with list. The per_row argument determines how many list items will be shown on a single row of the box.
-	.macro multichoicegrid X, Y, list, per_row, B
+	.macro multichoicegrid x, y, list, per_row, B
 	.byte 0x71
-	.byte \X
-	.byte \Y
+	.byte \x
+	.byte \y
 	.byte \list
 	.byte \per_row
 	.byte \B
@@ -810,20 +810,20 @@
 	.byte \byte4
 	.endm
 
-	@ Displays a box containing the front sprite for the specified (species) Pokmon species.
-	.macro drawpokepic species, X, Y
+	@ Displays a box containing the front sprite for the specified (species) Pokemon species.
+	.macro drawmonpic species, x, y
 	.byte 0x75
 	.2byte \species
-	.byte \X
-	.byte \Y
+	.byte \x
+	.byte \y
 	.endm
 
-	@ Hides all boxes displayed with showpokepic.
-	.macro erasepokepic
+	@ Hides all boxes displayed with drawmonpic.
+	.macro erasemonpic 
 	.byte 0x76
 	.endm
 
-	@ In FireRed, this command is a nop. (The argument is discarded.)
+	@ Draws an image of the winner of the contest. In FireRed, this command is a nop. (The argument is discarded.)
 	.macro drawcontestwinner a
 	.byte 0x77
 	.byte \a
@@ -835,8 +835,8 @@
 	.4byte \text
 	.endm
 
-	@ Gives the player one of the specified (species) Pokmon at level level holding item. The unknown arguments should all be zeroes.
-	.macro givepoke species, level, item, unknown1, unknown2, unknown3
+	@ Gives the player one of the specified (species) Pokemon at level level holding item. The unknown arguments should all be zeroes.
+	.macro givemon species, level, item, unknown1, unknown2, unknown3
 	.byte 0x79
 	.2byte \species
 	.byte \level
@@ -846,81 +846,81 @@
 	.byte \unknown3
 	.endm
 
-	.macro giveegg word
+	.macro giveegg species
 	.byte 0x7a
-	.2byte \word
+	.2byte \species
 	.endm
 
-	.macro setpokemove byte1, byte2, word
+	.macro setmonmove index, slot, move
 	.byte 0x7b
-	.byte \byte1
-	.byte \byte2
-	.2byte \word
+	.byte \index
+	.byte \slot
+	.2byte \move
 	.endm
 
-	@ Checks if at least one Pokmon in the player's party knows the specified (index) attack. If so, variable 0x800D (LASTRESULT) is set to the (zero-indexed) slot number of the Pokmon that knows the move. If not, LASTRESULT is set to 0x0006.
-	.macro checkpokemove index
+	@ Checks if at least one Pokemon in the player's party knows the specified (index) attack. If so, variable 0x800D (LASTRESULT) is set to the (zero-indexed) slot number of the first Pokemon that knows the move. If not, LASTRESULT is set to 0x0006. Variable 0x8004 is also set to this Pokemon's species.
+	.macro checkpartymove index
 	.byte 0x7c
 	.2byte \index
 	.endm
 
-	@ Writes the name of the Pokmon at index species to the specified buffer.
-	.macro getspeciesname out, species
+	@ Writes the name of the Pokemon at index species to the specified buffer.
+	.macro bufferspeciesname out, species
 	.byte 0x7d
 	.byte \out
 	.2byte \species
 	.endm
 
-	@ Writes the name of the first Pokmon in the player's party to the specified buffer.
-	.macro getfirstpartypokename out
+	@ Writes the name of the species of the first Pokemon in the player's party to the specified buffer.
+	.macro bufferleadmonspeciesname out
 	.byte 0x7e
 	.byte \out
 	.endm
 
-	@ Writes the name of the Pokmon in slot slot (zero-indexed) of the player's party to the specified buffer. If an empty or invalid slot is specified, ten spaces ("") are written to the buffer.
-	.macro getpartypokename out, slot
+	@ Writes the nickname of the Pokemon in slot slot (zero-indexed) of the player's party to the specified buffer. If an empty or invalid slot is specified, ten spaces ("") are written to the buffer.
+	.macro bufferpartymonnick out, slot
 	.byte 0x7f
 	.byte \out
 	.2byte \slot
 	.endm
 
 	@ Writes the name of the item at index item to the specified buffer. If the specified index is larger than the number of items in the game (0x176), the name of item 0 ("????????") is buffered instead.
-	.macro getitemname out, item
+	.macro bufferitemname out, item
 	.byte 0x80
 	.byte \out
 	.2byte \item
 	.endm
 
-	@ In FireRed, this command is a nop. (The first argument is discarded immediately. The second argument is read, but not used for anything.)
-	.macro getdecorname a, b
+	@ Writes the name of the decoration at index decoration to the specified buffer. In FireRed, this command is a nop.
+	.macro bufferdecorationname out, decoration
 	.byte 0x81
-	.byte \a
-	.2byte \b
+	.byte \out
+	.2byte \decoration
 	.endm
 
-	@ Writes the name of the attack at index attack to the specified buffer.
-	.macro getmovename out, attack
+	@ Writes the name of the move at index move to the specified buffer.
+	.macro buffermovename out, move
 	.byte 0x82
 	.byte \out
-	.2byte \attack
+	.2byte \move
 	.endm
 
 	@ Converts the value of input to a decimal string, and writes that string to the specified buffer.
-	.macro getnumberstring out, input
+	.macro buffernumberstring out, input
 	.byte 0x83
 	.byte \out
 	.2byte \input
 	.endm
 
-	@ Writes the standard string identified by index to the specified buffer. Specifying an invalid standard string (e.x. 0x2B) can and usually will cause data corruption (I've observed destruction of the stored player name and crashes when entering/exiting certain menu screens).
-	.macro getstdstring out, index
+	@ Writes the standard string identified by index to the specified buffer. This command has no protections in place at all, so specifying an invalid standard string (e.x. 0x2B) can and usually will cause data corruption.
+	.macro bufferstdstring out, index
 	.byte 0x84
 	.byte \out
 	.2byte \index
 	.endm
 
 	@ Copies the string at offset to the specified buffer.
-	.macro getstring out, offset
+	.macro bufferstring out, offset
 	.byte 0x85
 	.byte \out
 	.4byte \offset
@@ -932,46 +932,49 @@
 	.4byte \products
 	.endm
 
-	@ Apparent clone of pokemart.
-	.macro pokemartdecor products
+	@ Opens the Pokemart system and treats the list of items as decorations.
+	.macro pokemartdecoration products
 	.byte 0x87
 	.4byte \products
 	.endm
 
-	@ Apparent clone of pokemart.
-	.macro pokemartbp products
+	@ Apparent clone of pokemartdecoration.
+	.macro pokemartdecoration2 products
 	.byte 0x88
 	.4byte \products
 	.endm
 
+	@ Starts up the slot machine minigame.
 	.macro playslotmachine word
 	.byte 0x89
 	.2byte \word
 	.endm
 
-	@ In FireRed, this command is a nop.
-	.macro plantberrytree byte1, byte2, byte3
+	@ Sets a berry tree's specific berry and growth stage. In FireRed, this command is a nop.
+	.macro setberrytree tree_id, berry, growth_stage
 	.byte 0x8a
-	.byte \byte1, \byte2, \byte3
+	.byte \tree_id
+	.byte \berry
+	.byte \growth_stage
 	.endm
 
-	@ In FireRed, this command sets the byte at 0x03000EA8 to 0x01. I do not know what that means.
-	.macro choosecontestpkmn
+	@ This allows you to choose a Pokemon to use in a contest. In FireRed, this command sets the byte at 0x03000EA8 to 0x01.
+	.macro choosecontestmon 
 	.byte 0x8b
 	.endm
 
-	@ In FireRed, this command is a nop.
-	.macro startcontest
+	@ Starts a contest. In FireRed, this command is a nop.
+	.macro startcontest 
 	.byte 0x8c
 	.endm
 
-	@ In FireRed, this command is a nop.
-	.macro showcontestresults
+	@ Shows the results of a contest. In FireRed, this command is a nop.
+	.macro showcontestresults 
 	.byte 0x8d
 	.endm
 
-	@ In FireRed, this command is a nop.
-	.macro contestlinktransfer
+	@ Starts a contest over a link connection. In FireRed, this command is a nop.
+	.macro contestlinktransfer 
 	.byte 0x8e
 	.endm
 
@@ -1003,50 +1006,51 @@
 	.endm
 
 	@ Spawns a secondary box showing how much money the player has.
-	.macro showmoneybox X, Y
+	.macro showmoneybox x, y
 	.byte 0x93
-	.byte \X
-	.byte \Y
+	.byte \x
+	.byte \y
 	.endm
 
 	@ Hides the secondary box spawned by showmoney.
-	.macro hidemoneybox X, Y
+	.macro hidemoneybox x, y
 	.byte 0x94
-	.byte \X
-	.byte \Y
+	.byte \x
+	.byte \y
 	.endm
 
-	@ Updates the secondary box spawned by showmoney. (What does it do with its arguments?)
-	.macro updatemoneybox X, Y
+	@ Updates the secondary box spawned by showmoney. Consumes but does not use arguments.
+	.macro updatemoneybox x, y
 	.byte 0x95
-	.byte \X
-	.byte \Y
+	.byte \x
+	.byte \y
 	.endm
 
-	@ In FireRed, this command is a nop.
-	.macro getpricereduction word
+	@ Gets the price reduction for the index given. In FireRed, this command is a nop.
+	.macro getpricereduction index
 	.byte 0x96
-	.2byte \word
+	.2byte \index
 	.endm
 
-	@ Fades the screen to black or back, using the specified effect. Effect 0x00 fades in, and effect 0x01 fades out. I don't know if other effects exist.
+	@ Fades the screen to and from black and white. Mode 0x00 fades from black, mode 0x01 fades out to black, mode 0x2 fades in from white, and mode 0x3 fades out to white.
 	.macro fadescreen effect
 	.byte 0x97
 	.byte \effect
 	.endm
 
-	.macro fadescreendelay byte1, byte2
+	@ Fades the screen to and from black and white. Mode 0x00 fades from black, mode 0x01 fades out to black, mode 0x2 fades in from white, and mode 0x3 fades out to white. Other modes may exist.
+	.macro fadescreenspeed effect, speed
 	.byte 0x98
-	.byte \byte1
-	.byte \byte2
+	.byte \effect
+	.byte \speed
 	.endm
 
-	.macro setdarklevel word
+	.macro setflashradius word
 	.byte 0x99
 	.2byte \word
 	.endm
 
-	.macro animdarklevel byte
+	.macro animateflash byte
 	.byte 0x9a
 	.byte \byte
 	.endm
@@ -1062,11 +1066,11 @@
 	.2byte \animation
 	.endm
 
-	@ Tells the game which party Pokmon to use for the next field move animation.
-	.macro setfieldeffect animation, slot
+	@ Sets up the field effect argument argument with the value value.
+	.macro setfieldeffectargument argument, param
 	.byte 0x9d
-	.byte \animation
-	.2byte \slot
+	.byte \argument
+	.2byte \param
 	.endm
 
 	@ Blocks script execution until all playing field move animations complete.
@@ -1075,10 +1079,10 @@
 	.2byte \animation
 	.endm
 
-	@ Sets which healing place the player will return to if all of the Pokmon in their party faint. A list of available healing places can be found on PokeCommunity.
-	.macro sethealplace flightspot
+	@ Sets which healing place the player will return to if all of the Pokemon in their party faint.
+	.macro setrespawn heallocation
 	.byte 0x9f
-	.2byte \flightspot
+	.2byte \heallocation
 	.endm
 
 	@ Checks the player's gender. If male, then 0x0000 is stored in variable 0x800D (LASTRESULT). If female, then 0x0001 is stored in LASTRESULT.
@@ -1086,19 +1090,19 @@
 	.byte 0xa0
 	.endm
 
-	@ Plays the specified (species) Pokmon's cry. You can use waitcry to block script execution until the sound finishes.
-	.macro playpokecry species, effect
+	@ Plays the specified (species) Pokemon's cry. You can use waitcry to block script execution until the sound finishes.
+	.macro playmoncry species, effect
 	.byte 0xa1
 	.2byte \species
 	.2byte \effect
 	.endm
 
-	@ Changes the tile at (X, Y) on the current map.
-	.macro setmaptile X, Y, tile_number, tile_attrib
+	@ Changes the metatile at (x, y) on the current map.
+	.macro setmetatile x, y, metatile_number, tile_attrib
 	.byte 0xa2
-	.2byte \X
-	.2byte \Y
-	.2byte \tile_number
+	.2byte \x
+	.2byte \y
+	.2byte \metatile_number
 	.2byte \tile_attrib
 	.endm
 
@@ -1119,78 +1123,76 @@
 	.endm
 
 	@ This command manages cases in which maps have tiles that change state when stepped on (specifically, cracked/breakable floors).
-	.macro tileeffect subroutine
+	.macro setstepcallback subroutine
 	.byte 0xa6
 	.byte \subroutine
 	.endm
 
-	.macro setmaplayoutindex word
+	.macro setmaplayoutindex index
 	.byte 0xa7
-	.2byte \word
+	.2byte \index
 	.endm
 
-	.macro setobjectpriority word, byte1, byte2, byte3
+	.macro setobjectpriority index, map, priority
 	.byte 0xa8
-	.2byte \word
-	.byte \byte1
-	.byte \byte2
-	.byte \byte3
+	.2byte \index
+	map \map
+	.byte \priority
 	.endm
 
-	.macro resetobjectpriority word, byte1, byte2
+	.macro resetobjectpriority index, map
 	.byte 0xa9
-	.2byte \word
-	.byte \byte1
-	.byte \byte2
+	.2byte \index
+	map \map
 	.endm
 
-	.macro createvobject byte1, byte2, word1, word2, byte3, byte4
+	.macro createvobject sprite, byte2, x, y, elevation, direction
 	.byte 0xaa
-	.byte \byte1
+	.byte \sprite
 	.byte \byte2
-	.2byte \word1
-	.2byte \word2
-	.byte \byte3
-	.byte \byte4
+	.2byte \x
+	.2byte \y
+	.byte \elevation
+	.byte \direction
 	.endm
 
-	.macro turnvobject byte1, byte2
+	.macro turnvobject index, direction
 	.byte 0xab
-	.byte \byte1
-	.byte \byte2
+	.byte \index
+	.byte \direction
 	.endm
 
-	@ Queues the opening of the door tile at (X, Y) with an animation.
-	.macro opendoor X, Y
+	@ Opens the door metatile at (X, Y) with an animation.
+	.macro opendoor x, y
 	.byte 0xac
-	.2byte \X
-	.2byte \Y
+	.2byte \x
+	.2byte \y
 	.endm
 
-	@ Queues the closing of the door tile at (X, Y) with an animation.
-	.macro closedoor X, Y
+	@ Closes the door metatile at (X, Y) with an animation.
+	.macro closedoor x, y
 	.byte 0xad
-	.2byte \X
-	.2byte \Y
+	.2byte \x
+	.2byte \y
 	.endm
 
-	@ Executes the state changes queued with setdooropened, setdoorclosed, setdooropened2, and setdoorclosed2.
-	.macro waitdooranim
+	@ Waits for the door animation started with opendoor or closedoor to finish.
+	.macro waitdooranim 
 	.byte 0xae
 	.endm
 
-	@ Queues the opening of the door tile at (X, Y) without an animation.
-	.macro setdooropen X, Y
+	@ Sets the door tile at (x, y) to be open without an animation.
+	.macro setdooropen x, y
 	.byte 0xaf
-	.2byte \X
-	.2byte \Y
+	.2byte \x
+	.2byte \y
 	.endm
 
-	@ Queues the closing of the door tile at (X, Y) without an animation.
-	.macro setdoorclosed X, Y
+	@ Sets the door tile at (x, y) to be closed without an animation.
+	.macro setdoorclosed x, y
 	.byte 0xb0
-	.2byte \X
-	.2byte \Y
+	.2byte \x
+	.2byte \y
 	.endm
 
 	@ In FireRed, this command is a nop.
@@ -1198,24 +1200,24 @@
 	.byte 0xb1
 	.endm
 
-	@ In FireRed, this command is a nop.
-	.macro showelevmenu
+	@ In FireRed and Emerald, this command is a nop.
+	.macro showelevmenu 
 	.byte 0xb2
 	.endm
 
-	.macro checkcoins word
+	.macro checkcoins out
 	.byte 0xb3
-	.2byte \word
+	.2byte \out
 	.endm
 
-	.macro givecoins word
+	.macro givecoins count
 	.byte 0xb4
-	.2byte \word
+	.2byte \count
 	.endm
 
-	.macro takecoins word
+	.macro takecoins count
 	.byte 0xb5
-	.2byte \word
+	.2byte \count
 	.endm
 
 	@ Prepares to start a wild battle against a species at Level level holding item. Running this command will not affect normal wild battles. You start the prepared battle with dowildbattle.
@@ -1226,7 +1228,7 @@
 	.2byte \item
 	.endm
 
-	@ Starts a wild battle against the Pokmon generated by setwildbattle. Blocks script execution until the battle finishes.
+	@ Starts a wild battle against the Pokemon generated by setwildbattle. Blocks script execution until the battle finishes.
 	.macro dowildbattle
 	.byte 0xb7
 	.endm
@@ -1264,55 +1266,55 @@
 	.4byte \pointer
 	.endm
 
-	.macro vloadword pointer
+	.macro vloadptr pointer
 	.byte 0xbe
 	.4byte \pointer
 	.endm
 
-	.macro vgetstring byte, pointer
+	.macro vbufferstring byte, pointer
 	.byte 0xbf
 	.byte \byte
 	.4byte \pointer
 	.endm
 
 	@ Spawns a secondary box showing how many Coins the player has.
-	.macro showcoinsbox X, Y
+	.macro showcoinsbox x, y
 	.byte 0xc0
-	.byte \X
-	.byte \Y
+	.byte \x
+	.byte \y
 	.endm
 
-	@ Hides the secondary box spawned by showcoins. It doesn't appear to use its arguments, but they are still required.
-	.macro hidecoinsbox X, Y
+	@ Hides the secondary box spawned by showcoins. It consumes its arguments but doesn't use them.
+	.macro hidecoinsbox x, y
 	.byte 0xc1
-	.byte \X
-	.byte \Y
+	.byte \x
+	.byte \y
 	.endm
 
-	@ Updates the secondary box spawned by showcoins. (What does it do with its arguments?)
-	.macro updatecoinsbox X, Y
+	@ Updates the secondary box spawned by showcoins. It consumes its arguments but doesn't use them.
+	.macro updatecoinsbox x, y
 	.byte 0xc2
-	.byte \X
-	.byte \Y
+	.byte \x
+	.byte \y
 	.endm
 
-	@ Increases the value of the specified hidden variable by 1. The hidden variable's value will not be allowed to exceed 0x00FFFFFF.
-	.macro incrementgamestat a
+	@ Increases the value of the specified game stat by 1. The stat's value will not be allowed to exceed 0x00FFFFFF.
+	.macro incrementgamestat stat
 	.byte 0xc3
-	.byte \a
+	.byte \stat
 	.endm
 
-	@ Clone of warp... Except that it doesn't appear to have any effect when used in some of FireRed's default level scripts. (If it did, Berry Forest would be impossible to enter...)
-	.macro setescapewarp map, warp, X, Y
+	@ Sets the destination that using an Escape Rope or Dig will take the player to.
+	.macro setescapewarp map, warp, x, y
 	.byte 0xc4
 	map \map
 	.byte \warp
-	.2byte \X
-	.2byte \Y
+	.2byte \x
+	.2byte \y
 	.endm
 
 	@ Blocks script execution until cry finishes.
-	.macro waitpokecry
+	.macro waitmoncry
 	.byte 0xc5
 	.endm
 
@@ -1357,134 +1359,6 @@
 	.4byte \value
 	.endm
 
-	@ Makes the Pokmon in the specified slot of the player's party obedient. It will not randomly disobey orders in battle.
-	.macro setobedience slot
-	.byte 0xcd
-	.2byte \slot
-	.endm
-
-	@ Checks if the Pokmon in the specified slot of the player's party is obedient. If the Pokmon is disobedient, 0x0001 is written to script variable 0x800D (LASTRESULT). If the Pokmon is obedient (or if the specified slot is empty or invalid), 0x0000 is written.
-	.macro checkobedience slot
-	.byte 0xce
-	.2byte \slot
-	.endm
-
-	@ Depending on factors I haven't managed to understand yet, this command may cause script execution to jump to the offset specified by the pointer at 0x020370A4.
-	.macro execram
-	.byte 0xcf
-	.endm
-
-	@ Sets worldmapflag to 1. This allows the player to Fly to the corresponding map, if that map has a flightspot.
-	.macro setworldflag worldmapflag
-	.byte 0xd0
-	.2byte \worldmapflag
-	.endm
-
-	@ Clone of warpteleport? It is apparently only used in FR/LG, and only with specials.[source]
-	.macro warpteleport2 map, warp, X, Y
-	.byte 0xd1
-	map \map
-	.byte \warp
-	.2byte \X
-	.2byte \Y
-	.endm
-
-	@ Changes the location where the player caught the Pokmon in the specified slot of their party. A list of valid catch locations can be found on PokeCommunity.
-	.macro setcatchlocale slot, location
-	.byte 0xd2
-	.2byte \slot
-	.byte \location
-	.endm
-
-	.macro event_d3 unknown
-	.byte 0xd3
-	.2byte \unknown
-	.endm
-
-	.macro event_d4
-	.byte 0xd4
-	.endm
-
-	@ In FireRed, this command is a nop.
-	.macro event_d5 var
-	.byte 0xd5
-	.2byte \var
-	.endm
-
-	.macro event_d6
-	.byte 0xd6
-	.endm
-
-	.macro warp7 map, byte, word1, word2
-	.byte 0xd7
-	map \map
-	.byte \byte
-	.2byte \word1
-	.2byte \word2
-	.endm
-
-	.macro event_d8
-	.byte 0xd8
-	.endm
-
-	.macro event_d9
-	.byte 0xd9
-	.endm
-
-	.macro hidebox2
-	.byte 0xda
-	.endm
-
-	.macro message3 pointer
-	.byte 0xdb
-	.4byte \pointer
-	.endm
-
-	.macro fadescreen3 byte
-	.byte 0xdc
-	.byte \byte
-	.endm
-
-	.macro buffertrainerclass byte, word
-	.byte 0xdd
-	.byte \byte
-	.2byte \word
-	.endm
-
-	.macro buffertrainername byte, word
-	.byte 0xde
-	.byte \byte
-	.2byte \word
-	.endm
-
-	.macro pokenavcall pointer
-	.byte 0xdf
-	.4byte \pointer
-	.endm
-
-	.macro warp8 map, byte, word1, word2
-	.byte 0xe0
-	map \map
-	.byte \byte
-	.2byte \word1
-	.2byte \word2
-	.endm
-
-	.macro buffercontesttype byte, word
-	.byte 0xe1
-	.byte \byte
-	.2byte \word
-	.endm
-
-	@ Writes the name of the specified (item) item to the specified buffer. If the specified item is a Berry (0x85 - 0xAE) or Poke Ball (0x4) and if the quantity is 2 or more, the buffered string will be pluralized ("IES" or "S" appended). If the specified item is the Enigma Berry, I have no idea what this command does (but testing showed no pluralization). If the specified index is larger than the number of items in the game (0x176), the name of item 0 ("????????") is buffered instead.
-	.macro storeitems out, item, quantity
-	.byte 0xe2
-	.byte \out
-	.2byte \item
-	.2byte \quantity
-	.endm
-
-
 @ Supplementary
 
 	.macro goto_if_eq dest
@@ -1511,13 +1385,13 @@
 	YES = 1
 	NO  = 0
 
-	.macro giveitem item, amount=1, function=0
+	.macro giveitem_std item, amount=1, function=0
 	setorcopyvar 0x8000, \item
 	setorcopyvar 0x8001, \amount
 	callstd \function
 	.endm
 
-	.macro givedecoration decoration
+	.macro givedecoration_std decoration
 	setorcopyvar 0x8000, \decoration
 	callstd 7
 	.endm