Resolve compile warnings in modern

17 files changed, 430 insertions, 412 deletions

diff --git a/include/pokenav.h b/include/pokenav.h
index c840fd494..203d14015 100644
--- a/include/pokenav.h
+++ b/include/pokenav.h
@@ -4,7 +4,7 @@
 #include "bg.h"
 #include "main.h"
 
-typedef u32 (*LoopedTask)(int state);
+typedef u32 (*LoopedTask)(s32 state);
 
 // Return values of LoopedTask functions.
 #define LT_INC_AND_PAUSE 0
@@ -111,7 +111,7 @@ void sub_81C7850(u32 a0);
 u32 sub_81C786C(void);
 void LoadLeftHeaderGfxForIndex(u32 arg0);
 void sub_81C7FA0(u32 arg0, bool32 arg1, bool32 arg2);
-void sub_81C7AC0(int a0);
+void sub_81C7AC0(s32 a0);
 bool32 sub_81C8010(void);
 void InitBgTemplates(const struct BgTemplate *templates, int count);
 bool32 IsPaletteFadeActive(void);
diff --git a/include/text.h b/include/text.h
index eba3d0c4e..d3ff663bb 100644
--- a/include/text.h
+++ b/include/text.h
@@ -166,7 +166,11 @@ struct TextPrinter
 
     void (*callback)(struct TextPrinterTemplate *, u16); // 0x10
 
-    union __attribute__((packed)) {
+    union
+#if !MODERN
+    __attribute__((packed))
+#endif
+    {
         struct TextPrinterSubStruct sub;
         u8 fields[7];
     } subUnion;
diff --git a/ld_script.txt b/ld_script.txt
index c9c747490..42a94e9aa 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -41,293 +41,293 @@ SECTIONS {
     .text :
     ALIGN(4)
     {
-        asm/crt0.o(.text);
-        src/main.o(.text);
-        src/alloc.o(.text);
-        src/dma3_manager.o(.text);
-        src/gpu_regs.o(.text);
-        src/bg.o(.text);
-        src/blit.o(.text);
-        src/window.o(.text);
-        src/text.o(.text);
-        src/sprite.o(.text);
-        src/string_util.o(.text);
-        src/link.o(.text);
-        src/link_rfu.o(.text);
-        src/union_room.o(.text);
-        src/mystery_gift.o(.text);
-        src/union_room_player_avatar.o(.text);
-        src/union_room_battle.o(.text);
-        src/mevent2.o(.text);
-        src/mevent_801BAAC.o(.text);
-        src/mevent_server.o(.text);
-        src/mevent_client.o(.text);
-        src/mevent_server_helpers.o(.text);
-        src/mevent_news.o(.text);
-        src/union_room_chat.o(.text);
-        src/berry_crush.o(.text);
-        asm/berry_crush.o(.text);
-        src/berry_powder.o(.text);
-        src/dodrio_berry_picking.o(.text);
-        asm/dodrio_berry_picking.o(.text);
-        src/pokemon_jump.o(.text);
-        asm/pokemon_jump.o(.text);
-        src/rtc.o(.text);
-        src/main_menu.o(.text);
-        src/battle_controllers.o(.text);
-        src/decompress.o(.text);
-        src/rom_8034C54.o(.text);
-        src/battle_bg.o(.text);
-        src/battle_main.o(.text);
-        src/battle_util.o(.text);
-        src/battle_script_commands.o(.text);
-        src/battle_util2.o(.text);
-        src/battle_controller_player.o(.text);
-        src/battle_gfx_sfx_util.o(.text);
-        src/battle_controller_opponent.o(.text);
-        src/battle_ai_switch_items.o(.text);
-        src/battle_controller_link_opponent.o(.text);
-        src/pokemon.o(.text);
-        src/trig.o(.text);
-        src/random.o(.text);
-        src/util.o(.text);
-        src/daycare.o(.text);
-        src/egg_hatch.o(.text);
-        src/battle_interface.o(.text);
-        src/smokescreen.o(.text);
-        src/pokeball.o(.text);
-        src/load_save.o(.text);
-        src/trade.o(.text);
-        src/berry_blender.o(.text);
-        src/play_time.o(.text);
-        src/new_game.o(.text);
-        src/overworld.o(.text);
-        src/fieldmap.o(.text);
-        src/metatile_behavior.o(.text);
-        src/field_camera.o(.text);
-        src/field_door.o(.text);
-        src/field_player_avatar.o(.text);
-        src/event_object_movement.o(.text);
-        src/field_message_box.o(.text);
-        src/event_obj_lock.o(.text);
-        src/text_window.o(.text);
-        src/script.o(.text);
-        src/scrcmd.o(.text);
-        src/field_control_avatar.o(.text);
-        src/event_data.o(.text);
-        src/coord_event_weather.o(.text);
-        src/field_tasks.o(.text);
-        src/clock.o(.text);
-        src/reset_rtc_screen.o(.text);
-        src/start_menu.o(.text);
-        src/tileset_anims.o(.text);
-        src/palette.o(.text);
-        src/sound.o(.text);
-        src/battle_anim.o(.text);
-        src/battle_anim_mons.o(.text);
-        src/task.o(.text);
-        src/reshow_battle_screen.o(.text);
-        src/battle_anim_status_effects.o(.text);
-        src/title_screen.o(.text);
-        src/field_weather.o(.text);
-        src/field_weather_effect.o(.text);
-        src/field_screen_effect.o(.text);
-        src/battle_setup.o(.text);
-        src/cable_club.o(.text);
-        src/trainer_see.o(.text);
-        src/wild_encounter.o(.text);
-        src/field_effect.o(.text);
-        src/scanline_effect.o(.text);
-        src/option_menu.o(.text);
-        src/pokedex.o(.text);
-        src/trainer_card.o(.text);
-        src/frontier_pass.o(.text);
-        src/pokemon_storage_system.o(.text);
-        src/pokemon_icon.o(.text);
-        src/script_movement.o(.text);
-        src/fldeff_cut.o(.text);
-        src/mail_data.o(.text);
-        src/map_name_popup.o(.text);
-        src/item_menu_icons.o(.text);
-        src/battle_anim_mon_movement.o(.text);
-        src/item.o(.text);
-        src/contest.o(.text);
-        src/shop.o(.text);
-        src/fldeff_escalator.o(.text);
-        src/berry.o(.text);
-        src/script_menu.o(.text);
-        src/naming_screen.o(.text);
-        src/money.o(.text);
-        src/contest_effect.o(.text);
-        src/record_mixing.o(.text);
-        src/secret_base.o(.text);
-        src/tv.o(.text);
-        src/contest_link_80F57C4.o(.text);
-        src/script_pokemon_util_80F87D8.o(.text);
-        src/field_poison.o(.text);
-        src/pokemon_size_record.o(.text);
-        src/fldeff_misc.o(.text);
-        src/field_special_scene.o(.text);
-        src/rotating_gate.o(.text);
-        src/safari_zone.o(.text);
-        src/contest_link_80FC4F4.o(.text);
-        src/item_use.o(.text);
-        src/battle_anim_effects_1.o(.text);
-        src/battle_anim_effects_2.o(.text);
-        src/water.o(.text);
-        src/fire.o(.text);
-        src/electric.o(.text);
-        src/ice.o(.text);
-        src/fight.o(.text);
-        src/poison.o(.text);
-        src/flying.o(.text);
-        src/psychic.o(.text);
-        src/bug.o(.text);
-        src/rock.o(.text);
-        src/ghost.o(.text);
-        src/dragon.o(.text);
-        src/dark.o(.text);
-        src/ground.o(.text);
-        src/normal.o(.text);
-        src/battle_anim_utility_funcs.o(.text);
-        src/battle_intro.o(.text);
-        src/bike.o(.text);
-        src/easy_chat.o(.text);
-        src/mon_markings.o(.text);
-        src/mauville_old_man.o(.text);
-        src/mail.o(.text);
-        src/menu_helpers.o(.text);
-        src/dewford_trend.o(.text);
-        src/heal_location.o(.text);
-        src/region_map.o(.text);
-        src/contest_painting_effects.o(.text);
-        src/decoration.o(.text);
-        src/slot_machine.o(.text);
-        src/contest_painting.o(.text);
-        src/battle_ai_script_commands.o(.text);
-        src/trader.o(.text);
-        src/starter_choose.o(.text);
-        src/wallclock.o(.text);
-        src/fldeff_rocksmash.o(.text);
-        src/fldeff_dig.o(.text);
-        src/pokeblock.o(.text);
-        src/fldeff_flash.o(.text);
-        src/post_battle_event_funcs.o(.text);
-        src/time_events.o(.text);
-        src/birch_pc.o(.text);
-        src/hof_pc.o(.text);
-        src/field_specials.o(.text);
-        src/battle_records.o(.text);
-        src/pokedex_area_screen.o(.text);
-        src/evolution_scene.o(.text);
-        src/roulette.o(.text);
-        src/pokedex_cry_screen.o(.text);
-        src/coins.o(.text);
-        src/landmark.o(.text);
-        src/fldeff_strength.o(.text);
-        src/battle_transition.o(.text);
-        src/battle_controller_link_partner.o(.text);
-        src/battle_message.o(.text);
-        src/cable_car.o(.text);
-        src/math_util.o(.text);
-        src/roulette_util.o(.text);
-        src/rom_81520A8.o(.text);
-        src/save.o(.text);
-        src/mystery_event_script.o(.text);
-        src/field_effect_helpers.o(.text);
-        src/contest_ai.o(.text);
-        src/battle_anim_sound_tasks.o(.text);
-        src/battle_controller_safari.o(.text);
-        src/fldeff_sweetscent.o(.text);
-        src/battle_anim_effects_3.o(.text);
-        src/move_relearner.o(.text);
-        src/fldeff_softboiled.o(.text);
-        src/decoration_inventory.o(.text);
-        src/roamer.o(.text);
-        src/battle_tower.o(.text);
-        src/use_pokeblock.o(.text);
-        src/battle_controller_wally.o(.text);
-        src/player_pc.o(.text);
-        src/intro.o(.text);
-        src/reset_save_heap.o(.text);
-        src/field_region_map.o(.text);
-        src/battle_anim_special.o(.text);
-        src/hall_of_fame.o(.text);
-        src/credits.o(.text);
-        src/lottery_corner.o(.text);
-        src/diploma.o(.text);
-        src/berry_tag_screen.o(.text);
-        src/mystery_event_menu.o(.text);
-        src/save_failed_screen.o(.text);
-        src/braille_puzzles.o(.text);
-        src/pokeblock_feed.o(.text);
-        src/clear_save_data_screen.o(.text);
-        src/intro_credits_graphics.o(.text);
-        src/evolution_graphics.o(.text);
-        src/bard_music.o(.text);
-        src/fldeff_teleport.o(.text);
-        src/battle_tv.o(.text);
-        src/pokemon_animation.o(.text);
-        src/recorded_battle.o(.text);
-        src/battle_controller_recorded_opponent.o(.text);
-        src/battle_controller_recorded_player.o(.text);
-        src/trainer_pokemon_sprites.o(.text);
-        src/lilycove_lady.o(.text);
-        src/battle_dome.o(.text);
-        src/battle_palace.o(.text);
-        src/match_call.o(.text);
-        src/menu.o(.text);
-        src/battle_factory_screen.o(.text);
-        src/apprentice.o(.text);
-        src/frontier_util.o(.text);
-        src/battle_arena.o(.text);
-        src/battle_factory.o(.text);
-        src/battle_pike.o(.text);
-        src/mossdeep_gym.o(.text);
-        src/battle_pyramid.o(.text);
-        src/item_menu.o(.text);
-        src/list_menu.o(.text);
-        src/dynamic_placeholder_text_util.o(.text);
-        src/save_location.o(.text);
-        src/item_icon.o(.text);
-        src/party_menu.o(.text);
-        src/battle_tent.o(.text);
-        src/unk_text_util_2.o(.text);
-        src/multiboot.o(.text);
-        src/unk_81BAD84.o(.text);
-        src/battle_controller_player_partner.o(.text);
-        src/mirage_tower.o(.text);
-        src/berry_fix_program.o(.text);
-        src/pokemon_summary_screen.o(.text);
-        src/unk_pokedex_area_screen_helper.o(.text);
-        src/battle_pyramid_bag.o(.text);
-        src/pokenav.o(.text);
-        src/pokenav_main_menu.o(.text);
-        src/pokenav_match_call_ui.o(.text);
-        src/pokenav_unk_1.o(.text);
-        src/pokenav_unk_2.o(.text);
-        asm/pokenav_unk_2.o(.text);
-        src/pokenav_unk_3.o(.text);
-        src/pokenav_unk_4.o(.text);
-        src/pokenav_unk_5.o(.text);
-        asm/pokenav_unk_6.o(.text);
-        asm/pokenav_unk_7.o(.text);
-        asm/pokenav_unk_8.o(.text);
-        asm/pokenav_unk_9.o(.text);
-        asm/pokenav_unk_10.o(.text);
-        src/pokenav_unk_10.o(.text);
-        src/pokenav_match_call_data.o(.text);
-        src/menu_specialized.o(.text);
-        src/ereader_helpers.o(.text);
-        src/faraway_island.o(.text);
-        src/ereader_screen.o(.text);
-        src/trainer_hill.o(.text);
-        src/rayquaza_scene.o(.text);
-        src/walda_phrase.o(.text);
-        src/contest_link_81D9DE4.o(.text);
-        src/gym_leader_rematch.o(.text);
-        src/unk_transition.o(.text);
-        src/international_string_util.o(.text);
+        asm/crt0.o(.text*);
+        src/main.o(.text*);
+        src/alloc.o(.text*);
+        src/dma3_manager.o(.text*);
+        src/gpu_regs.o(.text*);
+        src/bg.o(.text*);
+        src/blit.o(.text*);
+        src/window.o(.text*);
+        src/text.o(.text*);
+        src/sprite.o(.text*);
+        src/string_util.o(.text*);
+        src/link.o(.text*);
+        src/link_rfu.o(.text*);
+        src/union_room.o(.text*);
+        src/mystery_gift.o(.text*);
+        src/union_room_player_avatar.o(.text*);
+        src/union_room_battle.o(.text*);
+        src/mevent2.o(.text*);
+        src/mevent_801BAAC.o(.text*);
+        src/mevent_server.o(.text*);
+        src/mevent_client.o(.text*);
+        src/mevent_server_helpers.o(.text*);
+        src/mevent_news.o(.text*);
+        src/union_room_chat.o(.text*);
+        src/berry_crush.o(.text*);
+        asm/berry_crush.o(.text*);
+        src/berry_powder.o(.text*);
+        src/dodrio_berry_picking.o(.text*);
+        asm/dodrio_berry_picking.o(.text*);
+        src/pokemon_jump.o(.text*);
+        asm/pokemon_jump.o(.text*);
+        src/rtc.o(.text*);
+        src/main_menu.o(.text*);
+        src/battle_controllers.o(.text*);
+        src/decompress.o(.text*);
+        src/rom_8034C54.o(.text*);
+        src/battle_bg.o(.text*);
+        src/battle_main.o(.text*);
+        src/battle_util.o(.text*);
+        src/battle_script_commands.o(.text*);
+        src/battle_util2.o(.text*);
+        src/battle_controller_player.o(.text*);
+        src/battle_gfx_sfx_util.o(.text*);
+        src/battle_controller_opponent.o(.text*);
+        src/battle_ai_switch_items.o(.text*);
+        src/battle_controller_link_opponent.o(.text*);
+        src/pokemon.o(.text*);
+        src/trig.o(.text*);
+        src/random.o(.text*);
+        src/util.o(.text*);
+        src/daycare.o(.text*);
+        src/egg_hatch.o(.text*);
+        src/battle_interface.o(.text*);
+        src/smokescreen.o(.text*);
+        src/pokeball.o(.text*);
+        src/load_save.o(.text*);
+        src/trade.o(.text*);
+        src/berry_blender.o(.text*);
+        src/play_time.o(.text*);
+        src/new_game.o(.text*);
+        src/overworld.o(.text*);
+        src/fieldmap.o(.text*);
+        src/metatile_behavior.o(.text*);
+        src/field_camera.o(.text*);
+        src/field_door.o(.text*);
+        src/field_player_avatar.o(.text*);
+        src/event_object_movement.o(.text*);
+        src/field_message_box.o(.text*);
+        src/event_obj_lock.o(.text*);
+        src/text_window.o(.text*);
+        src/script.o(.text*);
+        src/scrcmd.o(.text*);
+        src/field_control_avatar.o(.text*);
+        src/event_data.o(.text*);
+        src/coord_event_weather.o(.text*);
+        src/field_tasks.o(.text*);
+        src/clock.o(.text*);
+        src/reset_rtc_screen.o(.text*);
+        src/start_menu.o(.text*);
+        src/tileset_anims.o(.text*);
+        src/palette.o(.text*);
+        src/sound.o(.text*);
+        src/battle_anim.o(.text*);
+        src/battle_anim_mons.o(.text*);
+        src/task.o(.text*);
+        src/reshow_battle_screen.o(.text*);
+        src/battle_anim_status_effects.o(.text*);
+        src/title_screen.o(.text*);
+        src/field_weather.o(.text*);
+        src/field_weather_effect.o(.text*);
+        src/field_screen_effect.o(.text*);
+        src/battle_setup.o(.text*);
+        src/cable_club.o(.text*);
+        src/trainer_see.o(.text*);
+        src/wild_encounter.o(.text*);
+        src/field_effect.o(.text*);
+        src/scanline_effect.o(.text*);
+        src/option_menu.o(.text*);
+        src/pokedex.o(.text*);
+        src/trainer_card.o(.text*);
+        src/frontier_pass.o(.text*);
+        src/pokemon_storage_system.o(.text*);
+        src/pokemon_icon.o(.text*);
+        src/script_movement.o(.text*);
+        src/fldeff_cut.o(.text*);
+        src/mail_data.o(.text*);
+        src/map_name_popup.o(.text*);
+        src/item_menu_icons.o(.text*);
+        src/battle_anim_mon_movement.o(.text*);
+        src/item.o(.text*);
+        src/contest.o(.text*);
+        src/shop.o(.text*);
+        src/fldeff_escalator.o(.text*);
+        src/berry.o(.text*);
+        src/script_menu.o(.text*);
+        src/naming_screen.o(.text*);
+        src/money.o(.text*);
+        src/contest_effect.o(.text*);
+        src/record_mixing.o(.text*);
+        src/secret_base.o(.text*);
+        src/tv.o(.text*);
+        src/contest_link_80F57C4.o(.text*);
+        src/script_pokemon_util_80F87D8.o(.text*);
+        src/field_poison.o(.text*);
+        src/pokemon_size_record.o(.text*);
+        src/fldeff_misc.o(.text*);
+        src/field_special_scene.o(.text*);
+        src/rotating_gate.o(.text*);
+        src/safari_zone.o(.text*);
+        src/contest_link_80FC4F4.o(.text*);
+        src/item_use.o(.text*);
+        src/battle_anim_effects_1.o(.text*);
+        src/battle_anim_effects_2.o(.text*);
+        src/water.o(.text*);
+        src/fire.o(.text*);
+        src/electric.o(.text*);
+        src/ice.o(.text*);
+        src/fight.o(.text*);
+        src/poison.o(.text*);
+        src/flying.o(.text*);
+        src/psychic.o(.text*);
+        src/bug.o(.text*);
+        src/rock.o(.text*);
+        src/ghost.o(.text*);
+        src/dragon.o(.text*);
+        src/dark.o(.text*);
+        src/ground.o(.text*);
+        src/normal.o(.text*);
+        src/battle_anim_utility_funcs.o(.text*);
+        src/battle_intro.o(.text*);
+        src/bike.o(.text*);
+        src/easy_chat.o(.text*);
+        src/mon_markings.o(.text*);
+        src/mauville_old_man.o(.text*);
+        src/mail.o(.text*);
+        src/menu_helpers.o(.text*);
+        src/dewford_trend.o(.text*);
+        src/heal_location.o(.text*);
+        src/region_map.o(.text*);
+        src/contest_painting_effects.o(.text*);
+        src/decoration.o(.text*);
+        src/slot_machine.o(.text*);
+        src/contest_painting.o(.text*);
+        src/battle_ai_script_commands.o(.text*);
+        src/trader.o(.text*);
+        src/starter_choose.o(.text*);
+        src/wallclock.o(.text*);
+        src/fldeff_rocksmash.o(.text*);
+        src/fldeff_dig.o(.text*);
+        src/pokeblock.o(.text*);
+        src/fldeff_flash.o(.text*);
+        src/post_battle_event_funcs.o(.text*);
+        src/time_events.o(.text*);
+        src/birch_pc.o(.text*);
+        src/hof_pc.o(.text*);
+        src/field_specials.o(.text*);
+        src/battle_records.o(.text*);
+        src/pokedex_area_screen.o(.text*);
+        src/evolution_scene.o(.text*);
+        src/roulette.o(.text*);
+        src/pokedex_cry_screen.o(.text*);
+        src/coins.o(.text*);
+        src/landmark.o(.text*);
+        src/fldeff_strength.o(.text*);
+        src/battle_transition.o(.text*);
+        src/battle_controller_link_partner.o(.text*);
+        src/battle_message.o(.text*);
+        src/cable_car.o(.text*);
+        src/math_util.o(.text*);
+        src/roulette_util.o(.text*);
+        src/rom_81520A8.o(.text*);
+        src/save.o(.text*);
+        src/mystery_event_script.o(.text*);
+        src/field_effect_helpers.o(.text*);
+        src/contest_ai.o(.text*);
+        src/battle_anim_sound_tasks.o(.text*);
+        src/battle_controller_safari.o(.text*);
+        src/fldeff_sweetscent.o(.text*);
+        src/battle_anim_effects_3.o(.text*);
+        src/move_relearner.o(.text*);
+        src/fldeff_softboiled.o(.text*);
+        src/decoration_inventory.o(.text*);
+        src/roamer.o(.text*);
+        src/battle_tower.o(.text*);
+        src/use_pokeblock.o(.text*);
+        src/battle_controller_wally.o(.text*);
+        src/player_pc.o(.text*);
+        src/intro.o(.text*);
+        src/reset_save_heap.o(.text*);
+        src/field_region_map.o(.text*);
+        src/battle_anim_special.o(.text*);
+        src/hall_of_fame.o(.text*);
+        src/credits.o(.text*);
+        src/lottery_corner.o(.text*);
+        src/diploma.o(.text*);
+        src/berry_tag_screen.o(.text*);
+        src/mystery_event_menu.o(.text*);
+        src/save_failed_screen.o(.text*);
+        src/braille_puzzles.o(.text*);
+        src/pokeblock_feed.o(.text*);
+        src/clear_save_data_screen.o(.text*);
+        src/intro_credits_graphics.o(.text*);
+        src/evolution_graphics.o(.text*);
+        src/bard_music.o(.text*);
+        src/fldeff_teleport.o(.text*);
+        src/battle_tv.o(.text*);
+        src/pokemon_animation.o(.text*);
+        src/recorded_battle.o(.text*);
+        src/battle_controller_recorded_opponent.o(.text*);
+        src/battle_controller_recorded_player.o(.text*);
+        src/trainer_pokemon_sprites.o(.text*);
+        src/lilycove_lady.o(.text*);
+        src/battle_dome.o(.text*);
+        src/battle_palace.o(.text*);
+        src/match_call.o(.text*);
+        src/menu.o(.text*);
+        src/battle_factory_screen.o(.text*);
+        src/apprentice.o(.text*);
+        src/frontier_util.o(.text*);
+        src/battle_arena.o(.text*);
+        src/battle_factory.o(.text*);
+        src/battle_pike.o(.text*);
+        src/mossdeep_gym.o(.text*);
+        src/battle_pyramid.o(.text*);
+        src/item_menu.o(.text*);
+        src/list_menu.o(.text*);
+        src/dynamic_placeholder_text_util.o(.text*);
+        src/save_location.o(.text*);
+        src/item_icon.o(.text*);
+        src/party_menu.o(.text*);
+        src/battle_tent.o(.text*);
+        src/unk_text_util_2.o(.text*);
+        src/multiboot.o(.text*);
+        src/unk_81BAD84.o(.text*);
+        src/battle_controller_player_partner.o(.text*);
+        src/mirage_tower.o(.text*);
+        src/berry_fix_program.o(.text*);
+        src/pokemon_summary_screen.o(.text*);
+        src/unk_pokedex_area_screen_helper.o(.text*);
+        src/battle_pyramid_bag.o(.text*);
+        src/pokenav.o(.text*);
+        src/pokenav_main_menu.o(.text*);
+        src/pokenav_match_call_ui.o(.text*);
+        src/pokenav_unk_1.o(.text*);
+        src/pokenav_unk_2.o(.text*);
+        asm/pokenav_unk_2.o(.text*);
+        src/pokenav_unk_3.o(.text*);
+        src/pokenav_unk_4.o(.text*);
+        src/pokenav_unk_5.o(.text*);
+        asm/pokenav_unk_6.o(.text*);
+        asm/pokenav_unk_7.o(.text*);
+        asm/pokenav_unk_8.o(.text*);
+        asm/pokenav_unk_9.o(.text*);
+        asm/pokenav_unk_10.o(.text*);
+        src/pokenav_unk_10.o(.text*);
+        src/pokenav_match_call_data.o(.text*);
+        src/menu_specialized.o(.text*);
+        src/ereader_helpers.o(.text*);
+        src/faraway_island.o(.text*);
+        src/ereader_screen.o(.text*);
+        src/trainer_hill.o(.text*);
+        src/rayquaza_scene.o(.text*);
+        src/walda_phrase.o(.text*);
+        src/contest_link_81D9DE4.o(.text*);
+        src/gym_leader_rematch.o(.text*);
+        src/unk_transition.o(.text*);
+        src/international_string_util.o(.text*);
     } =0
 
     script_data :
@@ -346,70 +346,70 @@ SECTIONS {
     lib_text :
     ALIGN(4)
     {
-        asm/libgcnmultiboot.o(.text);
-        asm/m4a_1.o(.text);
-        src/m4a.o(.text);
-        src/agb_flash.o(.text);
-        src/agb_flash_1m.o(.text);
-        src/agb_flash_mx.o(.text);
-        src/siirtc.o(.text);
-        src/librfu_stwi.o(.text);
-        src/librfu_intr.o(.text);
-        asm/librfu_intr.o(.text);
-        src/librfu_rfu.o(.text);
-        asm/librfu.o(.text);
-        asm/libagbsyscall.o(.text);
-        *libgcc.a:_call_via_rX.o(.text);
-        *libgcc.a:_divdi3.o(.text);
-        *libgcc.a:_divsi3.o(.text);
-        *libgcc.a:_dvmd_tls.o(.text);
-        *libgcc.a:_fixunsdfsi.o(.text);
-        *libgcc.a:_fixunssfsi.o(.text);
-        *libgcc.a:_modsi3.o(.text);
-        *libgcc.a:_muldi3.o(.text);
-        *libgcc.a:_udivdi3.o(.text);
-        *libgcc.a:_udivsi3.o(.text);
-        *libgcc.a:_umodsi3.o(.text);
-        *libgcc.a:dp-bit.o(.text);
-        *libgcc.a:fp-bit.o(.text);
-        *libgcc.a:_lshrdi3.o(.text);
-        *libgcc.a:_negdi2.o(.text);
-        *libc.a:memcpy.o(.text);
-        *libc.a:memset.o(.text);
-        *libc.a:strcmp.o(.text);
-        *libc.a:strcpy.o(.text);
-        *libc.a:vfprintf.o(.text);
-        *libc.a:vsprintf.o(.text);
-        *libc.a:fvwrite.o(.text);
-        *libc.a:locale.o(.text);
-        *libc.a:findfp.o(.text);
-        *libc.a:fflush.o(.text);
-        *libc.a:wsetup.o(.text);
-        *libc.a:mbtowc_r.o(.text);
-        *libc.a:s_isinf.o(.text);
-        *libc.a:s_isnan.o(.text);
-        *libc.a:memchr.o(.text);
-        *libc.a:strlen.o(.text);
-        *libc.a:dtoa.o(.text);
-        *libc.a:memmove.o(.text);
-        *libc.a:stdio.o(.text);
-        *libc.a:mprec.o(.text);
-        *libc.a:mallocr.o(.text);
-        *libc.a:fwalk.o(.text);
-        *libc.a:freer.o(.text);
-        *libc.a:makebuf.o(.text);
-        *libc.a:readr.o(.text);
-        *libc.a:writer.o(.text);
-        *libc.a:lseekr.o(.text);
-        *libc.a:closer.o(.text);
-        *libc.a:callocr.o(.text);
-        *libc.a:sbrkr.o(.text);
-        *libc.a:mlock.o(.text);
-        *libc.a:fstatr.o(.text);
-        *libc.a:libcfunc.o(.text);
-        *libc.a:syscalls.o(.text);
-        *libc.a:errno.o(.text);
-        src/libisagbprn.o(.text);
+        asm/libgcnmultiboot.o(.text*);
+        asm/m4a_1.o(.text*);
+        src/m4a.o(.text*);
+        src/agb_flash.o(.text*);
+        src/agb_flash_1m.o(.text*);
+        src/agb_flash_mx.o(.text*);
+        src/siirtc.o(.text*);
+        src/librfu_stwi.o(.text*);
+        src/librfu_intr.o(.text*);
+        asm/librfu_intr.o(.text*);
+        src/librfu_rfu.o(.text*);
+        asm/librfu.o(.text*);
+        asm/libagbsyscall.o(.text*);
+        *libgcc.a:_call_via_rX.o(.text*);
+        *libgcc.a:_divdi3.o(.text*);
+        *libgcc.a:_divsi3.o(.text*);
+        *libgcc.a:_dvmd_tls.o(.text*);
+        *libgcc.a:_fixunsdfsi.o(.text*);
+        *libgcc.a:_fixunssfsi.o(.text*);
+        *libgcc.a:_modsi3.o(.text*);
+        *libgcc.a:_muldi3.o(.text*);
+        *libgcc.a:_udivdi3.o(.text*);
+        *libgcc.a:_udivsi3.o(.text*);
+        *libgcc.a:_umodsi3.o(.text*);
+        *libgcc.a:dp-bit.o(.text*);
+        *libgcc.a:fp-bit.o(.text*);
+        *libgcc.a:_lshrdi3.o(.text*);
+        *libgcc.a:_negdi2.o(.text*);
+        *libc.a:memcpy.o(.text*);
+        *libc.a:memset.o(.text*);
+        *libc.a:strcmp.o(.text*);
+        *libc.a:strcpy.o(.text*);
+        *libc.a:vfprintf.o(.text*);
+        *libc.a:vsprintf.o(.text*);
+        *libc.a:fvwrite.o(.text*);
+        *libc.a:locale.o(.text*);
+        *libc.a:findfp.o(.text*);
+        *libc.a:fflush.o(.text*);
+        *libc.a:wsetup.o(.text*);
+        *libc.a:mbtowc_r.o(.text*);
+        *libc.a:s_isinf.o(.text*);
+        *libc.a:s_isnan.o(.text*);
+        *libc.a:memchr.o(.text*);
+        *libc.a:strlen.o(.text*);
+        *libc.a:dtoa.o(.text*);
+        *libc.a:memmove.o(.text*);
+        *libc.a:stdio.o(.text*);
+        *libc.a:mprec.o(.text*);
+        *libc.a:mallocr.o(.text*);
+        *libc.a:fwalk.o(.text*);
+        *libc.a:freer.o(.text*);
+        *libc.a:makebuf.o(.text*);
+        *libc.a:readr.o(.text*);
+        *libc.a:writer.o(.text*);
+        *libc.a:lseekr.o(.text*);
+        *libc.a:closer.o(.text*);
+        *libc.a:callocr.o(.text*);
+        *libc.a:sbrkr.o(.text*);
+        *libc.a:mlock.o(.text*);
+        *libc.a:fstatr.o(.text*);
+        *libc.a:libcfunc.o(.text*);
+        *libc.a:syscalls.o(.text*);
+        *libc.a:errno.o(.text*);
+        src/libisagbprn.o(.text*);
     } =0
 
     .rodata :
diff --git a/src/battle_main.c b/src/battle_main.c
index b4c4bdf5c..61b6a5a12 100644
--- a/src/battle_main.c
+++ b/src/battle_main.c
@@ -72,6 +72,9 @@ extern const u8 *const gBattlescriptsForUsingItem[];
 extern const u8 *const gBattlescriptsForSafariActions[];
 
 // this file's functions
+#if !defined(NONMATCHING) && MODERN
+#define static
+#endif
 static void CB2_InitBattleInternal(void);
 static void CB2_PreInitMultiBattle(void);
 static void CB2_PreInitIngamePlayerPartnerBattle(void);
diff --git a/src/cable_car.c b/src/cable_car.c
index d44c9a241..adeee2647 100644
--- a/src/cable_car.c
+++ b/src/cable_car.c
@@ -245,7 +245,7 @@ static void CableCarMainCallback_Setup(void)
 {
     u16 imebak;
     u8 i = 0;
-    int sizeOut = 0;
+    u32 sizeOut = 0;
 
     switch (gMain.state)
     {
diff --git a/src/item.c b/src/item.c
index fe8e8eadd..5e505724c 100644
--- a/src/item.c
+++ b/src/item.c
@@ -18,6 +18,9 @@
 extern u16 gUnknown_0203CF30[];
 
 // this file's functions
+#if !defined(NONMATCHING) && MODERN
+#define static
+#endif
 static bool8 CheckPyramidBagHasItem(u16 itemId, u16 count);
 static bool8 CheckPyramidBagHasSpace(u16 itemId, u16 count);
 
diff --git a/src/item_menu.c b/src/item_menu.c
index a8d1d4445..845ffabb6 100755
--- a/src/item_menu.c
+++ b/src/item_menu.c
@@ -127,7 +127,7 @@ void sub_81ABAE0(void);
 u8 sub_81AB1F0(u8);
 void sub_81AC23C(u8);
 void BagMenu_MoveCursorCallback(s32 a, bool8 b, struct ListMenu*);
-void PrintItemQuantityPlusGFX(u8 rboxId, int item_index_in_pocket, u8 a);
+void PrintItemQuantityPlusGFX(u8 rboxId, s32 item_index_in_pocket, u8 a);
 void ItemMenu_UseOutOfBattle(u8 taskId);
 void ItemMenu_Toss(u8 taskId);
 void ItemMenu_Register(u8 taskId);
@@ -830,7 +830,7 @@ void BagMenu_MoveCursorCallback(s32 a, bool8 b, struct ListMenu *unused)
     }
 }
 
-void PrintItemQuantityPlusGFX(u8 rboxId, int item_index_in_pocket, u8 a)
+void PrintItemQuantityPlusGFX(u8 rboxId, s32 item_index_in_pocket, u8 a)
 {
     u16 itemId;
     u16 itemQuantity;
diff --git a/src/party_menu.c b/src/party_menu.c
index ad5807ce4..dd0a4dabd 100755
--- a/src/party_menu.c
+++ b/src/party_menu.c
@@ -1820,7 +1820,7 @@ static bool8 AllocPartyMenuBg(void)
 
 static bool8 AllocPartyMiscGfx(void)
 {
-    int sizeout;
+    u32 sizeout;
 
     switch (gUnknown_0203CEC4->data[0])
     {
diff --git a/src/pokemon_storage_system.c b/src/pokemon_storage_system.c
index 49b171ec0..c5cd71d15 100644
--- a/src/pokemon_storage_system.c
+++ b/src/pokemon_storage_system.c
@@ -464,6 +464,9 @@ EWRAM_DATA static u8 sMovingMonOrigBoxPos = 0;
 EWRAM_DATA static bool8 sCanOnlyMove = 0;
 
 // This file's functions.
+#if !defined(NONMATCHING) && MODERN
+#define static
+#endif
 static void CreatePCMenu(u8 whichMenu, s16 *windowIdPtr);
 static void Cb2_EnterPSS(u8 boxOption);
 static u8 GetCurrentBoxOption(void);
diff --git a/src/pokenav_main_menu.c b/src/pokenav_main_menu.c
index 94dab60bb..4422a70e3 100644
--- a/src/pokenav_main_menu.c
+++ b/src/pokenav_main_menu.c
@@ -64,16 +64,16 @@ static void HideLeftHeaderSubmenuSprites(bool32 isOnRightSide);
 static void HideLeftHeaderSprites(bool32 isOnRightSide);
 static void ShowLeftHeaderSprites(u32 startY, bool32 isOnRightSide);
 static void ShowLeftHeaderSubmenuSprites(u32 startY, bool32 isOnRightSide);
-static void MoveLeftHeader(struct Sprite *sprite, int startX, int endX, int duration);
+static void MoveLeftHeader(struct Sprite *sprite, s32 startX, s32 endX, s32 duration);
 static void SpriteCB_MoveLeftHeader(struct Sprite *sprite);
 static void InitPokenavMainMenuResources(void);
 static void InitHoennMapHeaderSprites(void);
 static void sub_81C7B74(void);
-static u32 LoopedTask_ScrollMenuHeaderDown(int a0);
-static u32 LoopedTask_ScrollMenuHeaderUp(int a0);
+static u32 LoopedTask_ScrollMenuHeaderDown(s32 a0);
+static u32 LoopedTask_ScrollMenuHeaderUp(s32 a0);
 static void sub_81C7BF8(u32 a0);
 static void SpriteCB_SpinningPokenav(struct Sprite* sprite);
-static u32 LoopedTask_InitPokenavMenu(int a0);
+static u32 LoopedTask_InitPokenavMenu(s32 a0);
 
 const u16 gSpinningPokenavPaletteData[] = INCBIN_U16("graphics/pokenav/icon2.gbapal");
 const u32 gSpinningPokenavGfx[] = INCBIN_U32("graphics/pokenav/icon2.4bpp.lz");
@@ -360,7 +360,7 @@ bool32 WaitForPokenavShutdownFade(void)
     return TRUE;
 }
 
-static u32 LoopedTask_InitPokenavMenu(int a0)
+static u32 LoopedTask_InitPokenavMenu(s32 a0)
 {
     struct PokenavMainMenuResources *structPtr;
 
@@ -440,7 +440,7 @@ bool32 MainMenuLoopedTaskIsBusy(void)
     return IsLoopedTaskActive(structPtr->currentTaskId);
 }
 
-static u32 LoopedTask_ScrollMenuHeaderDown(int a0)
+static u32 LoopedTask_ScrollMenuHeaderDown(s32 a0)
 {
     switch (a0)
     {
@@ -461,7 +461,7 @@ static u32 LoopedTask_ScrollMenuHeaderDown(int a0)
     }
 }
 
-static u32 LoopedTask_ScrollMenuHeaderUp(int a0)
+static u32 LoopedTask_ScrollMenuHeaderUp(s32 a0)
 {
     if (ChangeBgY(0, 384, 2) <= 0)
     {
@@ -637,7 +637,7 @@ _081C7AAE:\n\
     .syntax divided");
 }
 
-void sub_81C7AC0(int a0)
+void sub_81C7AC0(s32 a0)
 {
     struct PokenavMainMenuResources *structPtr = GetSubstructPtr(0);
 
@@ -708,7 +708,7 @@ static void sub_81C7BF8(u32 windowId)
 
 static void InitPokenavMainMenuResources(void)
 {
-    int i;
+    s32 i;
     u8 spriteId;
     struct PokenavMainMenuResources *structPtr = GetSubstructPtr(0);
 
@@ -758,13 +758,13 @@ void ResumeSpinningPokenavSprite(void)
 
 static void InitHoennMapHeaderSprites(void)
 {
-    int i, spriteId;
+    s32 i, spriteId;
     struct PokenavMainMenuResources *structPtr = GetSubstructPtr(0);
 
     LoadCompressedSpriteSheet(&sPokenavHoennMapLeftHeaderSpriteSheet);
     AllocSpritePalette(1);
     AllocSpritePalette(2);
-    for (i = 0; i < (int)ARRAY_COUNT(structPtr->leftHeaderSprites); i++)
+    for (i = 0; i < (s32)ARRAY_COUNT(structPtr->leftHeaderSprites); i++)
     {
         spriteId = CreateSprite(&sPokenavLeftHeaderHoennMapSpriteTemplate, 0, 0, 1);
         structPtr->leftHeaderSprites[i] = &gSprites[spriteId];
@@ -859,10 +859,10 @@ void sub_81C7FC4(u32 arg0, bool32 arg1)
 
 void sub_81C7FDC(void)
 {
-    int i;
+    s32 i;
     struct PokenavMainMenuResources *structPtr = GetSubstructPtr(0);
 
-    for (i = 0; i < (int)ARRAY_COUNT(structPtr->leftHeaderSprites); i++)
+    for (i = 0; i < (s32)ARRAY_COUNT(structPtr->leftHeaderSprites); i++)
     {
         structPtr->leftHeaderSprites[i]->invisible = TRUE;
         structPtr->submenuLeftHeaderSprites[i]->invisible = TRUE;
@@ -881,7 +881,7 @@ bool32 sub_81C8010(void)
 
 static void ShowLeftHeaderSprites(u32 startY, bool32 isOnRightSide)
 {
-    int start, end, i;
+    s32 start, end, i;
     struct PokenavMainMenuResources *structPtr = GetSubstructPtr(0);
 
     if (!isOnRightSide)
@@ -889,7 +889,7 @@ static void ShowLeftHeaderSprites(u32 startY, bool32 isOnRightSide)
     else
         start = 256, end = 160;
 
-    for (i = 0; i < (int)ARRAY_COUNT(structPtr->leftHeaderSprites); i++)
+    for (i = 0; i < (s32)ARRAY_COUNT(structPtr->leftHeaderSprites); i++)
     {
         structPtr->leftHeaderSprites[i]->pos1.y = startY;
         MoveLeftHeader(structPtr->leftHeaderSprites[i], start, end, 12);
@@ -898,7 +898,7 @@ static void ShowLeftHeaderSprites(u32 startY, bool32 isOnRightSide)
 
 static void ShowLeftHeaderSubmenuSprites(u32 startY, bool32 isOnRightSide)
 {
-    int start, end, i;
+    s32 start, end, i;
     struct PokenavMainMenuResources *structPtr = GetSubstructPtr(0);
 
     if (!isOnRightSide)
@@ -906,7 +906,7 @@ static void ShowLeftHeaderSubmenuSprites(u32 startY, bool32 isOnRightSide)
     else
         start = 256, end = 192;
 
-    for (i = 0; i < (int)ARRAY_COUNT(structPtr->submenuLeftHeaderSprites); i++)
+    for (i = 0; i < (s32)ARRAY_COUNT(structPtr->submenuLeftHeaderSprites); i++)
     {
         structPtr->submenuLeftHeaderSprites[i]->pos1.y = startY;
         MoveLeftHeader(structPtr->submenuLeftHeaderSprites[i], start, end, 12);
@@ -915,7 +915,7 @@ static void ShowLeftHeaderSubmenuSprites(u32 startY, bool32 isOnRightSide)
 
 static void HideLeftHeaderSprites(bool32 isOnRightSide)
 {
-    int start, end, i;
+    s32 start, end, i;
     struct PokenavMainMenuResources *structPtr = GetSubstructPtr(0);
 
     if (!isOnRightSide)
@@ -923,7 +923,7 @@ static void HideLeftHeaderSprites(bool32 isOnRightSide)
     else
         start = 192, end = 256;
 
-    for (i = 0; i < (int)ARRAY_COUNT(structPtr->leftHeaderSprites); i++)
+    for (i = 0; i < (s32)ARRAY_COUNT(structPtr->leftHeaderSprites); i++)
     {
         MoveLeftHeader(structPtr->leftHeaderSprites[i], start, end, 12);
     }
@@ -931,7 +931,7 @@ static void HideLeftHeaderSprites(bool32 isOnRightSide)
 
 static void HideLeftHeaderSubmenuSprites(bool32 isOnRightSide)
 {
-    int start, end, i;
+    s32 start, end, i;
     struct PokenavMainMenuResources *structPtr = GetSubstructPtr(0);
 
     if (!isOnRightSide)
@@ -939,13 +939,13 @@ static void HideLeftHeaderSubmenuSprites(bool32 isOnRightSide)
     else
         start = 192, end = 256;
 
-    for (i = 0; i < (int)ARRAY_COUNT(structPtr->submenuLeftHeaderSprites); i++)
+    for (i = 0; i < (s32)ARRAY_COUNT(structPtr->submenuLeftHeaderSprites); i++)
     {
         MoveLeftHeader(structPtr->submenuLeftHeaderSprites[i], start, end, 12);
     }
 }
 
-static void MoveLeftHeader(struct Sprite *sprite, int startX, int endX, int duration)
+static void MoveLeftHeader(struct Sprite *sprite, s32 startX, s32 endX, s32 duration)
 {
     sprite->pos1.x = startX;
     sprite->data[0] = startX * 16;
diff --git a/src/pokenav_unk_3.c b/src/pokenav_unk_3.c
index 404743345..d7afada49 100755
--- a/src/pokenav_unk_3.c
+++ b/src/pokenav_unk_3.c
@@ -34,7 +34,7 @@ static u32 sub_81CABFC(struct Pokenav3Struct *);
 static u32 sub_81CAC04(struct Pokenav3Struct *);
 static u32 sub_81CACB8(struct Pokenav3Struct *);
 static u32 sub_81CACF8(struct Pokenav3Struct *);
-static u32 sub_81CAD20(int);
+static u32 sub_81CAD20(s32);
 static bool32 sub_81CB1D0(void);
 
 extern const u8 gUnknown_08622508[];
@@ -190,7 +190,7 @@ static u32 sub_81CACF8(struct Pokenav3Struct *state)
     return 0;
 }
 
-static u32 sub_81CAD20(int taskState)
+static u32 sub_81CAD20(s32 taskState)
 {
     int i, j;
     struct Pokenav3Struct *state = GetSubstructPtr(5);
diff --git a/src/pokenav_unk_4.c b/src/pokenav_unk_4.c
index 6fa76daf2..cd9651580 100755
--- a/src/pokenav_unk_4.c
+++ b/src/pokenav_unk_4.c
@@ -50,7 +50,7 @@ struct Pokenav4Struct
 };
 
 static bool32 sub_81CB310(void);
-static u32 sub_81CB324(int);
+static u32 sub_81CB324(s32);
 static void sub_81CBBB8(void);
 static void sub_81CBC1C(void);
 static void sub_81CC2B4(void);
@@ -156,7 +156,7 @@ static bool32 sub_81CB310(void)
     return IsLoopedTaskActive(state->unk4);
 }
 
-static u32 sub_81CB324(int taskState)
+static u32 sub_81CB324(s32 taskState)
 {
     struct Pokenav4Struct *state = GetSubstructPtr(6);
     switch (taskState)
@@ -229,7 +229,7 @@ static u32 sub_81CB324(int taskState)
     }
 }
 
-u32 sub_81CB510(int taskState)
+u32 sub_81CB510(s32 taskState)
 {
     struct Pokenav4Struct *state = GetSubstructPtr(6);
     switch (taskState)
@@ -266,7 +266,7 @@ u32 sub_81CB510(int taskState)
     return 4;
 }
 
-u32 sub_81CB588(int taskState)
+u32 sub_81CB588(s32 taskState)
 {
     struct Pokenav4Struct *state = GetSubstructPtr(6);
     switch (taskState)
@@ -303,7 +303,7 @@ u32 sub_81CB588(int taskState)
     return 4;
 }
 
-u32 sub_81CB600(int taskState)
+u32 sub_81CB600(s32 taskState)
 {
     struct Pokenav4Struct *state = GetSubstructPtr(6);
     switch (taskState)
@@ -340,7 +340,7 @@ u32 sub_81CB600(int taskState)
     return 4;
 }
 
-u32 sub_81CB678(int taskState)
+u32 sub_81CB678(s32 taskState)
 {
     struct Pokenav4Struct *state = GetSubstructPtr(6);
     switch (taskState)
@@ -377,7 +377,7 @@ u32 sub_81CB678(int taskState)
     return 4;
 }
 
-u32 sub_81CB6F0(int taskState)
+u32 sub_81CB6F0(s32 taskState)
 {
     struct Pokenav4Struct *state = GetSubstructPtr(6);
     switch (taskState)
@@ -396,7 +396,7 @@ u32 sub_81CB6F0(int taskState)
     return 4;
 }
 
-u32 sub_81CB734(int taskState)
+u32 sub_81CB734(s32 taskState)
 {
     struct Pokenav4Struct *state;
     u16 var0;
@@ -408,7 +408,7 @@ u32 sub_81CB734(int taskState)
     return 4;
 }
 
-u32 sub_81CB75C(int taskState)
+u32 sub_81CB75C(s32 taskState)
 {
     struct Pokenav4Struct *state = GetSubstructPtr(6);
     switch (taskState)
@@ -427,7 +427,7 @@ u32 sub_81CB75C(int taskState)
     return 4;
 }
 
-u32 sub_81CB7A0(int taskState)
+u32 sub_81CB7A0(s32 taskState)
 {
     struct Pokenav4Struct *state = GetSubstructPtr(6);
     switch (taskState)
@@ -459,7 +459,7 @@ u32 sub_81CB7A0(int taskState)
     return 4;
 }
 
-u32 sub_81CB824(int taskState)
+u32 sub_81CB824(s32 taskState)
 {
     struct Pokenav4Struct *state = GetSubstructPtr(6);
     switch (taskState)
@@ -485,7 +485,7 @@ u32 sub_81CB824(int taskState)
     return 4;
 }
 
-u32 sub_81CB888(int taskState)
+u32 sub_81CB888(s32 taskState)
 {
     struct Pokenav4Struct *state = GetSubstructPtr(6);
     u32 result = 0;
@@ -549,7 +549,7 @@ u32 sub_81CB888(int taskState)
     return result;
 }
 
-u32 sub_81CB93C(int taskState)
+u32 sub_81CB93C(s32 taskState)
 {
     struct Pokenav4Struct *state = GetSubstructPtr(6);
     switch (taskState)
@@ -578,7 +578,7 @@ u32 sub_81CB93C(int taskState)
     return 4;
 }
 
-u32 sub_81CB9C8(int taskState)
+u32 sub_81CB9C8(s32 taskState)
 {
     int index;
     int var0;
@@ -617,7 +617,7 @@ u32 sub_81CB9C8(int taskState)
     return 4;
 }
 
-u32 sub_81CBA68(int taskState)
+u32 sub_81CBA68(s32 taskState)
 {
     struct Pokenav4Struct *state = GetSubstructPtr(6);
     switch (taskState)
@@ -643,7 +643,7 @@ u32 sub_81CBA68(int taskState)
     return 4;
 }
 
-u32 sub_81CBAD4(int taskState)
+u32 sub_81CBAD4(s32 taskState)
 {
     int index;
     int var0;
@@ -682,7 +682,7 @@ u32 sub_81CBAD4(int taskState)
     return 4;
 }
 
-u32 sub_81CBB74(int taskState)
+u32 sub_81CBB74(s32 taskState)
 {
     switch (taskState)
     {
diff --git a/src/pokenav_unk_5.c b/src/pokenav_unk_5.c
index eccc200d5..5f24fd07f 100755
--- a/src/pokenav_unk_5.c
+++ b/src/pokenav_unk_5.c
@@ -42,8 +42,8 @@ struct CityZoomPic
 static u32 sub_81CC568(struct Pokenav5Struct *);
 static u32 sub_81CC5B4(struct Pokenav5Struct *);
 static u32 sub_81CC5DC(struct Pokenav5Struct *);
-static u32 sub_81CC6F4(int);
-static u32 sub_81CCD34(int);
+static u32 sub_81CC6F4(s32);
+static u32 sub_81CCD34(s32);
 static bool32 sub_81CC6BC(void);
 static void sub_81CC9EC(void);
 static void sub_81CC9C0(void);
@@ -202,7 +202,7 @@ static bool8 sub_81CC6D0(void)
     return gSaveBlock2Ptr->regionMapZoom == 1;
 }
 
-static u32 sub_81CC6F4(int taskState)
+static u32 sub_81CC6F4(s32 taskState)
 {
     int var0;
     struct RegionMap *regionMap;
@@ -518,7 +518,7 @@ static bool32 sub_81CCD24(void)
     return FuncIsActiveLoopedTask(sub_81CCD34);
 }
 
-static u32 sub_81CCD34(int taskState)
+static u32 sub_81CCD34(s32 taskState)
 {
     struct Pokenav5Struct_2 *state = GetSubstructPtr(4);
     if (taskState < (int)ARRAY_COUNT(gUnknown_08623118))
diff --git a/src/secret_base.c b/src/secret_base.c
index ac35a090a..12cb8cd61 100644
--- a/src/secret_base.c
+++ b/src/secret_base.c
@@ -71,7 +71,7 @@ static EWRAM_DATA struct SecretBaseRegistryMenu *sRegistryMenu = NULL;
 
 static void Task_ShowSecretBaseRegistryMenu(u8 taskId);
 static void BuildRegistryMenuItems(u8 taskId);
-static void RegistryMenu_OnCursorMove(int unused, bool8 flag, struct ListMenu *menu);
+static void RegistryMenu_OnCursorMove(s32 unused, bool8 flag, struct ListMenu *menu);
 static void FinalizeRegistryMenu(u8 taskId);
 static void AddRegistryMenuScrollArrows(u8 taskId);
 static void HandleRegistryMenuInput(u8 taskId);
@@ -932,7 +932,7 @@ static void BuildRegistryMenuItems(u8 taskId)
     gMultiuseListMenuTemplate.maxShowed = data[3];
 }
 
-static void RegistryMenu_OnCursorMove(int unused, bool8 flag, struct ListMenu *menu)
+static void RegistryMenu_OnCursorMove(s32 unused, bool8 flag, struct ListMenu *menu)
 {
     if (flag != TRUE)
         PlaySE(SE_SELECT);
diff --git a/src/shop.c b/src/shop.c
index 7f1a8f27e..bf15568fb 100755
--- a/src/shop.c
+++ b/src/shop.c
@@ -87,8 +87,8 @@ static void Task_ReturnToItemListAfterItemPurchase(u8 taskId);
 static void Task_ReturnToItemListAfterDecorationPurchase(u8 taskId);
 static void Task_HandleShopMenuBuy(u8 taskId);
 static void Task_HandleShopMenuSell(u8 taskId);
-static void BuyMenuPrintItemDescriptionAndShowItemIcon(int item, bool8 onInit, struct ListMenu *list);
-static void BuyMenuPrintPriceInList(u8 windowId, int item, u8 y);
+static void BuyMenuPrintItemDescriptionAndShowItemIcon(s32 item, bool8 onInit, struct ListMenu *list);
+static void BuyMenuPrintPriceInList(u8 windowId, s32 item, u8 y);
 
 static const struct YesNoFuncTable sShopPurchaseYesNoFuncs =
 {
@@ -521,7 +521,7 @@ static void BuyMenuSetListEntry(struct ListMenuItem *menuItem, u16 item, u8 *nam
     menuItem->id = item;
 }
 
-static void BuyMenuPrintItemDescriptionAndShowItemIcon(int item, bool8 onInit, struct ListMenu *list)
+static void BuyMenuPrintItemDescriptionAndShowItemIcon(s32 item, bool8 onInit, struct ListMenu *list)
 {
     const u8 *description;
     if (onInit != TRUE)
@@ -550,7 +550,7 @@ static void BuyMenuPrintItemDescriptionAndShowItemIcon(int item, bool8 onInit, s
     BuyMenuPrint(2, description, 3, 1, 0, 0);
 }
 
-static void BuyMenuPrintPriceInList(u8 windowId, int item, u8 y)
+static void BuyMenuPrintPriceInList(u8 windowId, s32 item, u8 y)
 {
     u8 x;
 
diff --git a/src/trade.c b/src/trade.c
index f7650ff03..94accc43c 100644
--- a/src/trade.c
+++ b/src/trade.c
@@ -158,6 +158,9 @@ static EWRAM_DATA struct {
     /*0xFE*/ u8 unk_FE;
 } *gUnknown_020322A0 = {NULL};
 
+#if !defined(NONMATCHING) && MODERN
+#define static
+#endif
 static bool32 sub_8077260(void);
 static void sub_80773D0(void);
 static void sub_807811C(void);
@@ -2779,7 +2782,7 @@ static void sub_8079398(void)
     }
 }
 
-static void DisplayMessageAndContinueTask(void)
+static void Wait2SecondsAndCreateYesNoMenu(void)
 {
     gUnknown_0203229C->unk_A8++;
 
@@ -2918,7 +2921,7 @@ static void sub_80795AC(void)
             sub_80781C8();
             break;
         case 14:
-            DisplayMessageAndContinueTask();
+            Wait2SecondsAndCreateYesNoMenu();
             break;
         case 15:
             sub_8079034();
diff --git a/src/tv.c b/src/tv.c
index d696e1a21..b4c8463fd 100644
--- a/src/tv.c
+++ b/src/tv.c
@@ -69,7 +69,9 @@ EWRAM_DATA ALIGNED(4) u8 sTVShowState = 0;
 EWRAM_DATA u8 sTVSecretBaseSecretsRandomValues[3] = {};
 
 // Static ROM declarations
-
+#if !defined(NONMATCHING) && MODERN
+#define static
+#endif
 void ClearPokemonNews(void);
 u8 GetTVChannelByShowType(u8 kind);
 u8 FindFirstActiveTVShowThatIsNotAMassOutbreak(void);