Apple-2gs-SW
/
iigs-game-engine
mirror of https://github.com/lscharen/iigs-game-engine.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix a few more abs addr locations

This commit is contained in:
Lucas Scharenbroich 2023-05-26 12:42:15 -05:00
parent 5e157072fa
commit 9560591642
1 changed files with 50 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
demos/smb/rom2.s
View File

@ -3699,16 +3699,31 @@ NoKillE dex ;do this until all slots are checked
FrenzyIDData
db FlyCheepCheepFrenzy, BBill_CCheep_Frenzy, Stop_Frenzy
AreaFrenzy ldx $00 ;use area object identifier bit as offset
lda FrenzyIDData-8,x ;note that it starts at 8, thus weird address here
ldy #$05
FreCompLoop dey ;check regular slots of enemy object buffer
bmi ExitAFrenzy ;if all slots checked and enemy object not found, branch to store
cmp Enemy_ID,y ;check for enemy object in buffer versus frenzy object
bne FreCompLoop
lda #$00 ;if enemy object already present, nullify queue and leave
ExitAFrenzy sta EnemyFrenzyQueue ;store enemy into frenzy queue
rts
;AreaFrenzy ldx $00 ;use area object identifier bit as offset
; lda FrenzyIDData-8,x ;note that it starts at 8, thus weird address here
; ldy #$05
;:FreCompLoop dey ;check regular slots of enemy object buffer
; bmi :ExitAFrenzy ;if all slots checked and enemy object not found, branch to store
; cmp Enemy_ID,y ;check for enemy object in buffer versus frenzy object
; bne :FreCompLoop
; lda #$00 ;if enemy object already present, nullify queue and leave
;:ExitAFrenzy sta EnemyFrenzyQueue ;store enemy into frenzy queue
; rts
AreaFrenzy ldy $00 ;use area object identifier bit as offset
lda FrenzyIDData-8,y ;note that it starts at 8, thus weird address here
ldx #$05
:FreCompLoop dex ;check regular slots of enemy object buffer
bmi :ExitAFrenzy ;if all slots checked and enemy object not found, branch to store
cmp Enemy_ID,x ;check for enemy object in buffer versus frenzy object
bne :FreCompLoop
lda #$00 ;if enemy object already present, nullify queue and leave
:ExitAFrenzy sta EnemyFrenzyQueue ;store enemy into frenzy queue
txa
tyx
tay
lda EnemyFrenzyQueue
rts
;--------------------------------
;$06 - used by MushroomLedge to store length
@ -6774,16 +6789,34 @@ Setup_Vine
sta Enemy_ID,x ;store in buffer
lda #$01
sta Enemy_Flag,x ;set flag for enemy object buffer
lda Block_PageLoc,y
sta Enemy_PageLoc,x ;copy page location from previous object
lda Block_X_Position,y
sta Enemy_X_Position,x ;copy horizontal coordinate from previous object
lda Block_Y_Position,y
sta Enemy_Y_Position,x ;copy vertical coordinate from previous object
; lda Block_PageLoc,y
; sta Enemy_PageLoc,x ;copy page location from previous object
; lda Block_X_Position,y
; sta Enemy_X_Position,x ;copy horizontal coordinate from previous object
; lda Block_Y_Position,y
; sta Enemy_Y_Position,x ;copy vertical coordinate from previous object
stx GTE_TMP
tyx
lda Block_PageLoc,x ; FIXME
pha
lda Block_X_Position,x ; FIXME
pha
lda Block_Y_Position,x ; FIXME
ldx GTE_TMP
sta Enemy_Y_Position,x ;copy vertical coordinate from previous object
pla
sta Enemy_X_Position,x ;copy horizontal coordinate from previous object
pla
sta Enemy_PageLoc,x ;copy page location from previous object
lda Enemy_Y_Position,x ; GTE: reload into accumulator
ldy VineFlagOffset ;load vine flag/offset to next available vine slot
bne NextVO ;if set at all, don't bother to store vertical
sta VineStart_Y_Position ;otherwise store vertical coordinate here
NextVO txa ;store object offset to next available vine slot
NextVO txa ;store object offset to next available vine slot
sta VineObjOffset,y ;using vine flag as offset
inc VineFlagOffset ;increment vine flag offset
lda #Sfx_GrowVine