Consistently refer to CGB, not GBC (#491)

pret · Jan 30, 2025 · 310a5d9 · 310a5d9
1 parent daca963
commit 310a5d9
Show file tree

Hide file tree

Showing 10 changed files with 70 additions and 70 deletions.
diff --git a/pokeblue.map b/pokeblue.map
@@ -36,7 +36,7 @@ ROM0 bank #0:
 	         $0100 = Start
 	SECTION: $0150-$3fa5 ($3e56 bytes) ["Home"]
 	         $0150 = _Start
-	         $0157 = _Start.gbc
+	         $0157 = _Start.cgb
 	         $0159 = _Start.ok
 	         $015f = ReadJoypad
 	         $019a = Joypad
@@ -12836,7 +12836,7 @@ ROMX bank #28:
 	         $6002 = SendSGBPacket.nextBit0
 	         $600a = SendSGBPacket.next0
 	         $602b = LoadSGB
-	         $603f = LoadSGB.notGBC
+	         $603f = LoadSGB.notCGB
 	         $6075 = PrepareSuperNintendoVRAMTransfer
 	         $607a = PrepareSuperNintendoVRAMTransfer.loop
 	         $6089 = PrepareSuperNintendoVRAMTransfer.packetPointers
@@ -12851,10 +12851,10 @@ ROMX bank #28:
 	         $614a = Wait7000
 	         $614d = Wait7000.loop
 	         $6156 = SendSGBPackets
-	         $6165 = SendSGBPackets.notGBC
-	         $616d = InitGBCPalettes
-	         $6174 = InitGBCPalettes.loop
-	         $6180 = InitGBCPalettes.noCarry
+	         $6165 = SendSGBPackets.notCGB
+	         $616d = InitCGBPalettes
+	         $6174 = InitCGBPalettes.loop
+	         $6180 = InitCGBPalettes.noCarry
 	         $6187 = EmptyFunc3
 	         $6188 = CopySGBBorderTiles
 	         $618a = CopySGBBorderTiles.tileLoop
@@ -19055,7 +19055,7 @@ WRAM0 bank #0:
 	         $cf14 = wCurSpriteMovement2
 	         $cf17 = wNPCMovementScriptSpriteOffset
 	         $cf18 = wScriptedNPCWalkCounter
-	         $cf1a = wGBC
+	         $cf1a = wOnCGB
 	         $cf1b = wOnSGB
 	         $cf1c = wDefaultPaletteCommand
 	         $cf1d = wWholeScreenPaletteMonSpecies

diff --git a/pokeblue.sym b/pokeblue.sym
@@ -11,7 +11,7 @@
 00:00b5 CopyData
 00:0100 Start
 00:0150 _Start
-00:0157 _Start.gbc
+00:0157 _Start.cgb
 00:0159 _Start.ok
 00:015f ReadJoypad
 00:019a Joypad
@@ -12625,7 +12625,7 @@
 1c:6002 SendSGBPacket.nextBit0
 1c:600a SendSGBPacket.next0
 1c:602b LoadSGB
-1c:603f LoadSGB.notGBC
+1c:603f LoadSGB.notCGB
 1c:6075 PrepareSuperNintendoVRAMTransfer
 1c:607a PrepareSuperNintendoVRAMTransfer.loop
 1c:6089 PrepareSuperNintendoVRAMTransfer.packetPointers
@@ -12640,10 +12640,10 @@
 1c:614a Wait7000
 1c:614d Wait7000.loop
 1c:6156 SendSGBPackets
-1c:6165 SendSGBPackets.notGBC
-1c:616d InitGBCPalettes
-1c:6174 InitGBCPalettes.loop
-1c:6180 InitGBCPalettes.noCarry
+1c:6165 SendSGBPackets.notCGB
+1c:616d InitCGBPalettes
+1c:6174 InitCGBPalettes.loop
+1c:6180 InitCGBPalettes.noCarry
 1c:6187 EmptyFunc3
 1c:6188 CopySGBBorderTiles
 1c:618a CopySGBBorderTiles.tileLoop
@@ -18721,7 +18721,7 @@
 00:cf14 wCurSpriteMovement2
 00:cf17 wNPCMovementScriptSpriteOffset
 00:cf18 wScriptedNPCWalkCounter
-00:cf1a wGBC
+00:cf1a wOnCGB
 00:cf1b wOnSGB
 00:cf1c wDefaultPaletteCommand
 00:cf1d wWholeScreenPaletteMonSpecies

diff --git a/pokeblue_debug.map b/pokeblue_debug.map
@@ -36,7 +36,7 @@ ROM0 bank #0:
 	         $0100 = Start
 	SECTION: $0150-$3fb9 ($3e6a bytes) ["Home"]
 	         $0150 = _Start
-	         $0157 = _Start.gbc
+	         $0157 = _Start.cgb
 	         $0159 = _Start.ok
 	         $015f = ReadJoypad
 	         $019a = Joypad
@@ -12846,7 +12846,7 @@ ROMX bank #28:
 	         $6002 = SendSGBPacket.nextBit0
 	         $600a = SendSGBPacket.next0
 	         $602b = LoadSGB
-	         $603f = LoadSGB.notGBC
+	         $603f = LoadSGB.notCGB
 	         $6075 = PrepareSuperNintendoVRAMTransfer
 	         $607a = PrepareSuperNintendoVRAMTransfer.loop
 	         $6089 = PrepareSuperNintendoVRAMTransfer.packetPointers
@@ -12861,10 +12861,10 @@ ROMX bank #28:
 	         $614a = Wait7000
 	         $614d = Wait7000.loop
 	         $6156 = SendSGBPackets
-	         $6165 = SendSGBPackets.notGBC
-	         $616d = InitGBCPalettes
-	         $6174 = InitGBCPalettes.loop
-	         $6180 = InitGBCPalettes.noCarry
+	         $6165 = SendSGBPackets.notCGB
+	         $616d = InitCGBPalettes
+	         $6174 = InitCGBPalettes.loop
+	         $6180 = InitCGBPalettes.noCarry
 	         $6187 = EmptyFunc3
 	         $6188 = CopySGBBorderTiles
 	         $618a = CopySGBBorderTiles.tileLoop
@@ -19065,7 +19065,7 @@ WRAM0 bank #0:
 	         $cf14 = wCurSpriteMovement2
 	         $cf17 = wNPCMovementScriptSpriteOffset
 	         $cf18 = wScriptedNPCWalkCounter
-	         $cf1a = wGBC
+	         $cf1a = wOnCGB
 	         $cf1b = wOnSGB
 	         $cf1c = wDefaultPaletteCommand
 	         $cf1d = wWholeScreenPaletteMonSpecies

diff --git a/pokeblue_debug.sym b/pokeblue_debug.sym
@@ -11,7 +11,7 @@
 00:00b5 CopyData
 00:0100 Start
 00:0150 _Start
-00:0157 _Start.gbc
+00:0157 _Start.cgb
 00:0159 _Start.ok
 00:015f ReadJoypad
 00:019a Joypad
@@ -12635,7 +12635,7 @@
 1c:6002 SendSGBPacket.nextBit0
 1c:600a SendSGBPacket.next0
 1c:602b LoadSGB
-1c:603f LoadSGB.notGBC
+1c:603f LoadSGB.notCGB
 1c:6075 PrepareSuperNintendoVRAMTransfer
 1c:607a PrepareSuperNintendoVRAMTransfer.loop
 1c:6089 PrepareSuperNintendoVRAMTransfer.packetPointers
@@ -12650,10 +12650,10 @@
 1c:614a Wait7000
 1c:614d Wait7000.loop
 1c:6156 SendSGBPackets
-1c:6165 SendSGBPackets.notGBC
-1c:616d InitGBCPalettes
-1c:6174 InitGBCPalettes.loop
-1c:6180 InitGBCPalettes.noCarry
+1c:6165 SendSGBPackets.notCGB
+1c:616d InitCGBPalettes
+1c:6174 InitCGBPalettes.loop
+1c:6180 InitCGBPalettes.noCarry
 1c:6187 EmptyFunc3
 1c:6188 CopySGBBorderTiles
 1c:618a CopySGBBorderTiles.tileLoop
@@ -18731,7 +18731,7 @@
 00:cf14 wCurSpriteMovement2
 00:cf17 wNPCMovementScriptSpriteOffset
 00:cf18 wScriptedNPCWalkCounter
-00:cf1a wGBC
+00:cf1a wOnCGB
 00:cf1b wOnSGB
 00:cf1c wDefaultPaletteCommand
 00:cf1d wWholeScreenPaletteMonSpecies

diff --git a/pokeblue_vc.map b/pokeblue_vc.map
@@ -36,7 +36,7 @@ ROM0 bank #0:
 	         $0100 = Start
 	SECTION: $0150-$3fa5 ($3e56 bytes) ["Home"]
 	         $0150 = _Start
-	         $0157 = _Start.gbc
+	         $0157 = _Start.cgb
 	         $0159 = _Start.ok
 	         $015f = ReadJoypad
 	         $019a = Joypad
@@ -12863,7 +12863,7 @@ ROMX bank #28:
 	         $6002 = SendSGBPacket.nextBit0
 	         $600a = SendSGBPacket.next0
 	         $602b = LoadSGB
-	         $603f = LoadSGB.notGBC
+	         $603f = LoadSGB.notCGB
 	         $6075 = PrepareSuperNintendoVRAMTransfer
 	         $607a = PrepareSuperNintendoVRAMTransfer.loop
 	         $6089 = PrepareSuperNintendoVRAMTransfer.packetPointers
@@ -12879,10 +12879,10 @@ ROMX bank #28:
 	         $614a = Wait7000
 	         $614d = Wait7000.loop
 	         $6156 = SendSGBPackets
-	         $6165 = SendSGBPackets.notGBC
-	         $616d = InitGBCPalettes
-	         $6174 = InitGBCPalettes.loop
-	         $6180 = InitGBCPalettes.noCarry
+	         $6165 = SendSGBPackets.notCGB
+	         $616d = InitCGBPalettes
+	         $6174 = InitCGBPalettes.loop
+	         $6180 = InitCGBPalettes.noCarry
 	         $6187 = EmptyFunc3
 	         $6188 = CopySGBBorderTiles
 	         $618a = CopySGBBorderTiles.tileLoop
@@ -19107,7 +19107,7 @@ WRAM0 bank #0:
 	         $cf14 = wCurSpriteMovement2
 	         $cf17 = wNPCMovementScriptSpriteOffset
 	         $cf18 = wScriptedNPCWalkCounter
-	         $cf1a = wGBC
+	         $cf1a = wOnCGB
 	         $cf1b = wOnSGB
 	         $cf1c = wDefaultPaletteCommand
 	         $cf1d = wWholeScreenPaletteMonSpecies

diff --git a/pokeblue_vc.sym b/pokeblue_vc.sym
@@ -11,7 +11,7 @@
 00:00b5 CopyData
 00:0100 Start
 00:0150 _Start
-00:0157 _Start.gbc
+00:0157 _Start.cgb
 00:0159 _Start.ok
 00:015f ReadJoypad
 00:019a Joypad
@@ -12652,7 +12652,7 @@
 1c:6002 SendSGBPacket.nextBit0
 1c:600a SendSGBPacket.next0
 1c:602b LoadSGB
-1c:603f LoadSGB.notGBC
+1c:603f LoadSGB.notCGB
 1c:6075 PrepareSuperNintendoVRAMTransfer
 1c:607a PrepareSuperNintendoVRAMTransfer.loop
 1c:6089 PrepareSuperNintendoVRAMTransfer.packetPointers
@@ -12668,10 +12668,10 @@
 1c:614a Wait7000
 1c:614d Wait7000.loop
 1c:6156 SendSGBPackets
-1c:6165 SendSGBPackets.notGBC
-1c:616d InitGBCPalettes
-1c:6174 InitGBCPalettes.loop
-1c:6180 InitGBCPalettes.noCarry
+1c:6165 SendSGBPackets.notCGB
+1c:616d InitCGBPalettes
+1c:6174 InitCGBPalettes.loop
+1c:6180 InitCGBPalettes.noCarry
 1c:6187 EmptyFunc3
 1c:6188 CopySGBBorderTiles
 1c:618a CopySGBBorderTiles.tileLoop
@@ -18773,7 +18773,7 @@
 00:cf14 wCurSpriteMovement2
 00:cf17 wNPCMovementScriptSpriteOffset
 00:cf18 wScriptedNPCWalkCounter
-00:cf1a wGBC
+00:cf1a wOnCGB
 00:cf1b wOnSGB
 00:cf1c wDefaultPaletteCommand
 00:cf1d wWholeScreenPaletteMonSpecies

diff --git a/pokered.map b/pokered.map
@@ -36,7 +36,7 @@ ROM0 bank #0:
 	         $0100 = Start
 	SECTION: $0150-$3fa5 ($3e56 bytes) ["Home"]
 	         $0150 = _Start
-	         $0157 = _Start.gbc
+	         $0157 = _Start.cgb
 	         $0159 = _Start.ok
 	         $015f = ReadJoypad
 	         $019a = Joypad
@@ -12836,7 +12836,7 @@ ROMX bank #28:
 	         $6002 = SendSGBPacket.nextBit0
 	         $600a = SendSGBPacket.next0
 	         $602b = LoadSGB
-	         $603f = LoadSGB.notGBC
+	         $603f = LoadSGB.notCGB
 	         $6075 = PrepareSuperNintendoVRAMTransfer
 	         $607a = PrepareSuperNintendoVRAMTransfer.loop
 	         $6089 = PrepareSuperNintendoVRAMTransfer.packetPointers
@@ -12851,10 +12851,10 @@ ROMX bank #28:
 	         $614a = Wait7000
 	         $614d = Wait7000.loop
 	         $6156 = SendSGBPackets
-	         $6165 = SendSGBPackets.notGBC
-	         $616d = InitGBCPalettes
-	         $6174 = InitGBCPalettes.loop
-	         $6180 = InitGBCPalettes.noCarry
+	         $6165 = SendSGBPackets.notCGB
+	         $616d = InitCGBPalettes
+	         $6174 = InitCGBPalettes.loop
+	         $6180 = InitCGBPalettes.noCarry
 	         $6187 = EmptyFunc3
 	         $6188 = CopySGBBorderTiles
 	         $618a = CopySGBBorderTiles.tileLoop
@@ -19055,7 +19055,7 @@ WRAM0 bank #0:
 	         $cf14 = wCurSpriteMovement2
 	         $cf17 = wNPCMovementScriptSpriteOffset
 	         $cf18 = wScriptedNPCWalkCounter
-	         $cf1a = wGBC
+	         $cf1a = wOnCGB
 	         $cf1b = wOnSGB
 	         $cf1c = wDefaultPaletteCommand
 	         $cf1d = wWholeScreenPaletteMonSpecies

diff --git a/pokered.sym b/pokered.sym
@@ -11,7 +11,7 @@
 00:00b5 CopyData
 00:0100 Start
 00:0150 _Start
-00:0157 _Start.gbc
+00:0157 _Start.cgb
 00:0159 _Start.ok
 00:015f ReadJoypad
 00:019a Joypad
@@ -12625,7 +12625,7 @@
 1c:6002 SendSGBPacket.nextBit0
 1c:600a SendSGBPacket.next0
 1c:602b LoadSGB
-1c:603f LoadSGB.notGBC
+1c:603f LoadSGB.notCGB
 1c:6075 PrepareSuperNintendoVRAMTransfer
 1c:607a PrepareSuperNintendoVRAMTransfer.loop
 1c:6089 PrepareSuperNintendoVRAMTransfer.packetPointers
@@ -12640,10 +12640,10 @@
 1c:614a Wait7000
 1c:614d Wait7000.loop
 1c:6156 SendSGBPackets
-1c:6165 SendSGBPackets.notGBC
-1c:616d InitGBCPalettes
-1c:6174 InitGBCPalettes.loop
-1c:6180 InitGBCPalettes.noCarry
+1c:6165 SendSGBPackets.notCGB
+1c:616d InitCGBPalettes
+1c:6174 InitCGBPalettes.loop
+1c:6180 InitCGBPalettes.noCarry
 1c:6187 EmptyFunc3
 1c:6188 CopySGBBorderTiles
 1c:618a CopySGBBorderTiles.tileLoop
@@ -18721,7 +18721,7 @@
 00:cf14 wCurSpriteMovement2
 00:cf17 wNPCMovementScriptSpriteOffset
 00:cf18 wScriptedNPCWalkCounter
-00:cf1a wGBC
+00:cf1a wOnCGB
 00:cf1b wOnSGB
 00:cf1c wDefaultPaletteCommand
 00:cf1d wWholeScreenPaletteMonSpecies

diff --git a/pokered_vc.map b/pokered_vc.map
@@ -36,7 +36,7 @@ ROM0 bank #0:
 	         $0100 = Start
 	SECTION: $0150-$3fa5 ($3e56 bytes) ["Home"]
 	         $0150 = _Start
-	         $0157 = _Start.gbc
+	         $0157 = _Start.cgb
 	         $0159 = _Start.ok
 	         $015f = ReadJoypad
 	         $019a = Joypad
@@ -12865,7 +12865,7 @@ ROMX bank #28:
 	         $6002 = SendSGBPacket.nextBit0
 	         $600a = SendSGBPacket.next0
 	         $602b = LoadSGB
-	         $603f = LoadSGB.notGBC
+	         $603f = LoadSGB.notCGB
 	         $6075 = PrepareSuperNintendoVRAMTransfer
 	         $607a = PrepareSuperNintendoVRAMTransfer.loop
 	         $6089 = PrepareSuperNintendoVRAMTransfer.packetPointers
@@ -12881,10 +12881,10 @@ ROMX bank #28:
 	         $614a = Wait7000
 	         $614d = Wait7000.loop
 	         $6156 = SendSGBPackets
-	         $6165 = SendSGBPackets.notGBC
-	         $616d = InitGBCPalettes
-	         $6174 = InitGBCPalettes.loop
-	         $6180 = InitGBCPalettes.noCarry
+	         $6165 = SendSGBPackets.notCGB
+	         $616d = InitCGBPalettes
+	         $6174 = InitCGBPalettes.loop
+	         $6180 = InitCGBPalettes.noCarry
 	         $6187 = EmptyFunc3
 	         $6188 = CopySGBBorderTiles
 	         $618a = CopySGBBorderTiles.tileLoop
@@ -19110,7 +19110,7 @@ WRAM0 bank #0:
 	         $cf14 = wCurSpriteMovement2
 	         $cf17 = wNPCMovementScriptSpriteOffset
 	         $cf18 = wScriptedNPCWalkCounter
-	         $cf1a = wGBC
+	         $cf1a = wOnCGB
 	         $cf1b = wOnSGB
 	         $cf1c = wDefaultPaletteCommand
 	         $cf1d = wWholeScreenPaletteMonSpecies