diff options
| author | YamaArashi <shadow962@live.com> | 2016-08-30 22:58:43 -0700 |
|---|---|---|
| committer | YamaArashi <shadow962@live.com> | 2016-08-30 22:58:43 -0700 |
| commit | 521d95ae7070ec1cea5fc947d9352af600ab8c03 (patch) | |
| tree | f856957c9fb2014532621e9e28d494735a53d9e1 /asm | |
| parent | d5637762c3fd80a095061538c7bd874986e44b46 (diff) | |
trainer eye trainers
Diffstat (limited to 'asm')
| -rw-r--r-- | asm/macros.s | 13 | ||||
| -rw-r--r-- | asm/rom5.s | 16 |
2 files changed, 20 insertions, 9 deletions
diff --git a/asm/macros.s b/asm/macros.s index 49ed99695..42c35026e 100644 --- a/asm/macros.s +++ b/asm/macros.s @@ -118,7 +118,7 @@ .2byte \unknown .fill 4 @ padding .endm - + .macro credits_entry number, text .4byte \number .4byte \text @@ -136,3 +136,14 @@ .4byte \tile_addr .4byte \palette_addr .endm + + .macro trainer_eye_trainer opp_1, opp_2, opp_3, opp_4, opp_5, map_name + .2byte OPPONENT_\opp_1 + .2byte OPPONENT_\opp_2 + .2byte OPPONENT_\opp_3 + .2byte OPPONENT_\opp_4 + .2byte OPPONENT_\opp_5 + .2byte GROUP_\map_name + .2byte MAP_\map_name + .space 2 + .endm diff --git a/asm/rom5.s b/asm/rom5.s index 8c2ef7cbb..3a4002165 100644 --- a/asm/rom5.s +++ b/asm/rom5.s @@ -16350,7 +16350,7 @@ _08082BFA: pop {r0} bx r0 .align 2, 0 -_08082C00: .4byte gUnknown_0839AE70 +_08082C00: .4byte gTrainerEyeTrainers _08082C04: .4byte 0x02025734 _08082C08: .4byte 0x00000978 thumb_func_end sub_8082BD0 @@ -16370,7 +16370,7 @@ sub_8082C0C: @ 8082C0C pop {r1} bx r1 .align 2, 0 -_08082C28: .4byte gUnknown_0839AE70 +_08082C28: .4byte gTrainerEyeTrainers thumb_func_end sub_8082C0C thumb_func_start unref_sub_8082C2C @@ -16388,7 +16388,7 @@ unref_sub_8082C2C: @ 8082C2C pop {r1} bx r1 .align 2, 0 -_08082C48: .4byte gUnknown_0839AE70 +_08082C48: .4byte gTrainerEyeTrainers thumb_func_end unref_sub_8082C2C thumb_func_start sub_8082C4C @@ -16404,7 +16404,7 @@ sub_8082C4C: @ 8082C4C pop {r1} bx r1 .align 2, 0 -_08082C64: .4byte gUnknown_0839AE70 +_08082C64: .4byte gTrainerEyeTrainers thumb_func_end sub_8082C4C thumb_func_start sub_8082C68 @@ -16425,7 +16425,7 @@ sub_8082C68: @ 8082C68 lsrs r0, 24 b _08082C96 .align 2, 0 -_08082C8C: .4byte gUnknown_0839AE70 +_08082C8C: .4byte gTrainerEyeTrainers _08082C90: .4byte 0x0202ff5e _08082C94: movs r0, 0x1 @@ -16447,7 +16447,7 @@ sub_8082C9C: @ 8082C9C pop {r1} bx r1 .align 2, 0 -_08082CB0: .4byte gUnknown_0839AE70 +_08082CB0: .4byte gTrainerEyeTrainers _08082CB4: .4byte 0x0202ff5e thumb_func_end sub_8082C9C @@ -16462,7 +16462,7 @@ sub_8082CB8: @ 8082CB8 pop {r0} bx r0 .align 2, 0 -_08082CCC: .4byte gUnknown_0839AE70 +_08082CCC: .4byte gTrainerEyeTrainers _08082CD0: .4byte 0x0202ff5e thumb_func_end sub_8082CB8 @@ -254360,7 +254360,7 @@ _080F6D0E: _080F6D44: .4byte gUnknown_083DFEC4 _080F6D48: .4byte 0x0000d158 _080F6D4C: .4byte 0x020260ae -_080F6D50: .4byte gUnknown_0839AE70 +_080F6D50: .4byte gTrainerEyeTrainers _080F6D54: .4byte 0x0000cee8 _080F6D58: .4byte 0x0000ceec _080F6D5C: .4byte 0x0000ceea |