From 29339ed1a7a9d0ecd15e95f7c359ca5c98dbb5f9 Mon Sep 17 00:00:00 2001 From: PJBoy Date: Tue, 9 Jul 2024 14:53:04 +0000 Subject: [PATCH] Update logs from website --- Bank $A7.asm | 4 ++-- Bank $A8.asm | 48 ++++++++++++++++++++++++------------------------ Bank $AA.asm | 2 +- Bank $B3.asm | 9 ++++----- 4 files changed, 31 insertions(+), 32 deletions(-) diff --git a/Bank $A7.asm b/Bank $A7.asm index 1cbf928..03e9425 100644 --- a/Bank $A7.asm +++ b/Bank $A7.asm @@ -3215,7 +3215,7 @@ $A7:BB7C AD D2 10 LDA $10D2 [$7E:10D2] ;\ $A7:BB7F C9 39 89 CMP #$8939 ;} If [Kraid foot instruction list pointer] >= $8939 (last frame of walking backwards animation): $A7:BB82 30 1F BMI $1F [$BBA3] ;/ $A7:BB84 A9 2D B9 LDA #$B92D ;\ -$A7:BB87 8D E8 10 STA $10E8 [$7E:10E8] ;} Kraid foot function = decrement enemy function timer +$A7:BB87 8D E8 10 STA $10E8 [$7E:10E8] ;} Kraid foot function = handle Kraid enemy function timer $A7:BB8A A9 B4 00 LDA #$00B4 ;\ $A7:BB8D 8D F2 10 STA $10F2 [$7E:10F2] ;} Kraid foot function timer = 180 $A7:BB90 A9 A4 BB LDA #$BBA4 ;\ @@ -3430,7 +3430,7 @@ $A7:BD16 9D 8E 0F STA $0F8E,x[$7E:110E] ;} Enemy spritemap pointer = $A617 ( $A7:BD19 A9 60 BD LDA #$BD60 ;\ $A7:BD1C 9F 00 78 7E STA $7E7800,x[$7E:7980];} Enemy next function = initialise fingernail $A7:BD20 A9 2D B9 LDA #$B92D ;\ -$A7:BD23 9D A8 0F STA $0FA8,x[$7E:1128] ;} Enemy function = decrement enemy function timer +$A7:BD23 9D A8 0F STA $0FA8,x[$7E:1128] ;} Enemy function = handle Kraid enemy function timer $A7:BD26 A9 40 00 LDA #$0040 ;\ $A7:BD29 9D B2 0F STA $0FB2,x[$7E:1132] ;} Enemy function timer = 40h $A7:BD2C 6B RTL diff --git a/Bank $A8.asm b/Bank $A8.asm index 4c89a74..85f3bcb 100644 --- a/Bank $A8.asm +++ b/Bank $A8.asm @@ -6911,9 +6911,9 @@ $A8:CD46 A9 FC FF LDA #$FFFC ;} Extra Samus X displacement = -4.0 $A8:CD49 8D 58 0B STA $0B58 [$7E:0B58] ;/ $A8:CD4C BD 7E 0F LDA $0F7E,x[$7E:0F7E] ;\ -$A8:CD4F 9D AE 0F STA $0FAE,x[$7E:0FAE] ;} Enemy $0FAE = [enemy Y position] +$A8:CD4F 9D AE 0F STA $0FAE,x[$7E:0FAE] ;} Enemy Y position backup = [enemy Y position] $A8:CD52 BD 7A 0F LDA $0F7A,x[$7E:0F7A] ;\ -$A8:CD55 9D AC 0F STA $0FAC,x[$7E:0FAC] ;} Enemy $0FAC = [enemy X position] +$A8:CD55 9D AC 0F STA $0FAC,x[$7E:0FAC] ;} Enemy X position backup = [enemy X position] $A8:CD58 38 SEC ;\ $A8:CD59 FD 82 0F SBC $0F82,x[$7E:0F82] ;| $A8:CD5C 38 SEC ;} Enemy X position -= [enemy X radius] * 2 @@ -6929,9 +6929,9 @@ $A8:CD73 18 CLC ;| $A8:CD74 69 08 00 ADC #$0008 ;} Enemy laser cooldown += 8 $A8:CD77 9D AA 0F STA $0FAA,x[$7E:0FEA] ;/ $A8:CD7A BD AC 0F LDA $0FAC,x[$7E:0FEC] ;\ -$A8:CD7D 9D 7A 0F STA $0F7A,x[$7E:0FBA] ;} Enemy X position = [enemy $0FAC] +$A8:CD7D 9D 7A 0F STA $0F7A,x[$7E:0FBA] ;} Enemy X position = [enemy X position backup] $A8:CD80 BD AE 0F LDA $0FAE,x[$7E:0FEE] ;\ -$A8:CD83 9D 7E 0F STA $0F7E,x[$7E:0FBE] ;} Enemy Y position = [enemy $0FAE] +$A8:CD83 9D 7E 0F STA $0F7E,x[$7E:0FBE] ;} Enemy Y position = [enemy Y position backup] $A8:CD86 7A PLY $A8:CD87 AE 54 0E LDX $0E54 [$7E:0E54] $A8:CD8A A9 00 02 LDA #$0200 ;\ @@ -6941,9 +6941,9 @@ $A8:CD93 FA PLX $A8:CD94 6B RTL ; Return $A8:CD95 BD AC 0F LDA $0FAC,x[$7E:0FAC] ;\ -$A8:CD98 9D 7A 0F STA $0F7A,x[$7E:0F7A] ;} Enemy X position = [enemy $0FAC] +$A8:CD98 9D 7A 0F STA $0F7A,x[$7E:0F7A] ;} Enemy X position = [enemy X position backup] $A8:CD9B BD AE 0F LDA $0FAE,x[$7E:0FAE] ;\ -$A8:CD9E 9D 7E 0F STA $0F7E,x[$7E:0F7E] ;} Enemy Y position = [enemy $0FAE] +$A8:CD9E 9D 7E 0F STA $0F7E,x[$7E:0F7E] ;} Enemy Y position = [enemy Y position backup] $A8:CDA1 7A PLY $A8:CDA2 FA PLX $A8:CDA3 6B RTL @@ -7019,9 +7019,9 @@ $A8:CE27 A9 04 00 LDA #$0004 ;} Extra Samus X displacement = 4.0 $A8:CE2A 8D 58 0B STA $0B58 [$7E:0B58] ;/ $A8:CE2D BD 7E 0F LDA $0F7E,x[$7E:0F7E] ;\ -$A8:CE30 9D AE 0F STA $0FAE,x[$7E:0FAE] ;} Enemy $0FAE = [enemy Y position] +$A8:CE30 9D AE 0F STA $0FAE,x[$7E:0FAE] ;} Enemy Y position backup = [enemy Y position] $A8:CE33 BD 7A 0F LDA $0F7A,x[$7E:0F7A] ;\ -$A8:CE36 9D AC 0F STA $0FAC,x[$7E:0FAC] ;} Enemy $0FAC = [enemy X position] +$A8:CE36 9D AC 0F STA $0FAC,x[$7E:0FAC] ;} Enemy X position backup = [enemy X position] $A8:CE39 18 CLC ;\ $A8:CE3A 7D 82 0F ADC $0F82,x[$7E:0F82] ;| $A8:CE3D 18 CLC ;} Enemy X position += [enemy X radius] * 2 @@ -7037,9 +7037,9 @@ $A8:CE54 18 CLC ;| $A8:CE55 69 08 00 ADC #$0008 ;} Enemy laser cooldown += 8 $A8:CE58 9D AA 0F STA $0FAA,x[$7E:0FEA] ;/ $A8:CE5B BD AC 0F LDA $0FAC,x[$7E:0FEC] ;\ -$A8:CE5E 9D 7A 0F STA $0F7A,x[$7E:0FBA] ;} Enemy X position = [enemy $0FAC] +$A8:CE5E 9D 7A 0F STA $0F7A,x[$7E:0FBA] ;} Enemy X position = [enemy X position backup] $A8:CE61 BD AE 0F LDA $0FAE,x[$7E:0FEE] ;\ -$A8:CE64 9D 7E 0F STA $0F7E,x[$7E:0FBE] ;} Enemy Y position = [enemy $0FAE] +$A8:CE64 9D 7E 0F STA $0F7E,x[$7E:0FBE] ;} Enemy Y position = [enemy Y position backup] $A8:CE67 7A PLY $A8:CE68 AE 54 0E LDX $0E54 [$7E:0E54] $A8:CE6B A9 00 FE LDA #$FE00 ;\ @@ -7049,9 +7049,9 @@ $A8:CE74 FA PLX $A8:CE75 6B RTL ; Return $A8:CE76 BD AC 0F LDA $0FAC,x[$7E:0FAC] ;\ -$A8:CE79 9D 7A 0F STA $0F7A,x[$7E:0F7A] ;} Enemy X position = [enemy $0FAC] +$A8:CE79 9D 7A 0F STA $0F7A,x[$7E:0F7A] ;} Enemy X position = [enemy X position backup] $A8:CE7C BD AE 0F LDA $0FAE,x[$7E:0FAE] ;\ -$A8:CE7F 9D 7E 0F STA $0F7E,x[$7E:0F7E] ;} Enemy Y position = [enemy $0FAE] +$A8:CE7F 9D 7E 0F STA $0F7E,x[$7E:0F7E] ;} Enemy Y position = [enemy Y position backup] $A8:CE82 7A PLY $A8:CE83 FA PLX $A8:CE84 6B RTL @@ -7134,9 +7134,9 @@ $A8:CF0C A9 04 00 LDA #$0004 ;} Extra Samus X displacement = 4.0 $A8:CF0F 8D 58 0B STA $0B58 [$7E:0B58] ;/ $A8:CF12 BD 7E 0F LDA $0F7E,x[$7E:0F7E] ;\ -$A8:CF15 9D AE 0F STA $0FAE,x[$7E:0FAE] ;} Enemy $0FAE = [enemy Y position] +$A8:CF15 9D AE 0F STA $0FAE,x[$7E:0FAE] ;} Enemy Y position backup = [enemy Y position] $A8:CF18 BD 7A 0F LDA $0F7A,x[$7E:0F7A] ;\ -$A8:CF1B 9D AC 0F STA $0FAC,x[$7E:0FAC] ;} Enemy $0FAC = [enemy X position] +$A8:CF1B 9D AC 0F STA $0FAC,x[$7E:0FAC] ;} Enemy X position backup = [enemy X position] $A8:CF1E 18 CLC ;\ $A8:CF1F 7D 82 0F ADC $0F82,x[$7E:0F82] ;| $A8:CF22 18 CLC ;} Enemy X position += [enemy X radius] * 2 @@ -7152,9 +7152,9 @@ $A8:CF39 18 CLC ;| $A8:CF3A 69 08 00 ADC #$0008 ;} Enemy laser cooldown += 8 $A8:CF3D 9D AA 0F STA $0FAA,x[$7E:0FAA] ;/ $A8:CF40 BD AC 0F LDA $0FAC,x[$7E:0FAC] ;\ -$A8:CF43 9D 7A 0F STA $0F7A,x[$7E:0F7A] ;} Enemy X position = [enemy $0FAC] +$A8:CF43 9D 7A 0F STA $0F7A,x[$7E:0F7A] ;} Enemy X position = [enemy X position backup] $A8:CF46 BD AE 0F LDA $0FAE,x[$7E:0FAE] ;\ -$A8:CF49 9D 7E 0F STA $0F7E,x[$7E:0F7E] ;} Enemy Y position = [enemy $0FAE] +$A8:CF49 9D 7E 0F STA $0F7E,x[$7E:0F7E] ;} Enemy Y position = [enemy Y position backup] $A8:CF4C 7A PLY $A8:CF4D AE 54 0E LDX $0E54 [$7E:0E54] $A8:CF50 A9 00 FE LDA #$FE00 ;\ @@ -7164,9 +7164,9 @@ $A8:CF59 FA PLX $A8:CF5A 6B RTL ; Return $A8:CF5B BD AC 0F LDA $0FAC,x[$7E:0FAC] ;\ -$A8:CF5E 9D 7A 0F STA $0F7A,x[$7E:0F7A] ;} Enemy X position = [enemy $0FAC] +$A8:CF5E 9D 7A 0F STA $0F7A,x[$7E:0F7A] ;} Enemy X position = [enemy X position backup] $A8:CF61 BD AE 0F LDA $0FAE,x[$7E:0FAE] ;\ -$A8:CF64 9D 7E 0F STA $0F7E,x[$7E:0F7E] ;} Enemy Y position = [enemy $0FAE] +$A8:CF64 9D 7E 0F STA $0F7E,x[$7E:0F7E] ;} Enemy Y position = [enemy Y position backup] $A8:CF67 7A PLY $A8:CF68 FA PLX $A8:CF69 6B RTL @@ -7242,9 +7242,9 @@ $A8:CFED A9 FC FF LDA #$FFFC ;} Extra Samus X displacement = -4.0 $A8:CFF0 8D 58 0B STA $0B58 [$7E:0B58] ;/ $A8:CFF3 BD 7E 0F LDA $0F7E,x[$7E:0F7E] ;\ -$A8:CFF6 9D AE 0F STA $0FAE,x[$7E:0FAE] ;} Enemy $0FAE = [enemy Y position] +$A8:CFF6 9D AE 0F STA $0FAE,x[$7E:0FAE] ;} Enemy Y position backup = [enemy Y position] $A8:CFF9 BD 7A 0F LDA $0F7A,x[$7E:0F7A] ;\ -$A8:CFFC 9D AC 0F STA $0FAC,x[$7E:0FAC] ;} Enemy $0FAC = [enemy X position] +$A8:CFFC 9D AC 0F STA $0FAC,x[$7E:0FAC] ;} Enemy X position backup = [enemy X position] $A8:CFFF 38 SEC ;\ $A8:D000 FD 82 0F SBC $0F82,x[$7E:0F82] ;| $A8:D003 38 SEC ;} Enemy X position -= [enemy X radius] * 2 @@ -7260,9 +7260,9 @@ $A8:D01A 18 CLC ;| $A8:D01B 69 08 00 ADC #$0008 ;} Enemy laser cooldown += 8 $A8:D01E 9D AA 0F STA $0FAA,x[$7E:0FAA] ;/ $A8:D021 BD AE 0F LDA $0FAE,x[$7E:0FAE] ;\ -$A8:D024 9D 7E 0F STA $0F7E,x[$7E:0F7E] ;} Enemy X position = [enemy $0FAC] +$A8:D024 9D 7E 0F STA $0F7E,x[$7E:0F7E] ;} Enemy X position = [enemy X position backup] $A8:D027 BD AC 0F LDA $0FAC,x[$7E:0FAC] ;\ -$A8:D02A 9D 7A 0F STA $0F7A,x[$7E:0F7A] ;} Enemy Y position = [enemy $0FAE] +$A8:D02A 9D 7A 0F STA $0F7A,x[$7E:0F7A] ;} Enemy Y position = [enemy Y position backup] $A8:D02D 7A PLY $A8:D02E AE 54 0E LDX $0E54 [$7E:0E54] $A8:D031 A9 00 02 LDA #$0200 ;\ @@ -7272,9 +7272,9 @@ $A8:D03A FA PLX $A8:D03B 6B RTL ; Return $A8:D03C BD AE 0F LDA $0FAE,x[$7E:0FAE] ;\ -$A8:D03F 9D 7E 0F STA $0F7E,x[$7E:0F7E] ;} Enemy X position = [enemy $0FAC] +$A8:D03F 9D 7E 0F STA $0F7E,x[$7E:0F7E] ;} Enemy X position = [enemy X position backup] $A8:D042 BD AC 0F LDA $0FAC,x[$7E:0FAC] ;\ -$A8:D045 9D 7A 0F STA $0F7A,x[$7E:0F7A] ;} Enemy Y position = [enemy $0FAE] +$A8:D045 9D 7A 0F STA $0F7A,x[$7E:0F7A] ;} Enemy Y position = [enemy Y position backup] $A8:D048 7A PLY $A8:D049 FA PLX $A8:D04A 6B RTL diff --git a/Bank $AA.asm b/Bank $AA.asm index e9a1dda..95ddca8 100644 --- a/Bank $AA.asm +++ b/Bank $AA.asm @@ -4971,7 +4971,7 @@ $AA:E23D dw F401, F401, F404, F409, F40F, F418, F422, F42E, F43C, F } -;;; $E2BD..F7D2: n00b tube cracks ;;; +;;; $E2BD..F7D2: n00b tube cracks / chozo statue ;;; { ;;; $E2BD: Palette - enemy $F0BF (n00b tube cracks) ;;; { diff --git a/Bank $B3.asm b/Bank $B3.asm index c26b9e9..1dcd5a3 100644 --- a/Bank $B3.asm +++ b/Bank $B3.asm @@ -26,7 +26,7 @@ $B3:86A7 dx 000A,8714, } -;;; $86CB: Instruction list ;;; +;;; $86CB: Unused. Instruction list ;;; { $B3:86CB dx 0008,874C, 0008,8753, @@ -35,7 +35,7 @@ $B3:86CB dx 0008,874C, } -;;; $86DB: Instruction list ;;; +;;; $86DB: Unused. Instruction list ;;; { $B3:86DB dx 0008,8761, 0008,8768, @@ -44,7 +44,7 @@ $B3:86DB dx 0008,8761, } -;;; $86EB: Instruction list ;;; +;;; $86EB: Unused. Instruction list ;;; { $B3:86EB dx 0008,8776, 0008,877D, @@ -3590,7 +3590,7 @@ $B3:E670 A9 0F 00 LDA #$000F ;\ $B3:E673 22 33 82 80 JSL $808233[$80:8233] ;} If critters escaped: $B3:E677 90 06 BCC $06 [$E67F] ;/ $B3:E679 A9 DA E5 LDA #$E5DA ;\ -$B3:E67C 9D 92 0F STA $0F92,x[$7E:1052] ;} Enemy instruction list pointer = $E5DA +$B3:E67C 9D 92 0F STA $0F92,x[$7E:1052] ;} Enemy instruction list pointer = $E5DA (express gratitude then escape) $B3:E67F 60 RTS } @@ -3616,7 +3616,6 @@ $B3:E6A0 9D A8 0F STA $0FA8,x[$7E:1028] ;/ $B3:E6A3 10 05 BPL $05 [$E6AA] ; If [enemy X velocity] < 0: $B3:E6A5 A9 56 E5 LDA #$E556 ; Enemy instruction list pointer = $E556 $B3:E6A8 80 03 BRA $03 [$E6AD] - ; Else ([enemy X velocity] >= 0): $B3:E6AA A9 82 E5 LDA #$E582 ; Enemy instruction list pointer = $E582