dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Decompile naming_screen.c

Browse Source
This commit is contained in:
Diegoisawesome
2018-01-23 21:30:13 -06:00
parent f57340b729
commit 5a57485ece
25 changed files with 2337 additions and 4656 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/battle_frontier_1.s
+3 -3
View File
@@ -7096,7 +7096,7 @@ _081926B0:
movs r1, 0x1
str r1, [sp, 0x8]
ldr r1, =sub_8190938
bl sub_80D2CC4
bl CreateMonIcon
ldr r1, [r6]
adds r1, r4
strb r0, [r1]
@@ -8779,7 +8779,7 @@ _081934B0:
mov r1, r10
str r1, [sp, 0x8]
ldr r1, =sub_8190938
bl sub_80D2CC4
bl CreateMonIcon
ldr r1, [r6]
adds r1, r4
strb r0, [r1]
@@ -8927,7 +8927,7 @@ _081935FA:
movs r1, 0x1
str r1, [sp, 0x8]
ldr r1, =sub_8190938
bl sub_80D2CC4
bl CreateMonIcon
ldr r1, [r6]
adds r1, r4
strb r0, [r1]
asm/field_effect.s
+13 -13
View File
@@ -764,8 +764,8 @@ _080B608E:
bx r0
thumb_func_end sub_80B6070
thumb_func_start sub_80B609C
sub_80B609C: @ 80B609C
thumb_func_start MultiplyInvertedPaletteRGBComponents
MultiplyInvertedPaletteRGBComponents: @ 80B609C
push {r4-r7,lr}
mov r7, r9
mov r6, r8
@@ -832,7 +832,7 @@ sub_80B609C: @ 80B609C
pop {r0}
bx r0
.pool
thumb_func_end sub_80B609C
thumb_func_end MultiplyInvertedPaletteRGBComponents
thumb_func_start sub_80B6128
sub_80B6128: @ 80B6128
@@ -1469,7 +1469,7 @@ _080B65D8:
mov r9, r3
add r4, r9
ldrb r3, [r4]
bl sub_80B609C
bl MultiplyInvertedPaletteRGBComponents
ldrh r4, [r7, 0x32]
adds r4, 0x2
mov r0, r8
@@ -1488,7 +1488,7 @@ _080B65D8:
ldrb r2, [r2]
add r4, r9
ldrb r3, [r4]
bl sub_80B609C
bl MultiplyInvertedPaletteRGBComponents
ldrh r4, [r7, 0x32]
adds r4, 0x1
mov r3, r8
@@ -1507,7 +1507,7 @@ _080B65D8:
ldrb r2, [r2]
add r4, r9
ldrb r3, [r4]
bl sub_80B609C
bl MultiplyInvertedPaletteRGBComponents
ldrh r4, [r7, 0x32]
lsls r4, 24
lsrs r4, 24
@@ -1527,7 +1527,7 @@ _080B65D8:
adds r1, r6, 0
adds r2, r5, 0
adds r3, r4, 0
bl sub_80B609C
bl MultiplyInvertedPaletteRGBComponents
mov r0, r10
bl IndexOfSpritePaletteTag
lsls r0, 24
@@ -1538,7 +1538,7 @@ _080B65D8:
adds r1, r6, 0
adds r2, r5, 0
adds r3, r4, 0
bl sub_80B609C
bl MultiplyInvertedPaletteRGBComponents
movs r3, 0x34
ldrsh r0, [r7, r3]
cmp r0, 0x2
@@ -1612,7 +1612,7 @@ _080B6718:
adds r1, r6, 0
adds r2, r5, 0
adds r3, r4, 0
bl sub_80B609C
bl MultiplyInvertedPaletteRGBComponents
mov r0, r8
bl IndexOfSpritePaletteTag
lsls r0, 24
@@ -1624,7 +1624,7 @@ _080B6718:
adds r1, r6, 0
adds r2, r5, 0
adds r3, r4, 0
bl sub_80B609C
bl MultiplyInvertedPaletteRGBComponents
mov r0, r8
bl IndexOfSpritePaletteTag
lsls r0, 24
@@ -1636,7 +1636,7 @@ _080B6718:
adds r1, r6, 0
adds r2, r5, 0
adds r3, r4, 0
bl sub_80B609C
bl MultiplyInvertedPaletteRGBComponents
mov r0, r8
bl IndexOfSpritePaletteTag
lsls r0, 24
@@ -1647,7 +1647,7 @@ _080B6718:
adds r1, r6, 0
adds r2, r5, 0
adds r3, r4, 0
bl sub_80B609C
bl MultiplyInvertedPaletteRGBComponents
mov r0, r8
bl IndexOfSpritePaletteTag
lsls r0, 24
@@ -1658,7 +1658,7 @@ _080B6718:
adds r1, r6, 0
adds r2, r5, 0
adds r3, r4, 0
bl sub_80B609C
bl MultiplyInvertedPaletteRGBComponents
pop {r3}
mov r8, r3
pop {r4-r6}
asm/field_player_avatar.s
+3 -3
View File
@@ -2602,8 +2602,8 @@ _0808BD2C:
.pool
thumb_func_end sub_808BCF4
thumb_func_start sub_808BD3C
sub_808BD3C: @ 808BD3C
thumb_func_start GetRivalAvatarGraphicsIdByStateIdAndGender
GetRivalAvatarGraphicsIdByStateIdAndGender: @ 808BD3C
lsls r0, 24
lsls r1, 24
lsrs r1, 24
@@ -2614,7 +2614,7 @@ sub_808BD3C: @ 808BD3C
ldrb r0, [r1]
bx lr
.pool
thumb_func_end sub_808BD3C
thumb_func_end GetRivalAvatarGraphicsIdByStateIdAndGender
thumb_func_start GetPlayerAvatarGraphicsIdByStateIdAndGender
@ u8 GetPlayerAvatarGraphicsIdByStateIdAndGender(u8 stateId, u8 gender)
asm/naming_screen.s
-4267
View File
File diff suppressed because it is too large Load Diff
asm/overworld.s
+1 -1
View File
@@ -6698,7 +6698,7 @@ _08087C38:
lsls r1, 30
lsrs r1, 31
movs r0, 0
bl sub_808BD3C
bl GetRivalAvatarGraphicsIdByStateIdAndGender
_08087C44:
lsls r0, 24
lsrs r0, 24
asm/party_menu.s
+1 -1
View File
@@ -10415,7 +10415,7 @@ party_menu_link_mon_icon_anim: @ 81B5A2C
ldr r0, [sp, 0x20]
str r0, [sp, 0x8]
adds r0, r5, 0
bl sub_80D2CC4
bl CreateMonIcon
strb r0, [r4, 0x9]
ldr r2, =gSprites
ldrb r0, [r4, 0x9]
asm/pokemon_icon.s
+4 -4
View File
@@ -5,9 +5,9 @@
.text
thumb_func_start sub_80D2CC4
@ int sub_80D2CC4(u16 speciesId, int a2, u16 a3, u16 a4, u8 a5, u32 personality, int a7)
sub_80D2CC4: @ 80D2CC4
thumb_func_start CreateMonIcon
@ int CreateMonIcon(u16 speciesId, int a2, u16 a3, u16 a4, u8 a5, u32 personality, int a7)
CreateMonIcon: @ 80D2CC4
push {r4-r7,lr}
mov r7, r9
mov r6, r8
@@ -84,7 +84,7 @@ _080D2D2A:
pop {r1}
bx r1
.pool
thumb_func_end sub_80D2CC4
thumb_func_end CreateMonIcon
thumb_func_start sub_80D2D78
sub_80D2D78: @ 80D2D78
asm/slot_machine.s
+2 -2
View File
@@ -8934,7 +8934,7 @@ sub_812EB48: @ 812EB48
ldrb r3, [r1]
adds r1, r3, 0
adds r2, r3, 0
bl sub_80B609C
bl MultiplyInvertedPaletteRGBComponents
ldrh r0, [r4, 0x38]
adds r0, 0x1
movs r1, 0x1
@@ -8979,7 +8979,7 @@ sub_812EBCC: @ 812EBCC
movs r1, 0
movs r2, 0
movs r3, 0
bl sub_80B609C
bl MultiplyInvertedPaletteRGBComponents
movs r4, 0
_0812EBEA:
ldr r0, =gUnknown_0203AB34
asm/trade.s
+4 -4
View File
@@ -646,7 +646,7 @@ _080776E2:
str r1, [sp, 0x8]
adds r0, r5, 0
ldr r1, =sub_80D3014
bl sub_80D2CC4
bl CreateMonIcon
mov r2, r8
ldr r1, [r2]
adds r1, 0x28
@@ -705,7 +705,7 @@ _08077756:
str r0, [sp, 0x8]
adds r0, r5, 0
ldr r1, =sub_80D3014
bl sub_80D2CC4
bl CreateMonIcon
mov r2, r8
ldr r1, [r2]
adds r1, 0x2E
@@ -1264,7 +1264,7 @@ _08077CA8:
str r1, [sp, 0x8]
adds r0, r5, 0
ldr r1, =sub_80D3014
bl sub_80D2CC4
bl CreateMonIcon
mov r2, r8
ldr r1, [r2]
adds r1, 0x28
@@ -1323,7 +1323,7 @@ _08077D1E:
str r0, [sp, 0x8]
adds r0, r5, 0
ldr r1, =sub_80D3014
bl sub_80D2CC4
bl CreateMonIcon
mov r2, r8
ldr r1, [r2]
adds r1, 0x2E