diff options
| -rwxr-xr-x | data/moves/moves.asm | 4 | ||||
| -rwxr-xr-x | engine/overworld/healing_machine.asm | 4 | ||||
| -rw-r--r-- | home/joypad.asm | 8 | ||||
| -rw-r--r-- | home/print_num.asm | 18 | ||||
| -rw-r--r-- | home/vcopy.asm | 12 | ||||
| -rwxr-xr-x | macros/code.asm | 6 | ||||
| -rwxr-xr-x | macros/data.asm | 26 | ||||
| -rw-r--r-- | macros/enum.asm | 18 | ||||
| -rw-r--r-- | macros/gfx.asm | 4 | ||||
| -rwxr-xr-x | macros/scripts/events.asm | 8 | ||||
| -rw-r--r-- | macros/scripts/maps.asm | 32 | ||||
| -rwxr-xr-x | macros/scripts/text.asm | 4 | ||||
| -rw-r--r-- | rgbdscheck.asm | 6 |
13 files changed, 76 insertions, 74 deletions
diff --git a/data/moves/moves.asm b/data/moves/moves.asm index 44859681..183243e9 100755 --- a/data/moves/moves.asm +++ b/data/moves/moves.asm @@ -1,14 +1,14 @@ Moves: ; Characteristics of each move. -move: macro +move: MACRO db \1 ; animation (interchangeable with move id) db \2 ; effect db \3 ; power db \4 ; type db \5 percent ; accuracy db \6 ; pp -endm +ENDM move POUND, NO_ADDITIONAL_EFFECT, 40, NORMAL, 100, 35 MoveEnd: diff --git a/engine/overworld/healing_machine.asm b/engine/overworld/healing_machine.asm index 836af44d..a09a7590 100755 --- a/engine/overworld/healing_machine.asm +++ b/engine/overworld/healing_machine.asm @@ -89,9 +89,9 @@ FlashSprite8Times: CopyHealingMachineOAM: ; copy one OAM entry and advance the pointers - rept 4 + REPT 4 ld a, [de] inc de ld [hli], a - endr + ENDR ret diff --git a/home/joypad.asm b/home/joypad.asm index 2002bb29..9948b6e7 100644 --- a/home/joypad.asm +++ b/home/joypad.asm @@ -7,9 +7,9 @@ ReadJoypad:: ld c, 0 ld [rJOYP], a - rept 6 + REPT 6 ld a, [rJOYP] - endr + ENDR cpl and %1111 swap a @@ -17,9 +17,9 @@ ReadJoypad:: ld a, 1 << 4 ; select button keys ld [rJOYP], a - rept 10 + REPT 10 ld a, [rJOYP] - endr + ENDR cpl and %1111 or b diff --git a/home/print_num.asm b/home/print_num.asm index 5155977b..f7ea2174 100644 --- a/home/print_num.asm +++ b/home/print_num.asm @@ -59,18 +59,20 @@ PrintNumber:: cp 6 jr z, .hundred_thousands -print_digit: macro +print_digit: MACRO -if (\1) / $10000 +IF (\1) / $10000 ld a, \1 / $10000 % $100 -else xor a -endc +ELSE + xor a +ENDC ld [hPowerOf10 + 0], a -if (\1) / $100 +IF (\1) / $100 ld a, \1 / $100 % $100 -else xor a -endc +ELSE + xor a +ENDC ld [hPowerOf10 + 1], a ld a, \1 / $1 % $100 @@ -78,7 +80,7 @@ endc call .PrintDigit call .NextDigit -endm +ENDM .millions print_digit 1000000 .hundred_thousands print_digit 100000 diff --git a/home/vcopy.asm b/home/vcopy.asm index a6213b32..e2325d5c 100644 --- a/home/vcopy.asm +++ b/home/vcopy.asm @@ -170,13 +170,13 @@ AutoBgMapTransfer:: TransferBgRows:: ; unrolled loop and using pop for speed - rept 20 / 2 - 1 + REPT 20 / 2 - 1 pop de ld [hl], e inc l ld [hl], d inc l - endr + ENDR pop de ld [hl], e @@ -261,7 +261,7 @@ VBlankCopyDouble:: ld [hVBlankCopyDoubleSize], a .loop - rept 3 + REPT 3 pop de ld [hl], e inc l @@ -271,7 +271,7 @@ VBlankCopyDouble:: inc l ld [hl], d inc l - endr + ENDR pop de ld [hl], e @@ -339,13 +339,13 @@ VBlankCopy:: ld [hVBlankCopySize], a .loop - rept 7 + REPT 7 pop de ld [hl], e inc l ld [hl], d inc l - endr + ENDR pop de ld [hl], e diff --git a/macros/code.asm b/macros/code.asm index 72ce9caf..8507b1ad 100755 --- a/macros/code.asm +++ b/macros/code.asm @@ -11,10 +11,10 @@ ENDM ; Design patterns dict: MACRO -if \1 == 0 +IF \1 == 0 and a -else +ELSE cp \1 -endc +ENDC jp z, \2 ENDM diff --git a/macros/data.asm b/macros/data.asm index 333bf937..7a813529 100755 --- a/macros/data.asm +++ b/macros/data.asm @@ -13,40 +13,40 @@ bcd3: MACRO dn ((\1) / 10) % 10, (\1) % 10 ENDM -coins equs "bcd2" -money equs "bcd3" +coins EQUS "bcd2" +money EQUS "bcd3" tmhm: MACRO ; used in data/pokemon/base_stats/*.asm _tms1 = 0 ; TM01-TM24 (24) _tms2 = 0 ; TM25-TM48 (24) _tms3 = 0 ; TM49-TM50 + HM01-HM05 (7/24) -rept _NARG +REPT _NARG if DEF(\1_TMNUM) if \1_TMNUM < 24 + 1 _tms1 = _tms1 | (1 << ((\1_TMNUM) - 1)) - elif \1_TMNUM < 48 + 1 + ELIF \1_TMNUM < 48 + 1 _tms2 = _tms2 | (1 << ((\1_TMNUM) - 1 - 24)) else _tms3 = _tms3 | (1 << ((\1_TMNUM) - 1 - 48)) - endc + ENDC else fail "\1 is not a TM or HM move" - endc + ENDC shift -endr -rept 3 ; TM01-TM24 (24/24) +ENDR +REPT 3 ; TM01-TM24 (24/24) db _tms1 & $ff _tms1 = _tms1 >> 8 -endr -rept 3 ; TM25-TM48 (24/24) +ENDR +REPT 3 ; TM25-TM48 (24/24) db _tms2 & $ff _tms2 = _tms2 >> 8 -endr -rept 1 ; TM49-TM50 + HM01-HM05 (7/8) +ENDR +REPT 1 ; TM49-TM50 + HM01-HM05 (7/8) db _tms3 & $ff _tms3 = _tms3 >> 8 -endr +ENDR ENDM diff --git a/macros/enum.asm b/macros/enum.asm index 8fe5b534..5c69bcb8 100644 --- a/macros/enum.asm +++ b/macros/enum.asm @@ -1,16 +1,16 @@ ; Enumerate variables enum_start: MACRO -if _NARG >= 1 +IF _NARG >= 1 __enum__ = \1 -else +ELSE __enum__ = 0 -endc -if _NARG >= 2 +ENDC +IF _NARG >= 2 __enumdir__ = \2 -else +ELSE __enumdir__ = 1 -endc +ENDC ENDM enum: MACRO @@ -25,11 +25,11 @@ ENDM ; Enumerate constants const_def: MACRO -if _NARG >= 1 +IF _NARG >= 1 const_value = \1 -else +ELSE const_value = 0 -endc +ENDC ENDM const: MACRO diff --git a/macros/gfx.asm b/macros/gfx.asm index bad051ad..950daee1 100644 --- a/macros/gfx.asm +++ b/macros/gfx.asm @@ -1,8 +1,8 @@ RGB: MACRO -rept _NARG / 3 +REPT _NARG / 3 dw palred (\1) + palgreen (\2) + palblue (\3) shift 3 -endr +ENDR ENDM palred EQUS "(1 << 0) *" diff --git a/macros/scripts/events.asm b/macros/scripts/events.asm index c5f90107..9e84ec62 100755 --- a/macros/scripts/events.asm +++ b/macros/scripts/events.asm @@ -183,10 +183,10 @@ ENDM ;\3, \4, ... = additional (optional) event indices SetEvents: MACRO SetEvent \1 - rept _NARG - 1 + REPT _NARG - 1 SetEventReuseHL \2 shift - endr + ENDR ENDM @@ -235,10 +235,10 @@ ENDM ;\3 = event index (optional) ResetEvents: MACRO ResetEvent \1 - rept _NARG - 1 + REPT _NARG - 1 ResetEventReuseHL \2 shift - endr + ENDR ENDM diff --git a/macros/scripts/maps.asm b/macros/scripts/maps.asm index a30561b9..37da8c58 100644 --- a/macros/scripts/maps.asm +++ b/macros/scripts/maps.asm @@ -121,58 +121,58 @@ connection: MACRO ; Calculate tile offsets for source (current) and target maps _src = 0 _tgt = (\4) + 3 -if _tgt < 2 +IF _tgt < 2 _src = -_tgt _tgt = 0 -endc +ENDC -if "\1" == "north" +IF "\1" == "north" _blk = \3_WIDTH * (\3_HEIGHT - 3) + _src _map = _tgt _win = (\3_WIDTH + 6) * \3_HEIGHT + 1 _y = \3_HEIGHT * 2 - 1 _x = (\4) * -2 _len = CURRENT_MAP_WIDTH + 3 - (\4) -if _len > \3_WIDTH +IF _len > \3_WIDTH _len = \3_WIDTH -endc +ENDC -elif "\1" == "south" +ELIF "\1" == "south" _blk = _src _map = (CURRENT_MAP_WIDTH + 6) * (CURRENT_MAP_HEIGHT + 3) + _tgt _win = \3_WIDTH + 7 _y = 0 _x = (\4) * -2 _len = CURRENT_MAP_WIDTH + 3 - (\4) -if _len > \3_WIDTH +IF _len > \3_WIDTH _len = \3_WIDTH -endc +ENDC -elif "\1" == "west" +ELIF "\1" == "west" _blk = (\3_WIDTH * _src) + \3_WIDTH - 3 _map = (CURRENT_MAP_WIDTH + 6) * _tgt _win = (\3_WIDTH + 6) * 2 - 6 _y = (\4) * -2 _x = \3_WIDTH * 2 - 1 _len = CURRENT_MAP_HEIGHT + 3 - (\4) -if _len > \3_HEIGHT +IF _len > \3_HEIGHT _len = \3_HEIGHT -endc +ENDC -elif "\1" == "east" +ELIF "\1" == "east" _blk = (\3_WIDTH * _src) _map = (CURRENT_MAP_WIDTH + 6) * _tgt + CURRENT_MAP_WIDTH + 3 _win = \3_WIDTH + 7 _y = (\4) * -2 _x = 0 _len = CURRENT_MAP_HEIGHT + 3 - (\4) -if _len > \3_HEIGHT +IF _len > \3_HEIGHT _len = \3_HEIGHT -endc +ENDC -else +ELSE fail "Invalid direction for 'connection'." -endc +ENDC db \3 dw \2_Blocks + _blk diff --git a/macros/scripts/text.asm b/macros/scripts/text.asm index b1e1727b..4bf2c1bc 100755 --- a/macros/scripts/text.asm +++ b/macros/scripts/text.asm @@ -198,10 +198,10 @@ ENDM script_mart: MACRO db TX_SCRIPT_MART db _NARG ; number of items -rept _NARG +REPT _NARG db \1 ; item id shift -endr +ENDR db -1 ; end ENDM diff --git a/rgbdscheck.asm b/rgbdscheck.asm index d10f8d50..eee866ec 100644 --- a/rgbdscheck.asm +++ b/rgbdscheck.asm @@ -3,10 +3,10 @@ MAJOR EQU 0 MINOR EQU 4 PATCH EQU 0 -if !DEF(__RGBDS_MAJOR__) || !DEF(__RGBDS_MINOR__) || !DEF(__RGBDS_PATCH__) +IF !DEF(__RGBDS_MAJOR__) || !DEF(__RGBDS_MINOR__) || !DEF(__RGBDS_PATCH__) fail "pokered requires rgbds {MAJOR}.{MINOR}.{PATCH} or newer." -elif (__RGBDS_MAJOR__ < MAJOR) || \ +ELIF (__RGBDS_MAJOR__ < MAJOR) || \ (__RGBDS_MAJOR__ == MAJOR && __RGBDS_MINOR__ < MINOR) || \ (__RGBDS_MAJOR__ == MAJOR && __RGBDS_MINOR__ == MINOR && __RGBDS_PATCH__ < PATCH) fail "pokered requires rgbds {MAJOR}.{MINOR}.{PATCH} or newer." -endc +ENDC |