From 458db819d27d12f01cb04b08c63a9e00cb143516 Mon Sep 17 00:00:00 2001 From: Alex Bates Date: Wed, 14 Oct 2020 17:15:50 +0100 Subject: [PATCH] add newline to no-op func blocks --- src/code_10400_len_d30.c | 9 ++-- src/code_107830_len_e70.c | 3 +- src/code_121f0_len_1290.c | 3 +- src/code_135EE0.c | 3 +- src/code_13870_len_6980.c | 21 ++++++---- src/code_168590.c | 9 ++-- src/code_16c8e0.c | 84 +++++++++++++++++++++++++------------- src/code_26840_len_20d0.c | 3 +- src/code_28910_len_5090.c | 3 +- src/code_341d0_len_20d0.c | 6 ++- src/code_362a0_len_2f70.c | 6 ++- src/code_891b0_len_fb0.c | 3 +- src/code_a5dd0_len_114e0.c | 3 +- src/code_ad90_len_2880.c | 3 +- src/code_b72b0_len_15ed0.c | 12 ++++-- src/code_cd180_len_38f0.c | 3 +- src/code_d610_len_1330.c | 3 +- src/code_f270_len_1190.c | 3 +- 18 files changed, 120 insertions(+), 60 deletions(-) diff --git a/src/code_10400_len_d30.c b/src/code_10400_len_d30.c index c89d45b0c2..b001494f79 100644 --- a/src/code_10400_len_d30.c +++ b/src/code_10400_len_d30.c @@ -8,9 +8,11 @@ INCLUDE_ASM(s32, "code_10400_len_d30", func_800351C8); INCLUDE_ASM(s32, "code_10400_len_d30", func_800354EC); -void func_800355C4(void) {} +void func_800355C4(void) { +} -void func_800355CC(void) {} +void func_800355CC(void) { +} INCLUDE_ASM(s32, "code_10400_len_d30", func_800355D4); @@ -20,6 +22,7 @@ INCLUDE_ASM(s32, "code_10400_len_d30", func_80035704); INCLUDE_ASM(s32, "code_10400_len_d30", func_80035B40); -void func_80035D18(void) {} +void func_80035D18(void) { +} INCLUDE_ASM(s32, "code_10400_len_d30", func_80035D20); diff --git a/src/code_107830_len_e70.c b/src/code_107830_len_e70.c index 3fa46b4f7f..66025dc9db 100644 --- a/src/code_107830_len_e70.c +++ b/src/code_107830_len_e70.c @@ -8,7 +8,8 @@ INCLUDE_ASM(s32, "code_107830_len_e70", func_802E6118); INCLUDE_ASM(s32, "code_107830_len_e70", func_802E6178); -void func_802E6194(void) {} +void func_802E6194(void) { +} INCLUDE_ASM(s32, "code_107830_len_e70", func_802E619C); diff --git a/src/code_121f0_len_1290.c b/src/code_121f0_len_1290.c index 5444f7ce31..ce062a8fa6 100644 --- a/src/code_121f0_len_1290.c +++ b/src/code_121f0_len_1290.c @@ -8,7 +8,8 @@ INCLUDE_ASM(s32, "code_121f0_len_1290", func_800375A4); INCLUDE_ASM(s32, "code_121f0_len_1290", func_80037638); -void func_80037960(void) {} +void func_80037960(void) { +} INCLUDE_ASM(s32, "code_121f0_len_1290", func_80037968); diff --git a/src/code_135EE0.c b/src/code_135EE0.c index 11f3e6fb25..a07973bc6a 100644 --- a/src/code_135EE0.c +++ b/src/code_135EE0.c @@ -34,7 +34,8 @@ INCLUDE_ASM(s32, "code_135EE0", pause_interp_vertical_scroll); INCLUDE_ASM(s32, "code_135EE0", pause_update_cursor); -void func_80243568(void) {} +void func_80243568(void) { +} INCLUDE_ASM(s32, "code_135EE0", pause_textbox_draw_contents); diff --git a/src/code_13870_len_6980.c b/src/code_13870_len_6980.c index b28fffff50..5ec6f227d5 100644 --- a/src/code_13870_len_6980.c +++ b/src/code_13870_len_6980.c @@ -95,7 +95,8 @@ INCLUDE_ASM(s32, "code_13870_len_6980", func_8003B184); INCLUDE_ASM(s32, "code_13870_len_6980", func_8003B198); -void func_8003B1A8(void) {} +void func_8003B1A8(void) { +} INCLUDE_ASM(s32, "code_13870_len_6980", func_8003B1B0); @@ -133,9 +134,11 @@ INCLUDE_ASM(s32, "code_13870_len_6980", func_8003C53C); INCLUDE_ASM(s32, "code_13870_len_6980", func_8003C61C); -void func_8003C658(void) {} +void func_8003C658(void) { +} -void func_8003C660(void) {} +void func_8003C660(void) { +} INCLUDE_ASM(s32, "code_13870_len_6980", func_8003C668); @@ -143,7 +146,8 @@ INCLUDE_ASM(s32, "code_13870_len_6980", func_8003C78C); INCLUDE_ASM(s32, "code_13870_len_6980", func_8003C7A8); -void func_8003C8AC(void) {} +void func_8003C8AC(void) { +} INCLUDE_ASM(s32, "code_13870_len_6980", func_8003C8B4); @@ -159,7 +163,8 @@ INCLUDE_ASM(s32, "code_13870_len_6980", func_8003CC8C); INCLUDE_ASM(s32, "code_13870_len_6980", func_8003CCB0); -void func_8003CFA0(void) {} +void func_8003CFA0(void) { +} INCLUDE_ASM(s32, "code_13870_len_6980", func_8003CFA8); @@ -195,7 +200,8 @@ INCLUDE_ASM(s32, "code_13870_len_6980", func_8003E338); INCLUDE_ASM(s32, "code_13870_len_6980", clear_encounter_status); -void func_8003E50C(void) {} +void func_8003E50C(void) { +} INCLUDE_ASM(s32, "code_13870_len_6980", func_8003E514); @@ -205,7 +211,8 @@ INCLUDE_ASM(s32, "code_13870_len_6980", func_8003E5B0); INCLUDE_ASM(s32, "code_13870_len_6980", func_8003E63C); -void func_8003E670(void) {} +void func_8003E670(void) { +} INCLUDE_ASM(s32, "code_13870_len_6980", make_npcs); diff --git a/src/code_168590.c b/src/code_168590.c index c90cf1289a..f104ec8249 100644 --- a/src/code_168590.c +++ b/src/code_168590.c @@ -6,9 +6,11 @@ INCLUDE_ASM(s32, "code_168590", func_80247FD0); INCLUDE_ASM(s32, "code_168590", func_80248024); -void func_80248160(void) {} +void func_80248160(void) { +} -void func_80248168(void) {} +void func_80248168(void) { +} INCLUDE_ASM(s32, "code_168590", func_80248170); @@ -20,6 +22,7 @@ INCLUDE_ASM(s32, "code_168590", func_80248A80); INCLUDE_ASM(s32, "code_168590", func_80248BF4); -void func_80249324(void) {} +void func_80249324(void) { +} INCLUDE_ASM(s32, "code_168590", func_8024932C); diff --git a/src/code_16c8e0.c b/src/code_16c8e0.c index b502459c91..82c26376a8 100644 --- a/src/code_16c8e0.c +++ b/src/code_16c8e0.c @@ -8,7 +8,8 @@ INCLUDE_ASM(s32, "code_16c8e0", func_8023E11C); INCLUDE_ASM(s32, "code_16c8e0", initialize_battle); -void func_8023E3FC(void) {} +void func_8023E3FC(void) { +} INCLUDE_ASM(s32, "code_16c8e0", update_actor_shadows); @@ -48,47 +49,58 @@ INCLUDE_ASM(s32, "code_16c8e0", func_80241AB8); INCLUDE_ASM(s32, "code_16c8e0", func_80241B14); -void func_8024201C(void) {} +void func_8024201C(void) { +} INCLUDE_ASM(s32, "code_16c8e0", update_heroes_start_turn); -void func_80242AC0(void) {} +void func_80242AC0(void) { +} INCLUDE_ASM(s32, "code_16c8e0", switch_to_player); -void func_80242BA8(void) {} +void func_80242BA8(void) { +} INCLUDE_ASM(s32, "code_16c8e0", update_end_player_turn); -void func_80242EF8(void) {} +void func_80242EF8(void) { +} INCLUDE_ASM(s32, "code_16c8e0", switch_to_partner); -void func_80242FD8(void) {} +void func_80242FD8(void) { +} INCLUDE_ASM(s32, "code_16c8e0", func_80242FE0); -void func_80243910(void) {} +void func_80243910(void) { +} INCLUDE_ASM(s32, "code_16c8e0", switch_order); -void func_802439D0(void) {} +void func_802439D0(void) { +} INCLUDE_ASM(s32, "code_16c8e0", func_802439D8); -void func_80243FD4(void) {} +void func_80243FD4(void) { +} INCLUDE_ASM(s32, "code_16c8e0", func_80243FDC); -void func_80244000(void) {} +void func_80244000(void) { +} INCLUDE_ASM(s32, "code_16c8e0", func_80244008); -void func_80244708(void) {} +void func_80244708(void) { +} INCLUDE_ASM(s32, "code_16c8e0", func_80244710); -void func_80244A48(void) {} +void func_80244A48(void) { +} INCLUDE_ASM(s32, "code_16c8e0", end_battle); @@ -96,15 +108,18 @@ INCLUDE_ASM(s32, "code_16c8e0", func_80244D90); INCLUDE_ASM(s32, "code_16c8e0", func_80244E38); -void func_80244EF8(void) {} +void func_80244EF8(void) { +} INCLUDE_ASM(s32, "code_16c8e0", update_run_away); -void func_80245438(void) {} +void func_80245438(void) { +} INCLUDE_ASM(s32, "code_16c8e0", func_80245440); -void func_802456B0(void) {} +void func_802456B0(void) { +} INCLUDE_ASM(s32, "code_16c8e0", EnablePartnerBlur); @@ -112,31 +127,38 @@ INCLUDE_ASM(s32, "code_16c8e0", DisablePartnerBlur); INCLUDE_ASM(s32, "code_16c8e0", update_swap_partner); -void func_80245AC8(void) {} +void func_80245AC8(void) { +} INCLUDE_ASM(s32, "code_16c8e0", update_player_action); -void func_80246448(void) {} +void func_80246448(void) { +} INCLUDE_ASM(s32, "code_16c8e0", update_player_change_turn); -void func_80246B2C_code(void) {} +void func_80246B2C_code(void) { +} INCLUDE_ASM(s32, "code_16c8e0", update_partner_action); -void func_80247214(void) {} +void func_80247214(void) { +} INCLUDE_ASM(s32, "code_16c8e0", func_8024721C); -void func_802472A4(void) {} +void func_802472A4(void) { +} INCLUDE_ASM(s32, "code_16c8e0", update_enemy_change_turn); -void func_80247568(void) {} +void func_80247568(void) { +} INCLUDE_ASM(s32, "code_16c8e0", update_enemy_action); -void func_80247AFC(void) {} +void func_80247AFC(void) { +} INCLUDE_ASM(s32, "code_16c8e0", func_80247B04); @@ -432,7 +454,8 @@ INCLUDE_ASM(s32, "code_16c8e0", update_enemy_shadows); INCLUDE_ASM(s32, "code_16c8e0", update_hero_shadows); -void func_80255FD8(void) {} +void func_80255FD8(void) { +} INCLUDE_ASM(s32, "code_16c8e0", func_80255FE0); @@ -504,9 +527,11 @@ INCLUDE_ASM(s32, "code_16c8e0", func_8025CEC8); INCLUDE_ASM(s32, "code_16c8e0", _remove_part_decoration); -void func_8025D150(void) {} +void func_8025D150(void) { +} -void func_8025D158(void) {} +void func_8025D158(void) { +} INCLUDE_ASM(s32, "code_16c8e0", func_8025D160); @@ -514,7 +539,8 @@ INCLUDE_ASM(s32, "code_16c8e0", func_8025D290); INCLUDE_ASM(s32, "code_16c8e0", func_8025D2B0); -void func_8025D3C4(void) {} +void func_8025D3C4(void) { +} INCLUDE_ASM(s32, "code_16c8e0", func_8025D3CC); @@ -538,11 +564,13 @@ INCLUDE_ASM(s32, "code_16c8e0", func_8025D8EC); INCLUDE_ASM(s32, "code_16c8e0", func_8025D90C); -void func_8025DA60(void) {} +void func_8025DA60(void) { +} INCLUDE_ASM(s32, "code_16c8e0", func_8025DA68); -void func_8025DBC8(void) {} +void func_8025DBC8(void) { +} INCLUDE_ASM(s32, "code_16c8e0", func_8025DBD0); diff --git a/src/code_26840_len_20d0.c b/src/code_26840_len_20d0.c index d1f34b8492..8bb059f7cc 100644 --- a/src/code_26840_len_20d0.c +++ b/src/code_26840_len_20d0.c @@ -76,7 +76,8 @@ INCLUDE_ASM(s32, "code_26840_len_20d0", func_8004D2E4); INCLUDE_ASM(s32, "code_26840_len_20d0", func_8004D310); -void func_8004D31C(void) {} +void func_8004D31C(void) { +} INCLUDE_ASM(s32, "code_26840_len_20d0", func_8004D324); diff --git a/src/code_28910_len_5090.c b/src/code_28910_len_5090.c index 32a34b1169..9ea3bbb779 100644 --- a/src/code_28910_len_5090.c +++ b/src/code_28910_len_5090.c @@ -110,7 +110,8 @@ INCLUDE_ASM(s32, "code_28910_len_5090", func_800501A8); INCLUDE_ASM(s32, "code_28910_len_5090", func_800502F0); -void func_80050560(void) {} +void func_80050560(void) { +} INCLUDE_ASM(s32, "code_28910_len_5090", func_80050568); diff --git a/src/code_341d0_len_20d0.c b/src/code_341d0_len_20d0.c index 1898c07020..c60cce5cbc 100644 --- a/src/code_341d0_len_20d0.c +++ b/src/code_341d0_len_20d0.c @@ -18,13 +18,15 @@ INCLUDE_ASM(s32, "code_341d0_len_20d0", func_80059AB8); INCLUDE_ASM(s32, "code_341d0_len_20d0", func_80059BD4); -void func_80059C80(void) {} +void func_80059C80(void) { +} INCLUDE_ASM(s32, "code_341d0_len_20d0", func_80059C88); INCLUDE_ASM(s32, "code_341d0_len_20d0", func_80059C9C); -void func_80059D48(void) {} +void func_80059D48(void) { +} INCLUDE_ASM(s32, "code_341d0_len_20d0", func_80059D50); diff --git a/src/code_362a0_len_2f70.c b/src/code_362a0_len_2f70.c index 35d16a94b9..6b72b6841b 100644 --- a/src/code_362a0_len_2f70.c +++ b/src/code_362a0_len_2f70.c @@ -2,9 +2,11 @@ INCLUDE_ASM(s32, "code_362a0_len_2f70", allocate_hit_tables); -void func_8005AF84(void) {} +void func_8005AF84(void) { +} -void func_8005AF8C(void) {} +void func_8005AF8C(void) { +} INCLUDE_ASM(s32, "code_362a0_len_2f70", initialize_collision); diff --git a/src/code_891b0_len_fb0.c b/src/code_891b0_len_fb0.c index c3791b8a1a..34474f6004 100644 --- a/src/code_891b0_len_fb0.c +++ b/src/code_891b0_len_fb0.c @@ -1,6 +1,7 @@ #include "common.h" -void func_800EFD00(void) {} +void func_800EFD00(void) { +} INCLUDE_ASM(s32, "code_891b0_len_fb0", func_800EFD08); diff --git a/src/code_a5dd0_len_114e0.c b/src/code_a5dd0_len_114e0.c index 01c39ffa07..5414c5e1ed 100644 --- a/src/code_a5dd0_len_114e0.c +++ b/src/code_a5dd0_len_114e0.c @@ -151,7 +151,8 @@ INCLUDE_ASM(s32, "code_a5dd0_len_114e0", set_peach_shadow_scale); INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_80112B20); -void NOP_state(void) {} +void NOP_state(void) { +} INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_80112B98); diff --git a/src/code_ad90_len_2880.c b/src/code_ad90_len_2880.c index 9142751250..1d162c8702 100644 --- a/src/code_ad90_len_2880.c +++ b/src/code_ad90_len_2880.c @@ -10,7 +10,8 @@ INCLUDE_ASM(s32, "code_ad90_len_2880", func_80030210); INCLUDE_ASM(s32, "code_ad90_len_2880", func_8003034C); -void func_80030450(void) {} +void func_80030450(void) { +} INCLUDE_ASM(s32, "code_ad90_len_2880", test_ray_zone_aabb); diff --git a/src/code_b72b0_len_15ed0.c b/src/code_b72b0_len_15ed0.c index 5cab585b75..8e0ff55a60 100644 --- a/src/code_b72b0_len_15ed0.c +++ b/src/code_b72b0_len_15ed0.c @@ -58,7 +58,8 @@ INCLUDE_ASM(s32, "code_b72b0_len_15ed0", get_entity_fog_distance); INCLUDE_ASM(s32, "code_b72b0_len_15ed0", get_entity_fog_color); -void stub_dynamic_entity_delegate(void) {} +void stub_dynamic_entity_delegate(void) { +} INCLUDE_ASM(s32, "code_b72b0_len_15ed0", clear_dynamic_entity_list); @@ -250,11 +251,14 @@ INCLUDE_ASM(s32, "code_b72b0_len_15ed0", func_8013559C); INCLUDE_ASM(s32, "code_b72b0_len_15ed0", update_item_entity_static); -void func_801356C4(void) {} +void func_801356C4(void) { +} -void func_801356CC(void) {} +void func_801356CC(void) { +} -void func_801356D4(void) {} +void func_801356D4(void) { +} INCLUDE_ASM(s32, "code_b72b0_len_15ed0", update_item_entity_temp); diff --git a/src/code_cd180_len_38f0.c b/src/code_cd180_len_38f0.c index ec5e35f907..232183687d 100644 --- a/src/code_cd180_len_38f0.c +++ b/src/code_cd180_len_38f0.c @@ -20,7 +20,8 @@ INCLUDE_ASM(s32, "code_cd180_len_38f0", func_80138108); INCLUDE_ASM(s32, "code_cd180_len_38f0", func_80138188); -void func_80138198(void) {} +void func_80138198(void) { +} INCLUDE_ASM(s32, "code_cd180_len_38f0", func_801381A0); diff --git a/src/code_d610_len_1330.c b/src/code_d610_len_1330.c index 0535692eeb..f43ef7af55 100644 --- a/src/code_d610_len_1330.c +++ b/src/code_d610_len_1330.c @@ -14,7 +14,8 @@ INCLUDE_ASM(s32, "code_d610_len_1330", func_80032C64); INCLUDE_ASM(s32, "code_d610_len_1330", func_80033394); -void func_800334E8(void) {} +void func_800334E8(void) { +} INCLUDE_ASM(s32, "code_d610_len_1330", set_game_mode); diff --git a/src/code_f270_len_1190.c b/src/code_f270_len_1190.c index 5f487642a7..d75c92cc3e 100644 --- a/src/code_f270_len_1190.c +++ b/src/code_f270_len_1190.c @@ -12,7 +12,8 @@ INCLUDE_ASM(s32, "code_f270_len_1190", begin_state_pause_menu); INCLUDE_ASM(s32, "code_f270_len_1190", step_pause_menu); -void func_80034BF4(void) {} +void func_80034BF4(void) { +} INCLUDE_ASM(s32, "code_f270_len_1190", func_80034BFC);