Catobat map fix
Cutoff table updated Mutliworld mem location added for item ids
This commit is contained in:
@@ -112,6 +112,7 @@ function hexto555(h) = ((((h&$FF)/8)<<10)|(((h>>8&$FF)/8)<<5)|(((h>>16&$FF)/8)<<
|
|||||||
!MULTIWORLD_SPRITEITEM_PLAYER_ID = "$7EC099"
|
!MULTIWORLD_SPRITEITEM_PLAYER_ID = "$7EC099"
|
||||||
!MULTIWORLD_HUD_TIMER = "$7EC09A"
|
!MULTIWORLD_HUD_TIMER = "$7EC09A"
|
||||||
!MULTIWORLD_HUD_DELAY = "#120"
|
!MULTIWORLD_HUD_DELAY = "#120"
|
||||||
|
!MULTIWORLD_ITEM_ID = "$7EC09B" ; for lua scripts?
|
||||||
!Dungeon_ChestData = "$01E96C"
|
!Dungeon_ChestData = "$01E96C"
|
||||||
|
|
||||||
incsrc hooks.asm
|
incsrc hooks.asm
|
||||||
|
|||||||
@@ -582,6 +582,8 @@ dw $00bc, $00a2, $00a3, $00c2, $001a, $0049, $0014, $008c
|
|||||||
dw $009f, $0066, $005d, $00a8, $00a9, $00aa, $00b9, $0052
|
dw $009f, $0066, $005d, $00a8, $00a9, $00aa, $00b9, $0052
|
||||||
; HC West Hall, TR Dash Bridge, TR Hub, Pod Arena, GT Petting Zoo, Ice Spike Cross
|
; HC West Hall, TR Dash Bridge, TR Hub, Pod Arena, GT Petting Zoo, Ice Spike Cross
|
||||||
dw $0050, $00c5, $00c6, $0009, $0003, $002a, $007d, $005e
|
dw $0050, $00c5, $00c6, $0009, $0003, $002a, $007d, $005e
|
||||||
|
; Sewer Drop, Mire Cross, GT Crystal Circles
|
||||||
|
dw $0011, $00b2, $003d
|
||||||
dw $ffff
|
dw $ffff
|
||||||
|
|
||||||
; dungeon tables
|
; dungeon tables
|
||||||
|
|||||||
@@ -152,9 +152,8 @@ SEP #$30
|
|||||||
|
|
||||||
LDA $10 : CMP #$12 : BEQ .noprize
|
LDA $10 : CMP #$12 : BEQ .noprize
|
||||||
|
|
||||||
REP #$20
|
|
||||||
|
|
||||||
LDA.l MapMode
|
LDA.l MapMode
|
||||||
|
REP #$20
|
||||||
BEQ .drawprize
|
BEQ .drawprize
|
||||||
|
|
||||||
LDA.l $7EF368
|
LDA.l $7EF368
|
||||||
|
|||||||
@@ -456,6 +456,7 @@ AddReceivedItemExpanded:
|
|||||||
JSR IncrementItemCounters
|
JSR IncrementItemCounters
|
||||||
+
|
+
|
||||||
LDA $02D8 ; Item Value
|
LDA $02D8 ; Item Value
|
||||||
|
STA !MULTIWORLD_ITEM_ID
|
||||||
|
|
||||||
CMP.b #$16 : BEQ .bottle ; Bottle
|
CMP.b #$16 : BEQ .bottle ; Bottle
|
||||||
CMP.b #$2B : BEQ .bottle ; Red Potion w/bottle
|
CMP.b #$2B : BEQ .bottle ; Red Potion w/bottle
|
||||||
|
|||||||
Reference in New Issue
Block a user