Merge branch 'master' into document-gyms2

This commit is contained in:
GriffinR
2019-10-16 04:22:34 -04:00
committed by GitHub
361 changed files with 10599 additions and 11080 deletions
+3 -3
View File
@@ -878,15 +878,15 @@
.endm
@ Displays a box containing the front sprite for the specified (species) Pokemon species.
.macro drawmonpic species:req, x:req, y:req
.macro showmonpic species:req, x:req, y:req
.byte 0x75
.2byte \species
.byte \x
.byte \y
.endm
@ Hides all boxes displayed with drawmonpic.
.macro erasemonpic
@ Hides all boxes displayed with showmonpic.
.macro hidemonpic
.byte 0x76
.endm
+2 -2
View File
@@ -102,8 +102,8 @@
create_movement_action clear_fixed_priority
create_movement_action init_affine_anim
create_movement_action clear_affine_anim
create_movement_action unknown_movement_1
create_movement_action unknown_movement_2
create_movement_action hide_reflection
create_movement_action show_reflection
create_movement_action walk_down_start_affine
create_movement_action walk_down_affine