From a352ff972220ac5f8551a81cff4ed97d97cb164d Mon Sep 17 00:00:00 2001 From: octorock <79596758+octorock@users.noreply.github.com> Date: Mon, 8 Mar 2021 19:48:38 +0100 Subject: [PATCH] Readd void parameters --- data/scripts/script_0800939A.inc | 1 - data/scripts/script_080095F2.inc | 1 - data/scripts/script_08009E4E.inc | 1 - data/scripts/script_0800B7FC.inc | 1 - data/scripts/script_0800D242.inc | 1 - data/scripts/script_0800D24C.inc | 1 - data/scripts/script_0800D698.inc | 1 - data/scripts/script_0800E5D6.inc | 1 - data/scripts/script_0800E8A4.inc | 1 - data/scripts/script_0800E8D6.inc | 1 - data/scripts/script_0800E908.inc | 1 - data/scripts/script_08010964.inc | 1 - data/scripts/script_080113AA.inc | 1 - data/scripts/script_08011442.inc | 1 - data/scripts/script_08011508.inc | 1 - data/scripts/script_08012CD8.inc | 1 - data/scripts/script_08012D18.inc | 1 - data/scripts/script_08012D70.inc | 1 - data/scripts/script_08012F86.inc | 1 - data/scripts/script_0801319A.inc | 1 - data/scripts/script_08014248.inc | 1 - data/scripts/script_080157AC.inc | 1 - data/scripts/script_08015B34.inc | 1 - data/scripts/script_08016062.inc | 1 - data/scripts/script_0801609E.inc | 1 - data/scripts/script_08016384.inc | 1 - src/code_0805436C.c | 4 +-- src/npc/bladeBrothers.c | 2 +- src/npc/emma.c | 6 ++--- src/npc/forestMinish.c | 6 ++--- src/npc/guard.c | 2 +- src/npc/simon.c | 4 +-- src/npc/smith.c | 2 +- src/npc/zelda.c | 4 +-- src/object/greatFairy.c | 2 +- src/room.c | 26 +++++++++---------- src/script.c | 6 ++--- tools/script_disassembler/definitions.py | 3 ++- .../script_disassembler.py | 2 +- 39 files changed, 35 insertions(+), 60 deletions(-) diff --git a/data/scripts/script_0800939A.inc b/data/scripts/script_0800939A.inc index 42f99fd4..060c412b 100644 --- a/data/scripts/script_0800939A.inc +++ b/data/scripts/script_0800939A.inc @@ -1,5 +1,4 @@ SCRIPT_START script_0800939A -script_0800939A: CheckLocalFlag 0x00ae JumpIf script_0800943E CheckInventory1 0x000d diff --git a/data/scripts/script_080095F2.inc b/data/scripts/script_080095F2.inc index cf491e2a..c16c4201 100644 --- a/data/scripts/script_080095F2.inc +++ b/data/scripts/script_080095F2.inc @@ -1,5 +1,4 @@ SCRIPT_START script_080095F2 -script_080095F2: CheckEntityInteractType JumpIfNot script_080095DE _0807E864 diff --git a/data/scripts/script_08009E4E.inc b/data/scripts/script_08009E4E.inc index 2c71ed55..6e239720 100644 --- a/data/scripts/script_08009E4E.inc +++ b/data/scripts/script_08009E4E.inc @@ -1,5 +1,4 @@ SCRIPT_START script_08009E4E -script_08009E4E: _0807E878 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_0800B7FC.inc b/data/scripts/script_0800B7FC.inc index 823e716d..3e2d3fa4 100644 --- a/data/scripts/script_0800B7FC.inc +++ b/data/scripts/script_0800B7FC.inc @@ -1,5 +1,4 @@ SCRIPT_START script_0800B7FC -script_0800B7FC: CallWithArg sub_0807F4F8, 0x00000090 CallWithArg sub_0807F464, 0x00000078 Jump script_0800B7EE diff --git a/data/scripts/script_0800D242.inc b/data/scripts/script_0800D242.inc index 0d543eb1..c441c743 100644 --- a/data/scripts/script_0800D242.inc +++ b/data/scripts/script_0800D242.inc @@ -1,5 +1,4 @@ SCRIPT_START script_0800D242 -script_0800D242: DoPostScriptAction 0x0007 _0807E930 0x0003 SCRIPT_END diff --git a/data/scripts/script_0800D24C.inc b/data/scripts/script_0800D24C.inc index dd9a5e5a..0f9b2640 100644 --- a/data/scripts/script_0800D24C.inc +++ b/data/scripts/script_0800D24C.inc @@ -1,5 +1,4 @@ SCRIPT_START script_0800D24C -script_0800D24C: DoPostScriptAction 0x0006 SCRIPT_END .short 0x0000 diff --git a/data/scripts/script_0800D698.inc b/data/scripts/script_0800D698.inc index 6e71e13b..297e34b2 100644 --- a/data/scripts/script_0800D698.inc +++ b/data/scripts/script_0800D698.inc @@ -1,5 +1,4 @@ SCRIPT_START script_0800D698 -script_0800D698: _0807EEB4 _0807F0B4 0x0004 CameraTargetPlayer diff --git a/data/scripts/script_0800E5D6.inc b/data/scripts/script_0800E5D6.inc index 54f82101..6bc30b46 100644 --- a/data/scripts/script_0800E5D6.inc +++ b/data/scripts/script_0800E5D6.inc @@ -1,5 +1,4 @@ SCRIPT_START script_0800E5D6 -script_0800E5D6: EndBlock script_0800E5D8: CheckLocalFlag 0x0086 diff --git a/data/scripts/script_0800E8A4.inc b/data/scripts/script_0800E8A4.inc index 9a857695..c357c472 100644 --- a/data/scripts/script_0800E8A4.inc +++ b/data/scripts/script_0800E8A4.inc @@ -1,5 +1,4 @@ SCRIPT_START script_0800E8A4 -script_0800E8A4: BeginBlock TextboxNoOverlapFollow 0x4504 CallWithArg sub_0807F854, 0x000100c8 diff --git a/data/scripts/script_0800E8D6.inc b/data/scripts/script_0800E8D6.inc index 3e273e5c..a288f654 100644 --- a/data/scripts/script_0800E8D6.inc +++ b/data/scripts/script_0800E8D6.inc @@ -1,5 +1,4 @@ SCRIPT_START script_0800E8D6 -script_0800E8D6: BeginBlock TextboxNoOverlapFollow 0x4503 CallWithArg sub_0807F854, 0x00010032 diff --git a/data/scripts/script_0800E908.inc b/data/scripts/script_0800E908.inc index f2f46798..29579a3d 100644 --- a/data/scripts/script_0800E908.inc +++ b/data/scripts/script_0800E908.inc @@ -1,5 +1,4 @@ SCRIPT_START script_0800E908 -script_0800E908: TextboxNoOverlapFollow 0x4507 Jump script_0800E914 script_0800E910: diff --git a/data/scripts/script_08010964.inc b/data/scripts/script_08010964.inc index 82db0677..46a97af4 100644 --- a/data/scripts/script_08010964.inc +++ b/data/scripts/script_08010964.inc @@ -1,5 +1,4 @@ SCRIPT_START script_08010964 -script_08010964: CheckPlayerInRegion2 0x0808 JumpIfNot script_08010964 _0807E864 diff --git a/data/scripts/script_080113AA.inc b/data/scripts/script_080113AA.inc index 94883932..2be66000 100644 --- a/data/scripts/script_080113AA.inc +++ b/data/scripts/script_080113AA.inc @@ -1,5 +1,4 @@ SCRIPT_START script_080113AA -script_080113AA: _0807E610 0x00002000 _0807E5F8 0x00004000 WaitForSomething2 0x00002000 diff --git a/data/scripts/script_08011442.inc b/data/scripts/script_08011442.inc index 5511fd5e..3aaa70e7 100644 --- a/data/scripts/script_08011442.inc +++ b/data/scripts/script_08011442.inc @@ -1,5 +1,4 @@ SCRIPT_START script_08011442 -script_08011442: _0807E610 0x00008000 _0807E5F8 0x00010000 WaitForSomething2 0x00008000 diff --git a/data/scripts/script_08011508.inc b/data/scripts/script_08011508.inc index c8c35491..8232437f 100644 --- a/data/scripts/script_08011508.inc +++ b/data/scripts/script_08011508.inc @@ -1,5 +1,4 @@ SCRIPT_START script_08011508 -script_08011508: _0807E610 0x00020000 _0807E5F8 0x00040000 WaitForSomething2 0x00020000 diff --git a/data/scripts/script_08012CD8.inc b/data/scripts/script_08012CD8.inc index 420aa1ee..59f22008 100644 --- a/data/scripts/script_08012CD8.inc +++ b/data/scripts/script_08012CD8.inc @@ -1,5 +1,4 @@ SCRIPT_START script_08012CD8 -script_08012CD8: EndBlock BeginBlock _0807E564 diff --git a/data/scripts/script_08012D18.inc b/data/scripts/script_08012D18.inc index 092f737d..053ed2d2 100644 --- a/data/scripts/script_08012D18.inc +++ b/data/scripts/script_08012D18.inc @@ -1,5 +1,4 @@ SCRIPT_START script_08012D18 -script_08012D18: EndBlock BeginBlock CheckGlobalFlag 0x0014 diff --git a/data/scripts/script_08012D70.inc b/data/scripts/script_08012D70.inc index dff75ef9..e290f964 100644 --- a/data/scripts/script_08012D70.inc +++ b/data/scripts/script_08012D70.inc @@ -1,5 +1,4 @@ SCRIPT_START script_08012D70 -script_08012D70: CheckPlayerInRegion 0x0088, 0x0048, 0x3030 JumpIfNot script_08012D70 _0807E864 diff --git a/data/scripts/script_08012F86.inc b/data/scripts/script_08012F86.inc index 038b7bad..2a5ea045 100644 --- a/data/scripts/script_08012F86.inc +++ b/data/scripts/script_08012F86.inc @@ -1,5 +1,4 @@ SCRIPT_START script_08012F86 -script_08012F86: BeginBlock CheckLocalFlag 0x0060 JumpIf script_08012FD2 diff --git a/data/scripts/script_0801319A.inc b/data/scripts/script_0801319A.inc index 361e94cd..cc3e52d6 100644 --- a/data/scripts/script_0801319A.inc +++ b/data/scripts/script_0801319A.inc @@ -1,5 +1,4 @@ SCRIPT_START script_0801319A -script_0801319A: EndBlock BeginBlock CameraTargetEntity diff --git a/data/scripts/script_08014248.inc b/data/scripts/script_08014248.inc index bbafbef3..30fb9e3d 100644 --- a/data/scripts/script_08014248.inc +++ b/data/scripts/script_08014248.inc @@ -1,5 +1,4 @@ SCRIPT_START script_08014248 -script_08014248: TestBit 0x00020000 JumpIf script_08014264 Wait 0x0008 diff --git a/data/scripts/script_080157AC.inc b/data/scripts/script_080157AC.inc index 982c9bdf..b4482406 100644 --- a/data/scripts/script_080157AC.inc +++ b/data/scripts/script_080157AC.inc @@ -1,5 +1,4 @@ SCRIPT_START script_080157AC -script_080157AC: CheckPlayerInRegion 0x01f8, 0x0310, 0x2020 JumpIfNot script_080157AC _0807E864 diff --git a/data/scripts/script_08015B34.inc b/data/scripts/script_08015B34.inc index 1da50cf7..3b383a11 100644 --- a/data/scripts/script_08015B34.inc +++ b/data/scripts/script_08015B34.inc @@ -1,5 +1,4 @@ SCRIPT_START script_08015B34 -script_08015B34: EndBlock BeginBlock CheckLocalFlag 0x008b diff --git a/data/scripts/script_08016062.inc b/data/scripts/script_08016062.inc index 54f9b00f..7f7886a1 100644 --- a/data/scripts/script_08016062.inc +++ b/data/scripts/script_08016062.inc @@ -1,5 +1,4 @@ SCRIPT_START script_08016062 -script_08016062: SetEntityPosition 0xfff0, 0x0000 SCRIPT_END .short 0x0000 diff --git a/data/scripts/script_0801609E.inc b/data/scripts/script_0801609E.inc index 3c481171..69e5c09b 100644 --- a/data/scripts/script_0801609E.inc +++ b/data/scripts/script_0801609E.inc @@ -1,5 +1,4 @@ SCRIPT_START script_0801609E -script_0801609E: SetEntityPosition 0x0010, 0x0000 SCRIPT_END .short 0x0000 diff --git a/data/scripts/script_08016384.inc b/data/scripts/script_08016384.inc index 00176665..f1d84660 100644 --- a/data/scripts/script_08016384.inc +++ b/data/scripts/script_08016384.inc @@ -1,5 +1,4 @@ SCRIPT_START script_08016384 -script_08016384: BeginBlock EndBlock Jump script_08016384 diff --git a/src/code_0805436C.c b/src/code_0805436C.c index 142eb474..76a9b18c 100644 --- a/src/code_0805436C.c +++ b/src/code_0805436C.c @@ -168,11 +168,11 @@ void sub_08054524(void) { } #endif -void sub_08054564() { +void sub_08054564(void) { gRoomVars.filler[2] = 1; } -void sub_08054570() { +void sub_08054570(void) { gRoomVars.filler[2] = 0; } diff --git a/src/npc/bladeBrothers.c b/src/npc/bladeBrothers.c index 10bf8d4a..b08f2e48 100644 --- a/src/npc/bladeBrothers.c +++ b/src/npc/bladeBrothers.c @@ -347,7 +347,7 @@ void sub_08068E90(Entity* this) { *(u16*)&s->field_0xac = (1 << (gUnk_08111740[this->actionDelay] - 1)) | *(u16*)&s->field_0xac; } -void sub_08068EB4() { +void sub_08068EB4(void) { gPlayerState.field_0xab = 0; } diff --git a/src/npc/emma.c b/src/npc/emma.c index a10a5f03..3867cb87 100644 --- a/src/npc/emma.c +++ b/src/npc/emma.c @@ -19,14 +19,14 @@ void Emma(Entity* this) { } } -void sub_0806C578() { +void sub_0806C578(void) { DoExitTransition(&gUnk_0813AD10); } -void sub_0806C588() { +void sub_0806C588(void) { DoExitTransition(&gUnk_0813AD24); } -void sub_0806C598() { +void sub_0806C598(void) { DoExitTransition(&gUnk_0813AD38); } diff --git a/src/npc/forestMinish.c b/src/npc/forestMinish.c index 0ce3b893..7bcd03f3 100644 --- a/src/npc/forestMinish.c +++ b/src/npc/forestMinish.c @@ -226,7 +226,7 @@ void sub_0806030C(Entity* this, ScriptExecutionContext* context) { ModBombs(context->intVariable); } -void sub_08060318() { +void sub_08060318(void) { Entity* ent; int i; @@ -239,11 +239,11 @@ void sub_08060318() { } } -void sub_08060340() { +void sub_08060340(void) { gSave.unk490 = gSave.unk50; } -u32 sub_08060354() { +u32 sub_08060354(void) { u32 iVar1; s32 iVar2; diff --git a/src/npc/guard.c b/src/npc/guard.c index 2fad648d..081f9c10 100644 --- a/src/npc/guard.c +++ b/src/npc/guard.c @@ -212,7 +212,7 @@ void sub_08064030(Entity* arg0, Entity* arg1) { *(u32*)&arg1->animationState = (-gRoomVars.greatFairyState | gRoomVars.greatFairyState) >> 0x1f; } -void sub_08064044() { +void sub_08064044(void) { gScreenTransition.unk = 1; } diff --git a/src/npc/simon.c b/src/npc/simon.c index c94ec167..aad57a9f 100644 --- a/src/npc/simon.c +++ b/src/npc/simon.c @@ -27,7 +27,7 @@ void Simon(Entity* this) { } } -void sub_0806C224() { +void sub_0806C224(void) { DoExitTransition(&gUnk_0813AD60); gScreenTransition.transitionType = 6; } @@ -38,7 +38,7 @@ void Simon_CreateChest(Entity* this) { SoundReq(0x73); } -void sub_0806C280() { +void sub_0806C280(void) { SetGlobalFlag(MAROYA_WAKEUP); DoExitTransition(&gUnk_0813AD74); gScreenTransition.transitionType = 6; diff --git a/src/npc/smith.c b/src/npc/smith.c index 432df784..d365b222 100644 --- a/src/npc/smith.c +++ b/src/npc/smith.c @@ -158,7 +158,7 @@ void sub_0806622C(Entity* this) { void nullsub_501(Entity* this) { } -void sub_08066258() { +void sub_08066258(void) { SoundReq(gUnk_081103D0[Random() & 7]); } diff --git a/src/npc/zelda.c b/src/npc/zelda.c index f8ad4324..af6ec1c7 100644 --- a/src/npc/zelda.c +++ b/src/npc/zelda.c @@ -171,7 +171,7 @@ void sub_08066E80(Entity* this, ScriptExecutionContext* context) { gActiveScriptInfo.commandSize = 0; } -void sub_08066F94() { +void sub_08066F94(void) { u16 uVar1; u16* puVar2; @@ -183,7 +183,7 @@ void sub_08066F94() { } } -void sub_08066FB8() { +void sub_08066FB8(void) { u16 uVar1; u16* puVar2; diff --git a/src/object/greatFairy.c b/src/object/greatFairy.c index e3005ea2..0ab2d710 100644 --- a/src/object/greatFairy.c +++ b/src/object/greatFairy.c @@ -518,7 +518,7 @@ void sub_080873D0(Entity* this) { } } -void sub_080873FC() { +void sub_080873FC(void) { Entity* ent; SoundReq(0xf7); diff --git a/src/room.c b/src/room.c index 3b268657..6a0e9fad 100644 --- a/src/room.c +++ b/src/room.c @@ -3569,7 +3569,7 @@ void sub_0804D780(void) { extern u16 gUnk_080EAE00; -void sub_0804D7EC() { +void sub_0804D7EC(void) { u16 temp; u16* tilePos; @@ -3581,7 +3581,7 @@ void sub_0804D7EC() { } } -void sub_0804D810() { +void sub_0804D810(void) { u16 uVar1; u16* puVar2; @@ -4796,7 +4796,7 @@ void sub_0804E7DC(void) { extern u32 script_08009E58; -void sub_0804E864() { +void sub_0804E864(void) { gPlayerEntity.x.HALF.HI = gRoomControls.roomOriginX + 0x90; gPlayerEntity.y.HALF.HI = gRoomControls.roomOriginY + 0x38; sub_080751E8(1, 6, &script_08009E58); @@ -5729,62 +5729,62 @@ void sub_0804F79C(Entity* parent) { } } -void sub_0804F808() { +void sub_0804F808(void) { SetTileType(0x1d3, 0x41d, 1); SetTileType(0x1d3, 0x621, 1); } -void sub_0804F830() { +void sub_0804F830(void) { SetTileType(0x1d4, 0x41e, 1); SetTileType(0x1d4, 0x620, 1); } -void sub_0804F854() { +void sub_0804F854(void) { SetTileType(0x1d5, 0x41f, 1); SetTileType(0x1d4, 0x4e5, 1); SetTileType(0x1d5, 0x61f, 1); SetTileType(0x1d4, 0x559, 1); } -void sub_0804F89C() { +void sub_0804F89C(void) { SetTileType(0x1d6, 0x420, 1); SetTileType(0x1d5, 0x525, 1); SetTileType(0x1d6, 0x61e, 1); SetTileType(0x1d5, 0x519, 1); } -void sub_0804F8E0() { +void sub_0804F8E0(void) { SetTileType(0x1d3, 0x421, 1); SetTileType(0x1d6, 0x565, 1); SetTileType(0x1d3, 0x61d, 1); SetTileType(0x1d6, 0x4d9, 1); } -void sub_0804F928() { +void sub_0804F928(void) { sub_0807BA8C(0x41d, 1); sub_0807BA8C(0x621, 1); } -void sub_0804F944() { +void sub_0804F944(void) { sub_0807BA8C(0x41e, 1); sub_0807BA8C(0x620, 1); } -void sub_0804F960() { +void sub_0804F960(void) { sub_0807BA8C(0x41f, 1); sub_0807BA8C(0x4e5, 1); sub_0807BA8C(0x61f, 1); sub_0807BA8C(0x559, 1); } -void sub_0804F994() { +void sub_0804F994(void) { sub_0807BA8C(0x420, 1); sub_0807BA8C(0x525, 1); sub_0807BA8C(0x61e, 1); sub_0807BA8C(0x519, 1); } -void sub_0804F9C8() { +void sub_0804F9C8(void) { sub_0807BA8C(0x421, 1); sub_0807BA8C(0x565, 1); sub_0807BA8C(0x61d, 1); diff --git a/src/script.c b/src/script.c index 2bf9b6f0..cc9636b8 100644 --- a/src/script.c +++ b/src/script.c @@ -579,18 +579,18 @@ void sub_0807DEDC(Entity* entity, ScriptExecutionContext* context, u32 x, u32 y) entity->animationState = (entity->animationState & 0x80) | gUnk_0811E514[(u32)(direction << 0x18) >> 0x1c]; } -void sub_0807DF28() { +void sub_0807DF28(void) { sub_0807DF38(); sub_08079184(); sub_08077B20(); } -void sub_0807DF38() { +void sub_0807DF38(void) { gUnk_0200AF00.filler0[1] = 0xff; gUnk_02034490[0] = 0xff; } -void sub_0807DF50() { +void sub_0807DF50(void) { gUnk_02034490[0] = 0; gUnk_0200AF00.filler0[1] = 0; sub_0801C4A0(0); diff --git a/tools/script_disassembler/definitions.py b/tools/script_disassembler/definitions.py index 96104d05..0793db76 100644 --- a/tools/script_disassembler/definitions.py +++ b/tools/script_disassembler/definitions.py @@ -187,7 +187,8 @@ def get_script_pointer(barray): integers = struct.unpack('I', barray) val = integers[0] if val >= SCRIPTS_START and val <= SCRIPTS_END: - return 'script_' + (struct.pack('>I', val).hex()).upper() + return use_script_label(val) +# return 'script_' + (struct.pack('>I', val).hex()).upper() else: return '0x'+struct.pack('>I', val).hex() diff --git a/tools/script_disassembler/script_disassembler.py b/tools/script_disassembler/script_disassembler.py index 19b171c8..3095533c 100644 --- a/tools/script_disassembler/script_disassembler.py +++ b/tools/script_disassembler/script_disassembler.py @@ -31,7 +31,7 @@ def print_rest_bytes(ctx): def disassemble_command(ctx: Context, add_all_annotations=False): global used_labels - if add_all_annotations or ctx.script_addr + ctx.ptr in used_labels: + if (add_all_annotations or ctx.script_addr + ctx.ptr in used_labels) and ctx.ptr != 0: # print offsets to debug when manually inserting labels print(f'{get_script_label(ctx.script_addr + ctx.ptr)}:') cmd = struct.unpack('H', ctx.data[ctx.ptr:ctx.ptr + 2])[0]