* PChar -> PAnsichar

packages/libgbafpc/examples/graphics/SimpleBGScroll/SimpleBGScroll.pp

@@ -120,7 +120,7 @@ begin
   // draw a row of text from beginning of message
   updatescrolltext(0);
 
-  // set the screen base to 31 (0x600F800) and char base to 0 (0x6000000)
+  // set the screen base to 31 (0x600F800) and AnsiChar base to 0 (0x6000000)
   BGCTRL[0] := SCREEN_BASE(31);
 
   // screen mode & background to display

packages/libgbafpc/src/gba/gba_console.inc

@@ -39,14 +39,14 @@
 {$ifdef GBA_INTERFACE}
 // Make console interaction a little less eye-crossing
 
-function CON_CLS(): pchar; inline;
-function CON_ERASE(): pchar; inline;
-function CON_POS(_x, _y: cint): pchar; inline;
-function CON_UP(_dy: cint): pchar; inline;
-function CON_DOWN(_dy: cint): pchar; inline;
-function CON_RIGHT(_dx: cint): pchar; inline;
-function CON_LEFT(_dx: cint): pchar; inline;
-function CON_CLL(_y: cint): pchar; inline;
+function CON_CLS(): PAnsiChar; inline;
+function CON_ERASE(): PAnsiChar; inline;
+function CON_POS(_x, _y: cint): PAnsiChar; inline;
+function CON_UP(_dy: cint): PAnsiChar; inline;
+function CON_DOWN(_dy: cint): PAnsiChar; inline;
+function CON_RIGHT(_dx: cint): PAnsiChar; inline;
+function CON_LEFT(_dx: cint): PAnsiChar; inline;
+function CON_CLL(_y: cint): PAnsiChar; inline;
 
 procedure consoleInit(charBase, mapBase, background: cint;
 					const font: pcuint8; fontsize, palette: cint); cdecl; external;
@@ -56,43 +56,43 @@ procedure consoleDemoInit(); cdecl; external;
 
 
 {$ifdef GBA_IMPLEMENTATION}
-function CON_CLS(): pchar; inline;
+function CON_CLS(): PAnsiChar; inline;
 begin
  CON_CLS := #27'[2J';
 end;
 
-function CON_ERASE(): pchar; inline;
+function CON_ERASE(): PAnsiChar; inline;
 begin
   CON_ERASE := #27'[K';
 end;
 
-function CON_POS(_x, _y: cint): pchar; inline;
+function CON_POS(_x, _y: cint): PAnsiChar; inline;
 begin
-  CON_POS := pchar(#27'[' + (GBAIntToStr(_y)) +';' + (GBAIntToStr(_x)) +  'H');
+  CON_POS := PAnsiChar(#27'[' + (GBAIntToStr(_y)) +';' + (GBAIntToStr(_x)) +  'H');
 end;
 
-function CON_UP(_dy: cint): pchar; inline;
+function CON_UP(_dy: cint): PAnsiChar; inline;
 begin
-  CON_UP := pchar(#27'[' + GBAIntToStr(_dy) +'A');
+  CON_UP := PAnsiChar(#27'[' + GBAIntToStr(_dy) +'A');
 end;
 
-function CON_DOWN(_dy: cint): pchar; inline;
+function CON_DOWN(_dy: cint): PAnsiChar; inline;
 begin
-	CON_DOWN := pchar(#27'[' + GBAIntToStr(_dy) + 'B');
+	CON_DOWN := PAnsiChar(#27'[' + GBAIntToStr(_dy) + 'B');
 end;
 
-function CON_RIGHT(_dx: cint): pchar; inline;
+function CON_RIGHT(_dx: cint): PAnsiChar; inline;
 begin
-  CON_RIGHT := pchar(#27'[' + GBAIntToStr(_dx) + 'C');
+  CON_RIGHT := PAnsiChar(#27'[' + GBAIntToStr(_dx) + 'C');
 end;
 
-function CON_LEFT(_dx: cint): pchar; inline;
+function CON_LEFT(_dx: cint): PAnsiChar; inline;
 begin
-  CON_LEFT := pchar(#27'[' + GBAIntToStr(_dx) + 'D');
+  CON_LEFT := PAnsiChar(#27'[' + GBAIntToStr(_dx) + 'D');
 end;
 
-function CON_CLL(_y: cint): pchar; inline;
+function CON_CLL(_y: cint): PAnsiChar; inline;
 begin
-  CON_CLL := pchar(concat(CON_POS(1, _y), CON_ERASE()));
+  CON_CLL := PAnsiChar(concat(CON_POS(1, _y), CON_ERASE()));
 end;
 {$endif GBA_IMPLEMENTATION}

packages/libgbafpc/src/gba/gba_helper.inc

@@ -55,16 +55,16 @@ procedure memcpy16(dest: pointer; const src: pointer; hwcount: dword); cdecl; ex
 procedure memset32(dest: pointer; wd: dword; wcount: dword); cdecl; external;
 procedure memcpy32(dest: pointer; const src: pointer; wcount: dword); cdecl; external;
 
-function printf(format: Pchar; args: array of const): longint; cdecl; external;
-function printf(format: Pchar): longint; cdecl; varargs; external;
-function sprintf(s: Pchar; format: Pchar; args: array of const): longint; cdecl; external;
-function sprintf(s: Pchar; format: Pchar): longint; varargs; cdecl; external;
-function iprintf(format: Pchar; args: array of const): longint; cdecl; external;
-function iprintf(format: Pchar): longint; varargs; cdecl; external;
-function scanf(format: Pchar; args: array of const): longint; cdecl; external;
-function scanf(format: Pchar): longint; cdecl; varargs; external;
-function sscanf(s: Pchar; format: Pchar; args: array of const): longint; cdecl; external;
-function sscanf(s: Pchar; format: Pchar): longint; cdecl; varargs; external;
+function printf(format: PAnsiChar; args: array of const): longint; cdecl; external;
+function printf(format: PAnsiChar): longint; cdecl; varargs; external;
+function sprintf(s: PAnsiChar; format: PAnsiChar; args: array of const): longint; cdecl; external;
+function sprintf(s: PAnsiChar; format: PAnsiChar): longint; varargs; cdecl; external;
+function iprintf(format: PAnsiChar; args: array of const): longint; cdecl; external;
+function iprintf(format: PAnsiChar): longint; varargs; cdecl; external;
+function scanf(format: PAnsiChar; args: array of const): longint; cdecl; external;
+function scanf(format: PAnsiChar): longint; cdecl; varargs; external;
+function sscanf(s: PAnsiChar; format: PAnsiChar; args: array of const): longint; cdecl; external;
+function sscanf(s: PAnsiChar; format: PAnsiChar): longint; cdecl; varargs; external;
 
 function malloc(size: integer): pointer; cdecl; external;
 function realloc(ptr: pointer; size: integer): pointer; cdecl; external;
@@ -98,7 +98,7 @@ const
    SEEK_CUR = 1;
    SEEK_END = 2;
 
-function fopen(filename: Pchar; modes: Pchar): P_FILE; cdecl; external;
+function fopen(filename: PAnsiChar; modes: PAnsiChar): P_FILE; cdecl; external;
 function fread(ptr: pointer; size: longint; n: longint; stream: P_FILE): longint; cdecl; external;
 function fwrite(ptr: pointer; size: longint; n: longint; s: P_FILE): longint; cdecl; external;
 function ftell(stream: P_FILE): longint; cdecl; external;
@@ -155,13 +155,13 @@ const
   S_IWRITE      = $80;
   S_IEXEC       = $40;
 
-function diropen(const path: pchar): PDIR_ITER; cdecl; external;
+function diropen(const path: PAnsiChar): PDIR_ITER; cdecl; external;
 function dirreset(dirState: PDIR_ITER): cint; cdecl; external;
-function dirnext(dirState: PDIR_ITER; filename: pchar; filestat: Pstat): cint; cdecl; external;
+function dirnext(dirState: PDIR_ITER; filename: PAnsiChar; filestat: Pstat): cint; cdecl; external;
 function dirclose(dirState: PDIR_ITER): cint; cdecl; external;
   *)
-procedure DebugPrint(s: string); assembler; inline;
-function GBAIntToStr(i: integer): string;
+procedure DebugPrint(s: ansistring); assembler; inline;
+function GBAIntToStr(i: integer): ansistring;
 
 {$endif GBA_INTERFACE}
 
@@ -172,15 +172,15 @@ function GBAIntToStr(i: integer): string;
 // these are in ASM and optimized; use when possible
 {$l core_asm.o}
 
-procedure DebugPrint(s: string); assembler; inline;
+procedure DebugPrint(s: ansistring); assembler; inline;
 asm
   mov r0,s
   swi #0xff0000
 end['r0'];
 
-function GBAIntToStr(i: integer): string;
+function GBAIntToStr(i: integer): ajsçstring;
 var
-  s: string;
+  s: ansistring;
 begin
   str(i, s);
   GBAIntToStr := s;

packages/libgbafpc/src/gba/gba_video.inc

@@ -171,7 +171,7 @@ function SCREEN_BASE_BLOCK(m: integer): pointer; inline;
 function SCREEN_BASE(m: integer): integer; inline;
 function BG_MAP_BASE(m: integer): integer; inline;
 
-//alternate names for char and screen base
+//alternate names for AnsiChar and screen base
 function TILE_BASE(m: integer): integer; inline;
 function TILE_BASE_ADR(m: integer): pointer; inline;
 function MAP_BASE(m: integer): integer; inline;
@@ -320,7 +320,7 @@ begin
   BG_MAP_BASE := ((m) shl 8);
 end;
 
-//alternate names for char and screen base
+//alternate names for AnsiChar and screen base
 function TILE_BASE(m: integer): integer; inline;
 begin
   TILE_BASE := ((m) shl 2);

packages/libgbafpc/src/gba/helper.inc

@@ -55,16 +55,16 @@ procedure memcpy16(dest: pointer; const src: pointer; hwcount: dword); cdecl; ex
 procedure memset32(dest: pointer; wd: dword; wcount: dword); cdecl; external;
 procedure memcpy32(dest: pointer; const src: pointer; wcount: dword); cdecl; external;
 
-function printf(format: Pchar; args: array of const): longint; cdecl; external;
-function printf(format: Pchar): longint; cdecl; varargs; external;
-function sprintf(s: Pchar; format: Pchar; args: array of const): longint; cdecl; external;
-function sprintf(s: Pchar; format: Pchar): longint; varargs; cdecl; external;
-function iprintf(format: Pchar; args: array of const): longint; cdecl; external;
-function iprintf(format: Pchar): longint; varargs; cdecl; external;
-function scanf(format: Pchar; args: array of const): longint; cdecl; external;
-function scanf(format: Pchar): longint; cdecl; varargs; external;
-function sscanf(s: Pchar; format: Pchar; args: array of const): longint; cdecl; external;
-function sscanf(s: Pchar; format: Pchar): longint; cdecl; varargs; external;
+function printf(format: PAnsiChar; args: array of const): longint; cdecl; external;
+function printf(format: PAnsiChar): longint; cdecl; varargs; external;
+function sprintf(s: PAnsiChar; format: PAnsiChar; args: array of const): longint; cdecl; external;
+function sprintf(s: PAnsiChar; format: PAnsiChar): longint; varargs; cdecl; external;
+function iprintf(format: PAnsiChar; args: array of const): longint; cdecl; external;
+function iprintf(format: PAnsiChar): longint; varargs; cdecl; external;
+function scanf(format: PAnsiChar; args: array of const): longint; cdecl; external;
+function scanf(format: PAnsiChar): longint; cdecl; varargs; external;
+function sscanf(s: PAnsiChar; format: PAnsiChar; args: array of const): longint; cdecl; external;
+function sscanf(s: PAnsiChar; format: PAnsiChar): longint; cdecl; varargs; external;
 
 function malloc(size: integer): pointer; cdecl; external;
 function realloc(ptr: pointer; size: integer): pointer; cdecl; external;
@@ -98,7 +98,7 @@ const
    SEEK_CUR = 1;
    SEEK_END = 2;
 
-function fopen(filename: Pchar; modes: Pchar): P_FILE; cdecl; external;
+function fopen(filename: PAnsiChar; modes: PAnsiChar): P_FILE; cdecl; external;
 function fread(ptr: pointer; size: longint; n: longint; stream: P_FILE): longint; cdecl; external;
 function fwrite(ptr: pointer; size: longint; n: longint; s: P_FILE): longint; cdecl; external;
 function ftell(stream: P_FILE): longint; cdecl; external;
@@ -156,12 +156,12 @@ const
   S_IWRITE      = $80;
   S_IEXEC       = $40;
 
-function diropen(const path: pchar): PDIR_ITER; cdecl; external;
+function diropen(const path: PAnsiChar): PDIR_ITER; cdecl; external;
 function dirreset(dirState: PDIR_ITER): cint; cdecl; external;
-function dirnext(dirState: PDIR_ITER; filename: pchar; filestat: Pstat): cint; cdecl; external;
+function dirnext(dirState: PDIR_ITER; filename: PAnsiChar; filestat: Pstat): cint; cdecl; external;
 function dirclose(dirState: PDIR_ITER): cint; cdecl; external;
 
-procedure DebugPrint(s: string); assembler; inline;
+procedure DebugPrint(s: ansistring); assembler; inline;
 
 {$endif GBA_INTERFACE}
 
@@ -172,7 +172,7 @@ procedure DebugPrint(s: string); assembler; inline;
 // these are in ASM and optimized; use when possible
 {$l core_asm.o}
 
-procedure DebugPrint(s: string); assembler; inline;
+procedure DebugPrint(s: ansistring); assembler; inline;
 asm
   mov r0,s
   swi #0xff0000

packages/libgbafpc/src/gba/mappy.inc

@@ -46,14 +46,14 @@
 //---------------------------------------------------------------------------------
 // Don't Use these function names
 //---------------------------------------------------------------------------------
-procedure mappy_dprintf(str: pchar; args: array of const); cdecl; external;
+procedure mappy_dprintf(str: PAnsiChar; args: array of const); cdecl; external;
 procedure mappy_dputchar(c: integer); cdecl; external;
 
 //---------------------------------------------------------------------------------
 // Use these function names instead
 // these will be repeated for Xcomms & MBV2
 //---------------------------------------------------------------------------------
-procedure dprintf(str: pchar; args: array of const); inline;
+procedure dprintf(str: PAnsiChar; args: array of const); inline;
 procedure dputchar(c: integer); inline;
 
 //---------------------------------------------------------------------------------
@@ -74,7 +74,7 @@ procedure dputchar(c: integer); inline;
 {$endif GBA_INTERFACE}
 
 {$ifdef GBA_IMPLEMENTATION}
-procedure dprintf(str: pchar; args: array of const); inline;
+procedure dprintf(str: PAnsiChar; args: array of const); inline;
 begin
   mappy_dprintf(str, args);
 end;

packages/libgbafpc/src/gba/mbv2.inc

@@ -44,13 +44,13 @@
 //---------------------------------------------------------------------------------
 // Don't Use these function names
 //---------------------------------------------------------------------------------
-procedure mbv2_dprintf(str: pchar; args: array of const); cdecl; external;
-procedure mbv2_dfprintf(fp: integer; str: pchar; args: array of const); cdecl; external;
+procedure mbv2_dprintf(str: PAnsiChar; args: array of const); cdecl; external;
+procedure mbv2_dfprintf(fp: integer; str: PAnsiChar; args: array of const); cdecl; external;
 function mbv2_dputchar(c: integer): integer; cdecl; external;
 function mbv2_dgetch(): integer; cdecl; external;
 function mbv2_dkbhit(): integer; cdecl; external;
 
-function mbv2_dfopen(const _file: pchar; const _type: pchar): integer; cdecl; external;
+function mbv2_dfopen(const _file: PAnsiChar; const _type: PAnsiChar): integer; cdecl; external;
 function mbv2_dfclose	(fp: integer): integer; cdecl; external;
 function mbv2_dfgetc(fp: integer): integer; cdecl; external;
 function mbv2_dfputc(ch, fp: integer): integer; cdecl; external;
@@ -60,12 +60,12 @@ procedure mbv2_drewind(fp: integer); cdecl; external;
 // Use these function names instead
 // these will be repeated for VBA & Xcomms
 //---------------------------------------------------------------------------------
-procedure dprintf(str: pchar; args: array of const); inline;
-procedure dfprintf(fp: integer; str: pchar; args: array of const); inline;
+procedure dprintf(str: PAnsiChar; args: array of const); inline;
+procedure dfprintf(fp: integer; str: PAnsiChar; args: array of const); inline;
 function dputchar(c: integer): integer; inline;
 function dgetch(): integer; inline;
 function dkbhit(): integer; inline;
-function dfopen(const _file: pchar; const _type: pchar): integer; inline;
+function dfopen(const _file: PAnsiChar; const _type: PAnsiChar): integer; inline;
 function dfclose	(fp: integer): integer; inline;
 function dfgetc(fp: integer): integer; inline;
 function dfputc(ch, fp: integer): integer; inline;
@@ -97,12 +97,12 @@ function __dputchar (c: integer): integer; cdecl; external;
 // Use these function names instead
 // these will be repeated for VBA & Xcomms
 //---------------------------------------------------------------------------------
-procedure dprintf(str: pchar; args: array of const); inline;
+procedure dprintf(str: PAnsiChar; args: array of const); inline;
 begin
   mbv2_dprintf(str, args); 
 end;
 
-procedure dfprintf(fp: integer; str: pchar; args: array of const); inline;
+procedure dfprintf(fp: integer; str: PAnsiChar; args: array of const); inline;
 begin
   mbv2_dfprintf(fp, str, args); 
 end;
@@ -123,7 +123,7 @@ begin
 end;
 
 
-function dfopen(const _file: pchar; const _type: pchar): integer; inline;
+function dfopen(const _file: PAnsiChar; const _type: PAnsiChar): integer; inline;
 begin
   dfopen := mbv2_dfopen(_file, _type);
 end;