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

mon anim with master

Browse Source
This commit is contained in:
DizzyEggg
2018-01-29 14:40:50 +01:00
parent 78728ae454 10037ac0e1
commit 78fc471f32
57 changed files with 2438 additions and 4761 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/berry_tag_screen.s
+1 -1
View File
@@ -486,7 +486,7 @@ sub_817804C: @ 817804C
str r6, [sp, 0xC]
str r1, [sp, 0x10]
movs r1, 0x1
bl AddTextPrinterParametrized2
bl AddTextPrinterParameterized2
add sp, 0x14
pop {r4-r6}
pop {r0}
asm/credits.s
+1 -1
View File
@@ -149,7 +149,7 @@ _081755E4:
movs r0, 0
movs r1, 0x1
adds r3, r5, 0
bl AddTextPrinterParametrized2
bl AddTextPrinterParameterized2
add sp, 0x18
pop {r4,r5}
pop {r0}
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
+6 -6
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)
@@ -4538,7 +4538,7 @@ fish9: @ 808CC64
movs r0, 0
movs r1, 0x1
movs r3, 0x1
bl AddTextPrinterParametrized
bl AddTextPrinterParameterized
ldrh r0, [r4, 0x8]
adds r0, 0x1
strh r0, [r4, 0x8]
@@ -4695,7 +4695,7 @@ fishB: @ 808CD94
movs r0, 0
movs r1, 0x1
movs r3, 0x1
bl AddTextPrinterParametrized
bl AddTextPrinterParameterized
movs r0, 0xD
strh r0, [r5, 0x8]
movs r0, 0x1
@@ -4743,7 +4743,7 @@ fishC: @ 808CE04
movs r0, 0
movs r1, 0x1
movs r3, 0x1
bl AddTextPrinterParametrized
bl AddTextPrinterParameterized
ldrh r0, [r5, 0x8]
adds r0, 0x1
strh r0, [r5, 0x8]
asm/field_specials.s
+4 -4
View File
@@ -5639,7 +5639,7 @@ _0813AAAA:
movs r0, 0
movs r1, 0x1
movs r3, 0
bl AddTextPrinterParametrized
bl AddTextPrinterParameterized
ldr r1, =gUnknown_085B312C
lsls r0, r5, 1
adds r1, r0, r1
@@ -5665,7 +5665,7 @@ _0813AAE8:
movs r0, 0
movs r1, 0x1
movs r3, 0
bl AddTextPrinterParametrized
bl AddTextPrinterParameterized
ldr r1, =gUnknown_085B3142
lsls r0, r5, 1
adds r1, r0, r1
@@ -5712,7 +5712,7 @@ _0813AB5C:
movs r0, 0
movs r1, 0x1
movs r3, 0
bl AddTextPrinterParametrized
bl AddTextPrinterParameterized
ldr r1, =gUnknown_085B314E
lsls r0, r5, 1
adds r0, r1
@@ -5736,7 +5736,7 @@ _0813AB94:
movs r0, 0
movs r1, 0x1
movs r3, 0
bl AddTextPrinterParametrized
bl AddTextPrinterParameterized
ldr r1, =gUnknown_085B315C
lsls r0, r5, 1
adds r0, r1
asm/item_menu.s
+1 -1
View File
@@ -6043,7 +6043,7 @@ bag_menu_print: @ 81AE0BC
str r4, [sp, 0xC]
str r2, [sp, 0x10]
mov r2, r9
bl AddTextPrinterParametrized2
bl AddTextPrinterParameterized2
add sp, 0x14
pop {r3,r4}
mov r8, r3
asm/link.s
+15 -15
View File
@@ -28911,7 +28911,7 @@ _08018720:
movs r1, 0x1
movs r2, 0x4
movs r3, 0x1
bl AddTextPrinterParametrized2
bl AddTextPrinterParameterized2
movs r0, 0
adds r1, r7, 0
movs r2, 0xDE
@@ -28927,7 +28927,7 @@ _08018720:
movs r0, 0
movs r1, 0
movs r3, 0x1
bl AddTextPrinterParametrized2
bl AddTextPrinterParameterized2
movs r0, 0
movs r1, 0x2
bl CopyWindowToVram
@@ -29099,7 +29099,7 @@ sub_8018884: @ 8018884
movs r1, 0x1
movs r2, 0
movs r3, 0x1
bl AddTextPrinterParametrized2
bl AddTextPrinterParameterized2
movs r0, 0x1
movs r1, 0x1
movs r2, 0xF
@@ -29452,7 +29452,7 @@ _08018B4A:
str r1, [sp, 0x10]
movs r1, 0x1
movs r3, 0x1
bl AddTextPrinterParametrized2
bl AddTextPrinterParameterized2
ldrb r0, [r4]
movs r1, 0x1
movs r2, 0xF
@@ -29598,7 +29598,7 @@ _08018C8C:
str r1, [sp, 0x10]
movs r1, 0x1
movs r3, 0x1
bl AddTextPrinterParametrized2
bl AddTextPrinterParameterized2
ldrb r0, [r5]
movs r1, 0x1
movs r2, 0xF
@@ -33150,7 +33150,7 @@ _0801A93A:
adds r0, r7, 0
adds r1, r6, 0
adds r2, r5, 0
bl AddTextPrinterParametrized2
bl AddTextPrinterParameterized2
add sp, 0x18
pop {r4-r7}
pop {r0}
@@ -33471,7 +33471,7 @@ sub_801AB68: @ 801AB68
movs r1, 0x1
adds r2, r6, 0
ldr r3, [sp, 0x14]
bl AddTextPrinterParametrized2
bl AddTextPrinterParameterized2
add sp, 0x18
pop {r3-r5}
mov r8, r3
@@ -48548,7 +48548,7 @@ _08022616:
str r4, [sp, 0x10]
movs r1, 0x2
movs r3, 0x1
bl AddTextPrinterParametrized2
bl AddTextPrinterParameterized2
b _0802269C
.pool
_08022668:
@@ -48575,7 +48575,7 @@ _08022668:
str r4, [sp, 0x10]
movs r1, 0x2
movs r3, 0x1
bl AddTextPrinterParametrized2
bl AddTextPrinterParameterized2
_0802269C:
ldr r1, =0x000001bb
adds r0, r6, r1
@@ -49451,7 +49451,7 @@ _08022D42:
movs r0, 0
movs r1, 0x1
adds r2, r4, 0
bl AddTextPrinterParametrized
bl AddTextPrinterParameterized
b _08022DB2
.pool
_08022D90:
@@ -49470,7 +49470,7 @@ _08022D90:
str r0, [sp, 0xC]
movs r0, 0
movs r1, 0x1
bl AddTextPrinterParametrized
bl AddTextPrinterParameterized
_08022DB2:
movs r0, 0
movs r1, 0x3
@@ -52034,7 +52034,7 @@ _080241A6:
movs r0, 0
movs r1, 0x1
movs r3, 0
bl AddTextPrinterParametrized
bl AddTextPrinterParameterized
movs r0, 0
movs r1, 0x3
bl CopyWindowToVram
@@ -52393,7 +52393,7 @@ _08024460:
str r1, [sp, 0xC]
movs r0, 0
movs r1, 0x1
bl AddTextPrinterParametrized
bl AddTextPrinterParameterized
b _080244AC
.pool
_08024490:
@@ -52409,7 +52409,7 @@ _08024490:
str r0, [sp, 0xC]
movs r0, 0
movs r1, 0x1
bl AddTextPrinterParametrized
bl AddTextPrinterParameterized
_080244AC:
movs r0, 0
movs r1, 0x3
@@ -64123,7 +64123,7 @@ _0802A3AE:
movs r0, 0
movs r1, 0x1
movs r3, 0
bl AddTextPrinterParametrized
bl AddTextPrinterParameterized
b _0802A410
.pool
_0802A3D8:
asm/list_menu.s
+2 -2
View File
@@ -773,7 +773,7 @@ ListMenuPrint: @ 81AE9B4
str r6, [sp, 0x10]
adds r2, r7, 0
mov r3, r12
bl AddTextPrinterParametrized2
bl AddTextPrinterParameterized2
ldrb r1, [r5, 0x3]
movs r0, 0x7F
ands r0, r1
@@ -810,7 +810,7 @@ _081AEA20:
str r6, [sp, 0x10]
adds r2, r7, 0
mov r3, r12
bl AddTextPrinterParametrized2
bl AddTextPrinterParameterized2
_081AEA5E:
add sp, 0x18
pop {r4-r7}
asm/menu.s
+6 -6
View File
@@ -35,7 +35,7 @@ AddTextPrinterWithCallbackForMessage: @ 8197A9C
str r0, [sp, 0xC]
movs r0, 0
movs r1, 0x1
bl AddTextPrinterParametrized
bl AddTextPrinterParameterized
add sp, 0x10
pop {r4,r5}
pop {r0}
@@ -992,7 +992,7 @@ _0819829E:
movs r1, 0x1
movs r2, 0x4
movs r3, 0x1
bl AddTextPrinterParametrized2
bl AddTextPrinterParameterized2
mov r2, r9
cmp r2, 0
beq _081982C8
@@ -4736,9 +4736,9 @@ box_print: @ 8199E64
bx r0
thumb_func_end box_print
thumb_func_start AddTextPrinterParametrized2
@ void AddTextPrinterParametrized2(u8 windowId, u8 fontId, u8 x, u8 y, u8 letterSpacing, u8 lineSpacing, struct TextColor *color, u8 speed, u8 *str)
AddTextPrinterParametrized2: @ 8199EEC
thumb_func_start AddTextPrinterParameterized2
@ void AddTextPrinterParameterized2(u8 windowId, u8 fontId, u8 x, u8 y, u8 letterSpacing, u8 lineSpacing, struct TextColor *color, u8 speed, u8 *str)
AddTextPrinterParameterized2: @ 8199EEC
push {r4-r6,lr}
mov r6, r9
mov r5, r8
@@ -4806,7 +4806,7 @@ AddTextPrinterParametrized2: @ 8199EEC
pop {r4-r6}
pop {r0}
bx r0
thumb_func_end AddTextPrinterParametrized2
thumb_func_end AddTextPrinterParameterized2
thumb_func_start sub_8199F74
sub_8199F74: @ 8199F74
asm/menu_helpers.s
+1 -1
View File
@@ -156,7 +156,7 @@ _08121EC0:
adds r1, r7, 0
adds r2, r4, 0
adds r3, r5, 0
bl AddTextPrinterParametrized
bl AddTextPrinterParameterized
ldr r1, =gUnknown_0300117C
ldr r0, [sp, 0x34]
str r0, [r1]
asm/mystery_event_menu.s
+1 -1
View File
@@ -655,7 +655,7 @@ sub_8178EC4: @ 8178EC4
movs r1, 0x1
adds r2, r6, 0
ldr r3, [sp, 0x18]
bl AddTextPrinterParametrized2
bl AddTextPrinterParameterized2
add sp, 0x1C
pop {r3-r5}
mov r8, r3
asm/naming_screen.s
-4267
View File
File diff suppressed because it is too large Load Diff
asm/new_menu_helpers.s
+7 -7
View File
@@ -95,9 +95,9 @@ sub_8197224: @ 8197224
bx r1
thumb_func_end sub_8197224
thumb_func_start AddTextPrinterParametrized
@ u16 AddTextPrinterParametrized(u8 windowId, u8 fontId, u8 *str, u8 speed, void ( *callback)(u16, struct TextPrinter *), u8 fgColor, u8 bgColor, u8 shadowColor)
AddTextPrinterParametrized: @ 8197238
thumb_func_start AddTextPrinterParameterized
@ u16 AddTextPrinterParameterized(u8 windowId, u8 fontId, u8 *str, u8 speed, void ( *callback)(u16, struct TextPrinter *), u8 fgColor, u8 bgColor, u8 shadowColor)
AddTextPrinterParameterized: @ 8197238
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -166,7 +166,7 @@ AddTextPrinterParametrized: @ 8197238
pop {r1}
bx r1
.pool
thumb_func_end AddTextPrinterParametrized
thumb_func_end AddTextPrinterParameterized
thumb_func_start AddTextPrinterForMessage
@ void AddTextPrinterForMessage(u8 allowSkippingDelayWithButtonPress)
@@ -198,7 +198,7 @@ AddTextPrinterForMessage: @ 81972C4
str r0, [sp, 0xC]
movs r0, 0
movs r1, 0x1
bl AddTextPrinterParametrized
bl AddTextPrinterParameterized
add sp, 0x10
pop {r4,r5}
pop {r0}
@@ -236,7 +236,7 @@ AddTextPrinterForMessage_2: @ 8197310
str r0, [sp, 0xC]
movs r0, 0
movs r1, 0x1
bl AddTextPrinterParametrized
bl AddTextPrinterParameterized
add sp, 0x10
pop {r4}
pop {r0}
@@ -273,7 +273,7 @@ AddTextPrinterWithCustomSpeedForMessage: @ 819735C
str r0, [sp, 0xC]
movs r0, 0
movs r1, 0x1
bl AddTextPrinterParametrized
bl AddTextPrinterParameterized
add sp, 0x10
pop {r4,r5}
pop {r0}
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
+4 -4
View File
@@ -4268,7 +4268,7 @@ _081B243E:
adds r0, r4, 0
movs r1, 0
movs r3, 0x1
bl AddTextPrinterParametrized2
bl AddTextPrinterParameterized2
adds r0, r4, 0
bl PutWindowTilemap
adds r0, r4, 0
@@ -5946,7 +5946,7 @@ _081B328C:
str r1, [sp, 0x10]
movs r1, 0x1
mov r2, r9
bl AddTextPrinterParametrized2
bl AddTextPrinterParameterized2
adds r0, r5, 0x1
lsls r0, 24
lsrs r5, r0, 24
@@ -6007,7 +6007,7 @@ sub_81B3300: @ 81B3300
movs r0, 0x6
movs r1, 0x1
adds r2, r4, 0
bl AddTextPrinterParametrized
bl AddTextPrinterParameterized
add sp, 0x10
pop {r4}
pop {r0}
@@ -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/player_pc.s
+1 -1
View File
@@ -2150,7 +2150,7 @@ _0816C030:
movs r1, 0x1
movs r2, 0
adds r3, r6, 0
bl AddTextPrinterParametrized2
bl AddTextPrinterParameterized2
_0816C050:
add sp, 0x14
pop {r4-r6}
asm/pokedex.s
+4 -4
View File
@@ -3035,7 +3035,7 @@ sub_80BCE2C: @ 80BCE2C
str r4, [sp, 0xC]
str r2, [sp, 0x10]
mov r2, r8
bl AddTextPrinterParametrized2
bl AddTextPrinterParameterized2
add sp, 0x18
pop {r3}
mov r8, r3
@@ -6163,7 +6163,7 @@ sub_80BE8DC: @ 80BE8DC
movs r0, 0
movs r1, 0x1
adds r2, r5, 0
bl AddTextPrinterParametrized2
bl AddTextPrinterParameterized2
add sp, 0x18
pop {r4,r5}
pop {r0}
@@ -9974,7 +9974,7 @@ sub_80C0A88: @ 80C0A88
str r4, [sp, 0xC]
str r1, [sp, 0x10]
movs r1, 0x1
bl AddTextPrinterParametrized2
bl AddTextPrinterParameterized2
add sp, 0x18
pop {r4-r6}
pop {r0}
@@ -11022,7 +11022,7 @@ sub_80C1270: @ 80C1270
movs r0, 0
movs r1, 0x1
adds r2, r5, 0
bl AddTextPrinterParametrized2
bl AddTextPrinterParameterized2
add sp, 0x18
pop {r4,r5}
pop {r0}
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/pokemon_storage_system.s
+3 -3
View File
@@ -233,7 +233,7 @@ _080C72AC:
movs r0, 0
movs r1, 0x1
movs r3, 0xFF
bl AddTextPrinterParametrized
bl AddTextPrinterParameterized
movs r0, 0
movs r1, 0x3
bl CopyWindowToVram
@@ -339,7 +339,7 @@ _080C7392:
movs r0, 0
movs r1, 0x1
movs r3, 0
bl AddTextPrinterParametrized
bl AddTextPrinterParameterized
b _080C756A
.pool
_080C73D0:
@@ -509,7 +509,7 @@ _080C7532:
movs r0, 0
movs r1, 0x1
movs r3, 0
bl AddTextPrinterParametrized
bl AddTextPrinterParameterized
strh r4, [r5, 0x8]
b _080C756A
.pool
asm/pokemon_summary_screen.s
+2 -2
View File
@@ -5362,7 +5362,7 @@ sub_81C6C3C: @ 81C6C3C
str r4, [sp, 0xC]
str r1, [sp, 0x10]
movs r1, 0x1
bl AddTextPrinterParametrized2
bl AddTextPrinterParameterized2
add sp, 0x14
pop {r3}
mov r8, r3
@@ -5408,7 +5408,7 @@ sub_81C6C94: @ 81C6C94
str r4, [sp, 0xC]
str r1, [sp, 0x10]
movs r1, 0x7
bl AddTextPrinterParametrized2
bl AddTextPrinterParameterized2
add sp, 0x14
pop {r3}
mov r8, r3
asm/pokenav.s
+2 -2
View File
@@ -21900,7 +21900,7 @@ _081D1D8C:
movs r1, 0x1
movs r2, 0x8
adds r3, r5, 0
bl AddTextPrinterParametrized2
bl AddTextPrinterParameterized2
_081D1DAC:
add sp, 0x34
pop {r4,r5}
@@ -23765,7 +23765,7 @@ sub_81D2BF4: @ 81D2BF4
str r0, [sp, 0xC]
movs r1, 0x1
adds r2, r4, 0
bl AddTextPrinterParametrized
bl AddTextPrinterParameterized
add sp, 0x10
pop {r4}
pop {r0}
asm/script_menu.s
+3 -3
View File
@@ -877,7 +877,7 @@ ScriptMenu_DisplayPCStartupPrompt: @ 80E2514
movs r0, 0
movs r1, 0x1
movs r3, 0
bl AddTextPrinterParametrized
bl AddTextPrinterParameterized
add sp, 0x10
pop {r0}
bx r0
@@ -1606,7 +1606,7 @@ _080E2B12:
movs r0, 0
movs r1, 0x1
movs r3, 0
bl AddTextPrinterParametrized
bl AddTextPrinterParameterized
b _080E2B70
.pool
_080E2B40:
@@ -1630,7 +1630,7 @@ _080E2B40:
movs r0, 0
movs r1, 0x1
movs r3, 0
bl AddTextPrinterParametrized
bl AddTextPrinterParameterized
_080E2B70:
add sp, 0x10
pop {r4}
asm/shop.s
+2 -2
View File
@@ -839,7 +839,7 @@ _080E0176:
adds r0, r6, 0
movs r1, 0x7
adds r3, r7, 0
bl AddTextPrinterParametrized2
bl AddTextPrinterParameterized2
_080E01AC:
add sp, 0x14
pop {r4-r7}
@@ -1201,7 +1201,7 @@ BuyMenuPrint: @ 80E04A4
str r6, [sp, 0xC]
str r1, [sp, 0x10]
movs r1, 0x1
bl AddTextPrinterParametrized2
bl AddTextPrinterParameterized2
add sp, 0x14
pop {r4-r6}
pop {r0}
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/start_menu.s
+1 -1
View File
@@ -1695,7 +1695,7 @@ _080A05AC:
movs r0, 0
movs r1, 0x1
movs r3, 0xFF
bl AddTextPrinterParametrized
bl AddTextPrinterParameterized
movs r0, 0
movs r1, 0x8
movs r2, 0xE
asm/trade.s
+6 -6
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
@@ -4609,7 +4609,7 @@ _080798BC:
movs r1, 0x1
movs r2, 0
movs r3, 0
bl AddTextPrinterParametrized2
bl AddTextPrinterParameterized2
adds r0, r5, 0
bl PutWindowTilemap
adds r0, r5, 0
@@ -14296,7 +14296,7 @@ sub_807F1A8: @ 807F1A8
movs r1, 0x1
movs r2, 0
movs r3, 0x2
bl AddTextPrinterParametrized2
bl AddTextPrinterParameterized2
adds r0, r5, 0
movs r1, 0x3
bl CopyWindowToVram
asm/trainer_card.s
+2 -2
View File
@@ -8258,7 +8258,7 @@ _080C6E08:
str r1, [sp, 0x10]
movs r1, 0x1
movs r3, 0x1
bl AddTextPrinterParametrized2
bl AddTextPrinterParameterized2
ldr r0, [sp, 0x4C]
mov r10, r4
cmp r0, 0x6
@@ -8410,7 +8410,7 @@ sub_80C6EAC: @ 80C6EAC
movs r1, 0x1
movs r2, 0
movs r3, 0x2
bl AddTextPrinterParametrized2
bl AddTextPrinterParameterized2
lsrs r5, 1
adds r0, r7, 0
ldr r1, [sp, 0x24]