Remove the underscores in generic function labels to maintain consistency with pokecrystal

5 files changed, 188 insertions, 187 deletions

diff --git a/audio/engine.asm b/audio/engine.asm
index 0d1d065..8d66a08 100644
--- a/audio/engine.asm
+++ b/audio/engine.asm
@@ -74,7 +74,7 @@ _UpdateSound:: ; 3a:4037
 	cp NUM_CHANNELS
 	jr nz, .loop
 
-	call Function_e82f0
+	call Functione82f0
 	ret
 
 UpdateChannel: ; 3a:4061
@@ -94,10 +94,10 @@ UpdateChannel: ; 3a:4061
 
 .noteover
 	call DisablePitchWheel
-	call Function_e884f
+	call Functione884f
 
 .continue_sound_update
-	call Function_e80b6
+	call Functione80b6
 	ret
 
 DisablePitchWheel: ; 3a:4061
@@ -106,7 +106,7 @@ DisablePitchWheel: ; 3a:4061
 	res SOUND_PITCH_WHEEL, [hl]
 	ret
 
-Unreferenced_Function_e8081: ; 3a:4081
+Unreferenced_Functione8081: ; 3a:4081
 	ld a, [wMapMusic]
 	bit 0, a
 	jr nz, .disable_music
@@ -153,7 +153,7 @@ GetChannelRegisters: ; 3a:40a4
 .registers
 	db LOW(rNR10), LOW(rNR20), LOW(rNR30), LOW(rNR40)
 
-Function_e80b6: ; 3a:40b6
+Functione80b6: ; 3a:40b6
 	ld hl, CHANNEL_DUTY_CYCLE
 	add hl, bc
 	ld a, [hl]
@@ -172,13 +172,13 @@ Function_e80b6: ; 3a:40b6
 	ld [wCurTrackFrequency + 1], a
 	ld a, $3f
 	ld [wc195], a
-	call Function_e85d8
-	call Function_e87f9
-	call Function_e8839
+	call Functione85d8
+	call Functione87f9
+	call Functione8839
 	call IsChannelSFXOn
 	jr nc, .end
 
-	call Function_e80fa
+	call Functione80fa
 	ld hl, CHANNEL_TRACKS
 	add hl, bc
 	ld a, [wSoundOutput]
@@ -192,7 +192,7 @@ Function_e80b6: ; 3a:40b6
 	ld [hl], a
 	ret
 
-Function_e80fa: ; 3a:40fa
+Functione80fa: ; 3a:40fa
 	ld hl, .jumptable
 	ld a, [wCurChannel]
 	maskbits NUM_CHANNELS
@@ -249,12 +249,12 @@ IsAnySFXOn: ; 3a:42d0
 	scf
 	ret
 
-SECTION "Function_e82f0", ROMX[$42f0], BANK[$3a]
-Function_e82f0: ; 3a:42f0
+SECTION "Functione82f0", ROMX[$42f0], BANK[$3a]
+Functione82f0: ; 3a:42f0
 	call IncrementTempo
 	call PlayDanger
 	call FadeMusic
-	call Function_e841d
+	call Functione841d
 	ld a, [wVolume]
 	ld [rNR50], a
 	ld a, [wSoundOutput]
diff --git a/data/predef_pointers.inc b/data/predef_pointers.inc
index 691a072..de14d19 100644
--- a/data/predef_pointers.inc
+++ b/data/predef_pointers.inc
@@ -11,91 +11,91 @@ PredefPointers:: ; 1:62d3
 ; Please be a peach and nuke the hell out of these:
 ; WE NEED LABELS!
 ; Thank youu~
-	add_predef Function_6445
-	add_predef Function_5d27
-	add_predef Function_6713
-	add_predef Function_66b1
-	add_predef Function_4031
-	add_predef Function_ce10
-	add_predef Function_cd6f
-	add_predef Function_cde3
-	add_predef Function_cde3_2
-	add_predef Function_cde3_3
-	add_predef Function_cdf9
-	add_predef Function_ce10_2
-	add_predef Function_cd33
+	add_predef Function6445
+	add_predef Function5d27
+	add_predef Function6713
+	add_predef Function66b1
+	add_predef Function4031
+	add_predef Functionce10
+	add_predef Functioncd6f
+	add_predef Functioncde3
+	add_predef Functioncde3_2
+	add_predef Functioncde3_3
+	add_predef Functioncdf9
+	add_predef Functionce10_2
+	add_predef Functioncd33
 GiveItemPredef::
 	dbw 3, GiveItem
-	add_predef Function_ce3c
-	add_predef Function_da28
-	add_predef Function_d886
-	add_predef Function_da4f
-	add_predef Function_dac8
-	add_predef Function_dcfc
-	add_predef Function_dc16
-	add_predef Function_dd5c
-	add_predef Function_de79
-	add_predef Function_ce7c
-	add_predef Function_df7d
-	add_predef Function_df91
-	add_predef Function_1128f
-	add_predef Function_112c1
-	add_predef Function_28c98
-	add_predef Function_2d663
-	add_predef Function_3d5ce
-	add_predef Function_3f019
-	add_predef Function_3f068
-	add_predef Function_3f04a
-	add_predef Function_3d08c
-	add_predef Function_3d67c
-	add_predef Function_3e1a4
-	add_predef Function_3ef19
-	add_predef Function_3e874
-	add_predef Function_3e91e
-	add_predef Function_3e963
-	add_predef Function_421f8
-	add_predef Function_42252
-	add_predef Function_41fa1
-	add_predef Function_28da4
-	add_predef Function_28d6e
-	add_predef Function_40ac7
-	add_predef Function_40000
-	add_predef Function_40b5c
-	add_predef Function_50000
-	add_predef Function_50bfe
-	add_predef Function_50bcd
-	add_predef Function_50b92
-	add_predef Function_508c4
-	add_predef Function_50771
-	add_predef Function_50774
-	add_predef Function_5081f
-	add_predef Function_506d4
-	add_predef Function_5069e
-	add_predef Function_502b5
-	add_predef Function_50244
-	add_predef Function_50248
-	add_predef Function_500c6
-	add_predef Function_500a0
-	add_predef Function_50073
-	add_predef Function_50ed9
-	add_predef Function_cb6ff
-	add_predef Function_cb710
-	add_predef Function_cb733
-	add_predef Function_145b8
-	add_predef Function_146dc
-	add_predef Function_145de
+	add_predef Functionce3c
+	add_predef Functionda28
+	add_predef Functiond886
+	add_predef Functionda4f
+	add_predef Functiondac8
+	add_predef Functiondcfc
+	add_predef Functiondc16
+	add_predef Functiondd5c
+	add_predef Functionde79
+	add_predef Functionce7c
+	add_predef Functiondf7d
+	add_predef Functiondf91
+	add_predef Function1128f
+	add_predef Function112c1
+	add_predef Function28c98
+	add_predef Function2d663
+	add_predef Function3d5ce
+	add_predef Function3f019
+	add_predef Function3f068
+	add_predef Function3f04a
+	add_predef Function3d08c
+	add_predef Function3d67c
+	add_predef Function3e1a4
+	add_predef Function3ef19
+	add_predef Function3e874
+	add_predef Function3e91e
+	add_predef Function3e963
+	add_predef Function421f8
+	add_predef Function42252
+	add_predef Function41fa1
+	add_predef Function28da4
+	add_predef Function28d6e
+	add_predef Function40ac7
+	add_predef Function40000
+	add_predef Function40b5c
+	add_predef Function50000
+	add_predef Function50bfe
+	add_predef Function50bcd
+	add_predef Function50b92
+	add_predef Function508c4
+	add_predef Function50771
+	add_predef Function50774
+	add_predef Function5081f
+	add_predef Function506d4
+	add_predef Function5069e
+	add_predef Function502b5
+	add_predef Function50244
+	add_predef Function50248
+	add_predef Function500c6
+	add_predef Function500a0
+	add_predef Function50073
+	add_predef Function50ed9
+	add_predef Functioncb6ff
+	add_predef Functioncb710
+	add_predef Functioncb733
+	add_predef Function145b8
+	add_predef Function146dc
+	add_predef Function145de
 	add_predef ExecuteBGEffects
-	add_predef Function_1457a
-	add_predef Function_143e0
+	add_predef Function1457a
+	add_predef Function143e0
 	add_predef CheckSGB
-	add_predef Function_928b
-	add_predef Function_8786
-	add_predef Function_8c4be
-	add_predef Function_8c9c6
-	add_predef Function_8c940
-	add_predef Function_cc001
-	add_predef Function_cc000
-	add_predef Function_cc000_2
-	add_predef Function_fdb66
-	add_predef Function_1240b
+	add_predef Function928b
+	add_predef Function8786
+	add_predef Function8c4be
+	add_predef Function8c9c6
+	add_predef Function8c940
+	add_predef Functioncc001
+	add_predef Functioncc000
+	add_predef Functioncc000_2
+	add_predef Functionfdb66
+	add_predef Function1240b
 	dbw $ff, InexplicablyEmptyFunction
diff --git a/home/unknown.asm b/home/unknown.asm
index 7ad3157..e2cc5cd 100644
--- a/home/unknown.asm
+++ b/home/unknown.asm
@@ -135,4 +135,4 @@ Function094c::
 	pop af
 	call Bankswitch
 
-	jp Function_4031
+	jp Function4031
diff --git a/home/vcopy.asm b/home/vcopy.asm
index a453da5..8e916f2 100644
--- a/home/vcopy.asm
+++ b/home/vcopy.asm
@@ -545,7 +545,7 @@ EnableSprites:: ; 1531 (0:1531)
 	ret
 ; 0x1538
 
-Function_1538: ; 1538 (0:1538)
+Function1538: ; 1538 (0:1538)
 	ld a, [$d14f]
 	bit 0, a
 	ret z
diff --git a/shim.sym b/shim.sym
index b02001f..2e018c6 100644
--- a/shim.sym
+++ b/shim.sym
@@ -40,15 +40,16 @@
 00:3E32 Unk_3E32
 
 
-01:4031 Function_4031
+01:4031 Function4031
 01:53CC MainMenu
-01:5D27 Function_5d27
+01:5D27 Function5d27
 01:6114 TitleScreenInputAndTimeout
-01:6445 Function_6445
-01:66B1 Function_66b1
-01:6713 Function_6713
+01:6445 Function6445
+01:66B1 Function66b1
+01:6713 Function6713
 01:68F3 ItemAttributes
-02:4786 Function_8786
+02:4000 Function8000
+02:4786 Function8786
 
 02:4098 _InitializeVisibleSprites
 02:4856 DecompTownMapTilemap
@@ -56,38 +57,38 @@
 02:4C7C DrawMap
 02:4DC2 TownMapGfx
 02:4F32 PokegearRadioGfx
-02:528B Function_928b
+02:528B Function928b
 02:5695 CheckSGB
 
 03:4791 DebugWarp
 03:479F DebugWarp.Destinations
-03:4D33 Function_cd33
-03:4D6F Function_cd6f
-03:4DE3 Function_cde3
-03:4DE3 Function_cde3_2
-03:4DE3 Function_cde3_3
-03:4DF9 Function_cdf9
-03:4E10 Function_ce10
-03:4E10 Function_ce10_2
-03:4E3C Function_ce3c
-03:4E7C Function_ce7c
-03:5886 Function_d886
-03:5A28 Function_da28
-03:5A4F Function_da4f
-03:5AC8 Function_dac8
-03:5C16 Function_dc16
-03:5CFC Function_dcfc
-03:5D5C Function_dd5c
-03:5E79 Function_de79
-03:5F7D Function_df7d
-03:5F91 Function_df91
+03:4D33 Functioncd33
+03:4D6F Functioncd6f
+03:4DE3 Functioncde3
+03:4DE3 Functioncde3_2
+03:4DE3 Functioncde3_3
+03:4DF9 Functioncdf9
+03:4E10 Functionce10
+03:4E10 Functionce10_2
+03:4E3C Functionce3c
+03:4E7C Functionce7c
+03:5886 Functiond886
+03:5A28 Functionda28
+03:5A4F Functionda4f
+03:5AC8 Functiondac8
+03:5C16 Functiondc16
+03:5CFC Functiondcfc
+03:5D5C Functiondd5c
+03:5E79 Functionde79
+03:5F7D Functiondf7d
+03:5F91 Functiondf91
 
 04:4001 MapGroupPointers
-04:528F Function_1128f
-04:52C1 Function_112c1
+04:528F Function1128f
+04:52C1 Function112c1
 04:5677 DoPlayerMovement
 04:5DBE DisplayStartMenu
-04:640B Function_1240b
+04:640B Function1240b
 04:6C58 CheckRegisteredItem
 
 05:4000 Function14000
@@ -97,11 +98,11 @@
 05:405b AddIndoorSprites
 05:40aa AddOutdoorSprites
 05:40fb LoadUsedSpritesGfx ; TODO: maybe there's a better name
-05:43E0 Function_143e0
-05:457A Function_1457a
-05:45B8 Function_145b8
-05:45DE Function_145de
-05:46DC Function_146dc
+05:43E0 Function143e0
+05:457A Function1457a
+05:45B8 Function145b8
+05:45DE Function145de
+05:46DC Function146dc
 ; Structure:
 ; byte Map group ($ff = end)
 ; byte Map ID
@@ -110,54 +111,54 @@
 ; word Unknown (2 bytes)
 05:470e UnknownMapBufferPointers
 
-0A:4C98 Function_28c98
-0A:4D6E Function_28d6e
-0A:4DA4 Function_28da4
+0A:4C98 Function28c98
+0A:4D6E Function28d6e
+0A:4DA4 Function28da4
 
-0B:5663 Function_2d663
+0B:5663 Function2d663
 
 0e:4b78 LoadTrainerClassName
 0e:4ba0 LoadTrainerClassName.got_name
 0e:4ba9 LoadTrainerClass
 
-0F:508C Function_3d08c
-0F:55CE Function_3d5ce
-0F:567C Function_3d67c
-0F:61A4 Function_3e1a4
-0F:6874 Function_3e874
-0F:691E Function_3e91e
-0F:6963 Function_3e963
+0F:508C Function3d08c
+0F:55CE Function3d5ce
+0F:567C Function3d67c
+0F:61A4 Function3e1a4
+0F:6874 Function3e874
+0F:691E Function3e91e
+0F:6963 Function3e963
 0f:69a9 _LoadWildMons
-0F:6F19 Function_3ef19
-0F:7019 Function_3f019
-0F:704A Function_3f04a
-0F:7068 Function_3f068
+0F:6F19 Function3ef19
+0F:7019 Function3f019
+0F:704A Function3f04a
+0F:7068 Function3f068
 
-10:4000 Function_40000
+10:4000 Function40000
 10:40A6 ShowPokedexMenu
-10:4AC7 Function_40ac7
-10:4B5C Function_40b5c
-10:5FA1 Function_41fa1
-10:61F8 Function_421f8
-10:6252 Function_42252
-
-14:4000 Function_50000
-14:4073 Function_50073
-14:40A0 Function_500a0
-14:40C6 Function_500c6
-14:4244 Function_50244
-14:4248 Function_50248
-14:42B5 Function_502b5
-14:469E Function_5069e
-14:46D4 Function_506d4
-14:4771 Function_50771
-14:4774 Function_50774
-14:481F Function_5081f
-14:48C4 Function_508c4
-14:4B92 Function_50b92
-14:4BCD Function_50bcd
-14:4BFE Function_50bfe
-14:4ED9 Function_50ed9
+10:4AC7 Function40ac7
+10:4B5C Function40b5c
+10:5FA1 Function41fa1
+10:61F8 Function421f8
+10:6252 Function42252
+
+14:4000 Function50000
+14:4073 Function50073
+14:40A0 Function500a0
+14:40C6 Function500c6
+14:4244 Function50244
+14:4248 Function50248
+14:42B5 Function502b5
+14:469E Function5069e
+14:46D4 Function506d4
+14:4771 Function50771
+14:4774 Function50774
+14:481F Function5081f
+14:48C4 Function508c4
+14:4B92 Function50b92
+14:4BCD Function50bcd
+14:4BFE Function50bfe
+14:4ED9 Function50ed9
 
 23:4000 AnimateTilesetImpl
 23:42dc UpdateTimeOfDayPal
@@ -165,34 +166,34 @@
 23:4335 _UpdateTimePals
 23:4354 ReplaceTimeOfDayPals
 23:4370 GetTimePalette
-23:44BE Function_8c4be
-23:4940 Function_8c940
-23:49C6 Function_8c9c6
+23:44BE Function8c4be
+23:4940 Function8c940
+23:49C6 Function8c9c6
 23:60cc MenuMonIconGfx
 
 24:4000 SetClockDialog
 24:4239 SlotMachineGame
-32:76FF Function_cb6ff
-32:7710 Function_cb710
-32:7733 Function_cb733
-33:4000 Function_cc000
-33:4000 Function_cc000_2
-33:4001 Function_cc001
+32:76FF Functioncb6ff
+32:7710 Functioncb710
+32:7733 Functioncb733
+33:4000 Functioncc000
+33:4000 Functioncc000_2
+33:4001 Functioncc001
 33:467B QueueBattleAnimation
 33:625D BattleAnim_Sine_e
 33:6263 BattleAnim_Cosine_e
-3A:441D Function_e841d
-3A:45D8 Function_e85d8
-3A:47F9 Function_e87f9
-3A:4839 Function_e8839
-3A:484F Function_e884f
+3A:441D Functione841d
+3A:45D8 Functione85d8
+3A:47F9 Functione87f9
+3A:4839 Functione8839
+3A:484F Functione884f
 3A:4D9D _PlayCryHeader
 3A:4E22 _PlaySFX
 3A:4F11 LoadChannel
 3A:4F6C LoadMusicByte
 3A:52C7 Music
 3F:40E9 InGameDebugMenu
-3F:5B66 Function_fdb66
+3F:5B66 Functionfdb66
 3F:6255 Functionfe255
 3F:64CE MonsterTest
 3F:654E PicTest