alttpr-gwaa-kiwi/alttpr-baserom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'baserom/master' into MergeDecompression

Browse Source 
# Conflicts:
#	LTTP_RND_GeneralBugfixes.asm
#	inventory.asm
#	itemdatatables.asm
#	newitems.asm
This commit is contained in:
aerinon
2023-09-07 12:21:22 -06:00
parent 9fc85218ae 5a0bd6dbe0
commit 134651e4fb
19 changed files with 579 additions and 691 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
hooks.asm
View File

@@ -541,10 +541,6 @@ JSL AgahnimAsksAboutPed
org $9ED6E8
JSL CheckAgaForPed : NOP
; kill ganon when aga dies in light speed
org $80F970
JSL KillGanon
;================================================================================
; Zelda Sprite Fixes
;--------------------------------------------------------------------------------
@@ -715,6 +711,8 @@ JSL GetItemDamageValue
;================================================================================
; Misc Stats
;--------------------------------------------------------------------------------
org $80F970
JSL OnAga1Defeated
org $829E2E ; <- 11E2E - module_ganon_emerges.asm : 59 (JSL Dungeon_SaveRoomDataWRAM.justKeys)
JSL OnAga2Defeated
;--------------------------------------------------------------------------------
@@ -1466,6 +1464,7 @@ NOP #3 ; Not sure why this is here
;--------------------------------------------------------------------------------
org $87A205 : JSL.l RebuildHUD_update_long
org $8AEF62 : JSL.l RebuildHUD_update_long
org $87A1A4 : JSL.l RebuildHUD_update_long
org $87A1CF : JSL.l RebuildHUD_update_long
org $87A235 : JSL.l RebuildHUD_update_long
;--------------------------------------------------------------------------------
@@ -2547,20 +2546,18 @@ NOP ; 1 byte
;--------------------------------------------------------------------------------
; Text Renderer
;--------------------------------------------------------------------------------
if !FEATURE_NEW_TEXT
org $8EF51B : JML RenderCharExtended
org $8EF520 : RenderCharExtended_returnOriginal:
org $8EF567 : RenderCharExtended_returnUncompressed:
org $8EF356 : JSL RenderCharLookupWidth
org $8EF3BA : JSL RenderCharLookupWidth
org $8EF48E : JML RenderCharLookupWidthDraw
org $8EF499 : RenderCharLookupWidthDraw_return:
org $8EF6AA : JML RenderCharToMapExtended
org $8EF6C2 : RenderCharToMapExtended_return:
org $8EFA50 : JSL RenderCharSetColorExtended
org $8EEE5D : JSL RenderCharSetColorExtended_init
org $8EF285 : JSL RenderCharSetColorExtended_close : NOP
endif
org $8EF51B : JML RenderCharExtended
org $8EF520 : RenderCharExtended_returnOriginal:
org $8EF567 : RenderCharExtended_returnUncompressed:
org $8EF356 : JSL RenderCharLookupWidth
org $8EF3BA : JSL RenderCharLookupWidth
org $8EF48E : JML RenderCharLookupWidthDraw
org $8EF499 : RenderCharLookupWidthDraw_return:
org $8EF6AA : JML RenderCharToMapExtended
org $8EF6C2 : RenderCharToMapExtended_return:
org $8EFA50 : JSL RenderCharSetColorExtended
org $8EEE5D : JSL RenderCharSetColorExtended_init
org $8EF285 : JSL RenderCharSetColorExtended_close : NOP
;================================================================================
; VRAM