Leahnaya/pokeruby
1
0
Fork 0
mirror of https://github.com/pret/pokeruby.git synced 2026-09-14 05:56:52 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

GabbyAndTySetScriptVarsToFieldObjectLocalIds

Browse Source
This commit is contained in:
PikalaxALT
2017-05-20 23:00:33 -04:00
parent f56442a2a1
commit ea181bea76
2 changed files with 40 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

113
asm/tv.s
View File

@@ -731,120 +731,9 @@ _080BDD5C:
_080BDD5E:
pop {r1}
bx r1
.align 2, 0
thumb_func_end sub_80BDD18
thumb_func_start GabbyAndTySetScriptVarsToFieldObjectLocalIds
GabbyAndTySetScriptVarsToFieldObjectLocalIds: @ 80BDD64
push {lr}
bl GabbyAndTyGetBattleNum
lsls r0, 24
lsrs r0, 24
subs r0, 0x1
cmp r0, 0x7
bhi _080BDE3C
lsls r0, 2
ldr r1, _080BDD80 @ =_080BDD84
adds r0, r1
ldr r0, [r0]
mov pc, r0
.align 2, 0
_080BDD80: .4byte _080BDD84
.align 2, 0
_080BDD84:
.4byte _080BDDA4
.4byte _080BDDB8
.4byte _080BDDCC
.4byte _080BDDE0
.4byte _080BDDF4
.4byte _080BDE08
.4byte _080BDE1C
.4byte _080BDE30
_080BDDA4:
ldr r1, _080BDDB0 @ =gSpecialVar_0x8004
movs r0, 0xE
strh r0, [r1]
ldr r1, _080BDDB4 @ =gSpecialVar_0x8005
movs r0, 0xD
b _080BDE3A
.align 2, 0
_080BDDB0: .4byte gSpecialVar_0x8004
_080BDDB4: .4byte gSpecialVar_0x8005
_080BDDB8:
ldr r1, _080BDDC4 @ =gSpecialVar_0x8004
movs r0, 0x5
strh r0, [r1]
ldr r1, _080BDDC8 @ =gSpecialVar_0x8005
movs r0, 0x6
b _080BDE3A
.align 2, 0
_080BDDC4: .4byte gSpecialVar_0x8004
_080BDDC8: .4byte gSpecialVar_0x8005
_080BDDCC:
ldr r1, _080BDDD8 @ =gSpecialVar_0x8004
movs r0, 0x12
strh r0, [r1]
ldr r1, _080BDDDC @ =gSpecialVar_0x8005
movs r0, 0x11
b _080BDE3A
.align 2, 0
_080BDDD8: .4byte gSpecialVar_0x8004
_080BDDDC: .4byte gSpecialVar_0x8005
_080BDDE0:
ldr r1, _080BDDEC @ =gSpecialVar_0x8004
movs r0, 0x15
strh r0, [r1]
ldr r1, _080BDDF0 @ =gSpecialVar_0x8005
movs r0, 0x16
b _080BDE3A
.align 2, 0
_080BDDEC: .4byte gSpecialVar_0x8004
_080BDDF0: .4byte gSpecialVar_0x8005
_080BDDF4:
ldr r1, _080BDE00 @ =gSpecialVar_0x8004
movs r0, 0x8
strh r0, [r1]
ldr r1, _080BDE04 @ =gSpecialVar_0x8005
movs r0, 0x9
b _080BDE3A
.align 2, 0
_080BDE00: .4byte gSpecialVar_0x8004
_080BDE04: .4byte gSpecialVar_0x8005
_080BDE08:
ldr r1, _080BDE14 @ =gSpecialVar_0x8004
movs r0, 0x13
strh r0, [r1]
ldr r1, _080BDE18 @ =gSpecialVar_0x8005
movs r0, 0x14
b _080BDE3A
.align 2, 0
_080BDE14: .4byte gSpecialVar_0x8004
_080BDE18: .4byte gSpecialVar_0x8005
_080BDE1C:
ldr r1, _080BDE28 @ =gSpecialVar_0x8004
movs r0, 0x17
strh r0, [r1]
ldr r1, _080BDE2C @ =gSpecialVar_0x8005
movs r0, 0x18
b _080BDE3A
.align 2, 0
_080BDE28: .4byte gSpecialVar_0x8004
_080BDE2C: .4byte gSpecialVar_0x8005
_080BDE30:
ldr r1, _080BDE40 @ =gSpecialVar_0x8004
movs r0, 0xA
strh r0, [r1]
ldr r1, _080BDE44 @ =gSpecialVar_0x8005
movs r0, 0xB
_080BDE3A:
strh r0, [r1]
_080BDE3C:
pop {r0}
bx r0
.align 2, 0
_080BDE40: .4byte gSpecialVar_0x8004
_080BDE44: .4byte gSpecialVar_0x8005
thumb_func_end GabbyAndTySetScriptVarsToFieldObjectLocalIds
.section .text_80BE8EC
thumb_func_start sub_80C04A0

39
src/tv.c
View File

@@ -153,6 +153,45 @@ void nullsub_21(void);
void sub_80BE188(void);
void sub_80BE320(void);
extern u8 GabbyAndTyGetBattleNum(void);
void GabbyAndTySetScriptVarsToFieldObjectLocalIds(void) {
switch (GabbyAndTyGetBattleNum()) {
case 1:
gSpecialVar_0x8004 = 0xE;
gSpecialVar_0x8005 = 0xD;
break;
case 2:
gSpecialVar_0x8004 = 0x5;
gSpecialVar_0x8005 = 0x6;
break;
case 3:
gSpecialVar_0x8004 = 0x12;
gSpecialVar_0x8005 = 0x11;
break;
case 4:
gSpecialVar_0x8004 = 0x15;
gSpecialVar_0x8005 = 0x16;
break;
case 5:
gSpecialVar_0x8004 = 0x8;
gSpecialVar_0x8005 = 0x9;
break;
case 6:
gSpecialVar_0x8004 = 0x13;
gSpecialVar_0x8005 = 0x14;
break;
case 7:
gSpecialVar_0x8004 = 0x17;
gSpecialVar_0x8005 = 0x18;
break;
case 8:
gSpecialVar_0x8004 = 0xA;
gSpecialVar_0x8005 = 0xB;
break;
}
}
void sub_80BDE48(void) {
switch (gSpecialVar_0x8005) {
case TVSHOW_FAN_CLUB_LETTER: