scawful/oracle-of-secrets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cleanup labels, move sprites.asm to main

Browse Source
This commit is contained in:
scawful
2024-07-07 00:18:10 -04:00
parent f78b4a1d87
commit 18ec996f33
13 changed files with 30 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Dungeons/house_tag.asm
View File

@@ -95,7 +95,7 @@ HouseTag_WakeUpPlayer:
; Set the game mode ; Set the game mode
LDA #$00 : STA $7EF3C5 ; (0 - intro, 1 - pendants, 2 - crystals) LDA #$00 : STA $7EF3C5 ; (0 - intro, 1 - pendants, 2 - crystals)
LDA #$00 : STA $7EF3CC ; disable telepathic message LDA #$00 : STA $7EF3CC ; disable telepathic message
JSL $00FC41 ; fix monsters JSL Sprite_LoadGfxProperties
RTS RTS
} }

17
Items/bottle_net.asm
View File

@@ -4,11 +4,8 @@
!BottleFlag = $0AA6 !BottleFlag = $0AA6
org $1EFE33 PlayerItem_SpawnFaerie = $1EFE33
PlayerItem_SpawnFaerie: PlayerItem_ReleaseBee = $1EDCCF
org $1EDCCF
PlayerItem_ReleaseBee:
; ============================================================================= ; =============================================================================
; LinkItem_Bottle ; LinkItem_Bottle
@@ -155,7 +152,7 @@ LinkItem_Bottles:
LDA.b #$0E : STA.b $10 LDA.b #$0E : STA.b $10
LDA.b #$07 : STA.w $0208 LDA.b #$07 : STA.w $0208
JSL $0DFA58 JSL RebuildHUD_long
RTS RTS
@@ -175,7 +172,7 @@ LinkItem_Bottles:
LDA.b #$0E : STA.b $10 LDA.b #$0E : STA.b $10
LDA.b #$07 : STA.w $0208 LDA.b #$07 : STA.w $0208
JSL $0DFA58 ; RebuildHUD_long JSL RebuildHUD_long
BRA .bottle_exit BRA .bottle_exit
.LinkItem_BluePotion .LinkItem_BluePotion
@@ -194,7 +191,7 @@ LinkItem_Bottles:
LDA.b #$0E : STA.b $10 LDA.b #$0E : STA.b $10
LDA.b #$07 : STA.w $0208 LDA.b #$07 : STA.w $0208
JSL $0DFA58 ; RebuildHUD_Long JSL RebuildHUD_long
BRA .bottle_exit BRA .bottle_exit
.LinkItem_FairyBottle .LinkItem_FairyBottle
@@ -203,7 +200,7 @@ LinkItem_Bottles:
BRL LinkGoBeep ; BRL $07A955 BRL LinkGoBeep ; BRL $07A955
.released .released
JSL $0DFA58 ; RebuildHUD_Long JSL RebuildHUD_long
BRA .bottle_exit BRA .bottle_exit
.LinkItem_BeeBottle .LinkItem_BeeBottle
@@ -213,7 +210,7 @@ LinkItem_Bottles:
.bee_spawn_success .bee_spawn_success
LDA.b #$02 : STA.l $7EF35C, X LDA.b #$02 : STA.l $7EF35C, X
JSL $0DFA58 ; RebuildHUD_Long JSL RebuildHUD_long
.bottle_exit .bottle_exit
RTS RTS

4
Items/goldstar.asm
View File

@@ -959,7 +959,7 @@ BeginGoldstarOrHookshot:
JSL Hookshot_Init JSL Hookshot_Init
JSL BallChain_StartAnimationFlag JSL BallChain_StartAnimationFlag
LDY.b #$03 : LDA.b #$1F ; ANCILLA 1F LDY.b #$03 : LDA.b #$1F ; ANCILLA 1F
JSL $099B10 ; AncillaAdd_Hookshot JSL AncillaAdd_Hookshot
JSL TransferGFXinRAM JSL TransferGFXinRAM
RTL RTL
@@ -968,7 +968,7 @@ BeginGoldstarOrHookshot:
LDA.b #$13 : STA $5D ; Set hookshot state LDA.b #$13 : STA $5D ; Set hookshot state
LDA.b #$01 : STA.w $037B LDA.b #$01 : STA.w $037B
LDY.b #$03 : LDA.b #$1F ; ANCILLA 1F LDY.b #$03 : LDA.b #$1F ; ANCILLA 1F
JSL $099B10 ; AncillaAdd_Hookshot JSL AncillaAdd_Hookshot
RTL RTL
} }

2
Masks/gbc_form.asm
View File

@@ -98,7 +98,7 @@ OverworldTransition_CheckForGbcLink:
LDA #$06 : STA $02B2 LDA #$06 : STA $02B2
JSL Palette_ArmorAndGloves JSL Palette_ArmorAndGloves
.return .return
JSL $07E6A6 ; Link_HandleMovingAnimation_FullLongEntry JSL Link_HandleMovingAnimation_FullLongEntry
RTL RTL
} }

1
Oracle_main.asm
View File

@@ -83,6 +83,7 @@ namespace Oracle
incsrc "Util/ram.asm" incsrc "Util/ram.asm"
incsrc "Util/functions.asm" incsrc "Util/functions.asm"
incsrc "Core/music_macros.asm" incsrc "Core/music_macros.asm"
incsrc "Sprites/ZSpriteLib/sprites.asm"
incsrc "Core/message.asm" incsrc "Core/message.asm"

2
Sprites/Bosses/kydreeok_head.asm
View File

@@ -346,7 +346,7 @@ RandomlyAttack:
LDA #$CF LDA #$CF
JSL Sprite_SpawnDynamically JSL Sprite_SpawnDynamically
JSL Sprite_SetSpawnedCoords JSL Sprite_SetSpawnedCoords
JSL $09B020 ; Fireball_SpawnTrailGarnish JSL Fireball_SpawnTrailGarnish
LDA.b #$05 : STA.w SprAction, Y LDA.b #$05 : STA.w SprAction, Y
LDA #$20 : STA.w SprTimerA, Y LDA #$20 : STA.w SprTimerA, Y
.no_attack .no_attack

2
Sprites/Bosses/kydrog.asm
View File

@@ -116,7 +116,7 @@ Sprite_Kydrog_Main:
; Put us in the Dark World. ; Put us in the Dark World.
LDA $7EF3CA : EOR.b #$40 : STA $7EF3CA LDA $7EF3CA : EOR.b #$40 : STA $7EF3CA
JSL $00FC41 ; Sprite_LoadGfxProperties JSL Sprite_LoadGfxProperties
STZ $037B : STZ $3C : STZ $3A : STZ $03EF STZ $037B : STZ $3C : STZ $3A : STZ $03EF

4
Sprites/Bosses/kydrog_boss.asm
View File

@@ -326,7 +326,7 @@ Sprite_KydrogBoss_Main:
LDA.b #$28 ; SFX3.28 LDA.b #$28 ; SFX3.28
JSL $0DBB8A ; SpriteSFX_QueueSFX3WithPan JSL $0DBB8A ; SpriteSFX_QueueSFX3WithPan
%GotoAction($0A) ; Goto KydrogBoss_Ascend %GotoAction($0A) ; Goto KydrogBoss_Ascend
JSL $09EF56 ; Kill friends JSL Sprite_KillFriends
RTS RTS
.continue .continue
@@ -404,7 +404,7 @@ Sprite_KydrogBoss_Main:
%StartOnFrame(0) %StartOnFrame(0)
%PlayAnimation(0, 0, 10) %PlayAnimation(0, 0, 10)
JSL $09EF56 ; Kill friends JSL Sprite_KillFriends
LDA $0DA0, X : INC : CMP.b #$08 : BNE .dontReset LDA $0DA0, X : INC : CMP.b #$08 : BNE .dontReset
LDA.b #$00 LDA.b #$00

2
Sprites/NPCs/farore.asm
View File

@@ -195,7 +195,7 @@ Sprite_Farore_Main:
LDA #$02 : STA $7EF3C5 ; (0 - intro, 1 - pendants, 2 - crystals) LDA #$02 : STA $7EF3C5 ; (0 - intro, 1 - pendants, 2 - crystals)
LDA #$05 : STA $012D ; turn off rain sound LDA #$05 : STA $012D ; turn off rain sound
LDA #$01 : STA $B6 ; Set Story State LDA #$01 : STA $B6 ; Set Story State
JSL $00FC41 ; fix monsters JSL Sprite_LoadGfxProperties
%GotoAction(6) %GotoAction(6)
RTS RTS

2
Sprites/Objects/minecart.asm
View File

@@ -138,7 +138,7 @@ macro HandlePlayerCamera()
LDA $20 : SEC : SBC $3E : STA $30 LDA $20 : SEC : SBC $3E : STA $30
PHX PHX
JSL $07E6A6 ; Link_HandleMovingAnimation_FullLongEntry JSL Link_HandleMovingAnimation_FullLongEntry
JSL HandleIndoorCameraAndDoors JSL HandleIndoorCameraAndDoors
JSL Link_CancelDash JSL Link_CancelDash

4
Sprites/Objects/portal_sprite.asm
View File

@@ -252,7 +252,7 @@ Sprite_Portal_Main:
LDA $7EC194 : STA $0614 LDA $7EC194 : STA $0614
LDA $7EC196 : STA $0616 LDA $7EC196 : STA $0616
JSL $07E9D3 ; ApplyLinksMovementToCamera JSL ApplyLinksMovementToCamera
PHX ; Infinite loop prevention protocol PHX ; Infinite loop prevention protocol
LDA OrangeSpriteIndex : TAX LDA OrangeSpriteIndex : TAX
@@ -276,7 +276,7 @@ Sprite_Portal_Main:
LDA $7EC194 : STA $0614 LDA $7EC194 : STA $0614
LDA $7EC196 : STA $0616 LDA $7EC196 : STA $0616
JSL $07E9D3 ; ApplyLinksMovementToCamera JSL ApplyLinksMovementToCamera
PHX PHX
LDA BlueSpriteIndex : TAX LDA BlueSpriteIndex : TAX

11
Sprites/ZSpriteLib/sprites.asm
View File

@@ -462,6 +462,8 @@ Sprite_RepelDash = $079291
Sprite_SpawnPoofGarnish = $05AB9C Sprite_SpawnPoofGarnish = $05AB9C
Sprite_LoadGfxProperties = $00FC41
ThrownSprite_TileAndSpriteInteraction_long = $06DFF2 ThrownSprite_TileAndSpriteInteraction_long = $06DFF2
; ========================================================= ; =========================================================
@@ -490,6 +492,10 @@ Mosaic = $95
; 0x00 indicates no sprite in this slot ; 0x00 indicates no sprite in this slot
UWDEATH = $7FDF80 UWDEATH = $7FDF80
; =========================================================
RebuildHUD_long = $0DFA58
; ========================================================= ; =========================================================
; Controllers ; Controllers
@@ -855,7 +861,10 @@ AncillaAdd_SwordSwingSparkle = $0993C2
AncillaAdd_QuakeSpell = $099589 AncillaAdd_QuakeSpell = $099589
AncillaAdd_IceRodShot = $099863 AncillaAdd_IceRodShot = $099863
AncillaAdd_Splash = $0998FC AncillaAdd_Splash = $0998FC
AncillaAdd_Hookshot = $099B10
DeleteBoomAndByrnaSparks = $0FFD86 DeleteBoomAndByrnaSparks = $0FFD86
Sparkle_PrepOAMFromRadial = $08DA17 Sparkle_PrepOAMFromRadial = $08DA17
Fireball_SpawnTrailGarnish = $09B020

1
Sprites/all_sprites.asm
View File

@@ -69,7 +69,6 @@ org $05FF7D
; ========================================================= ; =========================================================
incsrc ZSpriteLib/sprite_macros.asm incsrc ZSpriteLib/sprite_macros.asm
incsrc ZSpriteLib/sprites.asm
; TODO: Sprite_AttemptKillingOfKin ; TODO: Sprite_AttemptKillingOfKin