mirror/tmc
1
0
Fork 0
mirror of https://github.com/zeldaret/tmc synced 2026-08-06 09:53:50 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into demo-jp

Browse Source
This commit is contained in:
octorock
2021-11-01 16:55:04 +01:00
parent 18387d8d60 541fd0e9ff
commit 57c5cefaf8
110 changed files with 709 additions and 723 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/scripts/script_0801232C.inc
+2 -2
View File
@@ -31,7 +31,7 @@ script_08012368:
StopBgm
BeginBlock
_0807E778 0x0004
_0807E788 0x00007fff
SetFadeMask 0x00007fff
DoFade5
_0807E858 0x0080
EndBlock
@@ -55,7 +55,7 @@ script_08012368:
Wait 0x003c
BeginBlock
_0807E778 0x0004
_0807E788 0xffffffff
SetFadeMask 0xffffffff
DoFade4
_0807E858 0x0080
EndBlock
data/scripts/script_08012430.inc
+1 -1
View File
@@ -77,7 +77,7 @@ script_0801248A:
MoveEntityToPlayer
Call sub_0807F844
CameraTargetPlayer
_0807E788 0xffffffff
SetFadeMask 0xffffffff
_0807E778 0x0004
_0807E800 0x00000000
WaitFor_2
data/scripts/script_0801319A.inc
+2 -2
View File
@@ -49,7 +49,7 @@ SCRIPT_START script_080131AC
_0807EA94
_0807E5F8 0x00000020
WaitForSomething2 0x00000040
_0807E788 0xffff7fff
SetFadeMask 0xffff7fff
_0807E778 0x0004
DoFade5
WaitFor_2
@@ -60,7 +60,7 @@ SCRIPT_START script_080131AC
Call sub_0807F5C0
TextboxNoOverlapFollowPos 0x1604, 0x0007
_0807EA94
_0807E788 0xffffffff
SetFadeMask 0xffffffff
_0807E778 0x0004
DoFade4
WaitFor_2
data/scripts/script_08016384.inc
+1 -1
View File
@@ -66,4 +66,4 @@ SCRIPT_START script_08016384
WaitFor_1
WaitFor_2
_0807E778 0x0004
_0807E788 0x0000ffff
SetFadeMask 0x0000ffff
data/sounds.s
+4 -4
View File
@@ -8591,12 +8591,12 @@ sfx151_track0:: @ 08DE3684
sfx151:: @ 08DE36B0
sound_header 1 0 0x60 0 gUnk_08A10DC0 sfx151_track0
sfx152_track0:: @ 08DE36BC
sfxNearPortal_track0:: @ 08DE36BC
.incbin "baserom.gba", 0xDE36BC, 0x0000086
sfx152_track1:: @ 08DE3742
sfxNearPortal_track1:: @ 08DE3742
.incbin "baserom.gba", 0xDE3742, 0x000008A
sfx152:: @ 08DE37CC
sound_header 2 0 0x40 0 gUnk_08A10DD8 sfx152_track0 sfx152_track1
sfxNearPortal:: @ 08DE37CC
sound_header 2 0 0x40 0 gUnk_08A10DD8 sfxNearPortal_track0 sfxNearPortal_track1
sfx153_track0:: @ 08DE37DC
.incbin "baserom.gba", 0xDE37DC, 0x0000030