summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormid-kid <esteve.varela@gmail.com>2018-04-04 22:26:07 +0200
committermid-kid <esteve.varela@gmail.com>2018-04-04 22:26:07 +0200
commitd3cc861d334c8b773c1b6c662ed9924c43cef009 (patch)
tree0e8df3581a081f77167785502c093fbfc5535d73
parent81fff9bb80af3db0ee381c824261b8963e1cc221 (diff)
Fix snake_case filenames
Renamed a bunch of files, most of them one-off functions, to better fit the general snake_case naming scheme. Also renamed some awfully long filenames.
-rw-r--r--engine/battle/check_battle_scene.asm (renamed from engine/battle/checkbattlescene.asm)0
-rw-r--r--engine/battle/consume_held_item.asm (renamed from engine/battle/consumehelditem.asm)0
-rw-r--r--engine/battle/update_battle_huds.asm (renamed from engine/battle/updatebattlehuds.asm)0
-rw-r--r--engine/battle_anims/pokeball_wobble.asm (renamed from engine/battle_anims/getpokeballwobble.asm)0
-rw-r--r--engine/events/fishing_gfx.asm (renamed from engine/events/loadfishinggfx.asm)0
-rw-r--r--engine/events/haircut.asm82
-rw-r--r--engine/events/play_slow_cry.asm (renamed from engine/events/playslowcry.asm)0
-rw-r--r--engine/events/shuckle.asm (renamed from engine/events/specials_2.asm)83
-rw-r--r--engine/gfx/load_overworld_font.asm (renamed from engine/gfx/loadoverworldfont.asm)0
-rw-r--r--engine/gfx/load_push_oam.asm (renamed from engine/gfx/loadpushoam.asm)0
-rw-r--r--engine/gfx/place_graphic.asm (renamed from engine/gfx/placegraphic.asm)0
-rw-r--r--engine/gfx/trademon_frontpic.asm (renamed from engine/gfx/trademonfrontpic.asm)0
-rw-r--r--engine/items/pack_kris.asm (renamed from engine/gfx/drawkrispackgfx.asm)0
-rw-r--r--engine/items/print_item_description.asm (renamed from engine/items/printitemdescription.asm)0
-rw-r--r--engine/items/update_item_description.asm (renamed from engine/items/updateitemdescription.asm)0
-rw-r--r--engine/link/init_list.asm (renamed from engine/link/initlist.asm)0
-rw-r--r--engine/link/place_waiting_text.asm (renamed from engine/link/placewaitingtext.asm)0
-rw-r--r--engine/math/get_square_root.asm (renamed from engine/math/getsquareroot.asm)0
-rw-r--r--engine/math/print_num.asm (renamed from engine/math/printnum.asm)0
-rw-r--r--engine/menus/empty_sram.asm (renamed from engine/menus/emptyallsrambanks.asm)0
-rw-r--r--engine/overworld/load_map_part.asm (renamed from engine/overworld/loadmappart.asm)0
-rw-r--r--engine/pokedex/new_pokedex_entry.asm (renamed from engine/pokedex/newpokedexentry.asm)0
-rw-r--r--engine/pokemon/bills_pc.asm (renamed from engine/pokemon/billspc.asm)0
-rw-r--r--engine/pokemon/bills_pc_top.asm (renamed from engine/pokemon/billspctop.asm)0
-rw-r--r--engine/pokemon/breedmon_level_growth.asm (renamed from engine/pokemon/getbreedmonlevelgrowth.asm)0
-rw-r--r--engine/pokemon/check_nick_errors.asm (renamed from engine/pokemon/checknickerrors.asm)0
-rw-r--r--engine/pokemon/correct_party_errors.asm (renamed from engine/pokemon/correcterrorsinplayerparty.asm)2
-rw-r--r--engine/pokemon/knows_move.asm (renamed from engine/pokemon/knowsmove.asm)0
-rw-r--r--engine/pokemon/level_up_happiness.asm (renamed from engine/pokemon/leveluphappinessmod.asm)0
-rw-r--r--engine/rtc/print_hours_mins.asm (renamed from engine/rtc/printhoursmins.asm)0
-rw-r--r--engine/tilesets/timeofday_pals.asm (renamed from engine/tilesets/timeofdaypals.asm)0
-rw-r--r--main.asm61
32 files changed, 114 insertions, 114 deletions
diff --git a/engine/battle/checkbattlescene.asm b/engine/battle/check_battle_scene.asm
index 577c36e33..577c36e33 100644
--- a/engine/battle/checkbattlescene.asm
+++ b/engine/battle/check_battle_scene.asm
diff --git a/engine/battle/consumehelditem.asm b/engine/battle/consume_held_item.asm
index d727a44e0..d727a44e0 100644
--- a/engine/battle/consumehelditem.asm
+++ b/engine/battle/consume_held_item.asm
diff --git a/engine/battle/updatebattlehuds.asm b/engine/battle/update_battle_huds.asm
index 0c31f1c36..0c31f1c36 100644
--- a/engine/battle/updatebattlehuds.asm
+++ b/engine/battle/update_battle_huds.asm
diff --git a/engine/battle_anims/getpokeballwobble.asm b/engine/battle_anims/pokeball_wobble.asm
index d85240f08..d85240f08 100644
--- a/engine/battle_anims/getpokeballwobble.asm
+++ b/engine/battle_anims/pokeball_wobble.asm
diff --git a/engine/events/loadfishinggfx.asm b/engine/events/fishing_gfx.asm
index 3d3ab0ba0..3d3ab0ba0 100644
--- a/engine/events/loadfishinggfx.asm
+++ b/engine/events/fishing_gfx.asm
diff --git a/engine/events/haircut.asm b/engine/events/haircut.asm
new file mode 100644
index 000000000..0e4400235
--- /dev/null
+++ b/engine/events/haircut.asm
@@ -0,0 +1,82 @@
+BillsGrandfather: ; 73f7
+ farcall SelectMonFromParty
+ jr c, .cancel
+ ld a, [wCurPartySpecies]
+ ld [wScriptVar], a
+ ld [wNamedObjectIndexBuffer], a
+ call GetPokemonName
+ jp CopyPokemonName_Buffer1_Buffer3
+
+.cancel
+ xor a
+ ld [wScriptVar], a
+ ret
+
+YoungerHaircutBrother: ; 7413
+ ld hl, HappinessData_YoungerHaircutBrother
+ jr HaircutOrGrooming
+
+OlderHaircutBrother: ; 7418
+ ld hl, HappinessData_OlderHaircutBrother
+ jr HaircutOrGrooming
+
+DaisysGrooming: ; 741d
+ ld hl, HappinessData_DaisysGrooming
+ ; fallthrough
+
+HaircutOrGrooming: ; 7420
+ push hl
+ farcall SelectMonFromParty
+ pop hl
+ jr c, .nope
+ ld a, [wCurPartySpecies]
+ cp EGG
+ jr z, .egg
+ push hl
+ call GetCurNick
+ call CopyPokemonName_Buffer1_Buffer3
+ pop hl
+ call Random
+; Bug: Subtracting $ff from $ff fails to set c.
+; This can result in overflow into the next data array.
+; In the case of getting a grooming from Daisy, we bleed
+; into CopyPokemonName_Buffer1_Buffer3, which passes
+; $d0 to ChangeHappiness and returns $73 to the script.
+; The end result is that there is a 0.4% chance your
+; Pokemon's happiness will not change at all.
+.loop
+ sub [hl]
+ jr c, .ok
+ inc hl
+ inc hl
+ inc hl
+ jr .loop
+
+.ok
+ inc hl
+ ld a, [hli]
+ ld [wScriptVar], a
+ ld c, [hl]
+ call ChangeHappiness
+ ret
+
+.nope
+ xor a
+ ld [wScriptVar], a
+ ret
+
+.egg
+ ld a, 1
+ ld [wScriptVar], a
+ ret
+
+INCLUDE "data/events/happiness_probabilities.asm"
+
+CopyPokemonName_Buffer1_Buffer3: ; 746e
+ ld hl, wStringBuffer1
+ ld de, wStringBuffer3
+ ld bc, MON_NAME_LENGTH
+ jp CopyBytes
+
+DummyPredef1: ; 747a
+ ret
diff --git a/engine/events/playslowcry.asm b/engine/events/play_slow_cry.asm
index 1f27a7ca4..1f27a7ca4 100644
--- a/engine/events/playslowcry.asm
+++ b/engine/events/play_slow_cry.asm
diff --git a/engine/events/specials_2.asm b/engine/events/shuckle.asm
index 9a83b982b..99fcd7924 100644
--- a/engine/events/specials_2.asm
+++ b/engine/events/shuckle.asm
@@ -140,86 +140,3 @@ ReturnShuckle: ; 737e
ld a, SHUCKIE_FAINTED
ld [wScriptVar], a
ret
-
-BillsGrandfather: ; 73f7
- farcall SelectMonFromParty
- jr c, .cancel
- ld a, [wCurPartySpecies]
- ld [wScriptVar], a
- ld [wNamedObjectIndexBuffer], a
- call GetPokemonName
- jp CopyPokemonName_Buffer1_Buffer3
-
-.cancel
- xor a
- ld [wScriptVar], a
- ret
-
-YoungerHaircutBrother: ; 7413
- ld hl, HappinessData_YoungerHaircutBrother
- jr HaircutOrGrooming
-
-OlderHaircutBrother: ; 7418
- ld hl, HappinessData_OlderHaircutBrother
- jr HaircutOrGrooming
-
-DaisysGrooming: ; 741d
- ld hl, HappinessData_DaisysGrooming
- ; fallthrough
-
-HaircutOrGrooming: ; 7420
- push hl
- farcall SelectMonFromParty
- pop hl
- jr c, .nope
- ld a, [wCurPartySpecies]
- cp EGG
- jr z, .egg
- push hl
- call GetCurNick
- call CopyPokemonName_Buffer1_Buffer3
- pop hl
- call Random
-; Bug: Subtracting $ff from $ff fails to set c.
-; This can result in overflow into the next data array.
-; In the case of getting a grooming from Daisy, we bleed
-; into CopyPokemonName_Buffer1_Buffer3, which passes
-; $d0 to ChangeHappiness and returns $73 to the script.
-; The end result is that there is a 0.4% chance your
-; Pokemon's happiness will not change at all.
-.loop
- sub [hl]
- jr c, .ok
- inc hl
- inc hl
- inc hl
- jr .loop
-
-.ok
- inc hl
- ld a, [hli]
- ld [wScriptVar], a
- ld c, [hl]
- call ChangeHappiness
- ret
-
-.nope
- xor a
- ld [wScriptVar], a
- ret
-
-.egg
- ld a, 1
- ld [wScriptVar], a
- ret
-
-INCLUDE "data/events/happiness_probabilities.asm"
-
-CopyPokemonName_Buffer1_Buffer3: ; 746e
- ld hl, wStringBuffer1
- ld de, wStringBuffer3
- ld bc, MON_NAME_LENGTH
- jp CopyBytes
-
-DummyPredef1: ; 747a
- ret
diff --git a/engine/gfx/loadoverworldfont.asm b/engine/gfx/load_overworld_font.asm
index f23f01c4e..f23f01c4e 100644
--- a/engine/gfx/loadoverworldfont.asm
+++ b/engine/gfx/load_overworld_font.asm
diff --git a/engine/gfx/loadpushoam.asm b/engine/gfx/load_push_oam.asm
index 95f67ff73..95f67ff73 100644
--- a/engine/gfx/loadpushoam.asm
+++ b/engine/gfx/load_push_oam.asm
diff --git a/engine/gfx/placegraphic.asm b/engine/gfx/place_graphic.asm
index 21b914950..21b914950 100644
--- a/engine/gfx/placegraphic.asm
+++ b/engine/gfx/place_graphic.asm
diff --git a/engine/gfx/trademonfrontpic.asm b/engine/gfx/trademon_frontpic.asm
index d5f7b55de..d5f7b55de 100644
--- a/engine/gfx/trademonfrontpic.asm
+++ b/engine/gfx/trademon_frontpic.asm
diff --git a/engine/gfx/drawkrispackgfx.asm b/engine/items/pack_kris.asm
index 54a21e447..54a21e447 100644
--- a/engine/gfx/drawkrispackgfx.asm
+++ b/engine/items/pack_kris.asm
diff --git a/engine/items/printitemdescription.asm b/engine/items/print_item_description.asm
index 2a9007b97..2a9007b97 100644
--- a/engine/items/printitemdescription.asm
+++ b/engine/items/print_item_description.asm
diff --git a/engine/items/updateitemdescription.asm b/engine/items/update_item_description.asm
index fdb1e864d..fdb1e864d 100644
--- a/engine/items/updateitemdescription.asm
+++ b/engine/items/update_item_description.asm
diff --git a/engine/link/initlist.asm b/engine/link/init_list.asm
index 26c77b5bb..26c77b5bb 100644
--- a/engine/link/initlist.asm
+++ b/engine/link/init_list.asm
diff --git a/engine/link/placewaitingtext.asm b/engine/link/place_waiting_text.asm
index 9b2260722..9b2260722 100644
--- a/engine/link/placewaitingtext.asm
+++ b/engine/link/place_waiting_text.asm
diff --git a/engine/math/getsquareroot.asm b/engine/math/get_square_root.asm
index 412fd04ff..412fd04ff 100644
--- a/engine/math/getsquareroot.asm
+++ b/engine/math/get_square_root.asm
diff --git a/engine/math/printnum.asm b/engine/math/print_num.asm
index fec798d5c..fec798d5c 100644
--- a/engine/math/printnum.asm
+++ b/engine/math/print_num.asm
diff --git a/engine/menus/emptyallsrambanks.asm b/engine/menus/empty_sram.asm
index 8b060f3ef..8b060f3ef 100644
--- a/engine/menus/emptyallsrambanks.asm
+++ b/engine/menus/empty_sram.asm
diff --git a/engine/overworld/loadmappart.asm b/engine/overworld/load_map_part.asm
index 2184ebf7e..2184ebf7e 100644
--- a/engine/overworld/loadmappart.asm
+++ b/engine/overworld/load_map_part.asm
diff --git a/engine/pokedex/newpokedexentry.asm b/engine/pokedex/new_pokedex_entry.asm
index 365cf1b70..365cf1b70 100644
--- a/engine/pokedex/newpokedexentry.asm
+++ b/engine/pokedex/new_pokedex_entry.asm
diff --git a/engine/pokemon/billspc.asm b/engine/pokemon/bills_pc.asm
index 96d6ac310..96d6ac310 100644
--- a/engine/pokemon/billspc.asm
+++ b/engine/pokemon/bills_pc.asm
diff --git a/engine/pokemon/billspctop.asm b/engine/pokemon/bills_pc_top.asm
index 1e808c02c..1e808c02c 100644
--- a/engine/pokemon/billspctop.asm
+++ b/engine/pokemon/bills_pc_top.asm
diff --git a/engine/pokemon/getbreedmonlevelgrowth.asm b/engine/pokemon/breedmon_level_growth.asm
index dc22db798..dc22db798 100644
--- a/engine/pokemon/getbreedmonlevelgrowth.asm
+++ b/engine/pokemon/breedmon_level_growth.asm
diff --git a/engine/pokemon/checknickerrors.asm b/engine/pokemon/check_nick_errors.asm
index 87ebd6bb3..87ebd6bb3 100644
--- a/engine/pokemon/checknickerrors.asm
+++ b/engine/pokemon/check_nick_errors.asm
diff --git a/engine/pokemon/correcterrorsinplayerparty.asm b/engine/pokemon/correct_party_errors.asm
index e815aa4c8..cf60115ee 100644
--- a/engine/pokemon/correcterrorsinplayerparty.asm
+++ b/engine/pokemon/correct_party_errors.asm
@@ -1,4 +1,4 @@
-Unreferenced_CorrectErrorsInPlayerParty:
+Unreferenced_CorrectPartyErrors:
ld hl, wPartyCount
ld a, [hl]
and a
diff --git a/engine/pokemon/knowsmove.asm b/engine/pokemon/knows_move.asm
index 4ec3da347..4ec3da347 100644
--- a/engine/pokemon/knowsmove.asm
+++ b/engine/pokemon/knows_move.asm
diff --git a/engine/pokemon/leveluphappinessmod.asm b/engine/pokemon/level_up_happiness.asm
index 8c6dd92fe..8c6dd92fe 100644
--- a/engine/pokemon/leveluphappinessmod.asm
+++ b/engine/pokemon/level_up_happiness.asm
diff --git a/engine/rtc/printhoursmins.asm b/engine/rtc/print_hours_mins.asm
index eb7dc1619..eb7dc1619 100644
--- a/engine/rtc/printhoursmins.asm
+++ b/engine/rtc/print_hours_mins.asm
diff --git a/engine/tilesets/timeofdaypals.asm b/engine/tilesets/timeofday_pals.asm
index b8d43d252..b8d43d252 100644
--- a/engine/tilesets/timeofdaypals.asm
+++ b/engine/tilesets/timeofday_pals.asm
diff --git a/main.asm b/main.asm
index 82e00596b..fac1b8f3f 100644
--- a/main.asm
+++ b/main.asm
@@ -3,18 +3,19 @@ INCLUDE "constants.asm"
SECTION "bank1", ROMX
-INCLUDE "engine/link/placewaitingtext.asm"
-INCLUDE "engine/gfx/loadpushoam.asm"
+INCLUDE "engine/link/place_waiting_text.asm"
+INCLUDE "engine/gfx/load_push_oam.asm"
INCLUDE "engine/overworld/map_objects.asm"
INCLUDE "engine/menus/intro_menu.asm"
INCLUDE "engine/overworld/init_map.asm"
INCLUDE "engine/pokemon/learn.asm"
-INCLUDE "engine/pokemon/checknickerrors.asm"
+INCLUDE "engine/pokemon/check_nick_errors.asm"
INCLUDE "engine/math/math.asm"
INCLUDE "data/items/attributes.asm"
INCLUDE "engine/overworld/npc_movement.asm"
INCLUDE "engine/events/happiness_egg.asm"
-INCLUDE "engine/events/specials_2.asm"
+INCLUDE "engine/events/shuckle.asm"
+INCLUDE "engine/events/haircut.asm"
SECTION "bank2", ROMX
@@ -29,19 +30,19 @@ SECTION "bank3", ROMX
INCLUDE "engine/events/checktime.asm"
INCLUDE "engine/events/specials.asm"
-INCLUDE "engine/math/printnum.asm"
+INCLUDE "engine/math/print_num.asm"
INCLUDE "engine/pokemon/health.asm"
INCLUDE "engine/events/overworld.asm"
INCLUDE "engine/items/items.asm"
INCLUDE "engine/overworld/player_step.asm"
INCLUDE "engine/battle/anim_hp_bar.asm"
INCLUDE "engine/pokemon/move_mon.asm"
-INCLUDE "engine/pokemon/billspctop.asm"
-INCLUDE "engine/pokemon/getbreedmonlevelgrowth.asm"
+INCLUDE "engine/pokemon/bills_pc_top.asm"
+INCLUDE "engine/pokemon/breedmon_level_growth.asm"
INCLUDE "engine/events/bug_contest/caught_mon.asm"
INCLUDE "engine/items/item_effects.asm"
-INCLUDE "engine/battle_anims/getpokeballwobble.asm"
-INCLUDE "engine/pokemon/knowsmove.asm"
+INCLUDE "engine/battle_anims/pokeball_wobble.asm"
+INCLUDE "engine/pokemon/knows_move.asm"
SECTION "bank4", ROMX
@@ -64,8 +65,8 @@ INCLUDE "engine/events/std_collision.asm"
INCLUDE "engine/events/bug_contest/judging.asm"
INCLUDE "engine/events/pokerus/apply_pokerus_tick.asm"
INCLUDE "engine/events/bug_contest/contest_2.asm"
-INCLUDE "engine/pokemon/correcterrorsinplayerparty.asm"
-INCLUDE "engine/math/getsquareroot.asm"
+INCLUDE "engine/pokemon/correct_party_errors.asm"
+INCLUDE "engine/math/get_square_root.asm"
SECTION "bank5", ROMX
@@ -102,7 +103,7 @@ SECTION "bank9", ROMX
INCLUDE "data/text_buffers.asm"
INCLUDE "engine/menus/menu.asm"
-INCLUDE "engine/items/updateitemdescription.asm"
+INCLUDE "engine/items/update_item_description.asm"
INCLUDE "engine/events/pokepic.asm"
INCLUDE "engine/overworld/map_objects_2.asm"
INCLUDE "engine/menus/scrolling_menu.asm"
@@ -114,11 +115,11 @@ INCLUDE "engine/items/buy_sell_toss.asm"
INCLUDE "engine/menus/trainer_card.asm"
INCLUDE "engine/events/prof_oaks_pc.asm"
INCLUDE "engine/overworld/decorations.asm"
-INCLUDE "engine/pokemon/leveluphappinessmod.asm"
+INCLUDE "engine/pokemon/level_up_happiness.asm"
INCLUDE "engine/battle/read_trainer_dvs.asm"
INCLUDE "data/trainers/dvs.asm"
INCLUDE "engine/battle/returntobattle_useball.asm"
-INCLUDE "engine/battle/consumehelditem.asm"
+INCLUDE "engine/battle/consume_held_item.asm"
INCLUDE "data/moves/effects_pointers.asm"
INCLUDE "data/moves/effects.asm"
INCLUDE "engine/events/kurt_selectquantity_interpretjoypad.asm"
@@ -148,7 +149,7 @@ INCLUDE "engine/items/tmhm.asm"
INCLUDE "data/moves/descriptions.asm"
INCLUDE "engine/events/pokerus/pokerus.asm"
INCLUDE "engine/battle/start_battle.asm"
-INCLUDE "engine/gfx/placegraphic.asm"
+INCLUDE "engine/gfx/place_graphic.asm"
SECTION "Effect Commands", ROMX
@@ -192,7 +193,7 @@ INCLUDE "engine/pokemon/mail.asm"
SECTION "Crystal Features 1", ROMX
INCLUDE "engine/menus/init_gender.asm"
-INCLUDE "engine/gfx/drawkrispackgfx.asm"
+INCLUDE "engine/items/pack_kris.asm"
INCLUDE "engine/events/move_tutor.asm"
INCLUDE "engine/gfx/crystal_layouts.asm"
INCLUDE "engine/events/celebi.asm"
@@ -208,11 +209,11 @@ SECTION "bank13", ROMX
INCLUDE "engine/tilesets/map_palettes.asm"
INCLUDE "gfx/tileset_palette_maps.asm"
INCLUDE "data/collision_permissions.asm"
-INCLUDE "engine/menus/emptyallsrambanks.asm"
+INCLUDE "engine/menus/empty_sram.asm"
INCLUDE "engine/menus/savemenu_copytilemapatonce.asm"
INCLUDE "engine/events/checksave.asm"
INCLUDE "data/maps/scenes.asm"
-INCLUDE "engine/overworld/loadmappart.asm"
+INCLUDE "engine/overworld/load_map_part.asm"
INCLUDE "engine/phone/phonering_copytilemapatonce.asm"
Shrink1Pic: ; 4d249
@@ -226,7 +227,7 @@ INCLUDE "engine/rtc/reset_password.asm"
INCLUDE "engine/menus/delete_save.asm"
INCLUDE "data/tilesets.asm"
INCLUDE "engine/smallflag.asm"
-INCLUDE "engine/gfx/trademonfrontpic.asm"
+INCLUDE "engine/gfx/trademon_frontpic.asm"
INCLUDE "engine/events/pokerus/check_pokerus.asm"
INCLUDE "engine/events/lucky_number.asm"
INCLUDE "engine/pokemon/caught_data.asm"
@@ -238,7 +239,7 @@ INCLUDE "engine/movie/init_hof_credits.asm"
INCLUDE "engine/events/battle_tower/get_trainer_class.asm"
INCLUDE "engine/battle/sliding_intro.asm"
INCLUDE "mobile/print_opp_message.asm"
-INCLUDE "engine/battle/checkbattlescene.asm"
+INCLUDE "engine/battle/check_battle_scene.asm"
INCLUDE "engine/movie/gbc_only.asm"
INCLUDE "engine/events/poke_seer.asm"
@@ -256,7 +257,7 @@ INCLUDE "engine/pokemon/tempmon.asm"
INCLUDE "engine/pokemon/types.asm"
INCLUDE "engine/battle/unreferenced_getgen1trainerclassname.asm"
INCLUDE "engine/pokemon/mon_stats.asm"
-INCLUDE "engine/link/initlist.asm"
+INCLUDE "engine/link/init_list.asm"
INCLUDE "engine/pokemon/experience.asm"
INCLUDE "engine/pokemon/switchpartymons.asm"
INCLUDE "engine/gfx/load_pics.asm"
@@ -305,7 +306,7 @@ INCLUDE "mobile/mobile_22_2.asm"
SECTION "bank23", ROMX
-INCLUDE "engine/tilesets/timeofdaypals.asm"
+INCLUDE "engine/tilesets/timeofday_pals.asm"
INCLUDE "engine/battle/battle_transition.asm"
INCLUDE "engine/events/field_moves.asm"
INCLUDE "engine/events/magnet_train.asm"
@@ -356,7 +357,7 @@ SECTION "bank2E", ROMX
INCLUDE "engine/events/map_name_sign.asm"
INCLUDE "engine/events/checkforhiddenitems.asm"
INCLUDE "engine/events/treemons.asm"
-INCLUDE "engine/events/loadfishinggfx.asm"
+INCLUDE "engine/events/fishing_gfx.asm"
INCLUDE "engine/pokegear/radio.asm"
INCLUDE "engine/pokemon/mail_2.asm"
@@ -434,7 +435,7 @@ INCLUDE "engine/events/print_unown_2.asm"
INCLUDE "engine/games/card_flip.asm"
INCLUDE "engine/games/unown_puzzle.asm"
INCLUDE "engine/games/dummy_game.asm"
-INCLUDE "engine/pokemon/billspc.asm"
+INCLUDE "engine/pokemon/bills_pc.asm"
SECTION "bank39", ROMX
@@ -451,8 +452,8 @@ SECTION "bank3E", ROMX
INCLUDE "engine/gfx/load_font.asm"
INCLUDE "engine/link/time_capsule.asm"
INCLUDE "engine/events/name_rater.asm"
-INCLUDE "engine/events/playslowcry.asm"
-INCLUDE "engine/pokedex/newpokedexentry.asm"
+INCLUDE "engine/events/play_slow_cry.asm"
+INCLUDE "engine/pokedex/new_pokedex_entry.asm"
INCLUDE "engine/link/time_capsule_2.asm"
INCLUDE "engine/pokedex/unown_dex.asm"
INCLUDE "engine/events/magikarp.asm"
@@ -478,7 +479,7 @@ INCLUDE "engine/overworld/warp_connection.asm"
INCLUDE "engine/link/mystery_gift.asm"
INCLUDE "engine/battle/used_move_text.asm"
INCLUDE "mobile/mobile_41.asm"
-INCLUDE "engine/gfx/loadoverworldfont.asm"
+INCLUDE "engine/gfx/load_overworld_font.asm"
SECTION "Mobile 42", ROMX
@@ -527,7 +528,7 @@ INCLUDE "data/phone/text/extra2.asm"
SECTION "UpdateBattleHUDs", ROMX
-INCLUDE "engine/battle/updatebattlehuds.asm"
+INCLUDE "engine/battle/update_battle_huds.asm"
SECTION "Mobile 5E", ROMX
@@ -567,7 +568,7 @@ INCLUDE "data/phone/text/trainers.asm"
SECTION "Miscellaneous Text", ROMX
INCLUDE "data/items/names.asm"
-INCLUDE "engine/items/printitemdescription.asm"
+INCLUDE "engine/items/print_item_description.asm"
INCLUDE "data/items/descriptions.asm"
INCLUDE "data/moves/names.asm"
INCLUDE "engine/overworld/landmarks.asm"
@@ -583,7 +584,7 @@ INCLUDE "engine/printer/print_party.asm"
SECTION "bank77_2", ROMX
-INCLUDE "engine/rtc/printhoursmins.asm"
+INCLUDE "engine/rtc/print_hours_mins.asm"
INCLUDE "engine/events/diploma.asm"
INCLUDE "engine/pokedex/pokedex_3.asm"
INCLUDE "engine/events/catch_tutorial_input.asm"