diff options
| author | luckytyphlosion <alan.rj.huang@gmail.com> | 2016-06-03 17:54:53 -0400 |
|---|---|---|
| committer | luckytyphlosion <alan.rj.huang@gmail.com> | 2016-06-03 17:54:53 -0400 |
| commit | 8cdf73265f95e9a55112f373804867244512878d (patch) | |
| tree | 64f4263b86839e1eb9770688ad890683fa89c503 /macros.asm | |
| parent | Update extras with fixed gbz80disasm.py (diff) | |
| parent | Fix tileset incbin statement alignment (diff) | |
| download | pokeyellow-8cdf73265f95e9a55112f373804867244512878d.tar.gz pokeyellow-8cdf73265f95e9a55112f373804867244512878d.tar.xz pokeyellow-8cdf73265f95e9a55112f373804867244512878d.zip | |
Merge pull request #10 from PikalaxALT/master
Next batch of scripts, etc.
Diffstat (limited to 'macros.asm')
| -rw-r--r-- | macros.asm | 19 |
1 files changed, 12 insertions, 7 deletions
@@ -350,11 +350,20 @@ TX_FAR: MACRO dab \1 ENDM - +TX_VENDING_MACHINE EQUS "db $f5" TX_CABLE_CLUB_RECEPTIONIST EQUS "db $f6" -TX_POKECENTER_NURSE EQUS "db $ff" +TX_PRIZE_VENDOR EQUS "db $f7" +TX_POKECENTER_PC EQUS "db $f9" +TX_PLAYERS_PC EQUS "db $fc" +TX_BILLS_PC EQUS "db $fd" +TX_POKEMART_CLERK EQUS "db $fe" +TX_POKECENTER_NURSE EQUS "db $ff" ; Predef macro. +predef_const: MACRO + const \1PredefID + ENDM + add_predef: MACRO \1Predef:: db BANK(\1) @@ -362,7 +371,7 @@ add_predef: MACRO ENDM predef_id: MACRO - ld a, (\1Predef) ; - PredefPointers) / 3 + ld a, (\1Predef - PredefPointers) / 3 ENDM predef: MACRO @@ -374,10 +383,6 @@ predef_jump: MACRO predef_id \1 jp Predef ENDM - -predef_const: MACRO - const \1Predef - ENDM tx_pre_const: MACRO const \1_id |