diff options
Diffstat (limited to 'macros')
| -rw-r--r-- | macros/gfx.asm (renamed from macros/color.asm) | 8 | ||||
| -rw-r--r-- | macros/scripts/events.asm | 8 | ||||
| -rw-r--r-- | macros/scripts/maps.asm | 18 | ||||
| -rwxr-xr-x | macros/wram.asm | 3 |
4 files changed, 19 insertions, 18 deletions
diff --git a/macros/color.asm b/macros/gfx.asm index 5ebaae218..ff07ba468 100644 --- a/macros/color.asm +++ b/macros/gfx.asm @@ -11,5 +11,9 @@ palred EQUS "(1 << 0) *" palgreen EQUS "(1 << 5) *" palblue EQUS "(1 << 10) *" -palettes EQUS "* 8" -palette EQUS "+ 8 *" +palettes EQUS "* PALETTE_SIZE" +palette EQUS "+ PALETTE_SIZE *" +color EQUS "+ PAL_COLOR_SIZE *" + +tiles EQUS "* LEN_2BPP_TILE" +tile EQUS "+ LEN_2BPP_TILE *" diff --git a/macros/scripts/events.asm b/macros/scripts/events.asm index 9bca1c004..6b17f5d94 100644 --- a/macros/scripts/events.asm +++ b/macros/scripts/events.asm @@ -520,10 +520,10 @@ yesorno: MACRO db yesorno_command ENDM - enum loadmenudata_command ; $4f -loadmenudata: MACRO - db loadmenudata_command - dw \1 ; data + enum loadmenuheader_command ; $4f +loadmenuheader: MACRO + db loadmenuheader_command + dw \1 ; menu_header ENDM enum closewindow_command ; $50 diff --git a/macros/scripts/maps.asm b/macros/scripts/maps.asm index 31a1f16d9..77f29620b 100644 --- a/macros/scripts/maps.asm +++ b/macros/scripts/maps.asm @@ -15,7 +15,7 @@ callback: MACRO dbw \1, \2 ENDM -warp_def: MACRO +warp_event: MACRO ;\1: x: left to right, starts at 0 ;\2: y: top to bottom, starts at 0 ;\3: warp destination: starts at 1 @@ -76,15 +76,15 @@ ENDM trainer: MACRO -;\1: flag: an EVENT_BEAT_* constant -;\2: trainer group -;\3: trainer id +;\1: trainer group +;\2: trainer id +;\3: flag: an EVENT_BEAT_* constant ;\4: seen text ;\5: win text ;\6: loss text ;\7: after-battle text - dw \1 - db \2, \3 + dw \3 + db \1, \2 dw \4, \5, \6, \7 ENDM @@ -99,9 +99,9 @@ endc ENDM hiddenitem: MACRO -;\1: flag: an EVENT_* constant -;\2: item: from constants/item_constants.asm - dwb \1, \2 +;\1: item: from constants/item_constants.asm +;\2: flag: an EVENT_* constant + dwb \2, \1 ENDM elevfloor: MACRO diff --git a/macros/wram.asm b/macros/wram.asm index 47138e40c..830b5680d 100755 --- a/macros/wram.asm +++ b/macros/wram.asm @@ -103,7 +103,6 @@ battle_struct: MACRO ENDM box: MACRO -\1:: \1Count:: db \1Species:: ds MONS_PER_BOX + 1 \1Mons:: @@ -285,7 +284,6 @@ slot_reel: MACRO ENDM object_struct: MACRO -\1Struct:: \1Sprite:: db \1MapObjectIndex:: db \1SpriteTile:: db @@ -323,7 +321,6 @@ object_struct: MACRO ENDM map_object: MACRO -\1Object:: \1ObjectStructID:: db \1ObjectSprite:: db \1ObjectYCoord:: db |