Rename AHI files for projectiles to have proj_ prefix

src/actors/acid.asm

@@ -28,7 +28,7 @@
 ;;;=========================================================================;;;
 
 ;;; The OBJ palette number used for acid projectile actors.
-kPaletteObjAcid = 2
+kPaletteObjProjAcid = 2
 
 ;;;=========================================================================;;;
 
@@ -58,8 +58,8 @@ kPaletteObjAcid = 2
 ;;; @preserve X
 .EXPORT FuncA_Objects_DrawActorProjAcid
 .PROC FuncA_Objects_DrawActorProjAcid
-    lda #kTileIdObjAcid  ; param: tile ID
-    ldy #kPaletteObjAcid  ; param: palette
+    lda #kTileIdObjProjAcid  ; param: tile ID
+    ldy #kPaletteObjProjAcid  ; param: palette
     jmp FuncA_Objects_Draw1x1Actor  ; preserves X
 .ENDPROC
 

src/actors/acid.inc

@@ -27,6 +27,6 @@
 ;;;   * State3: Unused.
 
 ;;; The OBJ tile ID for acid projectile actors.
-kTileIdObjAcid = $80
+kTileIdObjProjAcid = $80
 
 ;;;=========================================================================;;;

src/actors/breakball.asm

@@ -54,7 +54,7 @@
 ;;;=========================================================================;;;
 
 ;;; The OBJ palette number used for breakball projectile actors.
-kPaletteObjBreakball = 1
+kPaletteObjProjBreakball = 1
 
 ;;; How many VBlank frames between breakball animation frames.
 .DEFINE kProjBreakballAnimSlowdown 4
@@ -210,8 +210,8 @@ _Explode:
     lda Zp_FrameCounter_u8
     div #kProjBreakballAnimSlowdown
     and #$01
-    add #kTileIdObjBreakballFirst  ; param: tile ID
-    ldy #kPaletteObjBreakball  ; param: object flags
+    add #kTileIdObjProjBreakballFirst  ; param: tile ID
+    ldy #kPaletteObjProjBreakball  ; param: object flags
     jmp FuncA_Objects_Draw2x2MirroredShape
 .ENDPROC
 

src/actors/breakball.inc

@@ -26,6 +26,6 @@
 kProjBreakballRadius = 3
 
 ;;; The first tile ID for drawing breakball projectile actors.
-kTileIdObjBreakballFirst = $c4
+kTileIdObjProjBreakballFirst = $c4
 
 ;;;=========================================================================;;;

src/actors/breakbomb.asm

@@ -55,7 +55,7 @@ kBreakBombInitVelY = $ffff & -600
 kBreakbombShakeFrames = 4
 
 ;;; The OBJ palette number used for breakbomb projectile actors.
-kPaletteObjBreakbomb = 1
+kPaletteObjProjBreakbomb = 1
 
 ;;;=========================================================================;;;
 
@@ -145,9 +145,9 @@ _ExplodeIfHitsTerrain:
     lda Zp_FrameCounter_u8
     div #2
     and #$01
-    .assert kTileIdObjBreakbombFirst .mod 2 = 0, error
-    ora #kTileIdObjBreakbombFirst  ; param: tile ID
-    ldy #kPaletteObjBreakbomb  ; param: palette
+    .assert kTileIdObjProjBreakbombFirst .mod 2 = 0, error
+    ora #kTileIdObjProjBreakbombFirst  ; param: tile ID
+    ldy #kPaletteObjProjBreakbomb  ; param: palette
     jmp FuncA_Objects_Draw1x1Actor  ; preserves X
 .ENDPROC
 

src/actors/breakbomb.inc

@@ -26,6 +26,6 @@
 ;;;   * State3: Unused.
 
 ;;; The first tile ID for drawing breakbomb projectile actors.
-kTileIdObjBreakbombFirst = $80
+kTileIdObjProjBreakbombFirst = $80
 
 ;;;=========================================================================;;;

src/actors/breakfire.asm

@@ -44,7 +44,7 @@
 ;;;=========================================================================;;;
 
 ;;; The OBJ palette number used for breakfire projectile actors.
-kPaletteObjBreakfire = 1
+kPaletteObjProjBreakfire = 1
 
 ;;; How many VBlank frames between breakfire animation frames.
 .DEFINE kProjBreakfireAnimSlowdown 2
@@ -145,17 +145,17 @@ _Expire:
 _Short:
     lda #2
     sta T2  ; num tiles
-    lda #kTileIdObjBreakfireFirst + 4
+    lda #kTileIdObjProjBreakfireFirst + 4
     sta T3  ; first tile ID
     bne _Loop  ; unconditional
 _Tall:
     lda #3
     sta T2  ; num tiles
-    lda #kTileIdObjBreakfireFirst + 2
+    lda #kTileIdObjProjBreakfireFirst + 2
     sta T3  ; first tile ID
 _Loop:
     lda T3  ; param: tile ID
-    ldy #kPaletteObjBreakfire  ; param: object flags
+    ldy #kPaletteObjProjBreakfire  ; param: object flags
     jsr FuncA_Objects_Draw1x1Shape  ; preserves X and T2+
     jsr FuncA_Objects_MoveShapeUpOneTile  ; preserves X and T0+
     dec T3  ; tile ID

src/actors/breakfire.inc

@@ -28,6 +28,6 @@
 ;;;   * State3: Unused.
 
 ;;; The first tile ID for drawing breakfire projectile actors.
-kTileIdObjBreakfireFirst = $ab
+kTileIdObjProjBreakfireFirst = $ab
 
 ;;;=========================================================================;;;

src/actors/bullet.asm

@@ -39,11 +39,11 @@
 kProjBulletSpeed = 6
 
 ;;; OBJ tile IDs for bullet projectile actors.
-kTileIdObjBulletVert = kTileIdObjBulletFirst + 0
-kTileIdObjBulletHorz = kTileIdObjBulletFirst + 1
+kTileIdObjProjBulletVert = kTileIdObjProjBulletFirst + 0
+kTileIdObjProjBulletHorz = kTileIdObjProjBulletFirst + 1
 
 ;;; The OBJ palette number used for bullet projectile actors:
-kPaletteObjBullet = 1
+kPaletteObjProjBullet = 1
 
 ;;;=========================================================================;;;
 
@@ -118,13 +118,13 @@ _Done:
     lda Ram_ActorVelY_i16_1_arr, x
     beq @horz
     @vert:
-    lda #kTileIdObjBulletVert  ; param: tile ID
-    .assert kTileIdObjBulletVert > 0, error
+    lda #kTileIdObjProjBulletVert  ; param: tile ID
+    .assert kTileIdObjProjBulletVert > 0, error
     bne @draw  ; unconditional
     @horz:
-    lda #kTileIdObjBulletHorz  ; param: tile ID
+    lda #kTileIdObjProjBulletHorz  ; param: tile ID
     @draw:
-    ldy #kPaletteObjBullet  ; param: palette
+    ldy #kPaletteObjProjBullet  ; param: palette
     jmp FuncA_Objects_Draw1x1Actor  ; preserves X
 .ENDPROC
 

src/actors/bullet.inc

@@ -25,6 +25,6 @@
 ;;;   * State3: Unused.
 
 ;;; OBJ tile IDs for bullet projectile actors:
-kTileIdObjBulletFirst = $8e
+kTileIdObjProjBulletFirst = $8e
 
 ;;;=========================================================================;;;

src/actors/ember.asm

@@ -39,7 +39,7 @@
 kEmberTerminalVelocity = 5
 
 ;;; The OBJ palette number used for ember projectile actors.
-kPaletteObjEmber = 1
+kPaletteObjProjEmber = 1
 
 ;;;=========================================================================;;;
 
@@ -98,8 +98,8 @@ _Remove:
 ;;; @preserve X
 .EXPORT FuncA_Objects_DrawActorProjEmber
 .PROC FuncA_Objects_DrawActorProjEmber
-    lda #kTileIdObjEmber  ; param: tile ID
-    ldy #kPaletteObjEmber  ; param: palette
+    lda #kTileIdObjProjEmber  ; param: tile ID
+    ldy #kPaletteObjProjEmber  ; param: palette
     jmp FuncA_Objects_Draw1x1Actor  ; preserves X
 .ENDPROC
 

src/actors/ember.inc

@@ -27,6 +27,6 @@
 ;;;   * State3: Unused.
 
 ;;; The OBJ tile ID for ember projectile actors.
-kTileIdObjEmber = $86
+kTileIdObjProjEmber = $86
 
 ;;;=========================================================================;;;

src/actors/fireball.asm

@@ -49,8 +49,8 @@ kFireballSpeed  = 3
 kFireblastSpeed = 5
 
 ;;; The OBJ palette numbers used for fireball and fireblast actors.
-kPaletteObjFireball  = 1
-kPaletteObjFireblast = 1
+kPaletteObjProjFireball  = 1
+kPaletteObjProjFireblast = 1
 
 ;;;=========================================================================;;;
 
@@ -207,9 +207,9 @@ _HandleCollision:
     lda Zp_FrameCounter_u8
     div #2
     and #$03
-    .assert kTileIdObjFireballFirst .mod 4 = 0, error
-    ora #kTileIdObjFireballFirst  ; param: tile ID
-    ldy #kPaletteObjFireball  ; param: palette
+    .assert kTileIdObjProjFireballFirst .mod 4 = 0, error
+    ora #kTileIdObjProjFireballFirst  ; param: tile ID
+    ldy #kPaletteObjProjFireball  ; param: palette
     jmp FuncA_Objects_Draw1x1Actor  ; preserves X
 .ENDPROC
 
@@ -221,9 +221,9 @@ _HandleCollision:
     lda Zp_FrameCounter_u8
     div #2
     and #$01
-    .assert kTileIdObjFireballFirst .mod 2 = 0, error
-    ora #kTileIdObjFireblastFirst  ; param: tile ID
-    ldy #kPaletteObjFireblast  ; param: palette
+    .assert kTileIdObjProjFireballFirst .mod 2 = 0, error
+    ora #kTileIdObjProjFireblastFirst  ; param: tile ID
+    ldy #kPaletteObjProjFireblast  ; param: palette
     jmp FuncA_Objects_Draw1x1Actor  ; preserves X
 .ENDPROC
 

src/actors/fireball.inc

@@ -32,7 +32,7 @@
 ;;;     each frame, in increments of tau/256.
 
 ;;; Tile IDs for drawing fireball/fireblast projectile actors.
-kTileIdObjFireballFirst  = $c0
-kTileIdObjFireblastFirst = $9a
+kTileIdObjProjFireballFirst  = $c0
+kTileIdObjProjFireblastFirst = $9a
 
 ;;;=========================================================================;;;

src/actors/flamestrike.asm

@@ -55,7 +55,7 @@ kFlamestrikePauseFrames = 100
 kFlamestrikeMaxHeightTiles = 6
 
 ;;; The OBJ palette number used for flamestrike projectile actors.
-kPaletteObjFlamestrike = 1
+kPaletteObjProjFlamestrike = 1
 
 ;;;=========================================================================;;;
 
@@ -178,12 +178,12 @@ _Lengthen:
     lda Zp_FrameCounter_u8
     div #2
     and #1
-    .assert kTileIdObjFlamestrikeFirst .mod 2 = 0, error
-    ora #kTileIdObjFlamestrikeFirst
+    .assert kTileIdObjProjFlamestrikeFirst .mod 2 = 0, error
+    ora #kTileIdObjProjFlamestrikeFirst
     sta T2  ; tile ID
     ;; Draw a column of flame objects.
     @loop:
-    ldy #kPaletteObjFlamestrike  ; param: object flags
+    ldy #kPaletteObjProjFlamestrike  ; param: object flags
     lda T2  ; param: tile ID
     jsr FuncA_Objects_Draw1x1Shape  ; preserves X and T2+
     jsr FuncA_Objects_MoveShapeUpOneTile  ; preserves X and T0+

src/actors/flamestrike.inc

@@ -35,6 +35,6 @@
 .ENDENUM
 
 ;;; The first tile ID for drawing flamestrike projectile actors.
-kTileIdObjFlamestrikeFirst = $d6
+kTileIdObjProjFlamestrikeFirst = $d6
 
 ;;;=========================================================================;;;

src/actors/grenade.asm

@@ -44,7 +44,7 @@
 ;;;=========================================================================;;;
 
 ;;; The OBJ palette number used for grenade projectile actors.
-kPaletteObjGrenade = 0
+kPaletteObjProjGrenade = 0
 
 ;;;=========================================================================;;;
 
@@ -162,8 +162,8 @@ _Remove:
     lda Ram_ActorState1_byte_arr, x
     div #4
     and #$03
-    add #kTileIdObjGrenadeFirst
-    ldy #kPaletteObjGrenade  ; param: palette
+    add #kTileIdObjProjGrenadeFirst
+    ldy #kPaletteObjProjGrenade  ; param: palette
     jmp FuncA_Objects_Draw1x1Actor  ; preserves X
 .ENDPROC
 

src/actors/grenade.inc

@@ -28,6 +28,6 @@
 kGrenadeShakeFrames = 4
 
 ;;; The first tile ID for the grenade actor animation.
-kTileIdObjGrenadeFirst = $ec
+kTileIdObjProjGrenadeFirst = $ec
 
 ;;;=========================================================================;;;

src/actors/slime.asm

@@ -173,8 +173,8 @@ _Spike:
     blt @done
     jsr FuncA_Objects_MoveShapeDownByA  ; preserves X
     jsr FuncA_Objects_MoveShapeLeftHalfTile  ; preserves X
-    lda #kTileIdObjSpike
-    ldy #kPaletteObjSpike  ; param: object flags
+    lda #kTileIdObjProjSpike
+    ldy #kPaletteObjProjSpike  ; param: object flags
     jmp FuncA_Objects_Draw1x1Shape  ; preserves X
     @done:
     rts

src/actors/spike.asm

@@ -84,8 +84,8 @@ _Expire:
 ;;; @preserve X
 .EXPORT FuncA_Objects_DrawActorProjSpike
 .PROC FuncA_Objects_DrawActorProjSpike
-    lda #kTileIdObjSpike  ; param: tile ID
-    ldy #kPaletteObjSpike  ; param: palette
+    lda #kTileIdObjProjSpike  ; param: tile ID
+    ldy #kPaletteObjProjSpike  ; param: palette
     jmp FuncA_Objects_Draw1x1Actor  ; preserves X
 .ENDPROC
 

src/actors/spike.inc

@@ -27,9 +27,9 @@
 ;;;   * State4: Unused.
 
 ;;; The OBJ tile ID for spike projectile actors.
-kTileIdObjSpike = $80
+kTileIdObjProjSpike = $80
 
 ;;; The OBJ palette number used for spike projectile actors.
-kPaletteObjSpike = 0
+kPaletteObjProjSpike = 0
 
 ;;;=========================================================================;;;