From 43340e041b1186bc66fa4eebf15ff664f8165e43 Mon Sep 17 00:00:00 2001 From: dwsJason Date: Fri, 23 Nov 2018 15:39:53 -0500 Subject: [PATCH] ntpplayer updates: seems to link now that I put the ORG back in :-/ --- asm/merlin/link.s | 7 ++++--- asm/merlin/ninjatrackerplus.s | 5 ++--- asm/merlin/ntpplayer.a | Bin 24393 -> 23771 bytes 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/asm/merlin/link.s b/asm/merlin/link.s index 0ba2cb8..148c83e 100644 --- a/asm/merlin/link.s +++ b/asm/merlin/link.s @@ -8,9 +8,10 @@ asm ninjatrackerplus.s ds 0 - knd #$1100 ; Kind +; knd #$1100 ; Kind + knd #$0000 ; Kind ali None ; alignment - lna ntpplayer ; Load Name - sna ntpplayer ; Segment Name + lna "ntpplayer " ; Load Name + sna "ntpplayer " ; Segment Name diff --git a/asm/merlin/ninjatrackerplus.s b/asm/merlin/ninjatrackerplus.s index e9d22a3..6e6d2ae 100644 --- a/asm/merlin/ninjatrackerplus.s +++ b/asm/merlin/ninjatrackerplus.s @@ -9,9 +9,8 @@ * ***************************** -; dsk ntpplayer.a -; typ $b1 -; org $0f0000 + dsk ntpplayer.a + org $0f0000 mx %00 diff --git a/asm/merlin/ntpplayer.a b/asm/merlin/ntpplayer.a index 57f4822da89c2a97f94bd502b15139662a068453..2fe40d101f9cabb866deac1f3d0a6bc803eb398c 100644 GIT binary patch delta 78 zcmX@PkMZ_SM#tMR3}7%BOtUaCFfc*{;3R~v!{Ee_S5i=rlUSKrq`-|}ZnU2n!^i*t DGK~-F delta 704 zcmcb;lkwy}MtjeA1~8Z$1EjcEm>3us85jg1Vh|F@2Lc@i2Zp?of`XjH%G4qSIBTQh z%$WM`*+6X!+KephT)YDMMy3|F4$f|#KK=>01;u4G^=+LK=C4@2e)I1AhfbckeDlf6 zk3W7}Gca@Uic8C>YG@moTG_k$1cXP$CZ}cQa68Y_>Gq`b1Wp{2c(tA}^Je`rK>TvBRQeq(3QZf^^Qt!?_0Qb+wOy(zy18D$;`nkBrc__p=)ey=jh_@;~x|notTnS zTGiAwVcP748+YtIaP-X8NAJJ=He=xvmr>QxH?eeb4~mRS&dM(-uc~co?dhK~eb$_L z3l^_fy>9ci-St2VPn^AU^Ul*3uit(8`s4RMA7D_3NXaTFt7&NI=ouK9m|0la*f}`4 zxOsT__yq)oghfQf#3dx9WaSo=SJySSb@or1I&1FYWve%A-nnQ0;bW)IUA}(%-lL~4 z-hKN1#{g)WpoqAP?Ly+tb&S$sfD$ptA}4uSRyb=fHBh2-VKb9nR6E`Ub=kc>b2`PZr-|m z=kC4x4<0^x{AB6rv*#~fzIy%U?Ys9MzIyxN>u(cIL201pHFflj&7FWLAt)>=6&SUp zm357M6Q|6WvvA3p^;@^Ve?Od-Uw(n@?YVYBO^33J8ly$||a9>lvC`*}3_J eMrHuhP$e)ywD(K|dUE;tO