summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/battle/battle_2.c2
-rw-r--r--src/battle/battle_3.c2
-rw-r--r--src/battle/battle_4.c2
-rw-r--r--src/battle/battle_ai.c2
-rw-r--r--src/battle/battle_setup.c2
-rw-r--r--src/battle/battle_transition.c2
-rwxr-xr-xsrc/battle_anim_80CA710.c2
-rw-r--r--src/engine/link.c2
-rw-r--r--src/engine/main.c2
-rw-r--r--src/engine/random.c (renamed from src/engine/rng.c)2
-rw-r--r--src/engine/record_mixing.c2
-rw-r--r--src/engine/time_events.c2
-rw-r--r--src/field/battle_tower.c2
-rw-r--r--src/field/berry.c2
-rw-r--r--src/field/daycare.c2
-rw-r--r--src/field/dewford_trend.c2
-rw-r--r--src/field/easy_chat.c2
-rw-r--r--src/field/field_map_obj.c2
-rw-r--r--src/field/field_player_avatar.c2
-rw-r--r--src/field/field_specials.c2
-rw-r--r--src/field/field_weather.c2
-rw-r--r--src/field/field_weather_2.c2
-rw-r--r--src/field/lottery_corner.c2
-rw-r--r--src/field/mauville_man.c2
-rw-r--r--src/field/overworld.c2
-rw-r--r--src/field/roamer.c2
-rw-r--r--src/field/scrcmd.c2
-rw-r--r--src/field/tv.c4
-rw-r--r--src/field/wild_encounter.c2
-rw-r--r--src/pokemon/pokedex.c2
-rw-r--r--src/pokemon/pokemon_1.c2
-rw-r--r--src/pokemon/pokemon_2.c2
-rw-r--r--src/pokemon/pokemon_3.c2
-rw-r--r--src/scene/berry_blender.c2
-rw-r--r--src/scene/contest_painting.c2
-rw-r--r--src/scene/credits.c2
-rw-r--r--src/scene/egg_hatch.c2
-rw-r--r--src/scene/evolution_graphics.c2
-rw-r--r--src/scene/hall_of_fame.c2
-rw-r--r--src/scene/intro.c2
-rwxr-xr-xsrc/scene/intro_credits_graphics.c2
-rw-r--r--src/scene/new_game.c2
-rw-r--r--src/script_pokemon_util_80C4BF0.c2
43 files changed, 44 insertions, 44 deletions
diff --git a/src/battle/battle_2.c b/src/battle/battle_2.c
index 6d406c5e5..a3cd15042 100644
--- a/src/battle/battle_2.c
+++ b/src/battle/battle_2.c
@@ -13,7 +13,7 @@
#include "pokeball.h"
#include "pokedex.h"
#include "pokemon.h"
-#include "rng.h"
+#include "random.h"
#include "rom3.h"
#include "rom_8077ABC.h"
#include "rom_8094928.h"
diff --git a/src/battle/battle_3.c b/src/battle/battle_3.c
index 958ee0b55..263eb2be5 100644
--- a/src/battle/battle_3.c
+++ b/src/battle/battle_3.c
@@ -8,7 +8,7 @@
#include "species.h"
#include "pokemon.h"
#include "data2.h"
-#include "rng.h"
+#include "random.h"
#include "text.h"
#include "battle_move_effects.h"
#include "string_util.h"
diff --git a/src/battle/battle_4.c b/src/battle/battle_4.c
index 73530c486..088f30669 100644
--- a/src/battle/battle_4.c
+++ b/src/battle/battle_4.c
@@ -7,7 +7,7 @@
#include "items.h"
#include "data2.h"
#include "hold_effects.h"
-#include "rng.h"
+#include "random.h"
#include "rom3.h"
#include "species.h"
#include "pokemon.h"
diff --git a/src/battle/battle_ai.c b/src/battle/battle_ai.c
index cb6c10676..0348c3ccd 100644
--- a/src/battle/battle_ai.c
+++ b/src/battle/battle_ai.c
@@ -7,7 +7,7 @@
#include "item.h"
#include "moves.h"
#include "pokemon.h"
-#include "rng.h"
+#include "random.h"
#include "rom_8077ABC.h"
#include "species.h"
#include "util.h"
diff --git a/src/battle/battle_setup.c b/src/battle/battle_setup.c
index dab87b462..3d63a85c9 100644
--- a/src/battle/battle_setup.c
+++ b/src/battle/battle_setup.c
@@ -17,7 +17,7 @@
#include "metatile_behavior.h"
#include "opponent_constants.h"
#include "palette.h"
-#include "rng.h"
+#include "random.h"
#include "overworld.h"
#include "safari_zone.h"
#include "script.h"
diff --git a/src/battle/battle_transition.c b/src/battle/battle_transition.c
index 7f6c114f6..f7c8073c5 100644
--- a/src/battle/battle_transition.c
+++ b/src/battle/battle_transition.c
@@ -6,7 +6,7 @@
#include "palette.h"
#include "trig.h"
#include "field_effect.h"
-#include "rng.h"
+#include "random.h"
#include "sprite.h"
#include "sound.h"
#include "songs.h"
diff --git a/src/battle_anim_80CA710.c b/src/battle_anim_80CA710.c
index 6e4907888..01f445094 100755
--- a/src/battle_anim_80CA710.c
+++ b/src/battle_anim_80CA710.c
@@ -8,7 +8,7 @@
#include "ewram.h"
#include "main.h"
#include "palette.h"
-#include "rng.h"
+#include "random.h"
#include "rom_8077ABC.h"
#include "songs.h"
#include "sound.h"
diff --git a/src/engine/link.c b/src/engine/link.c
index 002d397d2..441f3707b 100644
--- a/src/engine/link.c
+++ b/src/engine/link.c
@@ -7,7 +7,7 @@
#include "main.h"
#include "menu.h"
#include "palette.h"
-#include "rng.h"
+#include "random.h"
#include "save.h"
#include "songs.h"
#include "sound.h"
diff --git a/src/engine/main.c b/src/engine/main.c
index ea381cb31..82a5fffb4 100644
--- a/src/engine/main.c
+++ b/src/engine/main.c
@@ -7,7 +7,7 @@
#include "load_save.h"
#include "m4a.h"
#include "play_time.h"
-#include "rng.h"
+#include "random.h"
#include "rom3.h"
#include "overworld.h"
#include "rtc.h"
diff --git a/src/engine/rng.c b/src/engine/random.c
index 7d4b5600e..8f82b722f 100644
--- a/src/engine/rng.c
+++ b/src/engine/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/engine/record_mixing.c b/src/engine/record_mixing.c
index cf51bec9e..4b5f1b6d5 100644
--- a/src/engine/record_mixing.c
+++ b/src/engine/record_mixing.c
@@ -13,7 +13,7 @@
#include "mauville_man.h"
#include "menu.h"
#include "mystery_event_script.h"
-#include "rng.h"
+#include "random.h"
#include "overworld.h"
#include "save.h"
#include "script.h"
diff --git a/src/engine/time_events.c b/src/engine/time_events.c
index accb03db8..831048add 100644
--- a/src/engine/time_events.c
+++ b/src/engine/time_events.c
@@ -3,7 +3,7 @@
#include "event_data.h"
#include "field_weather.h"
#include "pokemon.h"
-#include "rng.h"
+#include "random.h"
#include "overworld.h"
#include "rtc.h"
#include "script.h"
diff --git a/src/field/battle_tower.c b/src/field/battle_tower.c
index d6271643c..2b45766dd 100644
--- a/src/field/battle_tower.c
+++ b/src/field/battle_tower.c
@@ -14,7 +14,7 @@
#include "new_game.h"
#include "overworld.h"
#include "pokedex.h"
-#include "rng.h"
+#include "random.h"
#include "save.h"
#include "script_pokemon_80C4.h"
#include "species.h"
diff --git a/src/field/berry.c b/src/field/berry.c
index cd1fc5c94..973bc56ff 100644
--- a/src/field/berry.c
+++ b/src/field/berry.c
@@ -8,7 +8,7 @@
#include "item_use.h"
#include "items.h"
#include "main.h"
-#include "rng.h"
+#include "random.h"
#include "text.h"
#define BERRY_NAME_LENGTH 6
diff --git a/src/field/daycare.c b/src/field/daycare.c
index 2b58a0d5d..9f7e3b989 100644
--- a/src/field/daycare.c
+++ b/src/field/daycare.c
@@ -12,7 +12,7 @@
#include "party_menu.h"
#include "pokemon.h"
#include "pokemon_storage_system.h"
-#include "rng.h"
+#include "random.h"
#include "script.h"
#include "songs.h"
#include "sound.h"
diff --git a/src/field/dewford_trend.c b/src/field/dewford_trend.c
index 102784066..bdcd76ec5 100644
--- a/src/field/dewford_trend.c
+++ b/src/field/dewford_trend.c
@@ -3,7 +3,7 @@
#include "easy_chat.h"
#include "event_data.h"
#include "link.h"
-#include "rng.h"
+#include "random.h"
#include "text.h"
#include "ewram.h"
diff --git a/src/field/easy_chat.c b/src/field/easy_chat.c
index 8e7413516..7a4ae045e 100644
--- a/src/field/easy_chat.c
+++ b/src/field/easy_chat.c
@@ -4,7 +4,7 @@
#include "event_data.h"
#include "field_message_box.h"
#include "pokedex.h"
-#include "rng.h"
+#include "random.h"
#include "string_util.h"
#include "strings.h"
#include "strings2.h"
diff --git a/src/field/field_map_obj.c b/src/field/field_map_obj.c
index 98f6fedab..20edbc34f 100644
--- a/src/field/field_map_obj.c
+++ b/src/field/field_map_obj.c
@@ -10,7 +10,7 @@
#include "field_player_avatar.h"
#include "fieldmap.h"
#include "palette.h"
-#include "rng.h"
+#include "random.h"
#include "overworld.h"
#include "sprite.h"
#include "metatile_behavior.h"
diff --git a/src/field/field_player_avatar.c b/src/field/field_player_avatar.c
index e7da9b1b7..a26638b39 100644
--- a/src/field/field_player_avatar.c
+++ b/src/field/field_player_avatar.c
@@ -13,7 +13,7 @@
#include "menu.h"
#include "metatile_behavior.h"
#include "party_menu.h"
-#include "rng.h"
+#include "random.h"
#include "overworld.h"
#include "rotating_gate.h"
#include "script.h"
diff --git a/src/field/field_specials.c b/src/field/field_specials.c
index 48e9b44aa..e5bb1b798 100644
--- a/src/field/field_specials.c
+++ b/src/field/field_specials.c
@@ -34,7 +34,7 @@
#include "battle_tower.h"
#include "field_weather.h"
#include "pokemon_summary_screen.h"
-#include "rng.h"
+#include "random.h"
#if ENGLISH
#define CHAR_DECIMAL_SEPARATOR CHAR_PERIOD
diff --git a/src/field/field_weather.c b/src/field/field_weather.c
index 2d4711b81..80fe21c4b 100644
--- a/src/field/field_weather.c
+++ b/src/field/field_weather.c
@@ -3,7 +3,7 @@
#include "field_map_obj.h"
#include "field_weather.h"
#include "palette.h"
-#include "rng.h"
+#include "random.h"
#include "script.h"
#include "songs.h"
#include "sound.h"
diff --git a/src/field/field_weather_2.c b/src/field/field_weather_2.c
index fa97df459..64a5c5dc5 100644
--- a/src/field/field_weather_2.c
+++ b/src/field/field_weather_2.c
@@ -1,7 +1,7 @@
#include "global.h"
#include "field_map_obj.h"
#include "field_weather.h"
-#include "rng.h"
+#include "random.h"
#include "script.h"
#include "songs.h"
#include "sound.h"
diff --git a/src/field/lottery_corner.c b/src/field/lottery_corner.c
index c2c25b9ac..5f0ce2907 100644
--- a/src/field/lottery_corner.c
+++ b/src/field/lottery_corner.c
@@ -2,7 +2,7 @@
#include "lottery_corner.h"
#include "event_data.h"
#include "items.h"
-#include "rng.h"
+#include "random.h"
#include "species.h"
#include "string_util.h"
#include "text.h"
diff --git a/src/field/mauville_man.c b/src/field/mauville_man.c
index 33bc39648..a27c54df7 100644
--- a/src/field/mauville_man.c
+++ b/src/field/mauville_man.c
@@ -7,7 +7,7 @@
#include "m4a.h"
#include "menu.h"
#include "overworld.h"
-#include "rng.h"
+#include "random.h"
#include "script.h"
#include "songs.h"
#include "sound.h"
diff --git a/src/field/overworld.c b/src/field/overworld.c
index 59aac5c33..e6a6a9f11 100644
--- a/src/field/overworld.c
+++ b/src/field/overworld.c
@@ -32,7 +32,7 @@
#include "new_game.h"
#include "palette.h"
#include "play_time.h"
-#include "rng.h"
+#include "random.h"
#include "roamer.h"
#include "rotating_gate.h"
#include "safari_zone.h"
diff --git a/src/field/roamer.c b/src/field/roamer.c
index c45c87601..d8ea1ef52 100644
--- a/src/field/roamer.c
+++ b/src/field/roamer.c
@@ -1,7 +1,7 @@
#include "global.h"
#include "roamer.h"
#include "pokemon.h"
-#include "rng.h"
+#include "random.h"
#include "species.h"
#ifdef SAPPHIRE
diff --git a/src/field/scrcmd.c b/src/field/scrcmd.c
index 28584d4d0..28aa3355a 100644
--- a/src/field/scrcmd.c
+++ b/src/field/scrcmd.c
@@ -30,7 +30,7 @@
#include "palette.h"
#include "party_menu.h"
#include "pokemon.h"
-#include "rng.h"
+#include "random.h"
#include "overworld.h"
#include "rtc.h"
#include "script.h"
diff --git a/src/field/tv.c b/src/field/tv.c
index 29d012f28..e58adebc9 100644
--- a/src/field/tv.c
+++ b/src/field/tv.c
@@ -9,7 +9,7 @@
#include "field_message_box.h"
#include "field_camera.h"
#include "flags.h"
-#include "rng.h"
+#include "random.h"
#include "string_util.h"
#include "text.h"
#include "species.h"
@@ -30,7 +30,7 @@
#include "naming_screen.h"
#include "pokedex.h"
#include "region_map.h"
-#include "rng.h"
+#include "random.h"
#include "overworld.h"
#include "rtc.h"
#include "script_menu.h"
diff --git a/src/field/wild_encounter.c b/src/field/wild_encounter.c
index 390898917..df0b12207 100644
--- a/src/field/wild_encounter.c
+++ b/src/field/wild_encounter.c
@@ -8,7 +8,7 @@
#include "map_constants.h"
#include "metatile_behavior.h"
#include "pokeblock.h"
-#include "rng.h"
+#include "random.h"
#include "roamer.h"
#include "overworld.h"
#include "safari_zone.h"
diff --git a/src/pokemon/pokedex.c b/src/pokemon/pokedex.c
index cd37c3a93..604085b28 100644
--- a/src/pokemon/pokedex.c
+++ b/src/pokemon/pokedex.c
@@ -14,7 +14,7 @@
#include "pokedex_area_screen.h"
#include "pokedex_cry_screen.h"
#include "pokemon.h"
-#include "rng.h"
+#include "random.h"
#include "overworld.h"
#include "songs.h"
#include "sound.h"
diff --git a/src/pokemon/pokemon_1.c b/src/pokemon/pokemon_1.c
index 750a9892a..d44a8b61e 100644
--- a/src/pokemon/pokemon_1.c
+++ b/src/pokemon/pokemon_1.c
@@ -3,7 +3,7 @@
#include "items.h"
#include "main.h"
#include "pokemon.h"
-#include "rng.h"
+#include "random.h"
#include "overworld.h"
#include "species.h"
#include "sprite.h"
diff --git a/src/pokemon/pokemon_2.c b/src/pokemon/pokemon_2.c
index 68923a16e..cedcc2720 100644
--- a/src/pokemon/pokemon_2.c
+++ b/src/pokemon/pokemon_2.c
@@ -4,7 +4,7 @@
#include "event_data.h"
#include "main.h"
#include "pokemon.h"
-#include "rng.h"
+#include "random.h"
#include "rom_8077ABC.h"
#include "species.h"
#include "sprite.h"
diff --git a/src/pokemon/pokemon_3.c b/src/pokemon/pokemon_3.c
index a8e824b33..40165384d 100644
--- a/src/pokemon/pokemon_3.c
+++ b/src/pokemon/pokemon_3.c
@@ -10,7 +10,7 @@
#include "m4a.h"
#include "main.h"
#include "pokemon.h"
-#include "rng.h"
+#include "random.h"
#include "overworld.h"
#include "rom_8077ABC.h"
#include "rom_8094928.h"
diff --git a/src/scene/berry_blender.c b/src/scene/berry_blender.c
index 42c79bc99..91b5c10bc 100644
--- a/src/scene/berry_blender.c
+++ b/src/scene/berry_blender.c
@@ -15,7 +15,7 @@
#include "overworld.h"
#include "item.h"
#include "items.h"
-#include "rng.h"
+#include "random.h"
#include "save.h"
#include "menu_cursor.h"
#include "trig.h"
diff --git a/src/scene/contest_painting.c b/src/scene/contest_painting.c
index 2600076c3..442d8ec26 100644
--- a/src/scene/contest_painting.c
+++ b/src/scene/contest_painting.c
@@ -6,7 +6,7 @@
#include "main.h"
#include "menu.h"
#include "palette.h"
-#include "rng.h"
+#include "random.h"
#include "sprite.h"
#include "string_util.h"
#include "strings.h"
diff --git a/src/scene/credits.c b/src/scene/credits.c
index ccd4cebc6..fed1d993a 100644
--- a/src/scene/credits.c
+++ b/src/scene/credits.c
@@ -9,7 +9,7 @@
#include "menu.h"
#include "palette.h"
#include "pokedex.h"
-#include "rng.h"
+#include "random.h"
#include "songs.h"
#include "sound.h"
#include "species.h"
diff --git a/src/scene/egg_hatch.c b/src/scene/egg_hatch.c
index 49cced46a..3675b42cf 100644
--- a/src/scene/egg_hatch.c
+++ b/src/scene/egg_hatch.c
@@ -11,7 +11,7 @@
#include "overworld.h"
#include "palette.h"
#include "pokemon.h"
-#include "rng.h"
+#include "random.h"
#include "script.h"
#include "songs.h"
#include "sound.h"
diff --git a/src/scene/evolution_graphics.c b/src/scene/evolution_graphics.c
index 66b506fb5..dc0e219c5 100644
--- a/src/scene/evolution_graphics.c
+++ b/src/scene/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/scene/hall_of_fame.c b/src/scene/hall_of_fame.c
index a1de26c32..63aaf79c9 100644
--- a/src/scene/hall_of_fame.c
+++ b/src/scene/hall_of_fame.c
@@ -15,7 +15,7 @@
#include "m4a.h"
#include "data2.h"
#include "decompress.h"
-#include "rng.h"
+#include "random.h"
#include "trig.h"
#include "ewram.h"
diff --git a/src/scene/intro.c b/src/scene/intro.c
index b52fbb3a9..c713071e7 100644
--- a/src/scene/intro.c
+++ b/src/scene/intro.c
@@ -11,7 +11,7 @@
#include "main.h"
#include "new_game.h"
#include "palette.h"
-#include "rng.h"
+#include "random.h"
#include "save.h"
#include "songs.h"
#include "sound.h"
diff --git a/src/scene/intro_credits_graphics.c b/src/scene/intro_credits_graphics.c
index a150e8dc9..bb80ef3b6 100755
--- a/src/scene/intro_credits_graphics.c
+++ b/src/scene/intro_credits_graphics.c
@@ -11,7 +11,7 @@
#include "main.h"
#include "new_game.h"
#include "palette.h"
-#include "rng.h"
+#include "random.h"
#include "save.h"
#include "songs.h"
#include "sound.h"
diff --git a/src/scene/new_game.c b/src/scene/new_game.c
index b15282960..ee042a0de 100644
--- a/src/scene/new_game.c
+++ b/src/scene/new_game.c
@@ -18,7 +18,7 @@
#include "pokedex.h"
#include "pokemon_size_record.h"
#include "pokemon_storage_system.h"
-#include "rng.h"
+#include "random.h"
#include "roamer.h"
#include "overworld.h"
#include "rtc.h"
diff --git a/src/script_pokemon_util_80C4BF0.c b/src/script_pokemon_util_80C4BF0.c
index 1462a985d..9b6265308 100644
--- a/src/script_pokemon_util_80C4BF0.c
+++ b/src/script_pokemon_util_80C4BF0.c
@@ -17,7 +17,7 @@
#include "menu.h"
#include "pokedex.h"
#include "pokemon.h"
-#include "rng.h"
+#include "random.h"
#include "overworld.h"
#include "script_pokemon_80C4.h"
#include "species.h"