Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Naming screen #344

Merged
merged 26 commits into from
Oct 17, 2024
Merged

Naming screen #344

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
a3b4e07
NamingScreenApp_Init
PikalaxALT Oct 9, 2024
a7a532f
through NamingScreenApp_Main
PikalaxALT Oct 9, 2024
5c4b4e1
through NamingScreenApp_Exit
PikalaxALT Oct 9, 2024
0b3edc6
through NamingScreen_DeleteArgs
PikalaxALT Oct 10, 2024
3cdc13a
through sub_020832E4
PikalaxALT Oct 10, 2024
688eea4
through sub_020834FC
PikalaxALT Oct 11, 2024
ef2d980
through sub_02083654
PikalaxALT Oct 11, 2024
dd2b540
through sub_020837AC
PikalaxALT Oct 11, 2024
eb5639b
through sub_020839EC
PikalaxALT Oct 12, 2024
ea1c0e0
through sub_02083F48
PikalaxALT Oct 12, 2024
ea98e89
through sub_02084264
PikalaxALT Oct 12, 2024
f266432
through sub_02084830
PikalaxALT Oct 13, 2024
f74d558
through sub_02084C98
PikalaxALT Oct 13, 2024
79247f8
Finish naming_screen code
PikalaxALT Oct 13, 2024
7e160b2
naming_screen data decomp
PikalaxALT Oct 13, 2024
f5149d7
decompiing the data made this match lmfao
PikalaxALT Oct 13, 2024
92a5268
Merge remote-tracking branch 'origin/master' into naming_screen
PikalaxALT Oct 13, 2024
5b94579
Documentation, 1
PikalaxALT Oct 13, 2024
5adf148
Documentation, 2
PikalaxALT Oct 14, 2024
ddd230d
Documentation, 3
PikalaxALT Oct 14, 2024
1eac138
Documentation, 4
PikalaxALT Oct 14, 2024
fb0702f
Documentation, 5
PikalaxALT Oct 14, 2024
95b4e4a
Documentation, 6
PikalaxALT Oct 14, 2024
7ec0efa
add missing nclr (why are these gitignored anyway?)
PikalaxALT Oct 14, 2024
84f5754
Documentation, 7
PikalaxALT Oct 14, 2024
abff4b3
Documentation, 8
PikalaxALT Oct 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion asm/include/overlay_12_battle_command.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_14.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_43.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_80_0222BDF4.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
149 changes: 0 additions & 149 deletions asm/include/unk_02082908.inc
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion asm/include/unk_020910D8.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion asm/include/unk_020912AC.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@
.public sub_020912AC
.public sub_020912D0
.public _u32_div_f
.public sOverlayTemplate_NamingScreen
.public gOverlayTemplate_NamingScreen
2 changes: 1 addition & 1 deletion asm/include/unk_02091564.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions asm/overlay_12_battle_command.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions asm/overlay_14.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
6 changes: 3 additions & 3 deletions asm/overlay_43.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions asm/overlay_80_0222BDF4.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
Loading