diff options
Diffstat (limited to 'asm')
| -rw-r--r-- | asm/rom5.s | 68 |
1 files changed, 34 insertions, 34 deletions
diff --git a/asm/rom5.s b/asm/rom5.s index 9dcd41577..15e00fc99 100644 --- a/asm/rom5.s +++ b/asm/rom5.s @@ -76027,7 +76027,7 @@ _080A0282: pop {r0} bx r0 .align 2, 0 -_080A0290: .4byte gUnknown_083CF594 +_080A0290: .4byte gContestMoves _080A0294: .4byte gMoveNames _080A0298: .4byte 0x020231cc thumb_func_end sub_80A015C @@ -76099,7 +76099,7 @@ _080A0304: bl sub_80A1FF8 b _080A033E .align 2, 0 -_080A0320: .4byte gUnknown_083CF594 +_080A0320: .4byte gContestMoves _080A0324: .4byte 0x02018000 _080A0328: .4byte gMoveNames _080A032C: @@ -76315,7 +76315,7 @@ _080A04BC: .align 2, 0 _080A04C0: .4byte 0x0000ffff _080A04C4: .4byte gUnknown_083CADD4 -_080A04C8: .4byte gUnknown_083CF594 +_080A04C8: .4byte gContestMoves thumb_func_end sub_80A0498 thumb_func_start sub_80A04CC @@ -76513,7 +76513,7 @@ _080A063A: _080A0648: .4byte 0x06006800 _080A064C: .4byte 0x0000ffff _080A0650: .4byte gUnknown_083D00AC -_080A0654: .4byte gUnknown_083CF594 +_080A0654: .4byte gContestMoves _080A0658: .4byte 0x00001039 _080A065C: .4byte 0x0000044c _080A0660: .4byte 0x0000103d @@ -100212,7 +100212,7 @@ _080ABE20: pop {r0} bx r0 .align 2, 0 -_080ABE74: .4byte gUnknown_083CF594 +_080ABE74: .4byte gContestMoves _080ABE78: .4byte gUnknown_083CC3A7 _080ABE7C: .4byte gMoveNames _080ABE80: .4byte gUnknown_083CA341 @@ -102564,7 +102564,7 @@ _080AD262: .align 2, 0 _080AD270: .4byte 0x020233cc _080AD274: .4byte gUnknown_083CC2D8 -_080AD278: .4byte gUnknown_083CF594 +_080AD278: .4byte gContestMoves _080AD27C: .4byte 0x02019260 _080AD280: .4byte 0x020231cc _080AD284: .4byte 0x02038572 @@ -105753,7 +105753,7 @@ sub_80AEB68: @ 80AEB68 mov pc, r0 .align 2, 0 _080AEB90: .4byte gUnknown_083D00AC -_080AEB94: .4byte gUnknown_083CF594 +_080AEB94: .4byte gContestMoves _080AEB98: .4byte _080AEB9C .align 2, 0 _080AEB9C: @@ -105866,7 +105866,7 @@ _080AEC48: b _080AEC9C .align 2, 0 _080AEC74: .4byte 0x03004210 -_080AEC78: .4byte gUnknown_083CF594 +_080AEC78: .4byte gContestMoves _080AEC7C: .4byte 0x00004040 _080AEC80: .4byte gUnknown_083D00AC _080AEC84: .4byte gUnknown_083CADD4 @@ -110857,7 +110857,7 @@ _080B1176: b _080B11D8 .align 2, 0 _080B11B8: .4byte 0x02019260 -_080B11BC: .4byte gUnknown_083CF594 +_080B11BC: .4byte gContestMoves _080B11C0: lsls r4, r6, 3 subs r1, r4, r6 @@ -111027,7 +111027,7 @@ _080B12EC: orrs r0, r1 b _080B1320 .align 2, 0 -_080B1310: .4byte gUnknown_083CF594 +_080B1310: .4byte gContestMoves _080B1314: .4byte 0x02019260 _080B1318: ldrb r1, [r3, 0x15] @@ -111270,7 +111270,7 @@ _080B14CC: .4byte 0x02038572 _080B14D0: .4byte 0x020232cc _080B14D4: .4byte 0x02019260 _080B14D8: .4byte gMoveNames -_080B14DC: .4byte gUnknown_083CF594 +_080B14DC: .4byte gContestMoves _080B14E0: .4byte 0x020233cc _080B14E4: .4byte gUnknown_083CC280 _080B14E8: @@ -111930,7 +111930,7 @@ sub_80B19FC: @ 80B19FC bx lr .align 2, 0 _080B1A20: .4byte gUnknown_083CC5B4 -_080B1A24: .4byte gUnknown_083CF594 +_080B1A24: .4byte gContestMoves _080B1A28: .4byte 0x0203869c thumb_func_end sub_80B19FC @@ -124971,7 +124971,7 @@ _080B7D6E: ldrb r0, [r0] b _080B7D82 .align 2, 0 -_080B7D78: .4byte gUnknown_083CF594 +_080B7D78: .4byte gContestMoves _080B7D7C: .4byte gUnknown_083D016C _080B7D80: movs r0, 0 @@ -125602,7 +125602,7 @@ sub_80B81D4: @ 80B81D4 bx r0 .align 2, 0 _080B8208: .4byte 0x020192d0 -_080B820C: .4byte gUnknown_083CF594 +_080B820C: .4byte gContestMoves thumb_func_end sub_80B81D4 thumb_func_start sub_80B8210 @@ -125861,7 +125861,7 @@ _080B83BC: b _080B83FE .align 2, 0 _080B83F0: .4byte 0x02019260 -_080B83F4: .4byte gUnknown_083CF594 +_080B83F4: .4byte gContestMoves _080B83F8: .4byte gUnknown_083D016C _080B83FC: movs r0, 0 @@ -126165,7 +126165,7 @@ _080B8636: _080B863C: .4byte 0x02038696 _080B8640: .4byte 0x020192d0 _080B8644: .4byte gUnknown_083D00AC -_080B8648: .4byte gUnknown_083CF594 +_080B8648: .4byte gContestMoves thumb_func_end sub_80B85F8 thumb_func_start sub_80B864C @@ -126208,7 +126208,7 @@ _080B868A: _080B8690: .4byte 0x02038696 _080B8694: .4byte 0x020192d0 _080B8698: .4byte gUnknown_083D00AC -_080B869C: .4byte gUnknown_083CF594 +_080B869C: .4byte gContestMoves thumb_func_end sub_80B864C thumb_func_start ContestEffectFunc_080E5EB4 @@ -126615,7 +126615,7 @@ _080B8994: pop {r0} bx r0 .align 2, 0 -_080B899C: .4byte gUnknown_083CF594 +_080B899C: .4byte gContestMoves _080B89A0: .4byte gUnknown_083D00AC thumb_func_end ContestEffectFunc_080E611C @@ -126689,7 +126689,7 @@ _080B89D4: b _080B8A3C .align 2, 0 _080B8A28: .4byte 0x020192d0 -_080B8A2C: .4byte gUnknown_083CF594 +_080B8A2C: .4byte gContestMoves _080B8A30: .4byte gUnknown_083D00AC _080B8A34: adds r7, 0x1C @@ -127346,7 +127346,7 @@ _080B8EEA: pop {r0} bx r0 .align 2, 0 -_080B8EF0: .4byte gUnknown_083CF594 +_080B8EF0: .4byte gContestMoves _080B8EF4: .4byte 0x020192d0 _080B8EF8: .4byte 0x0203869c thumb_func_end sub_80B8EBC @@ -127558,7 +127558,7 @@ _080B9052: b _080B9086 .align 2, 0 _080B907C: .4byte 0x020192d0 -_080B9080: .4byte gUnknown_083CF594 +_080B9080: .4byte gContestMoves _080B9084: movs r0, 0xA _080B9086: @@ -358272,7 +358272,7 @@ sub_8129434: @ 8129434 .align 2, 0 _08129460: .4byte 0x02038570 _08129464: .4byte 0x020192e4 -_08129468: .4byte gUnknown_083CF594 +_08129468: .4byte gContestMoves _0812946C: .4byte 0x02039238 thumb_func_end sub_8129434 @@ -358378,7 +358378,7 @@ sub_81294F0: @ 81294F0 _08129524: .4byte 0x02038570 _08129528: .4byte 0x020192e4 _0812952C: .4byte gUnknown_083D00AC -_08129530: .4byte gUnknown_083CF594 +_08129530: .4byte gContestMoves _08129534: .4byte 0x02039238 thumb_func_end sub_81294F0 @@ -358505,7 +358505,7 @@ _08129608: _08129610: .4byte 0x02038570 _08129614: .4byte 0x020192e4 _08129618: .4byte gUnknown_083D00AC -_0812961C: .4byte gUnknown_083CF594 +_0812961C: .4byte gContestMoves _08129620: .4byte 0x02039238 _08129624: movs r0, 0 @@ -358611,7 +358611,7 @@ _081296CC: _081296D4: .4byte 0x02038570 _081296D8: .4byte 0x020192e4 _081296DC: .4byte gUnknown_083D00AC -_081296E0: .4byte gUnknown_083CF594 +_081296E0: .4byte gContestMoves _081296E4: .4byte 0x02039238 _081296E8: movs r0, 0 @@ -358703,7 +358703,7 @@ sub_8129740: @ 8129740 _08129784: .4byte 0x02038570 _08129788: .4byte 0x020192e4 _0812978C: .4byte gUnknown_083D00AC -_08129790: .4byte gUnknown_083CF594 +_08129790: .4byte gContestMoves _08129794: .4byte 0x02039238 thumb_func_end sub_8129740 @@ -358886,7 +358886,7 @@ sub_8129898: @ 8129898 _081298DC: .4byte 0x02038570 _081298E0: .4byte 0x020192e4 _081298E4: .4byte gUnknown_083D00AC -_081298E8: .4byte gUnknown_083CF594 +_081298E8: .4byte gContestMoves _081298EC: .4byte 0x02039238 thumb_func_end sub_8129898 @@ -359831,7 +359831,7 @@ _08129F9C: bx r0 .align 2, 0 _08129FAC: .4byte 0x02039238 -_08129FB0: .4byte gUnknown_083CF594 +_08129FB0: .4byte gContestMoves _08129FB4: .4byte 0x02019260 _08129FB8: .4byte 0x020192e4 thumb_func_end sub_8129F64 @@ -360601,7 +360601,7 @@ sub_812A4F4: @ 812A4F4 .align 2, 0 _0812A52C: .4byte 0x02039238 _0812A530: .4byte 0x02019204 -_0812A534: .4byte gUnknown_083CF594 +_0812A534: .4byte gContestMoves thumb_func_end sub_812A4F4 thumb_func_start sub_812A538 @@ -360953,7 +360953,7 @@ sub_812A774: @ 812A774 _0812A7B4: .4byte 0x02039238 _0812A7B8: .4byte 0x02019204 _0812A7BC: .4byte gUnknown_083D00AC -_0812A7C0: .4byte gUnknown_083CF594 +_0812A7C0: .4byte gContestMoves thumb_func_end sub_812A774 thumb_func_start sub_812A7C4 @@ -379662,7 +379662,7 @@ _08133860: lsls r4, r5, 1 b _081338C2 .align 2, 0 -_0813389C: .4byte gUnknown_083CF594 +_0813389C: .4byte gContestMoves _081338A0: .4byte gUnknown_083CAF70 _081338A4: lsls r4, r5, 1 @@ -379862,7 +379862,7 @@ _08133A1A: b _08133A58 .align 2, 0 _08133A34: .4byte gUnknown_083D00AC -_08133A38: .4byte gUnknown_083CF594 +_08133A38: .4byte gContestMoves _08133A3C: .4byte 0x030007b0 _08133A40: .4byte 0x02020004 _08133A44: @@ -379924,7 +379924,7 @@ _08133A9A: b _08133AD8 .align 2, 0 _08133AB4: .4byte gUnknown_083D00AC -_08133AB8: .4byte gUnknown_083CF594 +_08133AB8: .4byte gContestMoves _08133ABC: .4byte 0x030007b0 _08133AC0: .4byte 0x02020004 _08133AC4: @@ -380037,7 +380037,7 @@ _08133B8C: .4byte 0x02020004 _08133B90: .4byte gUnknown_08402E3D _08133B94: .4byte gUnknown_08402E24 _08133B98: .4byte gUnknown_083CADD4 -_08133B9C: .4byte gUnknown_083CF594 +_08133B9C: .4byte gContestMoves _08133BA0: movs r4, 0 subs r6, r5, 0x1 |