Merge branch 'doc-ttower' of https://github.com/GriffinRichards/pokefirered into doc-ttower
This commit is contained in:
GriffinR
+14
-14
@@ -773,10 +773,10 @@ _08080D44:
|
||||
_08080D50: .4byte sub_8080F78
|
||||
_08080D54:
|
||||
bl GetLinkPlayerCount_2
|
||||
ldr r4, _08080D7C @ =gUnknown_3005030
|
||||
ldr r4, _08080D7C @ =gFieldLinkPlayerCount
|
||||
strb r0, [r4]
|
||||
bl GetMultiplayerId
|
||||
ldr r1, _08080D80 @ =gUnknown_300502C
|
||||
ldr r1, _08080D80 @ =gLocalLinkPlayerId
|
||||
strb r0, [r1]
|
||||
ldrb r0, [r4]
|
||||
bl sub_800A900
|
||||
@@ -790,8 +790,8 @@ _08080D74:
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_08080D7C: .4byte gUnknown_3005030
|
||||
_08080D80: .4byte gUnknown_300502C
|
||||
_08080D7C: .4byte gFieldLinkPlayerCount
|
||||
_08080D80: .4byte gLocalLinkPlayerId
|
||||
_08080D84: .4byte gBlockSendBuffer
|
||||
_08080D88: .4byte sub_8080E6C
|
||||
thumb_func_end sub_8080CDC
|
||||
@@ -876,10 +876,10 @@ _08080E18: .4byte gTasks
|
||||
_08080E1C: .4byte sub_8080F78
|
||||
_08080E20:
|
||||
bl GetLinkPlayerCount_2
|
||||
ldr r4, _08080E58 @ =gUnknown_3005030
|
||||
ldr r4, _08080E58 @ =gFieldLinkPlayerCount
|
||||
strb r0, [r4]
|
||||
bl GetMultiplayerId
|
||||
ldr r1, _08080E5C @ =gUnknown_300502C
|
||||
ldr r1, _08080E5C @ =gLocalLinkPlayerId
|
||||
strb r0, [r1]
|
||||
ldrb r0, [r4]
|
||||
bl sub_800A900
|
||||
@@ -899,8 +899,8 @@ _08080E50:
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_08080E58: .4byte gUnknown_3005030
|
||||
_08080E5C: .4byte gUnknown_300502C
|
||||
_08080E58: .4byte gFieldLinkPlayerCount
|
||||
_08080E5C: .4byte gLocalLinkPlayerId
|
||||
_08080E60: .4byte gBlockSendBuffer
|
||||
_08080E64: .4byte gTasks
|
||||
_08080E68: .4byte sub_8080E6C
|
||||
@@ -1536,7 +1536,7 @@ _08081344:
|
||||
_0808135C:
|
||||
movs r0, 0x1
|
||||
movs r1, 0
|
||||
bl fade_screen
|
||||
bl FadeScreen
|
||||
ldr r1, _08081374 @ =gLinkType
|
||||
ldr r2, _08081378 @ =0x00002211
|
||||
adds r0, r2, 0
|
||||
@@ -1693,7 +1693,7 @@ _08081480:
|
||||
_080814A0:
|
||||
movs r0, 0x1
|
||||
movs r1, 0
|
||||
bl fade_screen
|
||||
bl FadeScreen
|
||||
ldr r0, _080814BC @ =gLinkType
|
||||
ldr r2, _080814C0 @ =0x00002211
|
||||
adds r1, r2, 0
|
||||
@@ -1931,7 +1931,7 @@ sub_8081668: @ 8081668
|
||||
ldrh r0, [r0]
|
||||
cmp r0, 0x5
|
||||
beq _0808170A
|
||||
ldr r0, _080816BC @ =gUnknown_300502C
|
||||
ldr r0, _080816BC @ =gLocalLinkPlayerId
|
||||
ldrb r0, [r0]
|
||||
movs r5, 0x1
|
||||
eors r0, r5
|
||||
@@ -1951,7 +1951,7 @@ sub_8081668: @ 8081668
|
||||
_080816B0: .4byte gBattleTypeFlags
|
||||
_080816B4: .4byte 0x0000ffdf
|
||||
_080816B8: .4byte gSpecialVar_0x8004
|
||||
_080816BC: .4byte gUnknown_300502C
|
||||
_080816BC: .4byte gLocalLinkPlayerId
|
||||
_080816C0: .4byte gWirelessCommType
|
||||
_080816C4: .4byte gBattleOutcome
|
||||
_080816C8:
|
||||
@@ -2179,7 +2179,7 @@ _08081882:
|
||||
bl ScriptContext2_Enable
|
||||
movs r0, 0x1
|
||||
movs r1, 0
|
||||
bl fade_screen
|
||||
bl FadeScreen
|
||||
bl ClearLinkCallback_2
|
||||
b _080818B8
|
||||
_08081894:
|
||||
@@ -2255,7 +2255,7 @@ _0808191A:
|
||||
bl ScriptContext2_Enable
|
||||
movs r0, 0x1
|
||||
movs r1, 0
|
||||
bl fade_screen
|
||||
bl FadeScreen
|
||||
bl Rfu_set_zero
|
||||
b _08081950
|
||||
_0808192C:
|
||||
|
||||
@@ -154,8 +154,8 @@ _080689EC: .4byte gObjectEvents
|
||||
_080689F0: .4byte gPlayerAvatar
|
||||
thumb_func_end FreezeObjectEventsExceptOne
|
||||
|
||||
thumb_func_start npc_sync_anim_pause_bits
|
||||
npc_sync_anim_pause_bits: @ 80689F4
|
||||
thumb_func_start UnfreezeObjectEvent
|
||||
UnfreezeObjectEvent: @ 80689F4
|
||||
push {r4,r5,lr}
|
||||
adds r5, r0, 0
|
||||
ldrh r2, [r5]
|
||||
@@ -207,7 +207,7 @@ _08068A4C:
|
||||
.align 2, 0
|
||||
_08068A54: .4byte 0x00000101
|
||||
_08068A58: .4byte gSprites
|
||||
thumb_func_end npc_sync_anim_pause_bits
|
||||
thumb_func_end UnfreezeObjectEvent
|
||||
|
||||
thumb_func_start UnfreezeObjectEvents
|
||||
UnfreezeObjectEvents: @ 8068A5C
|
||||
@@ -224,7 +224,7 @@ _08068A62:
|
||||
cmp r0, 0
|
||||
beq _08068A78
|
||||
adds r0, r1, 0
|
||||
bl npc_sync_anim_pause_bits
|
||||
bl UnfreezeObjectEvent
|
||||
_08068A78:
|
||||
adds r0, r4, 0x1
|
||||
lsls r0, 24
|
||||
|
||||
@@ -1427,8 +1427,8 @@ SpawnSpecialObjectEventParameterized: @ 805E830
|
||||
_0805E894: .4byte 0xfff90000
|
||||
thumb_func_end SpawnSpecialObjectEventParameterized
|
||||
|
||||
thumb_func_start show_sprite
|
||||
show_sprite: @ 805E898
|
||||
thumb_func_start TrySpawnObjectEvent
|
||||
TrySpawnObjectEvent: @ 805E898
|
||||
push {r4-r7,lr}
|
||||
sub sp, 0x8
|
||||
lsls r0, 24
|
||||
@@ -1468,7 +1468,7 @@ _0805E8E0:
|
||||
pop {r4-r7}
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end show_sprite
|
||||
thumb_func_end TrySpawnObjectEvent
|
||||
|
||||
thumb_func_start sub_805E8E8
|
||||
sub_805E8E8: @ 805E8E8
|
||||
@@ -13157,7 +13157,7 @@ _08063CC8:
|
||||
bl ObjectEventClearAnimIfSpecialAnimActive
|
||||
_08063CCE:
|
||||
adds r0, r4, 0
|
||||
bl npc_sync_anim_pause_bits
|
||||
bl UnfreezeObjectEvent
|
||||
movs r3, 0
|
||||
strb r5, [r4, 0x1C]
|
||||
ldrb r0, [r4]
|
||||
|
||||
@@ -2445,8 +2445,8 @@ _0805C560: .4byte gObjectEvents
|
||||
_0805C564: .4byte gPlayerAvatar
|
||||
thumb_func_end PlayerGetDestCoords
|
||||
|
||||
thumb_func_start plaer_get_pos_including_state_based_drift
|
||||
plaer_get_pos_including_state_based_drift: @ 805C568
|
||||
thumb_func_start player_get_pos_including_state_based_drift
|
||||
player_get_pos_including_state_based_drift: @ 805C568
|
||||
push {r4,r5,lr}
|
||||
adds r4, r0, 0
|
||||
adds r5, r1, 0
|
||||
@@ -2580,7 +2580,7 @@ _0805C6BC:
|
||||
pop {r4,r5}
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end plaer_get_pos_including_state_based_drift
|
||||
thumb_func_end player_get_pos_including_state_based_drift
|
||||
|
||||
thumb_func_start GetPlayerFacingDirection
|
||||
GetPlayerFacingDirection: @ 805C6C4
|
||||
|
||||
+3
-3
@@ -1584,8 +1584,8 @@ _0807A810: .4byte 0x000006c6
|
||||
_0807A814: .4byte 0x000006c2
|
||||
thumb_func_end sub_807A7C4
|
||||
|
||||
thumb_func_start fade_screen
|
||||
fade_screen: @ 807A818
|
||||
thumb_func_start FadeScreen
|
||||
FadeScreen: @ 807A818
|
||||
push {r4,r5,lr}
|
||||
sub sp, 0x4
|
||||
lsls r0, 24
|
||||
@@ -1735,7 +1735,7 @@ _0807A934: .4byte gUnknown_2037F34
|
||||
_0807A938: .4byte 0x000006c6
|
||||
_0807A93C: .4byte 0x000006ca
|
||||
_0807A940: .4byte 0x000006cb
|
||||
thumb_func_end fade_screen
|
||||
thumb_func_end FadeScreen
|
||||
|
||||
thumb_func_start FieldWeather_StartFadingOutCreditsMap
|
||||
FieldWeather_StartFadingOutCreditsMap: @ 807A944
|
||||
|
||||
+222
-175
@@ -1,257 +1,257 @@
|
||||
.macro if_random_less_than percent, address
|
||||
.macro if_random_less_than percent:req, ptr:req
|
||||
.byte 0x00
|
||||
.byte \percent
|
||||
.4byte \address
|
||||
.4byte \ptr
|
||||
.endm
|
||||
|
||||
@ unused
|
||||
.macro if_random_greater_than percent, address
|
||||
.macro if_random_greater_than percent:req, ptr:req
|
||||
.byte 0x01
|
||||
.byte \percent
|
||||
.4byte \address
|
||||
.4byte \ptr
|
||||
.endm
|
||||
|
||||
@ unused
|
||||
.macro if_random_equal address
|
||||
.macro if_random_equal ptr:req
|
||||
.byte 0x02
|
||||
.4byte \address
|
||||
.4byte \ptr
|
||||
.endm
|
||||
|
||||
@ unused
|
||||
.macro if_random_not_equal address
|
||||
.macro if_random_not_equal ptr:req
|
||||
.byte 0x03
|
||||
.4byte \address
|
||||
.4byte \ptr
|
||||
.endm
|
||||
|
||||
.macro score score
|
||||
.macro score score:req
|
||||
.byte 0x04
|
||||
.byte \score
|
||||
.endm
|
||||
|
||||
.macro if_hp_less_than target, percent, address
|
||||
.macro if_hp_less_than battler:req, percent:req, ptr:req
|
||||
.byte 0x05
|
||||
.byte \target
|
||||
.byte \battler
|
||||
.byte \percent
|
||||
.4byte \address
|
||||
.4byte \ptr
|
||||
.endm
|
||||
|
||||
.macro if_hp_more_than target, percent, address
|
||||
.macro if_hp_more_than battler:req, percent:req, ptr:req
|
||||
.byte 0x06
|
||||
.byte \target
|
||||
.byte \battler
|
||||
.byte \percent
|
||||
.4byte \address
|
||||
.4byte \ptr
|
||||
.endm
|
||||
|
||||
.macro if_hp_equal target, percent, address
|
||||
.macro if_hp_equal battler:req, percent:req, ptr:req
|
||||
.byte 0x07
|
||||
.byte \target
|
||||
.byte \battler
|
||||
.byte \percent
|
||||
.4byte \address
|
||||
.4byte \ptr
|
||||
.endm
|
||||
|
||||
.macro if_hp_not_equal target, percent, address
|
||||
.macro if_hp_not_equal battler:req, percent:req, ptr:req
|
||||
.byte 0x08
|
||||
.byte \target
|
||||
.byte \battler
|
||||
.byte \percent
|
||||
.4byte \address
|
||||
.4byte \ptr
|
||||
.endm
|
||||
|
||||
.macro if_status target, status, address
|
||||
.macro if_status battler:req, status:req, ptr:req
|
||||
.byte 0x09
|
||||
.byte \target
|
||||
.byte \battler
|
||||
.4byte \status
|
||||
.4byte \address
|
||||
.4byte \ptr
|
||||
.endm
|
||||
|
||||
.macro if_not_status target, status, address
|
||||
.macro if_not_status battler:req, status:req, ptr:req
|
||||
.byte 0x0a
|
||||
.byte \target
|
||||
.byte \battler
|
||||
.4byte \status
|
||||
.4byte \address
|
||||
.4byte \ptr
|
||||
.endm
|
||||
|
||||
.macro if_status2 target, status, address
|
||||
.macro if_status2 battler:req, status:req, ptr:req
|
||||
.byte 0x0b
|
||||
.byte \target
|
||||
.byte \battler
|
||||
.4byte \status
|
||||
.4byte \address
|
||||
.4byte \ptr
|
||||
.endm
|
||||
|
||||
.macro if_not_status2 target, status, address
|
||||
.macro if_not_status2 battler:req, status:req, ptr:req
|
||||
.byte 0x0c
|
||||
.byte \target
|
||||
.byte \battler
|
||||
.4byte \status
|
||||
.4byte \address
|
||||
.4byte \ptr
|
||||
.endm
|
||||
|
||||
.macro if_status3 target, status, address
|
||||
.macro if_status3 battler:req, status:req, ptr:req
|
||||
.byte 0x0d
|
||||
.byte \target
|
||||
.byte \battler
|
||||
.4byte \status
|
||||
.4byte \address
|
||||
.4byte \ptr
|
||||
.endm
|
||||
|
||||
.macro if_not_status3 target, status, address
|
||||
.macro if_not_status3 battler:req, status:req, ptr:req
|
||||
.byte 0x0e
|
||||
.byte \target
|
||||
.byte \battler
|
||||
.4byte \status
|
||||
.4byte \address
|
||||
.4byte \ptr
|
||||
.endm
|
||||
|
||||
.macro if_status4 target, status, address
|
||||
.macro if_side_affecting battler:req, status:req, ptr:req
|
||||
.byte 0x0f
|
||||
.byte \target
|
||||
.byte \battler
|
||||
.4byte \status
|
||||
.4byte \address
|
||||
.4byte \ptr
|
||||
.endm
|
||||
|
||||
.macro if_not_status4 target, status, address
|
||||
.macro if_not_side_affecting battler:req, status:req, ptr:req
|
||||
.byte 0x10
|
||||
.byte \target
|
||||
.byte \battler
|
||||
.4byte \status
|
||||
.4byte \address
|
||||
.4byte \ptr
|
||||
.endm
|
||||
|
||||
.macro if_less_than value, address
|
||||
.macro if_less_than value:req, ptr:req
|
||||
.byte 0x11
|
||||
.byte \value
|
||||
.4byte \address
|
||||
.4byte \ptr
|
||||
.endm
|
||||
|
||||
.macro if_more_than value, address
|
||||
.macro if_more_than value:req, ptr:req
|
||||
.byte 0x12
|
||||
.byte \value
|
||||
.4byte \address
|
||||
.4byte \ptr
|
||||
.endm
|
||||
|
||||
.macro if_equal value, address
|
||||
.macro if_equal value:req, ptr:req
|
||||
.byte 0x13
|
||||
.byte \value
|
||||
.4byte \address
|
||||
.4byte \ptr
|
||||
.endm
|
||||
|
||||
.macro if_not_equal value, address
|
||||
.macro if_not_equal value:req, ptr:req
|
||||
.byte 0x14
|
||||
.byte \value
|
||||
.4byte \address
|
||||
.4byte \ptr
|
||||
.endm
|
||||
|
||||
.macro if_less_than_32 value, address
|
||||
.macro if_less_than_ptr value:req, ptr:req
|
||||
.byte 0x15
|
||||
.4byte \value
|
||||
.4byte \address
|
||||
.4byte \ptr
|
||||
.endm
|
||||
|
||||
.macro if_more_than_32 value, address
|
||||
.macro if_more_than_ptr value:req, ptr:req
|
||||
.byte 0x16
|
||||
.4byte \value
|
||||
.4byte \address
|
||||
.4byte \ptr
|
||||
.endm
|
||||
|
||||
.macro if_equal_32 value, address
|
||||
.macro if_equal_ptr value:req, ptr:req
|
||||
.byte 0x17
|
||||
.4byte \value
|
||||
.4byte \address
|
||||
.4byte \ptr
|
||||
.endm
|
||||
|
||||
.macro if_not_equal_32 value, address
|
||||
.macro if_not_equal_ptr value:req, ptr:req
|
||||
.byte 0x18
|
||||
.4byte \value
|
||||
.4byte \address
|
||||
.4byte \ptr
|
||||
.endm
|
||||
|
||||
.macro if_move move, address
|
||||
.macro if_move move:req, ptr:req
|
||||
.byte 0x19
|
||||
.2byte \move
|
||||
.4byte \address
|
||||
.4byte \ptr
|
||||
.endm
|
||||
|
||||
.macro if_not_move move, address
|
||||
.macro if_not_move move:req, ptr:req
|
||||
.byte 0x1a
|
||||
.2byte \move
|
||||
.4byte \address
|
||||
.4byte \ptr
|
||||
.endm
|
||||
|
||||
.macro if_in_bytes list, address
|
||||
.macro if_in_bytes list:req, ptr:req
|
||||
.byte 0x1b
|
||||
.4byte \list
|
||||
.4byte \address
|
||||
.4byte \ptr
|
||||
.endm
|
||||
|
||||
.macro if_not_in_bytes list, address
|
||||
.macro if_not_in_bytes list:req, ptr:req
|
||||
.byte 0x1c
|
||||
.4byte \list
|
||||
.4byte \address
|
||||
.4byte \ptr
|
||||
.endm
|
||||
|
||||
.macro if_in_words list, address
|
||||
.macro if_in_hwords list:req, ptr:req
|
||||
.byte 0x1d
|
||||
.4byte \list
|
||||
.4byte \address
|
||||
.4byte \ptr
|
||||
.endm
|
||||
|
||||
.macro if_not_in_words list, address
|
||||
.macro if_not_in_hwords list:req, ptr:req
|
||||
.byte 0x1e
|
||||
.4byte \list
|
||||
.4byte \address
|
||||
.4byte \ptr
|
||||
.endm
|
||||
|
||||
.macro if_user_can_damage address
|
||||
.macro if_user_has_attacking_move ptr:req
|
||||
.byte 0x1f
|
||||
.4byte \address
|
||||
.4byte \ptr
|
||||
.endm
|
||||
|
||||
.macro if_user_cant_damage address
|
||||
.macro if_user_has_no_attacking_moves ptr:req
|
||||
.byte 0x20
|
||||
.4byte \address
|
||||
.4byte \ptr
|
||||
.endm
|
||||
|
||||
.macro get_turn_count
|
||||
.byte 0x21
|
||||
.endm
|
||||
|
||||
.macro get_type byte
|
||||
.macro get_type byte:req
|
||||
.byte 0x22
|
||||
.byte \byte
|
||||
.endm
|
||||
|
||||
@ unused
|
||||
.macro get_move_power
|
||||
.macro get_considered_move_power
|
||||
.byte 0x23
|
||||
.endm
|
||||
|
||||
.macro is_most_powerful_move
|
||||
.macro get_how_powerful_move_is
|
||||
.byte 0x24
|
||||
.endm
|
||||
|
||||
.macro get_move target
|
||||
.macro get_last_used_move battler:req
|
||||
.byte 0x25
|
||||
.byte \target
|
||||
.byte \battler
|
||||
.endm
|
||||
|
||||
.macro if_arg_equal type, address
|
||||
.macro if_equal_ type:req, ptr:req
|
||||
.byte 0x26
|
||||
.byte \type
|
||||
.4byte \address
|
||||
.4byte \ptr
|
||||
.endm
|
||||
|
||||
@ unused
|
||||
.macro if_arg_not_equal type, address
|
||||
.macro if_not_equal_ type:req, ptr:req
|
||||
.byte 0x27
|
||||
.byte \type
|
||||
.4byte \address
|
||||
.4byte \ptr
|
||||
.endm
|
||||
|
||||
.macro if_would_go_first target, address
|
||||
.macro if_would_go_first battler:req, ptr:req
|
||||
.byte 0x28
|
||||
.byte \target
|
||||
.4byte \address
|
||||
.byte \battler
|
||||
.4byte \ptr
|
||||
.endm
|
||||
|
||||
.macro if_would_not_go_first target, address
|
||||
.macro if_would_not_go_first battler:req, ptr:req
|
||||
.byte 0x29
|
||||
.byte \target
|
||||
.4byte \address
|
||||
.byte \battler
|
||||
.4byte \ptr
|
||||
.endm
|
||||
|
||||
@ nullsub
|
||||
@@ -264,9 +264,9 @@
|
||||
.byte 0x2b
|
||||
.endm
|
||||
|
||||
.macro count_alive_pokemon target
|
||||
.macro count_alive_pokemon battler:req
|
||||
.byte 0x2c
|
||||
.byte \target
|
||||
.byte \battler
|
||||
.endm
|
||||
|
||||
@ unused
|
||||
@@ -274,24 +274,24 @@
|
||||
.byte 0x2d
|
||||
.endm
|
||||
|
||||
.macro get_effect
|
||||
.macro get_considered_move_effect
|
||||
.byte 0x2e
|
||||
.endm
|
||||
|
||||
.macro get_ability target
|
||||
.macro get_ability battler:req
|
||||
.byte 0x2f
|
||||
.byte \target
|
||||
.byte \battler
|
||||
.endm
|
||||
|
||||
@ unused
|
||||
.macro get_highest_possible_damage
|
||||
.macro get_highest_type_effectiveness
|
||||
.byte 0x30
|
||||
.endm
|
||||
|
||||
.macro if_damage_bonus value, address
|
||||
.macro if_type_effectiveness effectiveness:req, ptr:req
|
||||
.byte 0x31
|
||||
.byte \value
|
||||
.4byte \address
|
||||
.byte \effectiveness
|
||||
.4byte \ptr
|
||||
.endm
|
||||
|
||||
@ nullsub
|
||||
@@ -304,162 +304,162 @@
|
||||
.byte 0x33
|
||||
.endm
|
||||
|
||||
.macro if_status_in_party target, status, address
|
||||
.macro if_status_in_party battler:req, status:req, ptr:req
|
||||
.byte 0x34
|
||||
.byte \target
|
||||
.byte \battler
|
||||
.4byte \status
|
||||
.4byte \address
|
||||
.4byte \ptr
|
||||
.endm
|
||||
|
||||
@ bugged
|
||||
.macro if_status_not_in_party target, status, address
|
||||
.macro if_status_not_in_party battler:req, status:req, ptr:req
|
||||
.byte 0x35
|
||||
.byte \target
|
||||
.byte \battler
|
||||
.4byte \status
|
||||
.4byte \address
|
||||
.4byte \ptr
|
||||
.endm
|
||||
|
||||
.macro get_weather
|
||||
.byte 0x36
|
||||
.endm
|
||||
|
||||
.macro if_effect byte, address
|
||||
.macro if_effect byte:req, ptr:req
|
||||
.byte 0x37
|
||||
.byte \byte
|
||||
.4byte \address
|
||||
.4byte \ptr
|
||||
.endm
|
||||
|
||||
.macro if_not_effect byte, address
|
||||
.macro if_not_effect byte:req, ptr:req
|
||||
.byte 0x38
|
||||
.byte \byte
|
||||
.4byte \address
|
||||
.4byte \ptr
|
||||
.endm
|
||||
|
||||
.macro if_stat_level_less_than target, stat, level, address
|
||||
.macro if_stat_level_less_than battler:req, stat:req, level:req, ptr:req
|
||||
.byte 0x39
|
||||
.byte \target
|
||||
.byte \battler
|
||||
.byte \stat
|
||||
.byte \level
|
||||
.4byte \address
|
||||
.4byte \ptr
|
||||
.endm
|
||||
|
||||
.macro if_stat_level_more_than target, stat, level, address
|
||||
.macro if_stat_level_more_than battler:req, stat:req, level:req, ptr:req
|
||||
.byte 0x3a
|
||||
.byte \target
|
||||
.byte \battler
|
||||
.byte \stat
|
||||
.byte \level
|
||||
.4byte \address
|
||||
.4byte \ptr
|
||||
.endm
|
||||
|
||||
.macro if_stat_level_equal target, stat, level, address
|
||||
.macro if_stat_level_equal battler:req, stat:req, level:req, ptr:req
|
||||
.byte 0x3b
|
||||
.byte \target
|
||||
.byte \battler
|
||||
.byte \stat
|
||||
.byte \level
|
||||
.4byte \address
|
||||
.4byte \ptr
|
||||
.endm
|
||||
|
||||
.macro if_stat_level_not_equal target, stat, level, address
|
||||
.macro if_stat_level_not_equal battler:req, stat:req, level:req, ptr:req
|
||||
.byte 0x3c
|
||||
.byte \target
|
||||
.byte \battler
|
||||
.byte \stat
|
||||
.byte \level
|
||||
.4byte \address
|
||||
.4byte \ptr
|
||||
.endm
|
||||
|
||||
.macro if_can_faint address
|
||||
.macro if_can_faint ptr:req
|
||||
.byte 0x3d
|
||||
.4byte \address
|
||||
.4byte \ptr
|
||||
.endm
|
||||
|
||||
.macro if_cant_faint address
|
||||
.macro if_cant_faint ptr:req
|
||||
.byte 0x3e
|
||||
.4byte \address
|
||||
.4byte \ptr
|
||||
.endm
|
||||
|
||||
@ unused
|
||||
.macro if_has_move, target, move, address
|
||||
.macro if_has_move battler:req, move:req, ptr:req
|
||||
.byte 0x3f
|
||||
.byte \target
|
||||
.byte \battler
|
||||
.2byte \move
|
||||
.4byte \address
|
||||
.4byte \ptr
|
||||
.endm
|
||||
|
||||
@ unused
|
||||
.macro if_dont_have_move, target, move, address
|
||||
.macro if_doesnt_have_move battler:req, move:req, ptr:req
|
||||
.byte 0x40
|
||||
.byte \target
|
||||
.byte \battler
|
||||
.2byte \move
|
||||
.4byte \address
|
||||
.4byte \ptr
|
||||
.endm
|
||||
|
||||
.macro if_move_effect target, effect, address
|
||||
.macro if_has_move_with_effect battler:req, effect:req, ptr:req
|
||||
.byte 0x41
|
||||
.byte \target
|
||||
.byte \battler
|
||||
.byte \effect
|
||||
.4byte \address
|
||||
.4byte \ptr
|
||||
.endm
|
||||
|
||||
.macro if_not_move_effect target, effect, address
|
||||
.macro if_doesnt_have_move_with_effect battler:req, effect:req, ptr:req
|
||||
.byte 0x42
|
||||
.byte \target
|
||||
.byte \battler
|
||||
.byte \effect
|
||||
.4byte \address
|
||||
.4byte \ptr
|
||||
.endm
|
||||
|
||||
.macro if_last_move_did_damage target, byte, address
|
||||
.macro if_any_move_disabled_or_encored battler:req, byte:req, ptr:req
|
||||
.byte 0x43
|
||||
.byte \target
|
||||
.byte \battler
|
||||
.byte \byte
|
||||
.4byte \address
|
||||
.4byte \ptr
|
||||
.endm
|
||||
|
||||
.macro if_encored target, address
|
||||
.macro if_curr_move_disabled_or_encored battler:req, ptr:req
|
||||
.byte 0x44
|
||||
.byte \target
|
||||
.4byte \address
|
||||
.byte \battler
|
||||
.4byte \ptr
|
||||
.endm
|
||||
|
||||
.macro flee
|
||||
.byte 0x45
|
||||
.endm
|
||||
|
||||
.macro if_random_100 address
|
||||
.macro if_random_safari_flee ptr:req
|
||||
.byte 0x46
|
||||
.4byte \address
|
||||
.4byte \ptr
|
||||
.endm
|
||||
|
||||
.macro watch
|
||||
.byte 0x47
|
||||
.endm
|
||||
|
||||
.macro get_hold_effect target
|
||||
.macro get_hold_effect battler:req
|
||||
.byte 0x48
|
||||
.byte \target
|
||||
.byte \battler
|
||||
.endm
|
||||
|
||||
.macro get_gender target
|
||||
.macro get_gender battler:req
|
||||
.byte 0x49
|
||||
.byte \target
|
||||
.byte \battler
|
||||
.endm
|
||||
|
||||
.macro is_first_turn target
|
||||
.macro is_first_turn_for battler:req
|
||||
.byte 0x4a
|
||||
.byte \target
|
||||
.byte \battler
|
||||
.endm
|
||||
|
||||
.macro get_stockpile_count target
|
||||
.macro get_stockpile_count battler:req
|
||||
.byte 0x4b
|
||||
.byte \target
|
||||
.byte \battler
|
||||
.endm
|
||||
|
||||
.macro is_double_battle
|
||||
.byte 0x4c
|
||||
.endm
|
||||
|
||||
.macro get_item target
|
||||
.macro get_used_held_item battler:req
|
||||
.byte 0x4d
|
||||
.byte \target
|
||||
.byte \battler
|
||||
.endm
|
||||
|
||||
.macro get_move_type_from_result
|
||||
@@ -474,9 +474,9 @@
|
||||
.byte 0x50
|
||||
.endm
|
||||
|
||||
.macro get_protect_count target
|
||||
.macro get_protect_count battler:req
|
||||
.byte 0x51
|
||||
.byte \target
|
||||
.byte \battler
|
||||
.endm
|
||||
|
||||
@ nullsub
|
||||
@@ -510,45 +510,92 @@
|
||||
.endm
|
||||
|
||||
@ unused
|
||||
.macro call address
|
||||
.macro call ptr:req
|
||||
.byte 0x58
|
||||
.4byte \address
|
||||
.4byte \ptr
|
||||
.endm
|
||||
|
||||
.macro jump address
|
||||
.macro goto ptr:req
|
||||
.byte 0x59
|
||||
.4byte \address
|
||||
.4byte \ptr
|
||||
.endm
|
||||
|
||||
.macro end
|
||||
.byte 0x5a
|
||||
.endm
|
||||
|
||||
.macro if_level_cond cond, address
|
||||
.macro if_level_cond cond:req, ptr:req
|
||||
.byte 0x5b
|
||||
.byte \cond
|
||||
.4byte \address
|
||||
.4byte \ptr
|
||||
.endm
|
||||
|
||||
.macro if_user_higher_level address
|
||||
if_level_cond 0, \address
|
||||
.macro if_user_higher_level ptr:req
|
||||
if_level_cond 0, \ptr
|
||||
.endm
|
||||
|
||||
.macro if_target_higher_level address
|
||||
if_level_cond 1, \address
|
||||
.macro if_target_higher_level ptr:req
|
||||
if_level_cond 1, \ptr
|
||||
.endm
|
||||
|
||||
.macro if_equal_levels address
|
||||
if_level_cond 2, \address
|
||||
.macro if_equal_levels ptr:req
|
||||
if_level_cond 2, \ptr
|
||||
.endm
|
||||
|
||||
@ unused
|
||||
.macro if_taunted address
|
||||
.macro if_target_taunted ptr:req
|
||||
.byte 0x5c
|
||||
.4byte \address
|
||||
.4byte \ptr
|
||||
.endm
|
||||
|
||||
.macro if_not_taunted address
|
||||
.macro if_target_not_taunted ptr:req
|
||||
.byte 0x5d
|
||||
.4byte \address
|
||||
.4byte \ptr
|
||||
.endm
|
||||
|
||||
@ useful script macros
|
||||
.macro get_curr_move_type
|
||||
get_type AI_TYPE_MOVE
|
||||
.endm
|
||||
|
||||
.macro get_user_type1
|
||||
get_type AI_TYPE1_USER
|
||||
.endm
|
||||
|
||||
.macro get_user_type2
|
||||
get_type AI_TYPE2_USER
|
||||
.endm
|
||||
|
||||
.macro get_target_type1
|
||||
get_type AI_TYPE1_TARGET
|
||||
.endm
|
||||
|
||||
.macro get_target_type2
|
||||
get_type AI_TYPE2_TARGET
|
||||
.endm
|
||||
|
||||
.macro if_target_faster ptr:req
|
||||
if_would_go_first 1, \ptr
|
||||
.endm
|
||||
|
||||
.macro if_user_faster ptr:req
|
||||
if_would_go_first 0, \ptr
|
||||
.endm
|
||||
|
||||
.macro if_double_battle ptr:req
|
||||
is_double_battle
|
||||
if_equal 1, \ptr
|
||||
.endm
|
||||
|
||||
.macro if_not_double_battle ptr:req
|
||||
is_double_battle
|
||||
if_equal 0, \ptr
|
||||
.endm
|
||||
|
||||
.macro if_any_move_disabled battler:req, ptr:req
|
||||
if_any_move_disabled_or_encored \battler, 0, \ptr
|
||||
.endm
|
||||
|
||||
.macro if_any_move_encored battler:req, ptr:req
|
||||
if_any_move_disabled_or_encored \battler, 1, \ptr
|
||||
.endm
|
||||
|
||||
+23
-23
@@ -4757,7 +4757,7 @@ _0805713C: .4byte gPlayerAvatar
|
||||
thumb_func_start sub_8057140
|
||||
sub_8057140: @ 8057140
|
||||
push {lr}
|
||||
ldr r0, _08057158 @ =gUnknown_300502C
|
||||
ldr r0, _08057158 @ =gLocalLinkPlayerId
|
||||
ldrb r0, [r0]
|
||||
bl sub_8058504
|
||||
lsls r0, 24
|
||||
@@ -4766,13 +4766,13 @@ sub_8057140: @ 8057140
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_08057158: .4byte gUnknown_300502C
|
||||
_08057158: .4byte gLocalLinkPlayerId
|
||||
thumb_func_end sub_8057140
|
||||
|
||||
thumb_func_start sub_805715C
|
||||
sub_805715C: @ 805715C
|
||||
push {lr}
|
||||
ldr r0, _08057174 @ =gUnknown_300502C
|
||||
ldr r0, _08057174 @ =gLocalLinkPlayerId
|
||||
ldrb r0, [r0]
|
||||
bl sub_8058504
|
||||
lsls r0, 24
|
||||
@@ -4781,7 +4781,7 @@ sub_805715C: @ 805715C
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_08057174: .4byte gUnknown_300502C
|
||||
_08057174: .4byte gLocalLinkPlayerId
|
||||
thumb_func_end sub_805715C
|
||||
|
||||
thumb_func_start sub_8057178
|
||||
@@ -4794,7 +4794,7 @@ sub_8057178: @ 8057178
|
||||
adds r1, r4, 0
|
||||
bl GetCameraFocusCoords
|
||||
mov r2, sp
|
||||
ldr r0, _080571A4 @ =gUnknown_300502C
|
||||
ldr r0, _080571A4 @ =gLocalLinkPlayerId
|
||||
ldrb r1, [r0]
|
||||
ldrh r0, [r2]
|
||||
adds r0, r1
|
||||
@@ -4807,7 +4807,7 @@ sub_8057178: @ 8057178
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080571A4: .4byte gUnknown_300502C
|
||||
_080571A4: .4byte gLocalLinkPlayerId
|
||||
thumb_func_end sub_8057178
|
||||
|
||||
thumb_func_start sub_80571A8
|
||||
@@ -4823,13 +4823,13 @@ sub_80571A8: @ 80571A8
|
||||
bl GetCameraFocusCoords
|
||||
mov r3, sp
|
||||
mov r2, sp
|
||||
ldr r0, _08057224 @ =gUnknown_300502C
|
||||
ldr r0, _08057224 @ =gLocalLinkPlayerId
|
||||
ldrb r1, [r0]
|
||||
ldrh r0, [r2]
|
||||
subs r0, r1
|
||||
strh r0, [r3]
|
||||
movs r6, 0
|
||||
ldr r0, _08057228 @ =gUnknown_3005030
|
||||
ldr r0, _08057228 @ =gFieldLinkPlayerCount
|
||||
mov r8, r4
|
||||
ldrb r0, [r0]
|
||||
cmp r6, r0
|
||||
@@ -4859,7 +4859,7 @@ _080571D8:
|
||||
adds r0, r6, 0x1
|
||||
lsls r0, 16
|
||||
lsrs r6, r0, 16
|
||||
ldr r0, _08057228 @ =gUnknown_3005030
|
||||
ldr r0, _08057228 @ =gFieldLinkPlayerCount
|
||||
ldrb r0, [r0]
|
||||
cmp r6, r0
|
||||
bcc _080571D8
|
||||
@@ -4872,8 +4872,8 @@ _08057212:
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_08057224: .4byte gUnknown_300502C
|
||||
_08057228: .4byte gUnknown_3005030
|
||||
_08057224: .4byte gLocalLinkPlayerId
|
||||
_08057228: .4byte gFieldLinkPlayerCount
|
||||
_0805722C: .4byte gLinkPlayers
|
||||
thumb_func_end sub_80571A8
|
||||
|
||||
@@ -4881,7 +4881,7 @@ _0805722C: .4byte gLinkPlayers
|
||||
sub_8057230: @ 8057230
|
||||
push {r4,r5,lr}
|
||||
movs r4, 0
|
||||
ldr r0, _08057264 @ =gUnknown_3005030
|
||||
ldr r0, _08057264 @ =gFieldLinkPlayerCount
|
||||
ldrb r0, [r0]
|
||||
cmp r4, r0
|
||||
bcs _0805725E
|
||||
@@ -4898,7 +4898,7 @@ _0805723E:
|
||||
adds r0, r4, 0x1
|
||||
lsls r0, 16
|
||||
lsrs r4, r0, 16
|
||||
ldr r0, _08057264 @ =gUnknown_3005030
|
||||
ldr r0, _08057264 @ =gFieldLinkPlayerCount
|
||||
ldrb r0, [r0]
|
||||
cmp r4, r0
|
||||
bcc _0805723E
|
||||
@@ -4907,7 +4907,7 @@ _0805725E:
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_08057264: .4byte gUnknown_3005030
|
||||
_08057264: .4byte gFieldLinkPlayerCount
|
||||
_08057268: .4byte gLinkPlayers
|
||||
thumb_func_end sub_8057230
|
||||
|
||||
@@ -5647,7 +5647,7 @@ c1_link_related: @ 8057884
|
||||
cmp r0, 0
|
||||
bne _080578C0
|
||||
_0805789E:
|
||||
ldr r0, _080578CC @ =gUnknown_300502C
|
||||
ldr r0, _080578CC @ =gLocalLinkPlayerId
|
||||
ldrb r4, [r0]
|
||||
ldr r0, _080578D0 @ =gLinkPartnersHeldKeys
|
||||
adds r1, r4, 0
|
||||
@@ -5666,7 +5666,7 @@ _080578C0:
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080578C8: .4byte gWirelessCommType
|
||||
_080578CC: .4byte gUnknown_300502C
|
||||
_080578CC: .4byte gLocalLinkPlayerId
|
||||
_080578D0: .4byte gLinkPartnersHeldKeys
|
||||
_080578D4: .4byte gUnknown_3000E84
|
||||
thumb_func_end c1_link_related
|
||||
@@ -5753,7 +5753,7 @@ sub_8057954: @ 8057954
|
||||
push {r4,lr}
|
||||
lsls r0, 16
|
||||
lsrs r3, r0, 16
|
||||
ldr r0, _08057974 @ =gUnknown_3005030
|
||||
ldr r0, _08057974 @ =gFieldLinkPlayerCount
|
||||
ldrb r2, [r0]
|
||||
movs r1, 0
|
||||
cmp r1, r2
|
||||
@@ -5767,7 +5767,7 @@ _08057966:
|
||||
movs r0, 0
|
||||
b _08057984
|
||||
.align 2, 0
|
||||
_08057974: .4byte gUnknown_3005030
|
||||
_08057974: .4byte gFieldLinkPlayerCount
|
||||
_08057978: .4byte gUnknown_3000E80
|
||||
_0805797C:
|
||||
adds r1, 0x1
|
||||
@@ -5786,7 +5786,7 @@ sub_805798C: @ 805798C
|
||||
push {r4,lr}
|
||||
lsls r0, 16
|
||||
lsrs r3, r0, 16
|
||||
ldr r0, _080579AC @ =gUnknown_3005030
|
||||
ldr r0, _080579AC @ =gFieldLinkPlayerCount
|
||||
ldrb r2, [r0]
|
||||
movs r1, 0
|
||||
cmp r1, r2
|
||||
@@ -5800,7 +5800,7 @@ _0805799E:
|
||||
movs r0, 0x1
|
||||
b _080579BC
|
||||
.align 2, 0
|
||||
_080579AC: .4byte gUnknown_3005030
|
||||
_080579AC: .4byte gFieldLinkPlayerCount
|
||||
_080579B0: .4byte gUnknown_3000E80
|
||||
_080579B4:
|
||||
adds r1, 0x1
|
||||
@@ -6499,7 +6499,7 @@ sub_8057EC0: @ 8057EC0
|
||||
cmp r2, r1
|
||||
bne _08057EE6
|
||||
ldr r1, _08057F08 @ =gUnknown_3000E80
|
||||
ldr r0, _08057F0C @ =gUnknown_300502C
|
||||
ldr r0, _08057F0C @ =gLocalLinkPlayerId
|
||||
ldrb r0, [r0]
|
||||
adds r0, r1
|
||||
ldrb r0, [r0]
|
||||
@@ -6511,7 +6511,7 @@ _08057EE6:
|
||||
cmp r1, r0
|
||||
bne _08057F14
|
||||
ldr r1, _08057F08 @ =gUnknown_3000E80
|
||||
ldr r0, _08057F0C @ =gUnknown_300502C
|
||||
ldr r0, _08057F0C @ =gLocalLinkPlayerId
|
||||
ldrb r0, [r0]
|
||||
adds r0, r1
|
||||
ldrb r0, [r0]
|
||||
@@ -6524,7 +6524,7 @@ _08057EFC:
|
||||
_08057F00: .4byte gUnknown_3000E84
|
||||
_08057F04: .4byte sub_8057E1C
|
||||
_08057F08: .4byte gUnknown_3000E80
|
||||
_08057F0C: .4byte gUnknown_300502C
|
||||
_08057F0C: .4byte gLocalLinkPlayerId
|
||||
_08057F10: .4byte sub_8057E10
|
||||
_08057F14:
|
||||
movs r0, 0x82
|
||||
|
||||
@@ -1619,7 +1619,7 @@ _0808C594: .4byte gUnknown_8418690
|
||||
_0808C598:
|
||||
movs r0, 0x1
|
||||
movs r1, 0
|
||||
bl fade_screen
|
||||
bl FadeScreen
|
||||
movs r0, 0x4
|
||||
strh r0, [r5, 0x8]
|
||||
b _0808C69C
|
||||
|
||||
@@ -482,7 +482,7 @@ _0809777C:
|
||||
lsls r0, 2
|
||||
ldr r1, _080977A8 @ =gObjectEvents
|
||||
adds r0, r1
|
||||
bl npc_sync_anim_pause_bits
|
||||
bl UnfreezeObjectEvent
|
||||
_08097792:
|
||||
adds r0, r5, 0x1
|
||||
lsls r0, 24
|
||||
|
||||
-11147
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user