falso
/
tmc
mirror of https://github.com/zeldaret/tmc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Replace the remaining pointers in scripts

This commit is contained in:
octorock 2021-03-08 22:08:51 +01:00
parent cb37ce24f3
commit 1488892c3a
8 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
asm/code_080043E8.s
View File

@ -378,10 +378,16 @@ gUnk_0800476A:: @ 0800476A
.incbin "baserom.gba", 0x00476A, 0x000008C
gUnk_080047F6:: @ 080047F6
.incbin "baserom.gba", 0x0047F6, 0x0000200
.incbin "baserom.gba", 0x0047F6, 0x00001E0
gUnk_080049D6:: @ 080049D6
.incbin "baserom.gba", 0x0049D6, 0x0000020
gUnk_080049F6:: @ 080049F6
.incbin "baserom.gba", 0x0049F6, 0x000000A
.incbin "baserom.gba", 0x0049F6, 0x0000008
gUnk_080049FE:: @ gUnk_080049FE
.incbin "baserom.gba", 0x0049FE, 0x0000002
gUnk_08004A00:: @ 08004A00
.incbin "baserom.gba", 0x004A00, 0x000000C

2
data/scripts/script_0800B828.inc
View File

@ -54,7 +54,7 @@ script_0800B89E:
_0807EB44 0x0004
DoPostScriptAction 0x0000
DoPostScriptAction 0x000a
CallWithArg sub_08064644, 0x0806464d
CallWithArg sub_08064644, sub_0806464C
EndBlock
script_0800B8D4:
Wait 0x003c

2
data/scripts/script_0800F724.inc
View File

@ -154,7 +154,7 @@ script_0800F72C:
CallWithArg sub_0807F244, 0x0000000d
SetIntVariable 0x000000ff
Call sub_0807F5B0
CallWithArg sub_0807F29C, 0x080049d6
CallWithArg sub_0807F29C, gUnk_080049D6
Wait 0x00b7
SetIntVariable 0x00000000
Call sub_0807F5B0

2
data/scripts/script_08010264.inc
View File

@ -140,7 +140,7 @@ script_08010410:
_0807EB44 0x0004
DoPostScriptAction 0x0000
DoPostScriptAction 0x000a
SetIntVariable 0x08064689
SetIntVariable sub_08064688
Call sub_08064644
EndBlock
script_08010446:

2
data/scripts/script_08010E5A.inc
View File

@ -29,7 +29,7 @@ SCRIPT_START script_08010E5A
Call sub_0806DC3C
Call sub_080791BC
CallWithArg sub_0807F244, 0x0000000d
CallWithArg sub_0807F29C, 0x080049f6
CallWithArg sub_0807F29C, gUnk_080049F6
_0807F0B4 0x0001
SetEntityPositionRelative 0x01f8, 0x0068
_0807E5F8 0x00000004

2
data/scripts/script_08010F84.inc
View File

@ -9,7 +9,7 @@ SCRIPT_START script_08010F84
Call sub_0806DC3C
Call sub_080791BC
CallWithArg sub_0807F244, 0x0000000d
CallWithArg sub_0807F29C, 0x080049f6
CallWithArg sub_0807F29C, gUnk_080049F6
Wait 0x001e
_0807E5F8 0x00000100
WaitForSomething2 0x00000200

2
data/scripts/script_080138B4.inc
View File

@ -82,7 +82,7 @@ script_080138D0:
CameraTargetEntity
Call sub_0806DC3C
CallWithArg sub_0807F244, 0x00010001
CallWithArg sub_0807F29C, 0x080049fe
CallWithArg sub_0807F29C, gUnk_080049FE
Wait 0x00c8
CallWithArg sub_0807F29C, 0x00000000
Call sub_0806DC58

3
src/npc/ezloCap.c
View File

@ -113,7 +113,8 @@ void sub_0806DA04(Entity* this, ScriptExecutionContext* context) {
}
void sub_0806DA1C(Entity* this, ScriptExecutionContext* context) {
sub_0808091C((ScreenTransitionData*)(gUnk_081141A4)[context->intVariable], (u32)(gUnk_081141E4[context->intVariable]));
sub_0808091C((ScreenTransitionData*)(gUnk_081141A4)[context->intVariable],
(u32)(gUnk_081141E4[context->intVariable]));
}
// Returns the kinstone id?