diff --git a/Dungeons/Objects/object_handler.asm b/Dungeons/Objects/object_handler.asm index 13f4fae..894a120 100644 --- a/Dungeons/Objects/object_handler.asm +++ b/Dungeons/Objects/object_handler.asm @@ -31,7 +31,7 @@ org $018264 ; Object ID 0x32 org $0182A8 ; Object ID 0x54 dw SpriteBodyObjects -; RoomDraw_WeirdUglyPot +; RoomDraw_WeirdUglyPot org $018650 ; Object ID 230 dw HeavyPot @@ -63,7 +63,7 @@ org $2C8000 InitHeavyPot: { LDA.w #$1010 - PHX + PHX LDX.w $042C ; MANIPINDEX LDA.w #$1111 : STA $0500, X ; M16BUFF500 @@ -83,10 +83,10 @@ CustomObjectHandler: STZ $03 ; 03 will be used to store the object ID for custom config LDA $00 : PHA LDA $02 : PHA - ; $00 Will be used for tile count and tile to skip + ; $00 Will be used for tile count and tile to skip LDA $B2 : ASL #2 : ORA $B4 - ;get the offset for the object data based on the object height + ;get the offset for the object data based on the object height ASL : TAX LDA .ObjOffset, X TAX @@ -128,11 +128,11 @@ CustomObjectHandler: RTL .ObjOffset - dw .LeftRight-.ObjData ; 00 - dw .UpDown-.ObjData ; 01 - dw .TopLeft-.ObjData ; 02 - dw .TopRight-.ObjData ; 03 - dw .Bottomleft-.ObjData ; 04 + dw .LeftRight-.ObjData ; 00 + dw .UpDown-.ObjData ; 01 + dw .TopLeft-.ObjData ; 02 + dw .TopRight-.ObjData ; 03 + dw .Bottomleft-.ObjData ; 04 dw .BottomRight-.ObjData ; 05 dw .UpDownFloor-.ObjData ; 06 dw .LeftRightFloor-.ObjData ; 07 @@ -142,7 +142,7 @@ CustomObjectHandler: dw .BottomRightFloor-.ObjData ; 11 dw .FloorAny-.ObjData ; 12 dw .WallSwordHouse-.ObjData ; 13 - dw .TrackAny-.ObjData ; 14 + dw .TrackAny-.ObjData ; 14 dw .SmallStatue-.ObjData ; 15 .ObjData @@ -188,10 +188,10 @@ SpriteObjectsDraw: STZ $03 ; 03 will be used to store the object ID for custom config LDA $00 : PHA LDA $02 : PHA - ; $00 Will be used for tile count and tile to skip + ; $00 Will be used for tile count and tile to skip LDA $B2 : ASL #2 : ORA $B4 - ;get the offset for the object data based on the object height + ;get the offset for the object data based on the object height ASL : TAX LDA .ObjOffset, X TAX @@ -253,10 +253,10 @@ CustomObjectHandler2: STZ $03 ; 03 will be used to store the object ID for custom config LDA $00 : PHA LDA $02 : PHA - ; $00 Will be used for tile count and tile to skip + ; $00 Will be used for tile count and tile to skip LDA $B2 : ASL #2 : ORA $B4 - ;get the offset for the object data based on the object height + ;get the offset for the object data based on the object height ASL : TAX LDA .ObjOffset, X TAX @@ -313,7 +313,7 @@ CustomObjectHandler2: pushpc -; Item ID 22B +; Item ID 22B org $00A9AC dw $0D28, $0D38, $4D28, $4D38 @@ -342,4 +342,4 @@ org $00C3B8 ; #obj2866: ; dw $282C, $0808, $080D, $282D ; dw $09EF, $0878, $682D, $09EF -; dw $4878, $682C, $4808, $480D \ No newline at end of file +; dw $4878, $682C, $4808, $480D diff --git a/Overworld/overworld.asm b/Overworld/overworld.asm index a1fbd74..d5ef676 100644 --- a/Overworld/overworld.asm +++ b/Overworld/overworld.asm @@ -28,7 +28,7 @@ org $0E9889 ; FlashGanonTowerPalette org $0EF587 LDA.b $8A - CMP.b #$73 + CMP.b #$73 BEQ .on_dark_dm CMP.b #$75 BEQ .on_dark_dm @@ -336,4 +336,4 @@ SpawnPointData: #_02DC51: db $03 ; 0x03 - Uncle - SONG 03 #_02DC52: db $10 ; 0x04 - Throne - SONG 10 #_02DC53: db $12 ; 0x05 - Old man cave - SONG 12 -#_02DC54: db $12 ; 0x06 - Old man home - SONG 12 \ No newline at end of file +#_02DC54: db $12 ; 0x06 - Old man home - SONG 12 diff --git a/Sprites/NPCs/goron.asm b/Sprites/NPCs/goron.asm index ff7548a..0770715 100644 --- a/Sprites/NPCs/goron.asm +++ b/Sprites/NPCs/goron.asm @@ -53,8 +53,6 @@ Sprite_Goron_Long: Sprite_Goron_Prep: { PHB : PHK : PLB - - PLB RTL }