diff options
Diffstat (limited to 'asm')
| -rw-r--r-- | asm/battle_anim_8137220.s | 4 | ||||
| -rw-r--r-- | asm/battle_tower.s | 58 | ||||
| -rw-r--r-- | asm/item_menu.s | 4 | ||||
| -rw-r--r-- | asm/mon_markings.s | 4 | ||||
| -rw-r--r-- | asm/rom_header.inc | 9 |
5 files changed, 76 insertions, 3 deletions
diff --git a/asm/battle_anim_8137220.s b/asm/battle_anim_8137220.s index f88a938e7..bc81a2640 100644 --- a/asm/battle_anim_8137220.s +++ b/asm/battle_anim_8137220.s @@ -3992,7 +3992,11 @@ _0813930C: bl StrCpyDecodeToDisplayedStringBattle ldr r4, _08139354 @ =gUnknown_03004210 ldr r1, _08139374 @ =gDisplayedStringBattle +.ifdef ENGLISH movs r2, 0xDC +.else + movs r2, 0xDE +.endif lsls r2, 1 movs r0, 0x23 str r0, [sp] diff --git a/asm/battle_tower.s b/asm/battle_tower.s index ee8e18198..919544c48 100644 --- a/asm/battle_tower.s +++ b/asm/battle_tower.s @@ -3603,5 +3603,61 @@ _0813611E: .align 2, 0 _0813612C: .4byte gSaveBlock2 + 0x556 thumb_func_end sub_813610C - + +.ifdef GERMAN + thumb_func_start de_sub_81364AC +de_sub_81364AC: @ 81364AC + push {lr} + ldr r2, _DE_081364C0 @ =gSaveBlock2 + ldr r0, _DE_081364C4 @ =0x00000564 + adds r1, r2, r0 + ldrb r0, [r1] + cmp r0, 0xC8 + bne _DE_081364CC + ldr r1, _DE_081364C8 @ =0x00000499 + adds r0, r2, r1 + b _DE_081364F2 + .align 2, 0 +_DE_081364C0: .4byte gSaveBlock2 +_DE_081364C4: .4byte 0x00000564 +_DE_081364C8: .4byte 0x00000499 +_DE_081364CC: + cmp r0, 0x63 + bhi _DE_081364E4 + ldr r2, _DE_081364E0 @ =gBattleTowerTrainers + ldrb r1, [r1] + lsls r0, r1, 1 + adds r0, r1 + lsls r0, 3 + adds r0, r2 + b _DE_081364F2 + .align 2, 0 +_DE_081364E0: .4byte gBattleTowerTrainers +_DE_081364E4: + ldrb r0, [r1] + subs r0, 0x64 + movs r1, 0xA4 + muls r0, r1 + adds r0, r2 + adds r1, 0xA9 + adds r0, r1 +_DE_081364F2: + ldrb r0, [r0] + pop {r1} + bx r1 + thumb_func_end de_sub_81364AC + + thumb_func_start de_sub_81364F8 +de_sub_81364F8: @ 81364F8 + ldr r0, _DE_08136504 @ =gSaveBlock2 + ldr r1, _DE_08136508 @ =0x00000499 + adds r0, r1 + ldrb r0, [r0] + bx lr + .align 2, 0 +_DE_08136504: .4byte gSaveBlock2 +_DE_08136508: .4byte 0x00000499 + thumb_func_end de_sub_81364F8 +.endif + .align 2, 0 @ Don't pad with nop. diff --git a/asm/item_menu.s b/asm/item_menu.s index b76f24ccf..17e399160 100644 --- a/asm/item_menu.s +++ b/asm/item_menu.s @@ -2516,7 +2516,11 @@ _080A4470: bl ItemId_GetItem adds r1, r0, 0 adds r0, r7, 0 +.ifdef ENGLISH movs r2, 0x60 +.else + movs r2, 0x63 +.endif movs r3, 0 bl sub_8072C74 ldr r0, _080A44F0 @ =gStringVar1 diff --git a/asm/mon_markings.s b/asm/mon_markings.s index caab4e299..d227b17c1 100644 --- a/asm/mon_markings.s +++ b/asm/mon_markings.s @@ -720,7 +720,11 @@ _080F7770: ldr r2, [r1, 0x24] ldr r3, [sp, 0x58] asrs r0, r3, 16 +.ifdef ENGLISH adds r0, 0x20 +.else + adds r0, 0x18 +.endif strh r0, [r2, 0x20] ldr r2, [r1, 0x24] mov r0, r8 diff --git a/asm/rom_header.inc b/asm/rom_header.inc index a7348ad1f..a2932f1aa 100644 --- a/asm/rom_header.inc +++ b/asm/rom_header.inc @@ -30,9 +30,14 @@ RomHeaderGameTitle: RomHeaderGameCode: .ifdef SAPPHIRE - .ascii "AXPE" + .ascii "AXP" .else - .ascii "AXVE" + .ascii "AXV" + .endif + .ifdef ENGLISH + .ascii "E" + .else + .ascii "D" .endif RomHeaderMakerCode: |