Merge pull request #344 from PikalaxALT/naming_screen

Naming screen
pret · Oct 17, 2024 · 9acc3cf · 9acc3cf
2 parents f70b77a + abff4b3
commit 9acc3cf
Show file tree

Hide file tree

Showing 69 changed files with 2,682 additions and 6,039 deletions.
diff --git a/asm/include/overlay_12_battle_command.inc b/asm/include/overlay_12_battle_command.inc
@@ -104,7 +104,7 @@
 .public _s32_div_f
 .public _u32_div_f
 .public gGameLanguage
-.public sOverlayTemplate_NamingScreen
+.public gOverlayTemplate_NamingScreen
 .public gSystem
 .public ov07_02232F58
 .public ov07_02232F60

diff --git a/asm/include/overlay_14.inc b/asm/include/overlay_14.inc
@@ -292,7 +292,7 @@
 .public _fsub
 .public _s32_div_f
 .public _u32_div_f
-.public sOverlayTemplate_NamingScreen
+.public gOverlayTemplate_NamingScreen
 .public gOverlayTemplate_PokemonSummary
 .public gSystem
 .public PCBox_Init

diff --git a/asm/include/overlay_43.inc b/asm/include/overlay_43.inc
@@ -192,7 +192,7 @@
 .public _ull_mod
 .public _s32_div_f
 .public _u32_div_f
-.public sOverlayTemplate_NamingScreen
+.public gOverlayTemplate_NamingScreen
 .public _02102620
 .public gSystem
 .public ov42_02227060

diff --git a/asm/include/overlay_80_0222BDF4.inc b/asm/include/overlay_80_0222BDF4.inc
@@ -180,7 +180,7 @@
 .public _s32_div_f
 .public _u32_div_f
 .public gOverlayTemplate_Battle
-.public sOverlayTemplate_NamingScreen
+.public gOverlayTemplate_NamingScreen
 .public gSystem
 .public ov00_021E6EBC
 .public _0223DC20

diff --git a/asm/include/unk_02082908.inc b/asm/include/unk_02082908.inc
diff --git a/asm/include/unk_020910D8.inc b/asm/include/unk_020910D8.inc
@@ -21,7 +21,7 @@
 .public MonSetTrainerMemo
 .public CallTask_HatchEggInParty
 .public sub_02093134
-.public sOverlayTemplate_NamingScreen
+.public gOverlayTemplate_NamingScreen
 .public ov95_021E6D70
 .public ov95_021E6E88
 .public ov95_021E6F0C
diff --git a/asm/include/unk_020912AC.inc b/asm/include/unk_020912AC.inc
@@ -5,4 +5,4 @@
 .public sub_020912AC
 .public sub_020912D0
 .public _u32_div_f
-.public sOverlayTemplate_NamingScreen
+.public gOverlayTemplate_NamingScreen
diff --git a/asm/include/unk_02091564.inc b/asm/include/unk_02091564.inc
@@ -37,7 +37,7 @@
 .public sub_02091598
 .public sub_020915A0
 .public sub_020915A4
-.public sOverlayTemplate_NamingScreen
+.public gOverlayTemplate_NamingScreen
 .public gApplication_OakSpeech
 .public OakSpeech_Init
 .public OakSpeech_Main

diff --git a/asm/overlay_12_battle_command.s b/asm/overlay_12_battle_command.s
@@ -1187,7 +1187,7 @@ _02246DB0:
 	mov r2, #0
 	bl GetMonData
 	str r0, [r5, #0x10]
-	ldr r0, _0224706C ; =sOverlayTemplate_NamingScreen
+	ldr r0, _0224706C ; =gOverlayTemplate_NamingScreen
 	add r1, r5, #0
 	mov r2, #5
 	bl OverlayManager_New
@@ -1484,7 +1484,7 @@ _0224702E:
 _02247060: .word 0x0000FFFF
 _02247064: .word 0x0000219C
 _02247068: .word 0x00000496
-_0224706C: .word sOverlayTemplate_NamingScreen
+_0224706C: .word gOverlayTemplate_NamingScreen
 _02247070: .word 0x00000498
 _02247074:
 	add r0, r5, #0

diff --git a/asm/overlay_14.s b/asm/overlay_14.s
@@ -6717,7 +6717,7 @@ ov14_021E8B3C: ; 0x021E8B3C
 	ldr r0, [r4, #4]
 	ldr r2, [r2, #0x18]
 	bl PCStorage_GetBoxName
-	ldr r0, _021E8B7C ; =sOverlayTemplate_NamingScreen
+	ldr r0, _021E8B7C ; =gOverlayTemplate_NamingScreen
 	ldr r1, [r4, #0x18]
 	mov r2, #9
 	bl OverlayManager_New
@@ -6726,7 +6726,7 @@ ov14_021E8B3C: ; 0x021E8B3C
 	add sp, #8
 	pop {r4, pc}
 	.balign 4, 0
-_021E8B7C: .word sOverlayTemplate_NamingScreen
+_021E8B7C: .word gOverlayTemplate_NamingScreen
 	thumb_func_end ov14_021E8B3C
 
 	thumb_func_start ov14_021E8B80

diff --git a/asm/overlay_43.s b/asm/overlay_43.s
@@ -5792,7 +5792,7 @@ _0222CBE2:
 	str r0, [r4, #8]
 	add r0, r7, #0
 	bl ov43_0222A1DC
-	ldr r0, _0222CD2C ; =sOverlayTemplate_NamingScreen
+	ldr r0, _0222CD2C ; =gOverlayTemplate_NamingScreen
 	ldr r1, [r4, #4]
 	add r2, r6, #0
 	bl OverlayManager_New
@@ -5865,7 +5865,7 @@ _0222CCAC:
 	str r0, [r4, #4]
 	add r0, r7, #0
 	bl ov43_0222A1DC
-	ldr r0, _0222CD2C ; =sOverlayTemplate_NamingScreen
+	ldr r0, _0222CD2C ; =gOverlayTemplate_NamingScreen
 	ldr r1, [r4, #4]
 	add r2, r6, #0
 	bl OverlayManager_New
@@ -5918,7 +5918,7 @@ _0222CD26:
 	add sp, #0x18
 	pop {r3, r4, r5, r6, r7, pc}
 	.balign 4, 0
-_0222CD2C: .word sOverlayTemplate_NamingScreen
+_0222CD2C: .word gOverlayTemplate_NamingScreen
 _0222CD30: .word _02102620
 	thumb_func_end ov43_0222CBB4
 

diff --git a/asm/overlay_80_0222BDF4.s b/asm/overlay_80_0222BDF4.s
@@ -1829,7 +1829,7 @@ FrtCmd_052: ; 0x0222CB54
 	bl NamingScreen_CreateArgs
 	add r2, r0, #0
 	ldr r0, _0222CB8C ; =ov80_0222CB94
-	ldr r1, _0222CB90 ; =sOverlayTemplate_NamingScreen
+	ldr r1, _0222CB90 ; =gOverlayTemplate_NamingScreen
 	str r0, [sp]
 	ldr r0, [r4]
 	mov r3, #0
@@ -1840,7 +1840,7 @@ FrtCmd_052: ; 0x0222CB54
 	pop {r4, pc}
 	.balign 4, 0
 _0222CB8C: .word ov80_0222CB94
-_0222CB90: .word sOverlayTemplate_NamingScreen
+_0222CB90: .word gOverlayTemplate_NamingScreen
 	thumb_func_end FrtCmd_052
 
 	thumb_func_start ov80_0222CB94