rename rng.c to random.c and rom4.c to overworld.c

38 files changed, 66 insertions, 66 deletions

diff --git a/asm/rom4.s b/asm/overworld.s
index ea03b8a8d..ea03b8a8d 100644
--- a/asm/rom4.s
+++ b/asm/overworld.s
diff --git a/data/rom4.s b/data/overworld.s
index 890829cd9..890829cd9 100644
--- a/data/rom4.s
+++ b/data/overworld.s
diff --git a/include/rng.h b/include/random.h
index ae98e575f..79a9d71dc 100644
--- a/include/rng.h
+++ b/include/random.h
@@ -1,5 +1,5 @@
-#ifndef GUARD_RNG_H
-#define GUARD_RNG_H
+#ifndef GUARD_RANDOM_H
+#define GUARD_RANDOM_H
 
 extern u32 gRngValue;
 extern u32 gRng2Value;
@@ -15,4 +15,4 @@ u16 Random2(void);
 void SeedRng(u16 seed);
 void SeedRng2(u16 seed);
 
-#endif // GUARD_RNG_H
+#endif // GUARD_RANDOM_H
diff --git a/ld_script.txt b/ld_script.txt
index cbbb28f7d..b1cafb74b 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -74,7 +74,7 @@ SECTIONS {
         src/pokemon_3.o(.text);
         asm/pokemon_3.o(.text);
         src/trig.o(.text);
-        src/rng.o(.text);
+        src/random.o(.text);
         src/util.o(.text);
         src/blend_palette.o(.text);
         src/daycare.o(.text);
@@ -87,7 +87,7 @@ SECTIONS {
         src/berry_blender.o(.text);
         src/play_time.o(.text);
         src/new_game.o(.text);
-        asm/rom4.o(.text);
+        asm/overworld.o(.text);
         asm/fieldmap.o(.text);
         src/metatile_behavior.o(.text);
         asm/field_camera.o(.text);
@@ -349,7 +349,7 @@ SECTIONS {
         data/trade.o(.rodata);
         src/berry_blender.o(.rodata);
         src/new_game.o(.rodata);
-        data/rom4.o(.rodata);
+        data/overworld.o(.rodata);
         data/tilesets.o(.rodata);
         data/maps.o(.rodata);
         data/fieldmap.o(.rodata);
diff --git a/src/battle_2.c b/src/battle_2.c
index e71d45017..006a5e467 100644
--- a/src/battle_2.c
+++ b/src/battle_2.c
@@ -25,7 +25,7 @@
 #include "event_data.h"
 #include "m4a.h"
 #include "window.h"
-#include "rng.h"
+#include "random.h"
 #include "songs.h"
 #include "sound.h"
 #include "battle_message.h"
diff --git a/src/battle_ai_script_commands.c b/src/battle_ai_script_commands.c
index c2e89f68d..ced8ba45f 100644
--- a/src/battle_ai_script_commands.c
+++ b/src/battle_ai_script_commands.c
@@ -4,7 +4,7 @@
 #include "battle.h"
 #include "species.h"
 #include "abilities.h"
-#include "rng.h"
+#include "random.h"
 #include "item.h"
 #include "battle_move_effects.h"
 #include "moves.h"
diff --git a/src/battle_ai_switch_items.c b/src/battle_ai_switch_items.c
index f5b6c7fe4..661fe0637 100644
--- a/src/battle_ai_switch_items.c
+++ b/src/battle_ai_switch_items.c
@@ -5,7 +5,7 @@
 #include "moves.h"
 #include "pokemon.h"
 #include "species.h"
-#include "rng.h"
+#include "random.h"
 #include "util.h"
 #include "items.h"
 #include "pokemon_item_effects.h"
diff --git a/src/battle_controller_opponent.c b/src/battle_controller_opponent.c
index dc23db8bc..41458c023 100644
--- a/src/battle_controller_opponent.c
+++ b/src/battle_controller_opponent.c
@@ -23,7 +23,7 @@
 #include "string_util.h"
 #include "bg.h"
 #include "reshow_battle_screen.h"
-#include "rng.h"
+#include "random.h"
 #include "pokeball.h"
 #include "data2.h"
 
diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c
index 137b33274..9689d3719 100644
--- a/src/battle_controller_player.c
+++ b/src/battle_controller_player.c
@@ -22,7 +22,7 @@
 #include "string_util.h"
 #include "bg.h"
 #include "reshow_battle_screen.h"
-#include "rng.h"
+#include "random.h"
 #include "pokeball.h"
 #include "data2.h"
 
diff --git a/src/battle_controller_wally.c b/src/battle_controller_wally.c
index 9df747888..3b7e3e4af 100644
--- a/src/battle_controller_wally.c
+++ b/src/battle_controller_wally.c
@@ -22,7 +22,7 @@
 #include "string_util.h"
 #include "bg.h"
 #include "reshow_battle_screen.h"
-#include "rng.h"
+#include "random.h"
 #include "pokeball.h"
 #include "data2.h"
 #include "party_menu.h"
diff --git a/src/battle_gfx_sfx_util.c b/src/battle_gfx_sfx_util.c
index 813d6d71b..e9b31ae55 100644
--- a/src/battle_gfx_sfx_util.c
+++ b/src/battle_gfx_sfx_util.c
@@ -6,7 +6,7 @@
 #include "battle_interface.h"
 #include "main.h"
 #include "malloc.h"
-#include "rng.h"
+#include "random.h"
 #include "util.h"
 #include "pokemon.h"
 #include "moves.h"
diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c
index ae4703512..a9578395d 100644
--- a/src/battle_script_commands.c
+++ b/src/battle_script_commands.c
@@ -12,7 +12,7 @@
 #include "util.h"
 #include "pokemon.h"
 #include "calculate_base_damage.h"
-#include "rng.h"
+#include "random.h"
 #include "battle_controllers.h"
 #include "battle_interface.h"
 #include "species.h"
diff --git a/src/battle_util.c b/src/battle_util.c
index b4268673c..e67d22d64 100644
--- a/src/battle_util.c
+++ b/src/battle_util.c
@@ -10,7 +10,7 @@
 #include "util.h"
 #include "battle_move_effects.h"
 #include "battle_scripts.h"
-#include "rng.h"
+#include "random.h"
 #include "text.h"
 #include "string_util.h"
 #include "battle_message.h"
diff --git a/src/battle_util2.c b/src/battle_util2.c
index 4854bb5bb..351bdff1d 100644
--- a/src/battle_util2.c
+++ b/src/battle_util2.c
@@ -5,7 +5,7 @@
 #include "pokemon.h"
 #include "event_data.h"
 #include "abilities.h"
-#include "rng.h"
+#include "random.h"
 #include "battle_scripts.h"
 
 extern struct BattlePokemon gBattleMons[BATTLE_BANKS_COUNT];
diff --git a/src/berry.c b/src/berry.c
index 0c1553463..5d833fb06 100644
--- a/src/berry.c
+++ b/src/berry.c
@@ -4,7 +4,7 @@
 #include "item.h"
 #include "items.h"
 #include "text.h"
-#include "rng.h"
+#include "random.h"
 #include "event_data.h"
 #include "fieldmap.h"
 
diff --git a/src/berry_blender.c b/src/berry_blender.c
index a6144a35d..7c90391fa 100644
--- a/src/berry_blender.c
+++ b/src/berry_blender.c
@@ -23,7 +23,7 @@
 #include "items.h"
 #include "string_util.h"
 #include "international_string_util.h"
-#include "rng.h"
+#include "random.h"
 #include "menu.h"
 #include "pokeblock.h"
 #include "trig.h"
diff --git a/src/daycare.c b/src/daycare.c
index 8dd45863a..1c0548058 100644
--- a/src/daycare.c
+++ b/src/daycare.c
@@ -7,7 +7,7 @@
 #include "mail.h"
 #include "pokemon_storage_system.h"
 #include "event_data.h"
-#include "rng.h"
+#include "random.h"
 #include "main.h"
 #include "moves.h"
 #include "egg_hatch.h"
diff --git a/src/egg_hatch.c b/src/egg_hatch.c
index 7fba0cd00..3be64b37d 100644
--- a/src/egg_hatch.c
+++ b/src/egg_hatch.c
@@ -16,7 +16,7 @@
 #include "string_util.h"
 #include "menu.h"
 #include "trig.h"
-#include "rng.h"
+#include "random.h"
 #include "malloc.h"
 #include "dma3.h"
 #include "gpu_regs.h"
diff --git a/src/evolution_graphics.c b/src/evolution_graphics.c
index 09c351b17..30aacec94 100644
--- a/src/evolution_graphics.c
+++ b/src/evolution_graphics.c
@@ -2,7 +2,7 @@
 #include "evolution_graphics.h"
 #include "sprite.h"
 #include "trig.h"
-#include "rng.h"
+#include "random.h"
 #include "decompress.h"
 #include "task.h"
 #include "sound.h"
diff --git a/src/field_map_obj.c b/src/field_map_obj.c
index 97df5682b..6a99890a4 100755
--- a/src/field_map_obj.c
+++ b/src/field_map_obj.c
@@ -4,7 +4,7 @@
 #include "malloc.h"
 #include "sprite.h"
 #include "overworld.h"
-#include "rng.h"
+#include "random.h"
 #include "event_scripts.h"
 #include "berry.h"
 #include "palette.h"
diff --git a/src/hall_of_fame.c b/src/hall_of_fame.c
index af1f9813a..9b421872c 100644
--- a/src/hall_of_fame.c
+++ b/src/hall_of_fame.c
@@ -22,7 +22,7 @@
 #include "international_string_util.h"
 #include "unknown_task.h"
 #include "trig.h"
-#include "rng.h"
+#include "random.h"
 #include "event_data.h"
 
 struct HallofFameMon
diff --git a/src/lilycove_lady.c b/src/lilycove_lady.c
index 62171e475..e18733e37 100644
--- a/src/lilycove_lady.c
+++ b/src/lilycove_lady.c
@@ -8,7 +8,7 @@
 #include "rom6.h"
 #include "event_data.h"
 #include "script.h"
-#include "rng.h"
+#include "random.h"
 #include "string_util.h"
 #include "item.h"
 #include "items.h"
diff --git a/src/load_save.c b/src/load_save.c
index 1d78bda50..2b40f2e92 100644
--- a/src/load_save.c
+++ b/src/load_save.c
@@ -3,7 +3,7 @@
 #include "load_save.h"
 #include "main.h"
 #include "pokemon.h"
-#include "rng.h"
+#include "random.h"
 
 extern void* gUnknown_0203CF5C;
 
diff --git a/src/lottery_corner.c b/src/lottery_corner.c
index 211b78f19..c935dc852 100644
--- a/src/lottery_corner.c
+++ b/src/lottery_corner.c
@@ -3,7 +3,7 @@
 #include "event_data.h"
 #include "pokemon.h"
 #include "items.h"
-#include "rng.h"
+#include "random.h"
 #include "species.h"
 #include "string_util.h"
 #include "text.h"
diff --git a/src/main.c b/src/main.c
index 665a4dd84..07ce07f1c 100644
--- a/src/main.c
+++ b/src/main.c
@@ -2,7 +2,7 @@
 #include "main.h"
 #include "m4a.h"
 #include "rtc.h"
-#include "rng.h"
+#include "random.h"
 #include "dma3.h"
 #include "gba/flash_internal.h"
 #include "battle.h"
diff --git a/src/new_game.c b/src/new_game.c
index 75e80dc8e..12873fec9 100644
--- a/src/new_game.c
+++ b/src/new_game.c
@@ -1,6 +1,6 @@
 #include "global.h"
 #include "new_game.h"
-#include "rng.h"
+#include "random.h"
 #include "pokemon.h"
 #include "roamer.h"
 #include "pokemon_size_record.h"
diff --git a/src/rom4.c b/src/overworld.c
index c538595f2..c538595f2 100644
--- a/src/rom4.c
+++ b/src/overworld.c
diff --git a/src/pokemon_1.c b/src/pokemon_1.c
index f56ade967..1c7c3b846 100644
--- a/src/pokemon_1.c
+++ b/src/pokemon_1.c
@@ -1,6 +1,6 @@
 #include "global.h"
 #include "pokemon.h"
-#include "rng.h"
+#include "random.h"
 #include "main.h"
 #include "items.h"
 #include "string_util.h"
diff --git a/src/pokemon_2.c b/src/pokemon_2.c
index 7014be492..e9bf14a41 100644
--- a/src/pokemon_2.c
+++ b/src/pokemon_2.c
@@ -2,7 +2,7 @@
 #include "pokemon.h"
 #include "battle.h"
 #include "event_data.h"
-#include "rng.h"
+#include "random.h"
 #include "sprite.h"
 #include "species.h"
 #include "text.h"
diff --git a/src/pokemon_3.c b/src/pokemon_3.c
index 1fafee810..b89b00e8e 100644
--- a/src/pokemon_3.c
+++ b/src/pokemon_3.c
@@ -10,7 +10,7 @@
 #include "species.h"
 #include "link.h"
 #include "hold_effects.h"
-#include "rng.h"
+#include "random.h"
 #include "trainer_classes.h"
 #include "trainer_ids.h"
 #include "songs.h"
diff --git a/src/rng.c b/src/random.c
index ddd149018..f2f0ede58 100644
--- a/src/rng.c
+++ b/src/random.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "rng.h"
+#include "random.h"
 
 // The number 1103515245 comes from the example implementation of rand and srand
 // in the ISO C standard.
diff --git a/src/recorded_battle.c b/src/recorded_battle.c
index e843ff7cb..4f3fe4ab9 100644
--- a/src/recorded_battle.c
+++ b/src/recorded_battle.c
@@ -3,7 +3,7 @@
 #include "recorded_battle.h"
 #include "main.h"
 #include "pokemon.h"
-#include "rng.h"
+#include "random.h"
 #include "event_data.h"
 #include "link.h"
 #include "string_util.h"
diff --git a/src/roamer.c b/src/roamer.c
index cbe1b6312..bce85dffd 100644
--- a/src/roamer.c
+++ b/src/roamer.c
@@ -1,7 +1,7 @@
 #include "global.h"
 #include "roamer.h"
 #include "pokemon.h"
-#include "rng.h"
+#include "random.h"
 #include "species.h"
 #include "event_data.h"
 
diff --git a/src/scrcmd.c b/src/scrcmd.c
index 183b9bab5..504d001ea 100644
--- a/src/scrcmd.c
+++ b/src/scrcmd.c
@@ -34,7 +34,7 @@
 #include "party_menu.h"
 #include "pokemon_3.h"
 #include "pokemon_storage_system.h"
-#include "rng.h"
+#include "random.h"
 #include "overworld.h"
 #include "rtc.h"
 #include "script.h"
diff --git a/src/tv.c b/src/tv.c
index 1d978b093..79e417f16 100644
--- a/src/tv.c
+++ b/src/tv.c
@@ -4,7 +4,7 @@
 #include "rtc.h"
 #include "overworld.h"
 #include "map_constants.h"
-#include "rng.h"
+#include "random.h"
 #include "event_data.h"
 #include "fieldmap.h"
 #include "field_camera.h"
diff --git a/src/wild_encounter.c b/src/wild_encounter.c
index ce1e02e5e..5d4e5a20f 100644
--- a/src/wild_encounter.c
+++ b/src/wild_encounter.c
@@ -4,7 +4,7 @@
 #include "species.h"
 #include "metatile_behavior.h"
 #include "fieldmap.h"
-#include "rng.h"
+#include "random.h"
 #include "map_constants.h"
 #include "field_player_avatar.h"
 #include "abilities.h"
diff --git a/sym_bss.txt b/sym_bss.txt
index e2f03b8f3..a4d3c2d82 100644
--- a/sym_bss.txt
+++ b/sym_bss.txt
@@ -2,32 +2,32 @@
 	.include "src/malloc.o"
 	.include "src/dma3_manager.o"
 	.include "src/gpu_regs.o"
-    .include "src/bg.o"
+	.include "src/bg.o"
 	.include "src/text.o"
 	.include "src/sprite.o"
-    .include "src/link.o"
-    .include "src/rtc.o"
-    .include "src/main_menu.o"
-    .include "src/battle_1.o"
-    .include "src/egg_hatch.o"
-    .include "src/berry_blender.o"
-    .include "src/play_time.o"
-    .include "src/rom4.o"
-    .include "src/field_camera.o"
-    .include "src/script.o"
-    .include "src/scrcmd.o"
-    .include "src/tileset_anims.o"
-    .include "src/palette.o"
-    .include "src/sound.o"
-    .include "src/field_screen.o"
-    .include "src/field_effect.o"
-    .include "src/pokemon_storage_system.o"
-    .include "src/fldeff_cut.o"
-    .include "src/script_menu.o"
-    .include "src/record_mixing.o"
-    .include "src/tv.o"
-
-    .space 1 @ TODO: define this u32 in mauville_old_man
+	.include "src/link.o"
+	.include "src/rtc.o"
+	.include "src/main_menu.o"
+	.include "src/battle_1.o"
+	.include "src/egg_hatch.o"
+	.include "src/berry_blender.o"
+	.include "src/play_time.o"
+	.include "src/overworld.o"
+	.include "src/field_camera.o"
+	.include "src/script.o"
+	.include "src/scrcmd.o"
+	.include "src/tileset_anims.o"
+	.include "src/palette.o"
+	.include "src/sound.o"
+	.include "src/field_screen.o"
+	.include "src/field_effect.o"
+	.include "src/pokemon_storage_system.o"
+	.include "src/fldeff_cut.o"
+	.include "src/script_menu.o"
+	.include "src/record_mixing.o"
+	.include "src/tv.o"
+
+	.space 1 @ TODO: define this u32 in mauville_old_man
 gUnknown_03001178: @ 3001178
 	.space 0x4
 
@@ -54,9 +54,9 @@ gUnknown_030011F6: @ 30011F6
 gUnknown_030011F7: @ 30011F7
 	.space 0x1
 
-    .include "src/starter_choose.o"
-    
-    .align 0x2
+	.include "src/starter_choose.o"
+	
+	.align 0x2
 
 gUnknown_030011FC: @ 30011FC
 	.space 0x2
@@ -138,7 +138,7 @@ gUnknown_03001298: @ 3001298
 gUnknown_030012A8: @ 30012A8
 	.space 0x10
 
-    .include "src/berry_fix_program.o"
+	.include "src/berry_fix_program.o"
 
 gUnknown_030012BC: @ 30012BC
 	.space 0x4
diff --git a/sym_ewram.txt b/sym_ewram.txt
index ee47f8e37..c35c21df6 100644
--- a/sym_ewram.txt
+++ b/sym_ewram.txt
@@ -543,7 +543,7 @@ gUnknown_0202499C: @ 202499C
 gUnknown_020249B4: @ 20249B4
 	.space 0x8
 
-	.include "src/rng.o"
+	.include "src/random.o"
 	.include "src/daycare.o"
     .include "src/load_save.o"