dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into doc-ttower

Browse Source
This commit is contained in:
GriffinR
2020-01-24 03:03:45 -05:00
committed by GitHub
parent ef1f9ead0b 85e5c57e8c
commit 39556605cd
121 changed files with 10876 additions and 19297 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/cable_club.s
+14 -14
View File
@@ -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:
asm/event_object_80688E4.s
+4 -4
View File
@@ -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
asm/event_object_movement.s
+4 -4
View File
@@ -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]
asm/field_player_avatar.s
+3 -3
View File
@@ -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
asm/field_weather.s
+3 -3
View File
@@ -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
asm/macros/battle_ai_script.inc
+222 -175
View File
@@ -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
asm/overworld.s
+23 -23
View File
@@ -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
asm/pokemon_storage_system.s
+1 -1
View File
@@ -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
asm/script_movement.s
+1 -1
View File
@@ -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
asm/union_room.s
-11147
View File
File diff suppressed because it is too large Load Diff
asm/union_room_player_avatar.s
-2064
View File
File diff suppressed because it is too large Load Diff
data/battle_ai_scripts.s
+2390 -2258
View File
File diff suppressed because it is too large Load Diff
data/event_scripts.s
+5 -87
View File
@@ -926,7 +926,7 @@ Text_1A5690:: @ 81A5690
.string "{PLAYER} handed over the\n"
.string "{STR_VAR_1}.$"
gUnknown_81A56A7:: @ 81A56A7
Text_GiveNicknameToThisMon:: @ 81A56A7
.string "Do you want to give a nickname to\n"
.string "this {STR_VAR_1}?$"
@@ -1008,43 +1008,7 @@ Text_1A5CD3:: @ 81A5CD3
Text_TheDoorIsOpen:: @ 81A5CDF
.string "The door is open…$"
Text_1A5CF1:: @ 81A5CF1
.string "{STR_VAR_2} was transferred to\n"
.string "Someone's PC.\p"
.string "It was placed in \n"
.string "BOX “{STR_VAR_1}.”$"
Text_1A5D31:: @ 81A5D31
.string "{STR_VAR_2} was transferred to\n"
.string "BILL'S PC.\p"
.string "It was placed in \n"
.string "BOX “{STR_VAR_1}.”$"
Text_1A5D6E:: @ 81A5D6E
.string "BOX “{STR_VAR_3}” on\n"
.string "Someone's PC was full.\p"
.string "{STR_VAR_2} was transferred to\n"
.string "BOX “{STR_VAR_1}.”$"
Text_1A5DB1:: @ 81A5DB1
.string "BOX “{STR_VAR_3}” on\n"
.string "BILL'S PC was full.\p"
.string "{STR_VAR_2} was transferred to\n"
.string "BOX “{STR_VAR_1}.”$"
Text_1A5DF1:: @ 81A5DF1
.string "{PLAYER} obtained\n"
.string "the {STR_VAR_1}!$"
Text_1A5E05:: @ 81A5E05
.string "ポケモンを　もちきれないので\n"
.string "パソコンの　ボックス“{STR_VAR_1}”　に\l"
.string "{STR_VAR_2}を　てんそうした！$"
gUnknown_81A5E31:: @ 81A5E31
.string "There's no more room for POKéMON!\p"
.string "The POKéMON BOXES are full and\n"
.string "can't accept any more!$"
.include "data/text/pc_transfer.inc"
Text_1A5E89:: @ 81A5E89
.string "First, you should restore your\n"
@@ -1511,53 +1475,7 @@ EventScript_1A80FE:: @ 81A80FE
end
.include "data/scripts/silphco_doors.inc"
EventScript_1A8C27:: @ 81A8C27
getpartysize
subvar VAR_RESULT, 1
copyvar VAR_0x8004, VAR_RESULT
return
EventScript_1A8C33:: @ 81A8C33
fadescreen FADE_TO_BLACK
special ChangeBoxPokemonNickname
waitstate
lock
faceplayer
return
EventScript_1A8C3C:: @ 81A8C3C
bufferboxname 0, VAR_PC_BOX_TO_SEND_MON
getspeciesname 1, VAR_TEMP_1
call_if_unset FLAG_SYS_NOT_SOMEONES_PC, EventScript_1A8C57
call_if_set FLAG_SYS_NOT_SOMEONES_PC, EventScript_1A8C82
return
EventScript_1A8C57:: @ 81A8C57
specialvar VAR_RESULT, ShouldShowBoxWasFullMessage
compare VAR_RESULT, TRUE
goto_if_eq EventScript_1A8C70
msgbox Text_1A5CF1
return
EventScript_1A8C70:: @ 81A8C70
specialvar VAR_RESULT, GetPCBoxToSendMon
bufferboxname 2, VAR_RESULT
msgbox Text_1A5D6E
return
EventScript_1A8C82:: @ 81A8C82
specialvar VAR_RESULT, ShouldShowBoxWasFullMessage
compare VAR_RESULT, TRUE
goto_if_eq EventScript_1A8C9B
msgbox Text_1A5D31
return
EventScript_1A8C9B:: @ 81A8C9B
specialvar VAR_RESULT, GetPCBoxToSendMon
bufferboxname 2, VAR_RESULT
msgbox Text_1A5DB1
return
.include "data/scripts/pc_transfer.inc"
EventScript_GetInGameTradeSpeciesInfo:: @ 81A8CAD
copyvar VAR_0x8004, VAR_0x8008
@@ -1777,9 +1695,9 @@ EventScript_BrailleCursorWaitButton:: @ 81A926C
special Special_BrailleCursorToggle
return
EventScript_1A927C:: @ 81A927C
EventScript_NoMoreRoomForPokemon:: @ 81A927C
textcolor 3
msgbox gUnknown_81A5E31
msgbox Text_NoMoreRoomForPokemon
release
end
data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc
+6 -6
View File
@@ -15,7 +15,7 @@ CeladonCity_Condominiums_RoofRoom_EventScript_16C46D:: @ 816C46D
compare VAR_RESULT, 1
goto_if_eq EventScript_16C4DA
compare VAR_RESULT, 2
goto_if_eq EventScript_1A927C
goto_if_eq EventScript_NoMoreRoomForPokemon
release
end
@@ -26,10 +26,10 @@ EventScript_16C4A6:: @ 816C4A6
waitmessage
waitfanfare
getspeciesname 0, SPECIES_EEVEE
msgbox gUnknown_81A56A7, MSGBOX_YESNO
msgbox Text_GiveNicknameToThisMon, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq EventScript_16C514
call EventScript_1A8C27
call EventScript_GetGiftMonPartySlot
call EventScript_ChangePokemonNickname
goto EventScript_16C514
end
@@ -41,15 +41,15 @@ EventScript_16C4DA:: @ 816C4DA
waitmessage
waitfanfare
getspeciesname 0, SPECIES_EEVEE
msgbox gUnknown_81A56A7, MSGBOX_YESNO
msgbox Text_GiveNicknameToThisMon, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq EventScript_16C509
call EventScript_1A8C33
call EventScript_NameReceivedBoxMon
goto EventScript_16C509
end
EventScript_16C509:: @ 816C509
call EventScript_1A8C3C
call EventScript_TransferredToPC
goto EventScript_16C514
end
data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc
+7 -7
View File
@@ -186,7 +186,7 @@ EventScript_16CD52:: @ 816CD52
EventScript_16CD74:: @ 816CD74
textcolor 3
msgbox gUnknown_81A5E31
msgbox Text_NoMoreRoomForPokemon
hidecoinsbox 0, 0
release
end
@@ -215,10 +215,10 @@ EventScript_16CDB3:: @ 816CDB3
updatecoinsbox 0, 5
getspeciesname 0, VAR_TEMP_1
playfanfare MUS_FANFA1
message Text_1A5DF1
message Text_PlayerObtainedTheMon
waitmessage
waitfanfare
msgbox gUnknown_81A56A7, MSGBOX_YESNO
msgbox Text_GiveNicknameToThisMon, MSGBOX_YESNO
compare VAR_RESULT, YES
goto_if_eq EventScript_16CD83
goto EventScript_16CC10
@@ -229,18 +229,18 @@ EventScript_16CDE0:: @ 816CDE0
updatecoinsbox 0, 5
getspeciesname 0, VAR_TEMP_1
playfanfare MUS_FANFA1
message Text_1A5DF1
message Text_PlayerObtainedTheMon
waitmessage
waitfanfare
msgbox gUnknown_81A56A7, MSGBOX_YESNO
msgbox Text_GiveNicknameToThisMon, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq EventScript_16CE12
call EventScript_1A8C33
call EventScript_NameReceivedBoxMon
goto EventScript_16CE12
end
EventScript_16CE12:: @ 816CE12
call EventScript_1A8C3C
call EventScript_TransferredToPC
goto EventScript_16CC10
end
data/maps/CinnabarIsland/map.json
+7 -7
View File
@@ -34,7 +34,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "CinnabarIsland_EventScript_1671EF",
"script": "CinnabarIsland_EventScript_Woman",
"flag": "0"
},
{
@@ -47,7 +47,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "CinnabarIsland_EventScript_167208",
"script": "CinnabarIsland_EventScript_OldMan",
"flag": "0"
},
{
@@ -122,7 +122,7 @@
"elevation": 3,
"var": "VAR_TEMP_1",
"var_value": 0,
"script": "CinnabarIsland_EventScript_1671CA"
"script": "CinnabarIsland_EventScript_GymDoorLocked"
}
],
"bg_events": [
@@ -131,28 +131,28 @@
"x": 12,
"y": 3,
"elevation": 0,
"script": "CinnabarIsland_EventScript_167211"
"script": "CinnabarIsland_EventScript_IslandSign"
},
{
"type": "bg_event_type_0",
"x": 9,
"y": 9,
"elevation": 0,
"script": "CinnabarIsland_EventScript_16721A"
"script": "CinnabarIsland_EventScript_PokemonLabSign"
},
{
"type": "bg_event_type_0",
"x": 22,
"y": 5,
"elevation": 0,
"script": "CinnabarIsland_EventScript_167223"
"script": "CinnabarIsland_EventScript_GymSign"
},
{
"type": "bg_event_type_0",
"x": 10,
"y": 9,
"elevation": 0,
"script": "CinnabarIsland_EventScript_16721A"
"script": "CinnabarIsland_EventScript_PokemonLabSign"
}
]
}
data/maps/CinnabarIsland/scripts.inc
+119 -114
View File
@@ -1,3 +1,6 @@
.equ LOCALID_BILL, 3
.equ LOCALID_SEAGALLOP, 4
CinnabarIsland_MapScripts:: @ 8166ED6
map_script MAP_SCRIPT_ON_TRANSITION, CinnabarIsland_OnTransition
map_script MAP_SCRIPT_ON_FRAME_TABLE, CinnabarIsland_OnFrame
@@ -5,82 +8,82 @@ CinnabarIsland_MapScripts:: @ 8166ED6
CinnabarIsland_OnTransition:: @ 8166EE1
setworldmapflag FLAG_WORLD_MAP_CINNABAR_ISLAND
call EventScript_166F5E
call CinnabarIsland_EventScript_CheckUnlockGym
compare VAR_MAP_SCENE_CINNABAR_ISLAND, 1
call_if_eq EventScript_166F24
call_if_eq CinnabarIsland_EventScript_ReadyObjectsSailToOneIsland
compare VAR_MAP_SCENE_CINNABAR_ISLAND, 3
call_if_eq EventScript_166F52
call_if_eq CinnabarIsland_EventScript_ReadyObjectsReturnFromSeviiIslands
compare VAR_MAP_SCENE_CINNABAR_ISLAND_2, 1
call_if_eq EventScript_166F0B
call_if_eq CinnabarIsland_EventScript_ReadyObjectsSailToOneIslandFromPokeCenter
end
EventScript_166F0B:: @ 8166F0B
CinnabarIsland_EventScript_ReadyObjectsSailToOneIslandFromPokeCenter:: @ 8166F0B
savebgm MUS_ANNAI
setflag FLAG_TEMP_2
setobjectxyperm 3, 15, 12
setobjectmovementtype 3, 9
setobjectxyperm 4, 30, 12
setobjectxyperm LOCALID_BILL, 15, 12
setobjectmovementtype LOCALID_BILL, MOVEMENT_TYPE_FACE_LEFT
setobjectxyperm LOCALID_SEAGALLOP, 30, 12
return
EventScript_166F24:: @ 8166F24
CinnabarIsland_EventScript_ReadyObjectsSailToOneIsland:: @ 8166F24
getplayerxy VAR_0x8004, VAR_0x8005
compare VAR_0x8004, 18
goto_if_ge EventScript_166F4A
goto_if_ge CinnabarIsland_EventScript_MoveSeagallopDown
setflag FLAG_TEMP_2
setobjectxyperm 3, 18, 12
setobjectmovementtype 3, 7
setobjectxyperm 4, 30, 12
setobjectxyperm LOCALID_BILL, 18, 12
setobjectmovementtype LOCALID_BILL, MOVEMENT_TYPE_FACE_UP
setobjectxyperm LOCALID_SEAGALLOP, 30, 12
return
EventScript_166F4A:: @ 8166F4A
setobjectxyperm 4, 30, 8
CinnabarIsland_EventScript_MoveSeagallopDown:: @ 8166F4A
setobjectxyperm LOCALID_SEAGALLOP, 30, 8
return
EventScript_166F52:: @ 8166F52
setobjectxyperm 3, 21, 8
setobjectmovementtype 3, 7
CinnabarIsland_EventScript_ReadyObjectsReturnFromSeviiIslands:: @ 8166F52
setobjectxyperm LOCALID_BILL, 21, 8
setobjectmovementtype LOCALID_BILL, MOVEMENT_TYPE_FACE_UP
return
EventScript_166F5E:: @ 8166F5E
goto_if_set FLAG_HIDE_POKEMON_MANSION_B1F_SECRET_KEY, EventScript_166F68
CinnabarIsland_EventScript_CheckUnlockGym:: @ 8166F5E
goto_if_set FLAG_HIDE_POKEMON_MANSION_B1F_SECRET_KEY, CinnabarIsland_EventScript_UnlockGym
return
EventScript_166F68:: @ 8166F68
CinnabarIsland_EventScript_UnlockGym:: @ 8166F68
setvar VAR_TEMP_1, 1
return
CinnabarIsland_OnFrame:: @ 8166F6E
map_script_2 VAR_MAP_SCENE_CINNABAR_ISLAND_2, 1, EventScript_166F88
map_script_2 VAR_MAP_SCENE_CINNABAR_ISLAND, 1, EventScript_166FCD
map_script_2 VAR_MAP_SCENE_CINNABAR_ISLAND, 3, EventScript_166FA0
map_script_2 VAR_MAP_SCENE_CINNABAR_ISLAND_2, 1, CinnabarIsland_EventScript_ExitPokeCenterForOneIsland
map_script_2 VAR_MAP_SCENE_CINNABAR_ISLAND, 1, CinnabarIsland_EventScript_BillScene
map_script_2 VAR_MAP_SCENE_CINNABAR_ISLAND, 3, CinnabarIsland_EventScript_ReturnFromSeviiIslands
.2byte 0
EventScript_166F88:: @ 8166F88
CinnabarIsland_EventScript_ExitPokeCenterForOneIsland:: @ 8166F88
lockall
clearflag FLAG_SPECIAL_FLAG_0x4001
savebgm MUS_DUMMY
textcolor 0
setvar VAR_MAP_SCENE_CINNABAR_ISLAND_2, 2
delay 20
call EventScript_1670E6
call CinnabarIsland_EventScript_SailToOneIsland
releaseall
end
EventScript_166FA0:: @ 8166FA0
CinnabarIsland_EventScript_ReturnFromSeviiIslands:: @ 8166FA0
lockall
textcolor 0
msgbox gUnknown_8180F09
msgbox CinnabarIsland_Text_IfYouHaveTriPassYouCanGoAgain
closemessage
applymovement 3, Movement_166FC6
applymovement LOCALID_BILL, CinnabarIsland_Movement_BillExit
waitmovement 0
removeobject 3
removeobject LOCALID_BILL
setvar VAR_MAP_SCENE_CINNABAR_ISLAND, 4
setflag FLAG_HIDE_TWO_ISLAND_GAME_CORNER_LOSTELLE
clearflag FLAG_HIDE_LOSTELLE_IN_HER_HOME
releaseall
end
Movement_166FC6:: @ 8166FC6
CinnabarIsland_Movement_BillExit:: @ 8166FC6
walk_down
walk_down
walk_down
@@ -89,72 +92,72 @@ Movement_166FC6:: @ 8166FC6
walk_down
step_end
EventScript_166FCD:: @ 8166FCD
CinnabarIsland_EventScript_BillScene:: @ 8166FCD
lockall
textcolor 0
call_if_unset FLAG_TEMP_2, EventScript_167032
call_if_set FLAG_TEMP_2, EventScript_16703D
call_if_unset FLAG_TEMP_2, CinnabarIsland_EventScript_BillFacePlayer1
call_if_set FLAG_TEMP_2, CinnabarIsland_EventScript_BillFacePlayer2
playse SE_PIN
applymovement 3, Movement_ExclamationMark
applymovement LOCALID_BILL, Movement_ExclamationMark
waitmovement 0
applymovement 3, Movement_Delay48
applymovement LOCALID_BILL, Movement_Delay48
waitmovement 0
call_if_unset FLAG_TEMP_2, EventScript_167048
call_if_set FLAG_TEMP_2, EventScript_167053
msgbox gUnknown_8180C90
msgbox gUnknown_8180CAA, MSGBOX_YESNO
call_if_unset FLAG_TEMP_2, CinnabarIsland_EventScript_BillApproachPlayer1
call_if_set FLAG_TEMP_2, CinnabarIsland_EventScript_BillApproachPlayer2
msgbox CinnabarIsland_Text_HeyIfItIsntPlayer
msgbox CinnabarIsland_Text_ComeWithMeToOneIsland, MSGBOX_YESNO
compare VAR_RESULT, YES
goto_if_eq EventScript_167068
goto_if_eq CinnabarIsland_EventScript_AgreeSailToOneIsland
compare VAR_RESULT, NO
goto_if_eq EventScript_167078
goto_if_eq CinnabarIsland_EventScript_DeclineSailToOneIsland
end
EventScript_167032:: @ 8167032
applymovement 3, Movement_WalkInPlaceFastestUp
CinnabarIsland_EventScript_BillFacePlayer1:: @ 8167032
applymovement LOCALID_BILL, Movement_WalkInPlaceFastestUp
waitmovement 0
return
EventScript_16703D:: @ 816703D
applymovement 3, Movement_WalkInPlaceFastestLeft
CinnabarIsland_EventScript_BillFacePlayer2:: @ 816703D
applymovement LOCALID_BILL, Movement_WalkInPlaceFastestLeft
waitmovement 0
return
EventScript_167048:: @ 8167048
applymovement 3, Movement_1671A4
CinnabarIsland_EventScript_BillApproachPlayer1:: @ 8167048
applymovement LOCALID_BILL, CinnabarIsland_Movement_BillApproachPlayer1
waitmovement 0
return
EventScript_167053:: @ 8167053
applymovement 3, Movement_1671A6
CinnabarIsland_EventScript_BillApproachPlayer2:: @ 8167053
applymovement LOCALID_BILL, CinnabarIsland_Movement_BillApproachPlayer2
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight
waitmovement 0
return
EventScript_167068:: @ 8167068
msgbox gUnknown_8180DDD
CinnabarIsland_EventScript_AgreeSailToOneIsland:: @ 8167068
msgbox CinnabarIsland_Text_AllRightLetsGo
closemessage
call EventScript_1670E6
call CinnabarIsland_EventScript_SailToOneIsland
releaseall
end
EventScript_167078:: @ 8167078
msgbox gUnknown_8180DF8
CinnabarIsland_EventScript_DeclineSailToOneIsland:: @ 8167078
msgbox CinnabarIsland_Text_IllBeWaitingInPokeCenter
closemessage
call_if_unset FLAG_TEMP_2, EventScript_1670A0
call_if_set FLAG_TEMP_2, EventScript_1670B3
removeobject 3
call_if_unset FLAG_TEMP_2, CinnabarIsland_EventScript_BillExitToPokeCenter
call_if_set FLAG_TEMP_2, CinnabarIsland_EventScript_BillReturnToPokeCenter
removeobject LOCALID_BILL
setvar VAR_MAP_SCENE_CINNABAR_ISLAND, 2
clearflag FLAG_HIDE_CINNABAR_POKECENTER_BILL
releaseall
end
EventScript_1670A0:: @ 81670A0
applymovement 3, Movement_1670AB
CinnabarIsland_EventScript_BillExitToPokeCenter:: @ 81670A0
applymovement LOCALID_BILL, CinnabarIsland_Movement_BillExitToPokeCenter
waitmovement 0
return
Movement_1670AB:: @ 81670AB
CinnabarIsland_Movement_BillExitToPokeCenter:: @ 81670AB
walk_right
walk_down
walk_down
@@ -164,46 +167,47 @@ Movement_1670AB:: @ 81670AB
walk_down
step_end
EventScript_1670B3:: @ 81670B3
applymovement OBJ_EVENT_ID_PLAYER, Movement_1670DB
applymovement 3, Movement_1670DE
CinnabarIsland_EventScript_BillReturnToPokeCenter:: @ 81670B3
applymovement OBJ_EVENT_ID_PLAYER, CinnabarIsland_Movement_PlayerWatchBillExit
applymovement LOCALID_BILL, CinnabarIsland_Movement_BillApproachDoor
waitmovement 0
opendoor 14, 11
waitdooranim
applymovement 3, Movement_1670E2
applymovement LOCALID_BILL, CinnabarIsland_Movement_BillReEnterPokeCenter
waitmovement 0
closedoor 14, 11
waitdooranim
return
Movement_1670DB:: @ 81670DB
CinnabarIsland_Movement_PlayerWatchBillExit:: @ 81670DB
walk_left
walk_in_place_fastest_right
step_end
Movement_1670DE:: @ 81670DE
CinnabarIsland_Movement_BillApproachDoor:: @ 81670DE
delay_16
walk_left
walk_in_place_fastest_up
step_end
Movement_1670E2:: @ 81670E2
CinnabarIsland_Movement_BillReEnterPokeCenter:: @ 81670E2
walk_up
delay_4
set_invisible
step_end
EventScript_1670E6:: @ 81670E6
call_if_set FLAG_TEMP_2, EventScript_167142
addobject 4
call_if_unset FLAG_TEMP_2, EventScript_167154
call_if_set FLAG_TEMP_2, EventScript_167166
msgbox gUnknown_8180EAD
@ Can be triggered outside, or after talking to Bill in the poke center
CinnabarIsland_EventScript_SailToOneIsland:: @ 81670E6
call_if_set FLAG_TEMP_2, CinnabarIsland_EventScript_ApproachShore
addobject LOCALID_SEAGALLOP
call_if_unset FLAG_TEMP_2, CinnabarIsland_EventScript_BoatArrive
call_if_set FLAG_TEMP_2, CinnabarIsland_EventScript_BoatArriveExitedPokeCenter
msgbox CinnabarIsland_Text_MyPalsBoatArrived
closemessage
call_if_unset FLAG_TEMP_2, EventScript_167171
call_if_set FLAG_TEMP_2, EventScript_167183
call_if_unset FLAG_TEMP_2, CinnabarIsland_EventScript_BoardBoat
call_if_set FLAG_TEMP_2, CinnabarIsland_EventScript_BoardBoatExitedPokeCenter
setvar VAR_MAP_SCENE_CINNABAR_ISLAND, 2
removeobject 3
removeobject LOCALID_BILL
delay 40
setflag FLAG_HIDE_CINNABAR_SEAGALLOP
setvar VAR_MAP_SCENE_ONE_ISLAND_HARBOR, 1
@@ -212,36 +216,36 @@ EventScript_1670E6:: @ 81670E6
goto EventScript_1A90DA
end
EventScript_167142:: @ 8167142
applymovement 3, Movement_1671AF
applymovement OBJ_EVENT_ID_PLAYER, Movement_1671AF
CinnabarIsland_EventScript_ApproachShore:: @ 8167142
applymovement LOCALID_BILL, CinnabarIsland_Movement_ApproachShore
applymovement OBJ_EVENT_ID_PLAYER, CinnabarIsland_Movement_ApproachShore
waitmovement 0
return
EventScript_167154:: @ 8167154
applymovement 3, Movement_1671AA
applymovement 4, Movement_167195
CinnabarIsland_EventScript_BoatArrive:: @ 8167154
applymovement LOCALID_BILL, CinnabarIsland_Movement_BillFaceBoat
applymovement LOCALID_SEAGALLOP, CinnabarIsland_Movement_BoatArrive
waitmovement 0
return
EventScript_167166:: @ 8167166
applymovement 4, Movement_167195
CinnabarIsland_EventScript_BoatArriveExitedPokeCenter:: @ 8167166
applymovement LOCALID_SEAGALLOP, CinnabarIsland_Movement_BoatArrive
waitmovement 0
return
EventScript_167171:: @ 8167171
applymovement 3, Movement_16719D
applymovement OBJ_EVENT_ID_PLAYER, Movement_1671BA
CinnabarIsland_EventScript_BoardBoat:: @ 8167171
applymovement LOCALID_BILL, CinnabarIsland_Movement_BillBoardBoat
applymovement OBJ_EVENT_ID_PLAYER, CinnabarIsland_Movement_PlayerBoardBoat
waitmovement 0
return
EventScript_167183:: @ 8167183
applymovement 3, Movement_1671B6
applymovement OBJ_EVENT_ID_PLAYER, Movement_1671C4
CinnabarIsland_EventScript_BoardBoatExitedPokeCenter:: @ 8167183
applymovement LOCALID_BILL, CinnabarIsland_Movement_BillBoardBoatFromShore
applymovement OBJ_EVENT_ID_PLAYER, CinnabarIsland_Movement_PlayerBoardBoatFromShore
waitmovement 0
return
Movement_167195:: @ 8167195
CinnabarIsland_Movement_BoatArrive:: @ 8167195
delay_16
delay_16
walk_fast_left
@@ -251,7 +255,7 @@ Movement_167195:: @ 8167195
walk_slowest_left
step_end
Movement_16719D:: @ 816719D
CinnabarIsland_Movement_BillBoardBoat:: @ 816719D
walk_right
walk_down
walk_down
@@ -260,24 +264,24 @@ Movement_16719D:: @ 816719D
set_invisible
step_end
Movement_1671A4:: @ 81671A4
CinnabarIsland_Movement_BillApproachPlayer1:: @ 81671A4
walk_up
step_end
Movement_1671A6:: @ 81671A6
CinnabarIsland_Movement_BillApproachPlayer2:: @ 81671A6
walk_left
walk_left
walk_left
step_end
Movement_1671AA:: @ 81671AA
CinnabarIsland_Movement_BillFaceBoat:: @ 81671AA
delay_16
delay_16
delay_8
walk_in_place_fastest_right
step_end
Movement_1671AF:: @ 81671AF
CinnabarIsland_Movement_ApproachShore:: @ 81671AF
walk_right
walk_right
walk_right
@@ -286,13 +290,13 @@ Movement_1671AF:: @ 81671AF
walk_right
step_end
Movement_1671B6:: @ 81671B6
CinnabarIsland_Movement_BillBoardBoatFromShore:: @ 81671B6
walk_right
delay_4
set_invisible
step_end
Movement_1671BA:: @ 81671BA
CinnabarIsland_Movement_PlayerBoardBoat:: @ 81671BA
walk_down
walk_right
walk_down
@@ -304,7 +308,7 @@ Movement_1671BA:: @ 81671BA
set_invisible
step_end
Movement_1671C4:: @ 81671C4
CinnabarIsland_Movement_PlayerBoardBoatFromShore:: @ 81671C4
walk_right
delay_4
walk_right
@@ -312,45 +316,46 @@ Movement_1671C4:: @ 81671C4
set_invisible
step_end
CinnabarIsland_EventScript_1671CA:: @ 81671CA
@ Triggered when VAR_TEMP_1 is 0
CinnabarIsland_EventScript_GymDoorLocked:: @ 81671CA
lockall
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp
waitmovement 0
delay 20
msgbox gUnknown_8180B20
msgbox CinnabarIsland_Text_DoorIsLocked
closemessage
applymovement OBJ_EVENT_ID_PLAYER, Movement_1671ED
applymovement OBJ_EVENT_ID_PLAYER, CinnabarIsland_Movement_ForcePlayerFromDoor
waitmovement 0
releaseall
end
Movement_1671ED:: @ 81671ED
CinnabarIsland_Movement_ForcePlayerFromDoor:: @ 81671ED
walk_down
step_end
CinnabarIsland_EventScript_1671EF:: @ 81671EF
CinnabarIsland_EventScript_Woman:: @ 81671EF
lock
faceplayer
famechecker FAMECHECKER_BLAINE, 3
msgbox gUnknown_8180B34
msgbox CinnabarIsland_Text_BlaineLivedHereSinceBeforeLab
release
end
CinnabarIsland_EventScript_167208:: @ 8167208
msgbox gUnknown_8180BA0, MSGBOX_NPC
CinnabarIsland_EventScript_OldMan:: @ 8167208
msgbox CinnabarIsland_Text_ScientistsExperimentInMansion, MSGBOX_NPC
end
CinnabarIsland_EventScript_167211:: @ 8167211
msgbox gUnknown_8180C0D, MSGBOX_SIGN
CinnabarIsland_EventScript_IslandSign:: @ 8167211
msgbox CinnabarIsland_Text_IslandSign, MSGBOX_SIGN
end
CinnabarIsland_EventScript_16721A:: @ 816721A
msgbox gUnknown_8180C3E, MSGBOX_SIGN
CinnabarIsland_EventScript_PokemonLabSign:: @ 816721A
msgbox CinnabarIsland_Text_PokemonLab, MSGBOX_SIGN
end
CinnabarIsland_EventScript_167223:: @ 8167223
CinnabarIsland_EventScript_GymSign:: @ 8167223
lockall
famechecker FAMECHECKER_BLAINE, 0
msgbox gUnknown_8180C4A
msgbox CinnabarIsland_Text_GymSign
releaseall
end
data/maps/CinnabarIsland/text.inc
+12 -12
View File
@@ -1,35 +1,35 @@
gUnknown_8180B20:: @ 8180B20
CinnabarIsland_Text_DoorIsLocked:: @ 8180B20
.string "The door is locked…$"
gUnknown_8180B34:: @ 8180B34
CinnabarIsland_Text_BlaineLivedHereSinceBeforeLab:: @ 8180B34
.string "CINNABAR GYM's BLAINE is quite the\n"
.string "odd fellow.\p"
.string "He's lived on the island since way\n"
.string "before the LAB was built.$"
gUnknown_8180BA0:: @ 8180BA0
CinnabarIsland_Text_ScientistsExperimentInMansion:: @ 8180BA0
.string "Scientists conduct experiments \n"
.string "in the burned-out building.\p"
.string "You know, the one they call the\n"
.string "POKéMON MANSION.$"
gUnknown_8180C0D:: @ 8180C0D
CinnabarIsland_Text_IslandSign:: @ 8180C0D
.string "CINNABAR ISLAND\n"
.string "The Fiery Town of Burning Desire$"
gUnknown_8180C3E:: @ 8180C3E
CinnabarIsland_Text_PokemonLab:: @ 8180C3E
.string "POKéMON LAB$"
gUnknown_8180C4A:: @ 8180C4A
CinnabarIsland_Text_GymSign:: @ 8180C4A
.string "CINNABAR ISLAND POKéMON GYM\n"
.string "LEADER: BLAINE\l"
.string "The Hotheaded Quiz Master!$"
gUnknown_8180C90:: @ 8180C90
CinnabarIsland_Text_HeyIfItIsntPlayer:: @ 8180C90
.string "Huh?\n"
.string "Hey, if it isn't {PLAYER}!$"
gUnknown_8180CAA:: @ 8180CAA
CinnabarIsland_Text_ComeWithMeToOneIsland:: @ 8180CAA
.string "Look, it's me, BILL.\n"
.string "Long time no see!\p"
.string "I hope you're still using my\n"
@@ -43,11 +43,11 @@ gUnknown_8180CAA:: @ 8180CAA
.string "How about it?\n"
.string "Do you feel like coming with me?$"
gUnknown_8180DDD:: @ 8180DDD
CinnabarIsland_Text_AllRightLetsGo:: @ 8180DDD
.string "All right, then.\n"
.string "Let's go!$"
gUnknown_8180DF8:: @ 8180DF8
CinnabarIsland_Text_IllBeWaitingInPokeCenter:: @ 8180DF8
.string "What, are you too busy?\p"
.string "Well, all right.\n"
.string "The boat hasn't arrived yet anyway.\p"
@@ -56,13 +56,13 @@ gUnknown_8180DF8:: @ 8180DF8
.string "Come see me when you're done with\n"
.string "your business here.$"
gUnknown_8180EAD:: @ 8180EAD
CinnabarIsland_Text_MyPalsBoatArrived:: @ 8180EAD
.string "Looks like my pal's boat arrived,\n"
.string "too.\p"
.string "He sent it specially here to\n"
.string "CINNABAR to pick me up.$"
gUnknown_8180F09:: @ 8180F09
CinnabarIsland_Text_IfYouHaveTriPassYouCanGoAgain:: @ 8180F09
.string "Hey, wasn't that a long cruise?\p"
.string "My buddy CELIO seemed to enjoy\n"
.string "your company.\p"
data/maps/CinnabarIsland_Gym/map.json
+24 -24
View File
@@ -23,7 +23,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 0,
"script": "CinnabarIsland_Gym_EventScript_16DB27",
"script": "CinnabarIsland_Gym_EventScript_Quinn",
"flag": "0"
},
{
@@ -36,7 +36,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 0,
"script": "CinnabarIsland_Gym_EventScript_16DA7F",
"script": "CinnabarIsland_Gym_EventScript_Erik",
"flag": "0"
},
{
@@ -49,7 +49,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 0,
"script": "CinnabarIsland_Gym_EventScript_16DA96",
"script": "CinnabarIsland_Gym_EventScript_Avery",
"flag": "0"
},
{
@@ -62,7 +62,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 0,
"script": "CinnabarIsland_Gym_EventScript_16DB53",
"script": "CinnabarIsland_Gym_EventScript_Ramon",
"flag": "0"
},
{
@@ -75,7 +75,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 0,
"script": "CinnabarIsland_Gym_EventScript_16DAC2",
"script": "CinnabarIsland_Gym_EventScript_Derek",
"flag": "0"
},
{
@@ -88,7 +88,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 0,
"script": "CinnabarIsland_Gym_EventScript_16DB7F",
"script": "CinnabarIsland_Gym_EventScript_Dusty",
"flag": "0"
},
{
@@ -101,7 +101,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 0,
"script": "CinnabarIsland_Gym_EventScript_16DAFB",
"script": "CinnabarIsland_Gym_EventScript_Zac",
"flag": "0"
},
{
@@ -114,7 +114,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "CinnabarIsland_Gym_EventScript_16D9D4",
"script": "CinnabarIsland_Gym_EventScript_Blaine",
"flag": "0"
},
{
@@ -127,7 +127,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "CinnabarIsland_Gym_EventScript_16DBAB",
"script": "CinnabarIsland_Gym_EventScript_GymGuy",
"flag": "0"
}
],
@@ -161,105 +161,105 @@
"x": 23,
"y": 20,
"elevation": 0,
"script": "CinnabarIsland_Gym_EventScript_16DBCA"
"script": "CinnabarIsland_Gym_EventScript_GymStatue"
},
{
"type": "bg_event_type_0",
"x": 27,
"y": 20,
"elevation": 0,
"script": "CinnabarIsland_Gym_EventScript_16DBCA"
"script": "CinnabarIsland_Gym_EventScript_GymStatue"
},
{
"type": "bg_event_type_1",
"x": 22,
"y": 10,
"elevation": 0,
"script": "CinnabarIsland_Gym_EventScript_16DBE8"
"script": "CinnabarIsland_Gym_EventScript_Quz1Left"
},
{
"type": "bg_event_type_1",
"x": 23,
"y": 10,
"elevation": 0,
"script": "CinnabarIsland_Gym_EventScript_16DBF4"
"script": "CinnabarIsland_Gym_EventScript_Quz1Right"
},
{
"type": "bg_event_type_1",
"x": 15,
"y": 2,
"elevation": 0,
"script": "CinnabarIsland_Gym_EventScript_16DCDD"
"script": "CinnabarIsland_Gym_EventScript_Quiz2Left"
},
{
"type": "bg_event_type_1",
"x": 16,
"y": 2,
"elevation": 0,
"script": "CinnabarIsland_Gym_EventScript_16DCE9"
"script": "CinnabarIsland_Gym_EventScript_Quiz2Right"
},
{
"type": "bg_event_type_1",
"x": 13,
"y": 10,
"elevation": 0,
"script": "CinnabarIsland_Gym_EventScript_16DDBB"
"script": "CinnabarIsland_Gym_EventScript_Quiz3Left"
},
{
"type": "bg_event_type_1",
"x": 14,
"y": 10,
"elevation": 0,
"script": "CinnabarIsland_Gym_EventScript_16DDC7"
"script": "CinnabarIsland_Gym_EventScript_Quiz3Right"
},
{
"type": "bg_event_type_1",
"x": 13,
"y": 17,
"elevation": 0,
"script": "CinnabarIsland_Gym_EventScript_16DE92"
"script": "CinnabarIsland_Gym_EventScript_Quiz4Left"
},
{
"type": "bg_event_type_1",
"x": 14,
"y": 17,
"elevation": 0,
"script": "CinnabarIsland_Gym_EventScript_16DE9E"
"script": "CinnabarIsland_Gym_EventScript_Quiz4Right"
},
{
"type": "bg_event_type_1",
"x": 1,
"y": 18,
"elevation": 0,
"script": "CinnabarIsland_Gym_EventScript_16DF69"
"script": "CinnabarIsland_Gym_EventScript_Quiz5Left"
},
{
"type": "bg_event_type_1",
"x": 2,
"y": 18,
"elevation": 0,
"script": "CinnabarIsland_Gym_EventScript_16DF75"
"script": "CinnabarIsland_Gym_EventScript_Quiz5Right"
},
{
"type": "bg_event_type_1",
"x": 1,
"y": 10,
"elevation": 0,
"script": "CinnabarIsland_Gym_EventScript_16E040"
"script": "CinnabarIsland_Gym_EventScript_Quiz6Left"
},
{
"type": "bg_event_type_1",
"x": 2,
"y": 10,
"elevation": 0,
"script": "CinnabarIsland_Gym_EventScript_16E04C"
"script": "CinnabarIsland_Gym_EventScript_Quiz6Right"
},
{
"type": "bg_event_type_1",
"x": 3,
"y": 1,
"elevation": 0,
"script": "CinnabarIsland_Gym_EventScript_1ACF07"
"script": "CinnabarIsland_Gym_EventScript_BlaineFujiPhoto"
}
]
}
data/maps/CinnabarIsland_Gym/scripts.inc
+332 -332
View File
File diff suppressed because it is too large Load Diff
data/maps/CinnabarIsland_Gym/text.inc
+41 -47
View File
@@ -1,4 +1,4 @@
Text_199543:: @ 8199543
CinnabarIsland_Gym_Text_BlaineIntro:: @ 8199543
.string "Hah!\p"
.string "I am BLAINE, the red-hot LEADER\n"
.string "of CINNABAR GYM!\p"
@@ -8,95 +8,91 @@ Text_199543:: @ 8199543
.string "Hah!\n"
.string "You better have BURN HEAL!{PLAY_BGM}{MUS_EXEYE}$"
Text_1995FA:: @ 81995FA
CinnabarIsland_Gym_Text_BlaineDefeat:: @ 81995FA
.string "I have burned down to nothing!\n"
.string "Not even ashes remain!\p"
.string "You have earned the VOLCANOBADGE.$"
gUnknown_8199652:: @ 8199652
CinnabarIsland_Gym_Text_FireBlastIsUltimateFireMove:: @ 8199652
.string "FIRE BLAST is the ultimate fire\n"
.string "technique.\p"
.string "Don't waste it on WATER POKéMON.$"
gUnknown_819969E:: @ 819969E
CinnabarIsland_Gym_Text_ExplainVolcanoBadge:: @ 819969E
.string "Hah!\p"
.string "The VOLCANOBADGE heightens the\n"
.string "SPECIAL stats of your POKéMON.\p"
.string "Here, you can have this, too!$"
gUnknown_81996FF:: @ 81996FF
CinnabarIsland_Gym_Text_ReceivedTM38FromBlaine:: @ 81996FF
.string "{PLAYER} received TM38\n"
.string "from BLAINE.$"
gUnknown_819971D:: @ 819971D
CinnabarIsland_Gym_Text_BlainePostBattle:: @ 819971D
.string "TM38 contains FIRE BLAST.\n"
.string "Teach it to FIRE-type POKéMON.\p"
.string "VULPIX or CHARMELEON would be\n"
.string "ideal for that move.$"
gUnknown_8199789:: @ 8199789
CinnabarIsland_Gym_Text_MakeSpaceForThis:: @ 8199789
.string "Make space for this, child!$"
Text_1997A5:: @ 81997A5
CinnabarIsland_Gym_Text_ErikIntro:: @ 81997A5
.string "Do you know how hot POKéMON fire\n"
.string "breath can get?$"
Text_1997D6:: @ 81997D6
CinnabarIsland_Gym_Text_ErikDefeat:: @ 81997D6
.string "Yow!\n"
.string "Hot, hot, hot!$"
gUnknown_81997EA:: @ 81997EA
CinnabarIsland_Gym_Text_ErikPostBattle:: @ 81997EA
.string "Fire, or to be more precise,\n"
.string "combustion…\p"
.string "…Oxygen in the air…\n"
.string "Blah, blah, blah, blah…$"
Text_19983F:: @ 819983F
gUnknown_819983F:: @ 819983F
CinnabarIsland_Gym_Text_QuinnIntro:: @ 819983F
.string "I was a thief, but I went straight\n"
.string "as a TRAINER.$"
Text_199870:: @ 8199870
CinnabarIsland_Gym_Text_QuinnDefeat:: @ 8199870
.string "I surrender!$"
gUnknown_819987D:: @ 819987D
CinnabarIsland_Gym_Text_QuinnPostBattle:: @ 819987D
.string "I get this uncontrollable urge to\n"
.string "steal other people's POKéMON.$"
Text_1998BD:: @ 81998BD
gUnknown_81998BD:: @ 81998BD
CinnabarIsland_Gym_Text_AveryIntro:: @ 81998BD
.string "I've studied POKéMON thoroughly.\n"
.string "You can't win!$"
Text_1998ED:: @ 81998ED
CinnabarIsland_Gym_Text_AveryDefeat:: @ 81998ED
.string "Waah!\n"
.string "My studies were insufficient!$"
gUnknown_8199911:: @ 8199911
CinnabarIsland_Gym_Text_AveryPostBattle:: @ 8199911
.string "My theories are too complicated\n"
.string "for you to understand.$"
Text_199948:: @ 8199948
gUnknown_8199948:: @ 8199948
CinnabarIsland_Gym_Text_RamonIntro:: @ 8199948
.string "I like using FIRE-type POKéMON.\n"
.string "I just do.$"
Text_199973:: @ 8199973
CinnabarIsland_Gym_Text_RamonDefeat:: @ 8199973
.string "Too hot to handle!$"
gUnknown_8199986:: @ 8199986
CinnabarIsland_Gym_Text_RamonPostBattle:: @ 8199986
.string "I wish there were a thief POKéMON.\n"
.string "I'd use that!$"
Text_1999B7:: @ 81999B7
gUnknown_81999B7:: @ 81999B7
CinnabarIsland_Gym_Text_DerekIntro:: @ 81999B7
.string "I know why BLAINE became a\n"
.string "TRAINER.$"
Text_1999DB:: @ 81999DB
CinnabarIsland_Gym_Text_DerekDefeat:: @ 81999DB
.string "Ow!$"
gUnknown_81999DF:: @ 81999DF
CinnabarIsland_Gym_Text_DerekPostBattle:: @ 81999DF
.string "Our LEADER, BLAINE, became lost\n"
.string "in the mountains but good.\p"
.string "Night fell when a fiery bird\n"
@@ -104,33 +100,31 @@ gUnknown_81999DF:: @ 81999DF
.string "Its light allowed BLAINE to find\n"
.string "his way down safely.$"
Text_199A7F:: @ 8199A7F
gUnknown_8199A7F:: @ 8199A7F
CinnabarIsland_Gym_Text_DustyIntro:: @ 8199A7F
.string "I've been to many GYMS, but this\n"
.string "one best suits my style.$"
Text_199AB9:: @ 8199AB9
CinnabarIsland_Gym_Text_DustyDefeat:: @ 8199AB9
.string "Yowza!\n"
.string "Too hot!$"
gUnknown_8199AC9:: @ 8199AC9
CinnabarIsland_Gym_Text_DustyPostBattle:: @ 8199AC9
.string "PONYTA, NINETALES…\n"
.string "Those are popular FIRE POKéMON.$"
Text_199AFC:: @ 8199AFC
gUnknown_8199AFC:: @ 8199AFC
CinnabarIsland_Gym_Text_ZacIntro:: @ 8199AFC
.string "Fire is weak against H2O.$"
Text_199B16:: @ 8199B16
CinnabarIsland_Gym_Text_ZacDefeat:: @ 8199B16
.string "Oh!\n"
.string "Snuffed out!$"
gUnknown_8199B27:: @ 8199B27
CinnabarIsland_Gym_Text_ZacPostBattle:: @ 8199B27
.string "Water beats fire, of course.\p"
.string "But fire melts ice, so the FIRE\n"
.string "type beats ICE-type POKéMON.$"
gUnknown_8199B81:: @ 8199B81
CinnabarIsland_Gym_Text_GymGuyAdvice:: @ 8199B81
.string "Yo!\n"
.string "Champ in the making!\p"
.string "The hotheaded BLAINE is a FIRE\n"
@@ -139,23 +133,23 @@ gUnknown_8199B81:: @ 8199B81
.string "You'd better take some\n"
.string "BURN HEALS, too.$"
gUnknown_8199C0C:: @ 8199C0C
CinnabarIsland_Gym_Text_GymGuyPostVictory:: @ 8199C0C
.string "{PLAYER}!\n"
.string "You beat that firebrand!$"
gUnknown_8199C29:: @ 8199C29
CinnabarIsland_Gym_Text_GymStatue:: @ 8199C29
.string "CINNABAR POKéMON GYM\n"
.string "LEADER: BLAINE\p"
.string "WINNING TRAINERS:\n"
.string "{RIVAL}$"
gUnknown_8199C62:: @ 8199C62
CinnabarIsland_Gym_Text_GymStatuePlayerWon:: @ 8199C62
.string "CINNABAR POKéMON GYM\n"
.string "LEADER: BLAINE\p"
.string "WINNING TRAINERS:\n"
.string "{RIVAL}, {PLAYER}$"
gUnknown_8199C9F:: @ 8199C9F
CinnabarIsland_Gym_Text_PokemonQuizRules:: @ 8199C9F
.string "POKéMON Quiz!\p"
.string "Get it right, and the door opens to\n"
.string "the next room.\p"
@@ -165,32 +159,32 @@ gUnknown_8199C9F:: @ 8199C9F
.string "Then get it right!\n"
.string "Here we go!$"
gUnknown_8199D5A:: @ 8199D5A
CinnabarIsland_Gym_Text_QuizQuestion1:: @ 8199D5A
.string "CATERPIE evolves into METAPOD?$"
gUnknown_8199D79:: @ 8199D79
CinnabarIsland_Gym_Text_QuizQuestion2:: @ 8199D79
.string "There are nine certified POKéMON\n"
.string "LEAGUE BADGES?$"
gUnknown_8199DA9:: @ 8199DA9
CinnabarIsland_Gym_Text_QuizQuestion3:: @ 8199DA9
.string "POLIWAG evolves three times?$"
gUnknown_8199DC6:: @ 8199DC6
CinnabarIsland_Gym_Text_QuizQuestion4:: @ 8199DC6
.string "Are electric moves effective\n"
.string "against GROUND-type POKéMON?$"
gUnknown_8199E00:: @ 8199E00
CinnabarIsland_Gym_Text_QuizQuestion5:: @ 8199E00
.string "POKéMON of the same kind and level\n"
.string "are not identical?$"
gUnknown_8199E36:: @ 8199E36
CinnabarIsland_Gym_Text_QuizQuestion6:: @ 8199E36
.string "TM28 contains TOMBSTONY?$"
gUnknown_8199E4F:: @ 8199E4F
CinnabarIsland_Gym_Text_CorrectGoOnThrough:: @ 8199E4F
.string "You're absolutely correct!\p"
.string "Go on through!$"
gUnknown_8199E79:: @ 8199E79
CinnabarIsland_Gym_Text_SorryBadCall:: @ 8199E79
.string "Sorry!\n"
.string "Bad call!$"
data/maps/CinnabarIsland_Mart/map.json
+3 -3
View File
@@ -23,7 +23,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "CinnabarIsland_Mart_EventScript_16EA22",
"script": "CinnabarIsland_Mart_EventScript_Clerk",
"flag": "0"
},
{
@@ -36,7 +36,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "CinnabarIsland_Mart_EventScript_16EA10",
"script": "CinnabarIsland_Mart_EventScript_Woman",
"flag": "0"
},
{
@@ -49,7 +49,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "CinnabarIsland_Mart_EventScript_16EA19",
"script": "CinnabarIsland_Mart_EventScript_Scientist",
"flag": "0"
}
],
data/maps/CinnabarIsland_Mart/scripts.inc
+7 -7
View File
@@ -1,27 +1,27 @@
CinnabarIsland_Mart_MapScripts:: @ 816EA0F
.byte 0
CinnabarIsland_Mart_EventScript_16EA10:: @ 816EA10
msgbox gUnknown_819A7A0, MSGBOX_NPC
CinnabarIsland_Mart_EventScript_Woman:: @ 816EA10
msgbox CinnabarIsland_Mart_Text_DontTheyHaveXAttack, MSGBOX_NPC
end
CinnabarIsland_Mart_EventScript_16EA19:: @ 816EA19
msgbox gUnknown_819A7F1, MSGBOX_NPC
CinnabarIsland_Mart_EventScript_Scientist:: @ 816EA19
msgbox CinnabarIsland_Mart_Text_ExtraItemsNeverHurt, MSGBOX_NPC
end
CinnabarIsland_Mart_EventScript_16EA22:: @ 816EA22
CinnabarIsland_Mart_EventScript_Clerk:: @ 816EA22
goto_if_questlog EventScript_ReleaseEnd
lock
faceplayer
message Text_MayIHelpYou
waitmessage
pokemart Items_16EA48
pokemart CinnabarIsland_Mart_Items
msgbox Text_PleaseComeAgain
release
end
.align 2
Items_16EA48:: @ 816EA48
CinnabarIsland_Mart_Items:: @ 816EA48
.2byte ITEM_ULTRA_BALL
.2byte ITEM_GREAT_BALL
.2byte ITEM_HYPER_POTION
data/maps/CinnabarIsland_Mart/text.inc
+2 -2
View File
@@ -1,9 +1,9 @@
gUnknown_819A7A0:: @ 819A7A0
CinnabarIsland_Mart_Text_DontTheyHaveXAttack:: @ 819A7A0
.string "Don't they have X ATTACK?\p"
.string "I like it because it raises the\n"
.string "ATTACK stat in battle.$"
gUnknown_819A7F1:: @ 819A7F1
CinnabarIsland_Mart_Text_ExtraItemsNeverHurt:: @ 819A7F1
.string "It never hurts to have extra items.\n"
.string "You never know what might happen.$"
data/maps/CinnabarIsland_PokemonCenter_1F/map.json
+7 -7
View File
@@ -23,7 +23,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "CinnabarIsland_PokemonCenter_1F_EventScript_16E8E6",
"script": "CinnabarIsland_PokemonCenter_1F_EventScript_Nurse",
"flag": "0"
},
{
@@ -36,7 +36,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "CinnabarIsland_PokemonCenter_1F_EventScript_16E8F8",
"script": "CinnabarIsland_PokemonCenter_1F_EventScript_CooltrainerF",
"flag": "0"
},
{
@@ -49,7 +49,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "CinnabarIsland_PokemonCenter_1F_EventScript_16E8EF",
"script": "CinnabarIsland_PokemonCenter_1F_EventScript_Gentleman",
"flag": "0"
},
{
@@ -62,7 +62,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "CinnabarIsland_PokemonCenter_1F_EventScript_16E901",
"script": "CinnabarIsland_PokemonCenter_1F_EventScript_Youngster",
"flag": "0"
},
{
@@ -75,7 +75,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "CinnabarIsland_PokemonCenter_1F_EventScript_1AD0B9",
"script": "CinnabarIsland_PokemonCenter_1F_EventScript_PokemonJournalMrFuji",
"flag": "FLAG_HIDE_POSTGAME_GOSSIPERS"
},
{
@@ -88,7 +88,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "CinnabarIsland_PokemonCenter_1F_EventScript_1AD0B9",
"script": "CinnabarIsland_PokemonCenter_1F_EventScript_PokemonJournalMrFuji",
"flag": "FLAG_HIDE_POSTGAME_GOSSIPERS"
},
{
@@ -101,7 +101,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "CinnabarIsland_PokemonCenter_1F_EventScript_16E90A",
"script": "CinnabarIsland_PokemonCenter_1F_EventScript_Bill",
"flag": "FLAG_HIDE_CINNABAR_POKECENTER_BILL"
}
],
data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc
+30 -30
View File
@@ -7,32 +7,32 @@ CinnabarIsland_PokemonCenter_1F_OnTransition:: @ 816E8E2
setrespawn SPAWN_CINNABAR_ISLAND
end
CinnabarIsland_PokemonCenter_1F_EventScript_16E8E6:: @ 816E8E6
CinnabarIsland_PokemonCenter_1F_EventScript_Nurse:: @ 816E8E6
lock
faceplayer
call EventScript_PkmnCenterNurse
release
end
CinnabarIsland_PokemonCenter_1F_EventScript_16E8EF:: @ 816E8EF
msgbox gUnknown_819A5BE, MSGBOX_NPC
CinnabarIsland_PokemonCenter_1F_EventScript_Gentleman:: @ 816E8EF
msgbox CinnabarIsland_PokemonCenter_1F_Text_VisitUnionRoom, MSGBOX_NPC
end
CinnabarIsland_PokemonCenter_1F_EventScript_16E8F8:: @ 816E8F8
msgbox gUnknown_819A4F8, MSGBOX_NPC
CinnabarIsland_PokemonCenter_1F_EventScript_CooltrainerF:: @ 816E8F8
msgbox CinnabarIsland_PokemonCenter_1F_Text_CinnabarGymLocked, MSGBOX_NPC
end
CinnabarIsland_PokemonCenter_1F_EventScript_16E901:: @ 816E901
msgbox gUnknown_819A6B1, MSGBOX_NPC
CinnabarIsland_PokemonCenter_1F_EventScript_Youngster:: @ 816E901
msgbox CinnabarIsland_PokemonCenter_1F_Text_EvolutionCanWaitForNewMoves, MSGBOX_NPC
end
CinnabarIsland_PokemonCenter_1F_EventScript_16E90A:: @ 816E90A
CinnabarIsland_PokemonCenter_1F_EventScript_Bill:: @ 816E90A
lock
faceplayer
msgbox gUnknown_819A725, MSGBOX_YESNO
msgbox CinnabarIsland_PokemonCenter_1F_Text_ReadyToSailToOneIsland, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq EventScript_16E9A5
msgbox gUnknown_819A785
goto_if_eq CinnabarIsland_PokemonCenter_1F_EventScript_NotReadyToSail
msgbox CinnabarIsland_PokemonCenter_1F_Text_LetsGo
closemessage
playbgm MUS_ANNAI, 1
savebgm MUS_ANNAI
@@ -40,11 +40,11 @@ CinnabarIsland_PokemonCenter_1F_EventScript_16E90A:: @ 816E90A
setflag FLAG_HIDE_CINNABAR_POKECENTER_BILL
delay 20
compare VAR_FACING, DIR_SOUTH
call_if_eq EventScript_16E96F
call_if_eq CinnabarIsland_PokemonCenter_1F_EventScript_ExitWithBillSouth
compare VAR_FACING, DIR_EAST
call_if_eq EventScript_16E981
call_if_eq CinnabarIsland_PokemonCenter_1F_EventScript_ExitWithBillEast
compare VAR_FACING, DIR_WEST
call_if_eq EventScript_16E993
call_if_eq CinnabarIsland_PokemonCenter_1F_EventScript_ExitWithBillWest
removeobject 7
setvar VAR_MAP_SCENE_CINNABAR_ISLAND_2, 1
clearflag FLAG_HIDE_CINNABAR_BILL
@@ -53,30 +53,30 @@ CinnabarIsland_PokemonCenter_1F_EventScript_16E90A:: @ 816E90A
release
end
EventScript_16E96F:: @ 816E96F
applymovement 7, Movement_16E9AF
applymovement OBJ_EVENT_ID_PLAYER, Movement_16E9B9
CinnabarIsland_PokemonCenter_1F_EventScript_ExitWithBillSouth:: @ 816E96F
applymovement 7, CinnabarIsland_PokemonCenter_1F_Movement_BillExit
applymovement OBJ_EVENT_ID_PLAYER, CinnabarIsland_PokemonCenter_1F_Movement_PlayerExitSouth
waitmovement 0
return
EventScript_16E981:: @ 816E981
applymovement 7, Movement_16E9C3
applymovement OBJ_EVENT_ID_PLAYER, Movement_16E9CF
CinnabarIsland_PokemonCenter_1F_EventScript_ExitWithBillEast:: @ 816E981
applymovement 7, CinnabarIsland_PokemonCenter_1F_Movement_BillExitEast
applymovement OBJ_EVENT_ID_PLAYER, CinnabarIsland_PokemonCenter_1F_Movement_PlayerExitEast
waitmovement 0
return
EventScript_16E993:: @ 816E993
applymovement 7, Movement_16E9AF
applymovement OBJ_EVENT_ID_PLAYER, Movement_16E9DE
CinnabarIsland_PokemonCenter_1F_EventScript_ExitWithBillWest:: @ 816E993
applymovement 7, CinnabarIsland_PokemonCenter_1F_Movement_BillExit
applymovement OBJ_EVENT_ID_PLAYER, CinnabarIsland_PokemonCenter_1F_Movement_PlayerExitWest
waitmovement 0
return
EventScript_16E9A5:: @ 816E9A5
msgbox gUnknown_819A766
CinnabarIsland_PokemonCenter_1F_EventScript_NotReadyToSail:: @ 816E9A5
msgbox CinnabarIsland_PokemonCenter_1F_Text_OhNotDoneYet
release
end
Movement_16E9AF:: @ 816E9AF
CinnabarIsland_PokemonCenter_1F_Movement_BillExit:: @ 816E9AF
walk_left
walk_left
walk_left
@@ -88,7 +88,7 @@ Movement_16E9AF:: @ 816E9AF
set_invisible
step_end
Movement_16E9B9:: @ 816E9B9
CinnabarIsland_PokemonCenter_1F_Movement_PlayerExitSouth:: @ 816E9B9
walk_down
walk_left
walk_left
@@ -100,7 +100,7 @@ Movement_16E9B9:: @ 816E9B9
walk_down
step_end
Movement_16E9C3:: @ 816E9C3
CinnabarIsland_PokemonCenter_1F_Movement_BillExitEast:: @ 816E9C3
walk_up
walk_left
walk_left
@@ -114,7 +114,7 @@ Movement_16E9C3:: @ 816E9C3
set_invisible
step_end
Movement_16E9CF:: @ 816E9CF
CinnabarIsland_PokemonCenter_1F_Movement_PlayerExitEast:: @ 816E9CF
delay_16
delay_16
delay_16
@@ -131,7 +131,7 @@ Movement_16E9CF:: @ 816E9CF
set_invisible
step_end
Movement_16E9DE:: @ 816E9DE
CinnabarIsland_PokemonCenter_1F_Movement_PlayerExitWest:: @ 816E9DE
walk_left
walk_left
walk_left
data/maps/CinnabarIsland_PokemonCenter_1F/text.inc
+6 -6
View File
@@ -1,4 +1,4 @@
gUnknown_819A4F8:: @ 819A4F8
CinnabarIsland_PokemonCenter_1F_Text_CinnabarGymLocked:: @ 819A4F8
.string "I came to visit the CINNABAR GYM,\n"
.string "but the door is locked tight.\p"
.string "There should be a key for it\n"
@@ -8,7 +8,7 @@ gUnknown_819A4F8:: @ 819A4F8
.string "The GYM LEADER's friend used to\n"
.string "live there, they say.$"
gUnknown_819A5BE:: @ 819A5BE
CinnabarIsland_PokemonCenter_1F_Text_VisitUnionRoom:: @ 819A5BE
.string "Do you have lots of friends?\p"
.string "Linking up with the usual friends\n"
.string "is fun, of course.\p"
@@ -19,20 +19,20 @@ gUnknown_819A5BE:: @ 819A5BE
.string "I think it would be worth your time\n"
.string "to check the UNION ROOM.$"
gUnknown_819A6B1:: @ 819A6B1
CinnabarIsland_PokemonCenter_1F_Text_EvolutionCanWaitForNewMoves:: @ 819A6B1
.string "POKéMON can still learn techniques\n"
.string "after canceling evolution.\p"
.string "Evolution can wait until new moves\n"
.string "have been learned.$"
gUnknown_819A725:: @ 819A725
CinnabarIsland_PokemonCenter_1F_Text_ReadyToSailToOneIsland:: @ 819A725
.string "BILL: Hey, you kept me waiting!\n"
.string "Ready to set sail to ONE ISLAND?$"
gUnknown_819A766:: @ 819A766
CinnabarIsland_PokemonCenter_1F_Text_OhNotDoneYet:: @ 819A766
.string "Oh, you're still not done yet?$"
gUnknown_819A785:: @ 819A785
CinnabarIsland_PokemonCenter_1F_Text_LetsGo:: @ 819A785
.string "Well, that's it.\n"
.string "Let's go!$"
data/maps/CinnabarIsland_PokemonLab_Entrance/map.json
+5 -5
View File
@@ -23,7 +23,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "CinnabarIsland_PokemonLab_Entrance_EventScript_16E28B",
"script": "CinnabarIsland_PokemonLab_Entrance_EventScript_Scientist",
"flag": "0"
}
],
@@ -78,28 +78,28 @@
"x": 4,
"y": 1,
"elevation": 0,
"script": "CinnabarIsland_PokemonLab_Entrance_EventScript_16E294"
"script": "CinnabarIsland_PokemonLab_Entrance_EventScript_DrFujiPhoto"
},
{
"type": "bg_event_type_0",
"x": 12,
"y": 5,
"elevation": 0,
"script": "CinnabarIsland_PokemonLab_Entrance_EventScript_16E29D"
"script": "CinnabarIsland_PokemonLab_Entrance_EventScript_MeetingRoomSign"
},
{
"type": "bg_event_type_0",
"x": 18,
"y": 5,
"elevation": 0,
"script": "CinnabarIsland_PokemonLab_Entrance_EventScript_16E2A6"
"script": "CinnabarIsland_PokemonLab_Entrance_EventScript_RAndDRoomSign"
},
{
"type": "bg_event_type_0",
"x": 24,
"y": 5,
"elevation": 0,
"script": "CinnabarIsland_PokemonLab_Entrance_EventScript_16E2AF"
"script": "CinnabarIsland_PokemonLab_Entrance_EventScript_TestingRoomSign"
}
]
}
data/maps/CinnabarIsland_PokemonLab_Entrance/scripts.inc
+12 -12
View File
@@ -4,29 +4,29 @@ CinnabarIsland_PokemonLab_Entrance_MapScripts:: @ 816E273
CinnabarIsland_PokemonLab_Entrance_OnTransition:: @ 816E279
compare VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_REVIVE_STATE, 1
call_if_eq EventScript_16E285
call_if_eq CinnabarIsland_PokemonLab_Entrance_EventScript_ReadyFossil
end
EventScript_16E285:: @ 816E285
CinnabarIsland_PokemonLab_Entrance_EventScript_ReadyFossil:: @ 816E285
setvar VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_REVIVE_STATE, 2
return
CinnabarIsland_PokemonLab_Entrance_EventScript_16E28B:: @ 816E28B
msgbox gUnknown_8199EE5, MSGBOX_NPC
CinnabarIsland_PokemonLab_Entrance_EventScript_Scientist:: @ 816E28B
msgbox CinnabarIsland_PokemonLab_Entrance_Text_StudyMonsExtensively, MSGBOX_NPC
end
CinnabarIsland_PokemonLab_Entrance_EventScript_16E294:: @ 816E294
msgbox gUnknown_8199F41, MSGBOX_SIGN
CinnabarIsland_PokemonLab_Entrance_EventScript_DrFujiPhoto:: @ 816E294
msgbox CinnabarIsland_PokemonLab_Entrance_Text_PhotoOfLabFounderDrFuji, MSGBOX_SIGN
end
CinnabarIsland_PokemonLab_Entrance_EventScript_16E29D:: @ 816E29D
msgbox gUnknown_8199F6A, MSGBOX_SIGN
CinnabarIsland_PokemonLab_Entrance_EventScript_MeetingRoomSign:: @ 816E29D
msgbox CinnabarIsland_PokemonLab_Entrance_Text_MeetingRoomSign, MSGBOX_SIGN
end
CinnabarIsland_PokemonLab_Entrance_EventScript_16E2A6:: @ 816E2A6
msgbox gUnknown_8199F83, MSGBOX_SIGN
CinnabarIsland_PokemonLab_Entrance_EventScript_RAndDRoomSign:: @ 816E2A6
msgbox CinnabarIsland_PokemonLab_Entrance_Text_RAndDRoomSign, MSGBOX_SIGN
end
CinnabarIsland_PokemonLab_Entrance_EventScript_16E2AF:: @ 816E2AF
msgbox gUnknown_8199F9A, MSGBOX_SIGN
CinnabarIsland_PokemonLab_Entrance_EventScript_TestingRoomSign:: @ 816E2AF
msgbox CinnabarIsland_PokemonLab_Entrance_Text_TestingRoomSign, MSGBOX_SIGN
end
data/maps/CinnabarIsland_PokemonLab_Entrance/text.inc
+6 -6
View File
@@ -1,28 +1,28 @@
Text_199E8A:: @ 8199E8A
CinnabarIsland_Gym_Text_PhotoOfBlaineAndFuji:: @ 8199E8A
.string "It's a photo of BLAINE and\n"
.string "MR. FUJI.\p"
.string "They're standing shoulder to\n"
.string "shoulder with big grins.$"
gUnknown_8199EE5:: @ 8199EE5
CinnabarIsland_PokemonLab_Entrance_Text_StudyMonsExtensively:: @ 8199EE5
.string "We study POKéMON extensively\n"
.string "every day.\p"
.string "People often bring us rare POKéMON\n"
.string "for examination.$"
gUnknown_8199F41:: @ 8199F41
CinnabarIsland_PokemonLab_Entrance_Text_PhotoOfLabFounderDrFuji:: @ 8199F41
.string "A photo of the LAB's founder…\n"
.string "DR. FUJI?!$"
gUnknown_8199F6A:: @ 8199F6A
CinnabarIsland_PokemonLab_Entrance_Text_MeetingRoomSign:: @ 8199F6A
.string "POKéMON LAB\n"
.string "Meeting Room$"
gUnknown_8199F83:: @ 8199F83
CinnabarIsland_PokemonLab_Entrance_Text_RAndDRoomSign:: @ 8199F83
.string "POKéMON LAB\n"
.string "R & D Room$"
gUnknown_8199F9A:: @ 8199F9A
CinnabarIsland_PokemonLab_Entrance_Text_TestingRoomSign:: @ 8199F9A
.string "POKéMON LAB\n"
.string "Testing Room$"
data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/map.json
+2 -2
View File
@@ -23,7 +23,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_16E401",
"script": "CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_Garett",
"flag": "0"
},
{
@@ -36,7 +36,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_16E47D",
"script": "CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_FossilScientist",
"flag": "0"
}
],
data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/scripts.inc
+157 -153
View File
@@ -1,309 +1,313 @@
.equ HELIX_FOSSIL, 1
.equ DOME_FOSSIL, 2
.equ OLD_AMBER, 3
CinnabarIsland_PokemonLab_ExperimentRoom_MapScripts:: @ 816E400
.byte 0
CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_16E401:: @ 816E401
CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_Garett:: @ 816E401
lock
faceplayer
setvar VAR_0x8008, INGAME_TRADE_SEEL
call EventScript_GetInGameTradeSpeciesInfo
goto_if_set FLAG_DID_SEELOR_TRADE, EventScript_16E473
msgbox gUnknown_81A597B, MSGBOX_YESNO
goto_if_set FLAG_DID_SEELOR_TRADE, CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_AlreadyTraded
msgbox Trade_Text_LookingForMonWannaTradeForMon, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq EventScript_16E45B
goto_if_eq CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_DeclineTrade
call EventScript_ChooseMonForInGameTrade
compare VAR_0x8004, PARTY_SIZE
goto_if_ge EventScript_16E45B
goto_if_ge CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_DeclineTrade
call EventScript_GetInGameTradeSpecies
compare VAR_RESULT, VAR_0x8009
goto_if_ne EventScript_16E465
goto_if_ne CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_NotRequestedMon
call EventScript_DoInGameTrade
msgbox gUnknown_81A59DA
msgbox Trade_Text_HeyThanks
setflag FLAG_DID_SEELOR_TRADE
release
end
EventScript_16E45B:: @ 816E45B
msgbox gUnknown_81A59B6
CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_DeclineTrade:: @ 816E45B
msgbox Trade_Text_AwwOhWell
release
end
EventScript_16E465:: @ 816E465
CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_NotRequestedMon:: @ 816E465
getspeciesname 0, VAR_0x8009
msgbox gUnknown_81A59C6
msgbox Trade_Text_WhatThatsNoMon
release
end
EventScript_16E473:: @ 816E473
msgbox gUnknown_81A59E7
CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_AlreadyTraded:: @ 816E473
msgbox Trade_Text_IsntMyOldMonGreat
release
end
CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_16E47D:: @ 816E47D
CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_FossilScientist:: @ 816E47D
lock
faceplayer
setvar VAR_RESULT, 0
call_if_set FLAG_REVIVED_AMBER, EventScript_16E8A1
compare VAR_RESULT, 1
goto_if_eq EventScript_16E897
setvar VAR_RESULT, FALSE
call_if_set FLAG_REVIVED_AMBER, CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_CheckRevivedMtMoonFossil
compare VAR_RESULT, TRUE
goto_if_eq CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_RevivedAllFossils
compare VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_REVIVE_STATE, 2
goto_if_eq EventScript_16E736
goto_if_eq CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_GiveRevivedMon
compare VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_REVIVE_STATE, 1
goto_if_eq EventScript_16E72C
call EventScript_16E4EC
compare VAR_RESULT, 1
goto_if_eq EventScript_16E544
call EventScript_16E504
compare VAR_RESULT, 1
goto_if_eq EventScript_16E586
call EventScript_16E51C
compare VAR_RESULT, 1
goto_if_eq EventScript_16E5C8
msgbox gUnknown_819A282
goto EventScript_16E53A
goto_if_eq CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_FossilStillReviving
call CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_CheckAddHelixFossilToList
compare VAR_RESULT, TRUE
goto_if_eq CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_ChooseFossilHelix
call CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_CheckAddDomeFossilToList
compare VAR_RESULT, TRUE
goto_if_eq CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_ChooseFossilDome
call CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_CheckAddOldAmberToList
compare VAR_RESULT, TRUE
goto_if_eq CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_ChooseFossilAmber
msgbox CinnabarIsland_PokemonLab_ExperimentRoom_Text_HaveYouAFossilForMe
goto CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_DontShowFossil
end
EventScript_16E4EC:: @ 816E4EC
goto_if_unset FLAG_GOT_HELIX_FOSSIL, EventScript_16E534
goto_if_set FLAG_REVIVED_HELIX, EventScript_16E534
setvar VAR_RESULT, 1
CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_CheckAddHelixFossilToList:: @ 816E4EC
goto_if_unset FLAG_GOT_HELIX_FOSSIL, CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_SetResultFalse
goto_if_set FLAG_REVIVED_HELIX, CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_SetResultFalse
setvar VAR_RESULT, TRUE
return
EventScript_16E504:: @ 816E504
goto_if_unset FLAG_GOT_DOME_FOSSIL, EventScript_16E534
goto_if_set FLAG_REVIVED_DOME, EventScript_16E534
setvar VAR_RESULT, 1
CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_CheckAddDomeFossilToList:: @ 816E504
goto_if_unset FLAG_GOT_DOME_FOSSIL, CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_SetResultFalse
goto_if_set FLAG_REVIVED_DOME, CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_SetResultFalse
setvar VAR_RESULT, TRUE
return
EventScript_16E51C:: @ 816E51C
goto_if_unset FLAG_GOT_OLD_AMBER, EventScript_16E534
goto_if_set FLAG_REVIVED_AMBER, EventScript_16E534
setvar VAR_RESULT, 1
CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_CheckAddOldAmberToList:: @ 816E51C
goto_if_unset FLAG_GOT_OLD_AMBER, CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_SetResultFalse
goto_if_set FLAG_REVIVED_AMBER, CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_SetResultFalse
setvar VAR_RESULT, TRUE
return
EventScript_16E534:: @ 816E534
setvar VAR_RESULT, 0
CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_SetResultFalse:: @ 816E534
setvar VAR_RESULT, FALSE
return
EventScript_16E53A:: @ 816E53A
msgbox gUnknown_819A314
CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_DontShowFossil:: @ 816E53A
msgbox CinnabarIsland_PokemonLab_ExperimentRoom_Text_NoIsTooBad
release
end
EventScript_16E544:: @ 816E544
message Text_19A282
CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_ChooseFossilHelix:: @ 816E544
message CinnabarIsland_PokemonLab_ExperimentRoom_Text_HaveYouAFossilForMe
waitmessage
call EventScript_16E51C
compare VAR_RESULT, 1
goto_if_eq EventScript_16E5FA
call CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_CheckAddOldAmberToList
compare VAR_RESULT, TRUE
goto_if_eq CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_ChooseFossilHelixAmber
multichoice 0, 0, MULTICHOICE_HELIX, FALSE
switch VAR_RESULT
case 0, EventScript_16E668
case 1, EventScript_16E53A
case 127, EventScript_16E53A
case 0, CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_ShowHelixFossil
case 1, CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_DontShowFossil
case 127, CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_DontShowFossil
end
EventScript_16E586:: @ 816E586
message Text_19A282
CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_ChooseFossilDome:: @ 816E586
message CinnabarIsland_PokemonLab_ExperimentRoom_Text_HaveYouAFossilForMe
waitmessage
call EventScript_16E51C
compare VAR_RESULT, 1
goto_if_eq EventScript_16E631
call CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_CheckAddOldAmberToList
compare VAR_RESULT, TRUE
goto_if_eq CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_ChooseFossilDomeAmber
multichoice 0, 0, MULTICHOICE_DOME, FALSE
switch VAR_RESULT
case 0, EventScript_16E6A6
case 1, EventScript_16E53A
case 127, EventScript_16E53A
case 0, CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_ShowDomeFossil
case 1, CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_DontShowFossil
case 127, CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_DontShowFossil
end
EventScript_16E5C8:: @ 816E5C8
message Text_19A282
CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_ChooseFossilAmber:: @ 816E5C8
message CinnabarIsland_PokemonLab_ExperimentRoom_Text_HaveYouAFossilForMe
waitmessage
multichoice 0, 0, MULTICHOICE_AMBER, FALSE
switch VAR_RESULT
case 0, EventScript_16E6E4
case 1, EventScript_16E53A
case 127, EventScript_16E53A
case 0, CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_ShowOldAmber
case 1, CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_DontShowFossil
case 127, CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_DontShowFossil
end
EventScript_16E5FA:: @ 816E5FA
CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_ChooseFossilHelixAmber:: @ 816E5FA
multichoice 0, 0, MULTICHOICE_HELIX_AMBER, FALSE
switch VAR_RESULT
case 0, EventScript_16E668
case 1, EventScript_16E6E4
case 2, EventScript_16E53A
case 127, EventScript_16E53A
case 0, CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_ShowHelixFossil
case 1, CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_ShowOldAmber
case 2, CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_DontShowFossil
case 127, CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_DontShowFossil
end
EventScript_16E631:: @ 816E631
CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_ChooseFossilDomeAmber:: @ 816E631
multichoice 0, 0, MULTICHOICE_DOME_AMBER, FALSE
switch VAR_RESULT
case 0, EventScript_16E6A6
case 1, EventScript_16E6E4
case 2, EventScript_16E53A
case 127, EventScript_16E53A
case 0, CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_ShowDomeFossil
case 1, CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_ShowOldAmber
case 2, CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_DontShowFossil
case 127, CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_DontShowFossil
end
EventScript_16E668:: @ 816E668
CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_ShowHelixFossil:: @ 816E668
getspeciesname 0, SPECIES_OMANYTE
getitemname 1, ITEM_HELIX_FOSSIL
msgbox gUnknown_819A3D4, MSGBOX_YESNO
msgbox CinnabarIsland_PokemonLab_ExperimentRoom_Text_ThatFossilIsOfMonMakeItLiveAgain, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq EventScript_16E722
msgbox gUnknown_819A45D
goto_if_eq CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_DeclineReviveFossil
msgbox CinnabarIsland_PokemonLab_ExperimentRoom_Text_HandedFossilToWeirdDoctor
textcolor 0
removeitem ITEM_HELIX_FOSSIL, 1
msgbox gUnknown_819A4AB
removeitem ITEM_HELIX_FOSSIL
msgbox CinnabarIsland_PokemonLab_ExperimentRoom_Text_TakesTimeGoForWalk
setvar VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_REVIVE_STATE, 1
setvar VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_WHICH_FOSSIL, 1
setvar VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_WHICH_FOSSIL, HELIX_FOSSIL
release
end
EventScript_16E6A6:: @ 816E6A6
CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_ShowDomeFossil:: @ 816E6A6
getspeciesname 0, SPECIES_KABUTO
getitemname 1, ITEM_DOME_FOSSIL
msgbox gUnknown_819A3D4, MSGBOX_YESNO
msgbox CinnabarIsland_PokemonLab_ExperimentRoom_Text_ThatFossilIsOfMonMakeItLiveAgain, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq EventScript_16E722
msgbox gUnknown_819A45D
goto_if_eq CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_DeclineReviveFossil
msgbox CinnabarIsland_PokemonLab_ExperimentRoom_Text_HandedFossilToWeirdDoctor
textcolor 0
removeitem ITEM_DOME_FOSSIL, 1
msgbox gUnknown_819A4AB
removeitem ITEM_DOME_FOSSIL
msgbox CinnabarIsland_PokemonLab_ExperimentRoom_Text_TakesTimeGoForWalk
setvar VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_REVIVE_STATE, 1
setvar VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_WHICH_FOSSIL, 2
setvar VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_WHICH_FOSSIL, DOME_FOSSIL
release
end
EventScript_16E6E4:: @ 816E6E4
CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_ShowOldAmber:: @ 816E6E4
getspeciesname 0, SPECIES_AERODACTYL
getitemname 1, ITEM_OLD_AMBER
msgbox gUnknown_819A3D4, MSGBOX_YESNO
msgbox CinnabarIsland_PokemonLab_ExperimentRoom_Text_ThatFossilIsOfMonMakeItLiveAgain, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq EventScript_16E722
msgbox gUnknown_819A45D
goto_if_eq CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_DeclineReviveFossil
msgbox CinnabarIsland_PokemonLab_ExperimentRoom_Text_HandedFossilToWeirdDoctor
textcolor 0
removeitem ITEM_OLD_AMBER, 1
msgbox gUnknown_819A4AB
removeitem ITEM_OLD_AMBER
msgbox CinnabarIsland_PokemonLab_ExperimentRoom_Text_TakesTimeGoForWalk
setvar VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_REVIVE_STATE, 1
setvar VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_WHICH_FOSSIL, 3
setvar VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_WHICH_FOSSIL, OLD_AMBER
release
end
EventScript_16E722:: @ 816E722
msgbox gUnknown_819A4E1
CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_DeclineReviveFossil:: @ 816E722
msgbox CinnabarIsland_PokemonLab_ExperimentRoom_Text_YouComeAgain
release
end
EventScript_16E72C:: @ 816E72C
msgbox gUnknown_819A4AB
CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_FossilStillReviving:: @ 816E72C
msgbox CinnabarIsland_PokemonLab_ExperimentRoom_Text_TakesTimeGoForWalk
release
end
EventScript_16E736:: @ 816E736
compare VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_WHICH_FOSSIL, 1
goto_if_eq EventScript_16E758
compare VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_WHICH_FOSSIL, 2
goto_if_eq EventScript_16E79D
compare VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_WHICH_FOSSIL, 3
goto_if_eq EventScript_16E7E2
CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_GiveRevivedMon:: @ 816E736
compare VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_WHICH_FOSSIL, HELIX_FOSSIL
goto_if_eq CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_GiveOmanyte
compare VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_WHICH_FOSSIL, DOME_FOSSIL
goto_if_eq CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_GiveKabuto
compare VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_WHICH_FOSSIL, OLD_AMBER
goto_if_eq CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_GiveAerodactyl
end
EventScript_16E758:: @ 816E758
CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_GiveOmanyte:: @ 816E758
setvar VAR_TEMP_1, SPECIES_OMANYTE
getspeciesname 0, SPECIES_OMANYTE
msgbox gUnknown_819A34F
msgbox CinnabarIsland_PokemonLab_ExperimentRoom_Text_FossilMonBackToLife
givemon SPECIES_OMANYTE, 5, ITEM_NONE
compare VAR_RESULT, 2
goto_if_eq EventScript_1A927C
goto_if_eq EventScript_NoMoreRoomForPokemon
setflag FLAG_REVIVED_HELIX
compare VAR_RESULT, 0
goto_if_eq EventScript_16E827
goto_if_eq CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_NicknameMonParty
compare VAR_RESULT, 1
goto_if_eq EventScript_16E85B
goto_if_eq CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_NicknameMonPC
end
EventScript_16E79D:: @ 816E79D
CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_GiveKabuto:: @ 816E79D
setvar VAR_TEMP_1, SPECIES_KABUTO
getspeciesname 0, SPECIES_KABUTO
msgbox gUnknown_819A34F
msgbox CinnabarIsland_PokemonLab_ExperimentRoom_Text_FossilMonBackToLife
givemon SPECIES_KABUTO, 5, ITEM_NONE
compare VAR_RESULT, 2
goto_if_eq EventScript_1A927C
goto_if_eq EventScript_NoMoreRoomForPokemon
setflag FLAG_REVIVED_DOME
compare VAR_RESULT, 0
goto_if_eq EventScript_16E827
goto_if_eq CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_NicknameMonParty
compare VAR_RESULT, 1
goto_if_eq EventScript_16E85B
goto_if_eq CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_NicknameMonPC
end
EventScript_16E7E2:: @ 816E7E2
CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_GiveAerodactyl:: @ 816E7E2
setvar VAR_TEMP_1, SPECIES_AERODACTYL
getspeciesname 0, SPECIES_AERODACTYL
msgbox gUnknown_819A34F
msgbox CinnabarIsland_PokemonLab_ExperimentRoom_Text_FossilMonBackToLife
givemon SPECIES_AERODACTYL, 5, ITEM_NONE
compare VAR_RESULT, 2
goto_if_eq EventScript_1A927C
goto_if_eq EventScript_NoMoreRoomForPokemon
setflag FLAG_REVIVED_AMBER
compare VAR_RESULT, 0
goto_if_eq EventScript_16E827
goto_if_eq CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_NicknameMonParty
compare VAR_RESULT, 1
goto_if_eq EventScript_16E85B
goto_if_eq CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_NicknameMonPC
end
EventScript_16E827:: @ 816E827
CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_NicknameMonParty:: @ 816E827
textcolor 3
playfanfare MUS_FANFA1
message Text_19A39E
message CinnabarIsland_PokemonLab_ExperimentRoom_Text_ReceivedMonFromDoctor
waitmessage
waitfanfare
setvar VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_REVIVE_STATE, 0
msgbox gUnknown_81A56A7, MSGBOX_YESNO
msgbox Text_GiveNicknameToThisMon, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq EventScript_16E895
call EventScript_1A8C27
goto_if_eq CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_EndGiveMon
call EventScript_GetGiftMonPartySlot
call EventScript_ChangePokemonNickname
goto EventScript_16E895
goto CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_EndGiveMon
end
EventScript_16E85B:: @ 816E85B
CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_NicknameMonPC:: @ 816E85B
textcolor 3
playfanfare MUS_FANFA1
message Text_19A39E
message CinnabarIsland_PokemonLab_ExperimentRoom_Text_ReceivedMonFromDoctor
waitmessage
waitfanfare
setvar VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_REVIVE_STATE, 0
msgbox gUnknown_81A56A7, MSGBOX_YESNO
msgbox Text_GiveNicknameToThisMon, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq EventScript_16E88A
call EventScript_1A8C33
goto EventScript_16E88A
goto_if_eq CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_MonSentToPC
call EventScript_NameReceivedBoxMon
goto CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_MonSentToPC
end
EventScript_16E88A:: @ 816E88A
call EventScript_1A8C3C
goto EventScript_16E895
CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_MonSentToPC:: @ 816E88A
call EventScript_TransferredToPC
goto CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_EndGiveMon
end
EventScript_16E895:: @ 816E895
CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_EndGiveMon:: @ 816E895
release
end
EventScript_16E897:: @ 816E897
msgbox gUnknown_819A4E1
CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_RevivedAllFossils:: @ 816E897
msgbox CinnabarIsland_PokemonLab_ExperimentRoom_Text_YouComeAgain
release
end
EventScript_16E8A1:: @ 816E8A1
goto_if_set FLAG_GOT_HELIX_FOSSIL, EventScript_16E8B9
goto_if_set FLAG_GOT_DOME_FOSSIL, EventScript_16E8C8
goto EventScript_16E534
CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_CheckRevivedMtMoonFossil:: @ 816E8A1
goto_if_set FLAG_GOT_HELIX_FOSSIL, CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_CheckRevivedHelix
goto_if_set FLAG_GOT_DOME_FOSSIL, CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_CheckRevivedDome
goto CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_SetResultFalse
end
EventScript_16E8B9:: @ 816E8B9
goto_if_unset FLAG_REVIVED_HELIX, EventScript_16E534
setvar VAR_RESULT, 1
CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_CheckRevivedHelix:: @ 816E8B9
goto_if_unset FLAG_REVIVED_HELIX, CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_SetResultFalse
setvar VAR_RESULT, TRUE
return
EventScript_16E8C8:: @ 816E8C8
goto_if_unset FLAG_REVIVED_DOME, EventScript_16E534
setvar VAR_RESULT, 1
CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_CheckRevivedDome:: @ 816E8C8
goto_if_unset FLAG_REVIVED_DOME, CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_SetResultFalse
setvar VAR_RESULT, TRUE
return
data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/text.inc
+13 -11
View File
@@ -19,8 +19,7 @@ Text_MetronomeTaught:: @ 819A20E
.string "It tweaks your POKéMON's brain into\n"
.string "using moves it doesn't even know.$"
Text_19A282:: @ 819A282
gUnknown_819A282:: @ 819A282
CinnabarIsland_PokemonLab_ExperimentRoom_Text_HaveYouAFossilForMe:: @ 819A282
.string "Hiya!\p"
.string "I am important doctor.\n"
.string "Yes, very much so, indeed.\p"
@@ -29,29 +28,31 @@ gUnknown_819A282:: @ 819A282
.string "You!\n"
.string "Have you a fossil for me?$"
gUnknown_819A314:: @ 819A314
CinnabarIsland_PokemonLab_ExperimentRoom_Text_NoIsTooBad:: @ 819A314
.string "No!\n"
.string "Is too bad!$"
Text_19A324:: @ 819A324
@ Unused
CinnabarIsland_PokemonLab_ExperimentRoom_Text_TakesTimeGoForWalkJP:: @ 819A324
.string "ちょっと　じかん　かかるよ！\p"
.string "そこらへんを　すこし\n"
.string "ブラブラ　してくると　よろしー！$"
gUnknown_819A34F:: @ 819A34F
CinnabarIsland_PokemonLab_ExperimentRoom_Text_FossilMonBackToLife:: @ 819A34F
.string "You late.\n"
.string "Where were you?\p"
.string "Your fossil is back to life!\n"
.string "It was {STR_VAR_1} like I think!$"
Text_19A39E:: @ 819A39E
CinnabarIsland_PokemonLab_ExperimentRoom_Text_ReceivedMonFromDoctor:: @ 819A39E
.string "{PLAYER} received the {STR_VAR_1}\n"
.string "from the doctor.$"
Text_19A3C2:: @ 819A3C2
@ Unused
CinnabarIsland_PokemonLab_ExperimentRoom_Text_NoRoomForPokemon:: @ 819A3C2
.string "ポケモン　いっぱいで　もてないね！$"
gUnknown_819A3D4:: @ 819A3D4
CinnabarIsland_PokemonLab_ExperimentRoom_Text_ThatFossilIsOfMonMakeItLiveAgain:: @ 819A3D4
.string "Oh!\n"
.string "That is {STR_VAR_2}, it is!\p"
.string "It is fossil of {STR_VAR_1},\n"
@@ -59,17 +60,18 @@ gUnknown_819A3D4:: @ 819A3D4
.string "My Resurrection Machine will make\n"
.string "that POKéMON live again!$"
gUnknown_819A45D:: @ 819A45D
@ TODO: Resolve text dump error below?
CinnabarIsland_PokemonLab_ExperimentRoom_Text_HandedFossilToWeirdDoctor:: @ 819A45D
.string "So!\n"
.string "You hurry and give me that!\p"
.string "{SIZE}Á{PLAYER} handed over the\n"
.string "{STR_VAR_2} to the weird doctor.$"
gUnknown_819A4AB:: @ 819A4AB
CinnabarIsland_PokemonLab_ExperimentRoom_Text_TakesTimeGoForWalk:: @ 819A4AB
.string "I take a little time!\n"
.string "You go for walk a little while!$"
gUnknown_819A4E1:: @ 819A4E1
CinnabarIsland_PokemonLab_ExperimentRoom_Text_YouComeAgain:: @ 819A4E1
.string "Aiyah!\n"
.string "You come again!$"
data/maps/CinnabarIsland_PokemonLab_Lounge/map.json
+3 -3
View File
@@ -23,7 +23,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "CinnabarIsland_PokemonLab_Lounge_EventScript_16E2B9",
"script": "CinnabarIsland_PokemonLab_Lounge_EventScript_Scientist",
"flag": "0"
},
{
@@ -36,7 +36,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "CinnabarIsland_PokemonLab_Lounge_EventScript_16E2C2",
"script": "CinnabarIsland_PokemonLab_Lounge_EventScript_Clifton",
"flag": "0"
},
{
@@ -49,7 +49,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "CinnabarIsland_PokemonLab_Lounge_EventScript_16E33E",
"script": "CinnabarIsland_PokemonLab_Lounge_EventScript_Norma",
"flag": "0"
}
],
data/maps/CinnabarIsland_PokemonLab_Lounge/scripts.inc
+23 -23
View File
@@ -1,90 +1,90 @@
CinnabarIsland_PokemonLab_Lounge_MapScripts:: @ 816E2B8
.byte 0
CinnabarIsland_PokemonLab_Lounge_EventScript_16E2B9:: @ 816E2B9
msgbox gUnknown_8199FB3, MSGBOX_NPC
CinnabarIsland_PokemonLab_Lounge_EventScript_Scientist:: @ 816E2B9
msgbox CinnabarIsland_PokemonLab_Lounge_Text_FoundFossilInMtMoon, MSGBOX_NPC
end
CinnabarIsland_PokemonLab_Lounge_EventScript_16E2C2:: @ 816E2C2
CinnabarIsland_PokemonLab_Lounge_EventScript_Clifton:: @ 816E2C2
lock
faceplayer
setvar VAR_0x8008, INGAME_TRADE_ELECTRODE
call EventScript_GetInGameTradeSpeciesInfo
goto_if_set FLAG_DID_ESPHERE_TRADE, EventScript_16E334
goto_if_set FLAG_DID_ESPHERE_TRADE, CinnabarIsland_PokemonLab_Lounge_EventScript_CliftonAlreadyTraded
msgbox Trade_Text_DoYouHaveMonWouldYouTradeForMon, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq EventScript_16E31C
goto_if_eq CinnabarIsland_PokemonLab_Lounge_EventScript_CliftonDeclineTrade
call EventScript_ChooseMonForInGameTrade
compare VAR_0x8004, PARTY_SIZE
goto_if_ge EventScript_16E31C
goto_if_ge CinnabarIsland_PokemonLab_Lounge_EventScript_CliftonDeclineTrade
call EventScript_GetInGameTradeSpecies
compare VAR_RESULT, VAR_0x8009
goto_if_ne EventScript_16E326
goto_if_ne CinnabarIsland_PokemonLab_Lounge_EventScript_CliftonNotRequestedMon
call EventScript_DoInGameTrade
msgbox Trade_Text_Thanks
setflag FLAG_DID_ESPHERE_TRADE
release
end
EventScript_16E31C:: @ 816E31C
CinnabarIsland_PokemonLab_Lounge_EventScript_CliftonDeclineTrade:: @ 816E31C
msgbox Trade_Text_WellIfYouDontWantTo
release
end
EventScript_16E326:: @ 816E326
CinnabarIsland_PokemonLab_Lounge_EventScript_CliftonNotRequestedMon:: @ 816E326
getspeciesname 0, VAR_0x8009
msgbox Trade_Text_ThisIsntMon
release
end
EventScript_16E334:: @ 816E334
CinnabarIsland_PokemonLab_Lounge_EventScript_CliftonAlreadyTraded:: @ 816E334
msgbox Trade_Text_HasTradedMonGrownStronger
release
end
CinnabarIsland_PokemonLab_Lounge_EventScript_16E33E:: @ 816E33E
CinnabarIsland_PokemonLab_Lounge_EventScript_Norma:: @ 816E33E
lock
faceplayer
setvar VAR_0x8008, INGAME_TRADE_TANGELA
copyvar VAR_0x8004, VAR_0x8008
specialvar VAR_RESULT, GetInGameTradeSpeciesInfo
copyvar VAR_0x8009, VAR_RESULT
goto_if_set FLAG_DID_TANGENY_TRADE, EventScript_16E3D4
msgbox gUnknown_81A5AD6, MSGBOX_YESNO
goto_if_set FLAG_DID_TANGENY_TRADE, CinnabarIsland_PokemonLab_Lounge_EventScript_NormaAlreadyTraded
msgbox Trade_Text_DoYouHaveMonWantToTradeForMon, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq EventScript_16E3BC
goto_if_eq CinnabarIsland_PokemonLab_Lounge_EventScript_NormaDeclineTrade
special Special_ChooseMonFromParty
waitstate
copyvar VAR_0x800A, VAR_0x8004
compare VAR_0x8004, PARTY_SIZE
goto_if_ge EventScript_16E3BC
goto_if_ge CinnabarIsland_PokemonLab_Lounge_EventScript_NormaDeclineTrade
copyvar VAR_0x8005, VAR_0x800A
specialvar VAR_RESULT, GetTradeSpecies
copyvar VAR_0x800B, VAR_RESULT
compare VAR_RESULT, VAR_0x8009
goto_if_ne EventScript_16E3C6
goto_if_ne CinnabarIsland_PokemonLab_Lounge_EventScript_NormaNotRequestedMon
copyvar VAR_0x8004, VAR_0x8008
copyvar VAR_0x8005, VAR_0x800A
special CreateInGameTradePokemon
special DoInGameTradeScene
waitstate
msgbox gUnknown_81A5B4A
msgbox Trade_Text_ThanksYoureAPal
setflag FLAG_DID_TANGENY_TRADE
release
end
EventScript_16E3BC:: @ 816E3BC
msgbox gUnknown_81A5B08
CinnabarIsland_PokemonLab_Lounge_EventScript_NormaDeclineTrade:: @ 816E3BC
msgbox Trade_Text_ThatsTooBad
release
end
EventScript_16E3C6:: @ 816E3C6
CinnabarIsland_PokemonLab_Lounge_EventScript_NormaNotRequestedMon:: @ 816E3C6
getspeciesname 0, VAR_0x8009
msgbox gUnknown_81A5B18
msgbox Trade_Text_ThisIsNoMon
release
end
EventScript_16E3D4:: @ 816E3D4
msgbox gUnknown_81A5B60
CinnabarIsland_PokemonLab_Lounge_EventScript_NormaAlreadyTraded:: @ 816E3D4
msgbox Trade_Text_HowIsMyOldMon
release
end
data/maps/CinnabarIsland_PokemonLab_Lounge/text.inc
+1 -1
View File
@@ -1,4 +1,4 @@
gUnknown_8199FB3:: @ 8199FB3
CinnabarIsland_PokemonLab_Lounge_Text_FoundFossilInMtMoon:: @ 8199FB3
.string "I found this most remarkable fossil\n"
.string "inside MT. MOON.\p"
.string "I think it's of a rare, prehistoric\n"
data/maps/CinnabarIsland_PokemonLab_ResearchRoom/map.json
+3 -3
View File
@@ -36,7 +36,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "CinnabarIsland_PokemonLab_ResearchRoom_EventScript_16E3E5",
"script": "CinnabarIsland_PokemonLab_ResearchRoom_EventScript_Scientist",
"flag": "0"
}
],
@@ -56,14 +56,14 @@
"x": 6,
"y": 1,
"elevation": 0,
"script": "CinnabarIsland_PokemonLab_ResearchRoom_EventScript_16E3F7"
"script": "CinnabarIsland_PokemonLab_ResearchRoom_EventScript_AmberPipe"
},
{
"type": "bg_event_type_0",
"x": 3,
"y": 1,
"elevation": 0,
"script": "CinnabarIsland_PokemonLab_ResearchRoom_EventScript_16E3EE"
"script": "CinnabarIsland_PokemonLab_ResearchRoom_EventScript_Computer"
}
]
}
data/maps/CinnabarIsland_PokemonLab_ResearchRoom/scripts.inc
+6 -6
View File
@@ -5,14 +5,14 @@ CinnabarIsland_PokemonLab_ResearchRoom_EventScript_MetronomeTutor:: @ 816E3DF
goto EventScript_MetronomeTutor
end
CinnabarIsland_PokemonLab_ResearchRoom_EventScript_16E3E5:: @ 816E3E5
msgbox gUnknown_819A015, MSGBOX_NPC
CinnabarIsland_PokemonLab_ResearchRoom_EventScript_Scientist:: @ 816E3E5
msgbox CinnabarIsland_PokemonLab_ResearchRoom_Text_EeveeCanEvolveIntroThreeMons, MSGBOX_NPC
end
CinnabarIsland_PokemonLab_ResearchRoom_EventScript_16E3EE:: @ 816E3EE
msgbox gUnknown_819A04A, MSGBOX_SIGN
CinnabarIsland_PokemonLab_ResearchRoom_EventScript_Computer:: @ 816E3EE
msgbox CinnabarIsland_PokemonLab_ResearchRoom_Text_LegendaryBirdEmail, MSGBOX_SIGN
end
CinnabarIsland_PokemonLab_ResearchRoom_EventScript_16E3F7:: @ 816E3F7
msgbox gUnknown_819A128, MSGBOX_SIGN
CinnabarIsland_PokemonLab_ResearchRoom_EventScript_AmberPipe:: @ 816E3F7
msgbox CinnabarIsland_PokemonLab_ResearchRoom_Text_AnAmberPipe, MSGBOX_SIGN
end
data/maps/CinnabarIsland_PokemonLab_ResearchRoom/text.inc
+3 -3
View File
@@ -1,8 +1,8 @@
gUnknown_819A015:: @ 819A015
CinnabarIsland_PokemonLab_ResearchRoom_Text_EeveeCanEvolveIntroThreeMons:: @ 819A015
.string "EEVEE can evolve into one of three\n"
.string "kinds of POKéMON.$"
gUnknown_819A04A:: @ 819A04A
CinnabarIsland_PokemonLab_ResearchRoom_Text_LegendaryBirdEmail:: @ 819A04A
.string "There's an e-mail message.\p"
.string "… … …\p"
.string "There are three legendary bird\n"
@@ -14,6 +14,6 @@ gUnknown_819A04A:: @ 819A04A
.string "close to CERULEAN.\p"
.string "From: POKéMON RESEARCH TEAM…$"
gUnknown_819A128:: @ 819A128
CinnabarIsland_PokemonLab_ResearchRoom_Text_AnAmberPipe:: @ 819A128
.string "An amber pipe!$"
data/maps/PalletTown_ProfessorOaksLab/scripts.inc
+1 -1
View File
@@ -1206,7 +1206,7 @@ EventScript_ThisPokeIsRealyEnergetic:: @ 8169C74
waitmessage
playfanfare MUS_FAN5
waitfanfare
msgbox gUnknown_81A56A7, MSGBOX_YESNO
msgbox Text_GiveNicknameToThisMon, MSGBOX_YESNO
compare VAR_RESULT, YES
goto_if_eq EventScript_GiveNicknameToStarter
compare VAR_RESULT, NO
data/maps/Route11_EastEntrance_2F/scripts.inc
+5 -5
View File
@@ -23,7 +23,7 @@ Route11_EastEntrance_2F_EventScript_16FD5C:: @ 816FD5C
setvar VAR_0x8008, INGAME_TRADE_NIDORINOA
call EventScript_GetInGameTradeSpeciesInfo
goto_if_set FLAG_DID_NINA_TRADE, EventScript_16FDCE
msgbox gUnknown_81A597B, MSGBOX_YESNO
msgbox Trade_Text_LookingForMonWannaTradeForMon, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq EventScript_16FDB6
call EventScript_ChooseMonForInGameTrade
@@ -33,24 +33,24 @@ Route11_EastEntrance_2F_EventScript_16FD5C:: @ 816FD5C
compare VAR_RESULT, VAR_0x8009
goto_if_ne EventScript_16FDC0
call EventScript_DoInGameTrade
msgbox gUnknown_81A59DA
msgbox Trade_Text_HeyThanks
setflag FLAG_DID_NINA_TRADE
release
end
EventScript_16FDB6:: @ 816FDB6
msgbox gUnknown_81A59B6
msgbox Trade_Text_AwwOhWell
release
end
EventScript_16FDC0:: @ 816FDC0
getspeciesname 0, VAR_0x8009
msgbox gUnknown_81A59C6
msgbox Trade_Text_WhatThatsNoMon
release
end
EventScript_16FDCE:: @ 816FDCE
msgbox gUnknown_81A59E7
msgbox Trade_Text_IsntMyOldMonGreat
release
end
data/maps/Route18_EastEntrance_2F/scripts.inc
+5 -5
View File
@@ -15,7 +15,7 @@ Route18_EastEntrance_2F_EventScript_17047E:: @ 817047E
setvar VAR_0x8008, INGAME_TRADE_LICKITUNG
call EventScript_GetInGameTradeSpeciesInfo
goto_if_set FLAG_DID_MARC_TRADE, EventScript_1704F0
msgbox gUnknown_81A597B, MSGBOX_YESNO
msgbox Trade_Text_LookingForMonWannaTradeForMon, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq EventScript_1704D8
call EventScript_ChooseMonForInGameTrade
@@ -25,23 +25,23 @@ Route18_EastEntrance_2F_EventScript_17047E:: @ 817047E
compare VAR_RESULT, VAR_0x8009
goto_if_ne EventScript_1704E2
call EventScript_DoInGameTrade
msgbox gUnknown_81A59DA
msgbox Trade_Text_HeyThanks
setflag FLAG_DID_MARC_TRADE
release
end
EventScript_1704D8:: @ 81704D8
msgbox gUnknown_81A59B6
msgbox Trade_Text_AwwOhWell
release
end
EventScript_1704E2:: @ 81704E2
getspeciesname 0, VAR_0x8009
msgbox gUnknown_81A59C6
msgbox Trade_Text_WhatThatsNoMon
release
end
EventScript_1704F0:: @ 81704F0
msgbox gUnknown_81A59E7
msgbox Trade_Text_IsntMyOldMonGreat
release
end
data/maps/Route2_House/scripts.inc
+5 -5
View File
@@ -11,7 +11,7 @@ Route2_House_EventScript_16F602:: @ 816F602
setvar VAR_0x8008, INGAME_TRADE_MR_MIME
call EventScript_GetInGameTradeSpeciesInfo
goto_if_set FLAG_DID_MIMIEN_TRADE, EventScript_16F674
msgbox gUnknown_81A597B, MSGBOX_YESNO
msgbox Trade_Text_LookingForMonWannaTradeForMon, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq EventScript_16F65C
call EventScript_ChooseMonForInGameTrade
@@ -21,23 +21,23 @@ Route2_House_EventScript_16F602:: @ 816F602
compare VAR_RESULT, VAR_0x8009
goto_if_ne EventScript_16F666
call EventScript_DoInGameTrade
msgbox gUnknown_81A59DA
msgbox Trade_Text_HeyThanks
setflag FLAG_DID_MIMIEN_TRADE
release
end
EventScript_16F65C:: @ 816F65C
msgbox gUnknown_81A59B6
msgbox Trade_Text_AwwOhWell
release
end
EventScript_16F666:: @ 816F666
getspeciesname 0, VAR_0x8009
msgbox gUnknown_81A59C6
msgbox Trade_Text_WhatThatsNoMon
release
end
EventScript_16F674:: @ 816F674
msgbox gUnknown_81A59E7
msgbox Trade_Text_IsntMyOldMonGreat
release
end
data/maps/Route4_PokemonCenter_1F/scripts.inc
+5 -5
View File
@@ -59,10 +59,10 @@ EventScript_16F7A2:: @ 816F7A2
EventScript_16F7F6:: @ 816F7F6
call EventScript_16F86F
msgbox gUnknown_81A56A7, MSGBOX_YESNO
msgbox Text_GiveNicknameToThisMon, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq EventScript_16F861
call EventScript_1A8C27
call EventScript_GetGiftMonPartySlot
fadescreen FADE_TO_BLACK
hidemoneybox 0, 0
special ChangePokemonNickname
@@ -72,7 +72,7 @@ EventScript_16F7F6:: @ 816F7F6
EventScript_16F822:: @ 816F822
call EventScript_16F86F
msgbox gUnknown_81A56A7, MSGBOX_YESNO
msgbox Text_GiveNicknameToThisMon, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq EventScript_16F84B
fadescreen FADE_TO_BLACK
@@ -85,12 +85,12 @@ EventScript_16F822:: @ 816F822
end
EventScript_16F84B:: @ 816F84B
call EventScript_1A8C3C
call EventScript_TransferredToPC
goto EventScript_16F861
end
EventScript_16F856:: @ 816F856
call EventScript_1A8C3C
call EventScript_TransferredToPC
goto EventScript_16F86A
end
data/maps/SaffronCity_Dojo/scripts.inc
+6 -6
View File
@@ -64,7 +64,7 @@ EventScript_16EC82:: @ 816EC82
compare VAR_RESULT, 1
goto_if_eq EventScript_16ECEC
compare VAR_RESULT, 2
goto_if_eq EventScript_1A927C
goto_if_eq EventScript_NoMoreRoomForPokemon
release
end
@@ -76,10 +76,10 @@ EventScript_16ECB5:: @ 816ECB5
waitmessage
waitfanfare
setflag FLAG_GOT_HITMON_FROM_DOJO
msgbox gUnknown_81A56A7, MSGBOX_YESNO
msgbox Text_GiveNicknameToThisMon, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq EventScript_16ED29
call EventScript_1A8C27
call EventScript_GetGiftMonPartySlot
call EventScript_ChangePokemonNickname
goto EventScript_16ED29
end
@@ -92,15 +92,15 @@ EventScript_16ECEC:: @ 816ECEC
waitmessage
waitfanfare
setflag FLAG_GOT_HITMON_FROM_DOJO
msgbox gUnknown_81A56A7, MSGBOX_YESNO
msgbox Text_GiveNicknameToThisMon, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq EventScript_16ED1E
call EventScript_1A8C33
call EventScript_NameReceivedBoxMon
goto EventScript_16ED1E
end
EventScript_16ED1E:: @ 816ED1E
call EventScript_1A8C3C
call EventScript_TransferredToPC
goto EventScript_16ED29
end
data/maps/SilphCo_7F/scripts.inc
+6 -6
View File
@@ -136,7 +136,7 @@ SilphCo_7F_EventScript_161AC8:: @ 8161AC8
compare VAR_RESULT, 1
goto_if_eq EventScript_161B45
compare VAR_RESULT, 2
goto_if_eq EventScript_1A927C
goto_if_eq EventScript_NoMoreRoomForPokemon
release
end
@@ -147,10 +147,10 @@ EventScript_161B12:: @ 8161B12
waitmessage
waitfanfare
getspeciesname 0, SPECIES_LAPRAS
msgbox gUnknown_81A56A7, MSGBOX_YESNO
msgbox Text_GiveNicknameToThisMon, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq EventScript_161B7E
call EventScript_1A8C27
call EventScript_GetGiftMonPartySlot
call EventScript_ChangePokemonNickname
goto EventScript_161B7E
@@ -164,17 +164,17 @@ EventScript_161B45:: @ 8161B45
waitmessage
waitfanfare
getspeciesname 0, SPECIES_LAPRAS
msgbox gUnknown_81A56A7, MSGBOX_YESNO
msgbox Text_GiveNicknameToThisMon, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq EventScript_161B73
call EventScript_1A8C33
call EventScript_NameReceivedBoxMon
goto EventScript_161B73
EventScript_161B72:: @ 8161B72
end
EventScript_161B73:: @ 8161B73
call EventScript_1A8C3C
call EventScript_TransferredToPC
goto EventScript_161B7E
EventScript_161B7D:: @ 8161B7D
data/maps/UndergroundPath_NorthEntrance/scripts.inc
+5 -5
View File
@@ -7,7 +7,7 @@ UndergroundPath_NorthEntrance_EventScript_Saige:: @ 8160E39
setvar VAR_0x8008, INGAME_TRADE_NIDORAN
call EventScript_GetInGameTradeSpeciesInfo
goto_if_set FLAG_DID_MS_NIDO_TRADE, UndergroundPath_NorthEntrance_EventScript_AlreadyTraded
msgbox gUnknown_81A5AD6, MSGBOX_YESNO
msgbox Trade_Text_DoYouHaveMonWantToTradeForMon, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq UndergroundPath_NorthEntrance_EventScript_DeclineTrade
call EventScript_ChooseMonForInGameTrade
@@ -17,23 +17,23 @@ UndergroundPath_NorthEntrance_EventScript_Saige:: @ 8160E39
compare VAR_RESULT, VAR_0x8009
goto_if_ne UndergroundPath_NorthEntrance_EventScript_NotRequestedMon
call EventScript_DoInGameTrade
msgbox gUnknown_81A5B4A
msgbox Trade_Text_ThanksYoureAPal
setflag FLAG_DID_MS_NIDO_TRADE
release
end
UndergroundPath_NorthEntrance_EventScript_DeclineTrade:: @ 8160E93
msgbox gUnknown_81A5B08
msgbox Trade_Text_ThatsTooBad
release
end
UndergroundPath_NorthEntrance_EventScript_NotRequestedMon:: @ 8160E9D
getspeciesname 0, VAR_0x8009
msgbox gUnknown_81A5B18
msgbox Trade_Text_ThisIsNoMon
release
end
UndergroundPath_NorthEntrance_EventScript_AlreadyTraded:: @ 8160EAB
msgbox gUnknown_81A5B60
msgbox Trade_Text_HowIsMyOldMon
release
end
data/naming_screen.s
+4 -4
View File
@@ -16,10 +16,10 @@ gUnknown_83E1980:: @ 83E1980
.incbin "graphics/interface/naming_screen_83E1980.4bpp"
gUnknown_83E2280:: @ 83E2280
.4byte Text_1A5CF1
.4byte Text_1A5D31
.4byte Text_1A5D6E
.4byte Text_1A5DB1
.4byte Text_MonSentToBoxInSomeonesPC
.4byte Text_MonSentToBoxInBillsPC
.4byte Text_MonSentToBoxSomeonesBoxFull
.4byte Text_MonSentToBoxBillsBoxFull
gUnknown_83E2290:: @ 83E2290
.4byte 0x000001e0
data/scripts/fame_checker.inc
+4 -4
View File
@@ -127,11 +127,11 @@ SaffronCity_PokemonCenter_1F_EventScript_1ACEEC:: @ 81ACEEC
release
end
CinnabarIsland_Gym_EventScript_1ACF07:: @ 81ACF07
CinnabarIsland_Gym_EventScript_BlaineFujiPhoto:: @ 81ACF07
lockall
famechecker FAMECHECKER_BLAINE, 4
famechecker FAMECHECKER_MRFUJI, 4
msgbox Text_199E8A
msgbox CinnabarIsland_Gym_Text_PhotoOfBlaineAndFuji
releaseall
end
@@ -260,12 +260,12 @@ LavenderTown_PokemonCenter_1F_EventScript_BaldingMan:: @ 81AD0A0
release
end
CinnabarIsland_PokemonCenter_1F_EventScript_1AD0B9:: @ 81AD0B9
CinnabarIsland_PokemonCenter_1F_EventScript_PokemonJournalMrFuji:: @ 81AD0B9
lock
faceplayer
famechecker FAMECHECKER_MRFUJI, 5
textcolor 3
msgbox gUnknown_81B1BD1
msgbox PokemonJournal_Text_SpecialFeatureMrFuji
release
end
data/scripts/pc_transfer.inc
+46
View File
@@ -0,0 +1,46 @@
EventScript_GetGiftMonPartySlot:: @ 81A8C27
getpartysize
subvar VAR_RESULT, 1
copyvar VAR_0x8004, VAR_RESULT
return
EventScript_NameReceivedBoxMon:: @ 81A8C33
fadescreen FADE_TO_BLACK
special ChangeBoxPokemonNickname
waitstate
lock
faceplayer
return
EventScript_TransferredToPC:: @ 81A8C3C
bufferboxname 0, VAR_PC_BOX_TO_SEND_MON
getspeciesname 1, VAR_TEMP_1
call_if_unset FLAG_SYS_NOT_SOMEONES_PC, EventScript_TransferredSomeonesPC
call_if_set FLAG_SYS_NOT_SOMEONES_PC, EventScript_TransferredBillsPC
return
EventScript_TransferredSomeonesPC:: @ 81A8C57
specialvar VAR_RESULT, ShouldShowBoxWasFullMessage
compare VAR_RESULT, TRUE
goto_if_eq EventScript_TransferredSomeonesPCBoxFull
msgbox Text_MonSentToBoxInSomeonesPC
return
EventScript_TransferredSomeonesPCBoxFull:: @ 81A8C70
specialvar VAR_RESULT, GetPCBoxToSendMon
bufferboxname 2, VAR_RESULT
msgbox Text_MonSentToBoxSomeonesBoxFull
return
EventScript_TransferredBillsPC:: @ 81A8C82
specialvar VAR_RESULT, ShouldShowBoxWasFullMessage
compare VAR_RESULT, TRUE
goto_if_eq EventScript_TransferredBillsPCBoxFull
msgbox Text_MonSentToBoxInBillsPC
return
EventScript_TransferredBillsPCBoxFull:: @ 81A8C9B
specialvar VAR_RESULT, GetPCBoxToSendMon
bufferboxname 2, VAR_RESULT
msgbox Text_MonSentToBoxBillsBoxFull
return
data/strings.s
+3 -3
View File
@@ -4598,14 +4598,14 @@ gText_WhichMoveShouldBeForgotten:: @ 841E50C
gUnknown_841E52D:: @ 0x841E52D
.string "----------$"
gUnknown_841E538:: @ 841E538
gText_CommStandbyAwaitingOtherPlayer:: @ 841E538
.string "Communication standby‥\n"
.string "Awaiting another player to choose.$"
gUnknown_841E572:: @ 841E572
gText_BattleWasRefused:: @ 841E572
.string "The battle was refused.{PAUSE 0x3C}$"
gUnknown_841E58D:: @ 841E58D
gText_RefusedBattle:: @ 841E58D
.string "Refused the battle.{PAUSE 0x3C}$"
gFameCheckerText_MainScreenUI:: @ 841E5A4
data/text/fame_checker.inc
+1 -1
View File
@@ -1477,7 +1477,7 @@ gUnknown_81B1B3D:: @ 81B1B3D
.string "Grand Champion is DAISY OAK of\l"
.string "PALLET TOWN!$"
gUnknown_81B1BD1:: @ 81B1BD1
PokemonJournal_Text_SpecialFeatureMrFuji:: @ 81B1BD1
.string "POKéMON JOURNAL\p"
.string "Special Feature:\n"
.string "MR. FUJI of POKéMON HOUSE!\p"
data/text/ingame_trade.inc
+10 -10
View File
@@ -1,21 +1,21 @@
gUnknown_81A597B:: @ 81A597B
Trade_Text_LookingForMonWannaTradeForMon:: @ 81A597B
.string "I'm looking for the POKéMON\n"
.string "{STR_VAR_1}!\p"
.string "Wanna trade one for my\n"
.string "{STR_VAR_2}?$"
gUnknown_81A59B6:: @ 81A59B6
Trade_Text_AwwOhWell:: @ 81A59B6
.string "Awww!\n"
.string "Oh, well…$"
gUnknown_81A59C6:: @ 81A59C6
Trade_Text_WhatThatsNoMon:: @ 81A59C6
.string "What?\n"
.string "That's no {STR_VAR_1}!$"
gUnknown_81A59DA:: @ 81A59DA
Trade_Text_HeyThanks:: @ 81A59DA
.string "Hey, thanks!$"
gUnknown_81A59E7:: @ 81A59E7
Trade_Text_IsntMyOldMonGreat:: @ 81A59E7
.string "Isn't my old {STR_VAR_2} great?$"
Trade_Text_DoYouHaveMonWouldYouTradeForMon:: @ 81A59FE
@@ -39,22 +39,22 @@ Trade_Text_HasTradedMonGrownStronger:: @ 81A5AA5
.string "The {STR_VAR_2} that I traded you,\n"
.string "has it grown stronger?$"
gUnknown_81A5AD6:: @ 81A5AD6
Trade_Text_DoYouHaveMonWantToTradeForMon:: @ 81A5AD6
.string "Hi!\n"
.string "Do you have a {STR_VAR_1}?\p"
.string "Want to trade it for my\n"
.string "{STR_VAR_2}?$"
gUnknown_81A5B08:: @ 81A5B08
Trade_Text_ThatsTooBad:: @ 81A5B08
.string "That's too bad.$"
gUnknown_81A5B18:: @ 81A5B18
Trade_Text_ThisIsNoMon:: @ 81A5B18
.string "…This is no {STR_VAR_1}.\p"
.string "If you get one, trade it with me.$"
gUnknown_81A5B4A:: @ 81A5B4A
Trade_Text_ThanksYoureAPal:: @ 81A5B4A
.string "Thanks, you're a pal!$"
gUnknown_81A5B60:: @ 81A5B60
Trade_Text_HowIsMyOldMon:: @ 81A5B60
.string "How is my old {STR_VAR_2}?\n"
.string "My {STR_VAR_1} is doing great!$"
data/text/pc_transfer.inc
+39
View File
@@ -0,0 +1,39 @@
Text_MonSentToBoxInSomeonesPC:: @ 81A5CF1
.string "{STR_VAR_2} was transferred to\n"
.string "Someone's PC.\p"
.string "It was placed in \n"
.string "BOX “{STR_VAR_1}.”$"
Text_MonSentToBoxInBillsPC:: @ 81A5D31
.string "{STR_VAR_2} was transferred to\n"
.string "BILL'S PC.\p"
.string "It was placed in \n"
.string "BOX “{STR_VAR_1}.”$"
Text_MonSentToBoxSomeonesBoxFull:: @ 81A5D6E
.string "BOX “{STR_VAR_3}” on\n"
.string "Someone's PC was full.\p"
.string "{STR_VAR_2} was transferred to\n"
.string "BOX “{STR_VAR_1}.”$"
Text_MonSentToBoxBillsBoxFull:: @ 81A5DB1
.string "BOX “{STR_VAR_3}” on\n"
.string "BILL'S PC was full.\p"
.string "{STR_VAR_2} was transferred to\n"
.string "BOX “{STR_VAR_1}.”$"
Text_PlayerObtainedTheMon:: @ 81A5DF1
.string "{PLAYER} obtained\n"
.string "the {STR_VAR_1}!$"
@ Unused. Translated below
@ You cannot carry any more Pokemon, so {STR_VAR_2} was sent to PC Box {STR_VAR_1}!
Text_MonSentToBoxInPC:: @ 81A5E05
.string "ポケモンを　もちきれないので\n"
.string "パソコンの　ボックス“{STR_VAR_1}”　に\l"
.string "{STR_VAR_2}を　てんそうした！$"
Text_NoMoreRoomForPokemon:: @ 81A5E31
.string "There's no more room for POKéMON!\p"
.string "The POKéMON BOXES are full and\n"
.string "can't accept any more!$"
data/union_room.s
-1571
View File
File diff suppressed because it is too large Load Diff
include/berry_crush.h
+6
View File
@@ -0,0 +1,6 @@
#ifndef GUARD_BERRY_CRUSH_H
#define GUARD_BERRY_CRUSH_H
void sub_814B754(MainCallback callback);
#endif //GUARD_BERRY_CRUSH_H
include/cable_club.h
+1
View File
@@ -10,5 +10,6 @@
// Exported ROM declarations
void sub_8081A90(u8 taskId);
u8 sub_8081150(void);
void sub_8081668(void);
#endif //GUARD_CABLE_CLUB_H
include/constants/battle.h
+8 -6
View File
@@ -58,14 +58,15 @@
#define BATTLE_TYPE_EREADER_TRAINER 0x0800
#define BATTLE_TYPE_KYOGRE_GROUDON 0x1000
#define BATTLE_TYPE_LEGENDARY 0x2000
#define BATTLE_TYPE_GHOST_UNVEILED 0x2000 // Re-use of BATTLE_TYPE_LEGENDARY, when combined with BATTLE_TYPE_GHOST
#define BATTLE_TYPE_REGI 0x4000
#define BATTLE_TYPE_GHOST 0x8000
#define BATTLE_TYPE_POKEDUDE 0x10000
#define BATTLE_TYPE_PALACE 0x20000
#define BATTLE_TYPE_ARENA 0x40000
#define BATTLE_TYPE_WILD_SCRIPTED 0x20000
#define BATTLE_TYPE_LEGENDARY_FRLG 0x40000
#define BATTLE_TYPE_TRAINER_TOWER 0x80000
#define BATTLE_TYPE_PIKE 0x100000
#define BATTLE_TYPE_PYRAMID 0x200000
#define BATTLE_TYPE_x100000 0x100000
#define BATTLE_TYPE_x200000 0x200000
#define BATTLE_TYPE_INGAME_PARTNER 0x400000
#define BATTLE_TYPE_x800000 0x800000
#define BATTLE_TYPE_RECORDED 0x1000000
@@ -76,8 +77,9 @@
#define BATTLE_TYPE_KYOGRE 0x20000000
#define BATTLE_TYPE_RAYQUAZA 0x40000000
#define BATTLE_TYPE_x80000000 0x80000000
#define BATTLE_TYPE_FRONTIER (BATTLE_TYPE_BATTLE_TOWER | BATTLE_TYPE_DOME | BATTLE_TYPE_PALACE | BATTLE_TYPE_ARENA | BATTLE_TYPE_FACTORY | BATTLE_TYPE_PIKE | BATTLE_TYPE_PYRAMID)
#define BATTLE_TYPE_FRONTIER_NO_PYRAMID (BATTLE_TYPE_BATTLE_TOWER | BATTLE_TYPE_DOME | BATTLE_TYPE_PALACE | BATTLE_TYPE_ARENA | BATTLE_TYPE_FACTORY | BATTLE_TYPE_PIKE)
#define IS_BATTLE_TYPE_GHOST_WITHOUT_SCOPE(flags) ((flags) & BATTLE_TYPE_GHOST && !((flags) & BATTLE_TYPE_GHOST_UNVEILED))
#define IS_BATTLE_TYPE_GHOST_WITH_SCOPE(flags) ((flags) & BATTLE_TYPE_GHOST && (flags) & BATTLE_TYPE_GHOST_UNVEILED)
// Battle Outcome defines
#define B_OUTCOME_WON 0x1
include/constants/battle_ai.h
+3 -3
View File
@@ -23,7 +23,7 @@
#define AI_EFFECTIVENESS_x0 0
// ai weather
#define AI_WEATHER_SUNNY 0
#define AI_WEATHER_SUN 0
#define AI_WEATHER_RAIN 1
#define AI_WEATHER_SANDSTORM 2
#define AI_WEATHER_HAIL 3
@@ -35,8 +35,8 @@
// script's table id to bit
#define AI_SCRIPT_CHECK_BAD_MOVE (1 << 0)
#define AI_SCRIPT_TRY_TO_FAINT (1 << 1)
#define AI_SCRIPT_CHECK_VIABILITY (1 << 2)
#define AI_SCRIPT_CHECK_VIABILITY (1 << 1)
#define AI_SCRIPT_TRY_TO_FAINT (1 << 2)
#define AI_SCRIPT_SETUP_FIRST_TURN (1 << 3)
#define AI_SCRIPT_RISKY (1 << 4)
#define AI_SCRIPT_PREFER_STRONGEST_MOVE (1 << 5)
include/constants/event_object_movement.h
+5 -2
View File
@@ -1,6 +1,7 @@
#ifndef GUARD_CONSTANTS_EVENT_OBJECT_MOVEMENT_H
#define GUARD_CONSTANTS_EVENT_OBJECT_MOVEMENT_H
// FIXME: Different in FRLG
#define MOVEMENT_TYPE_NONE 0x0
#define MOVEMENT_TYPE_LOOK_AROUND 0x1
#define MOVEMENT_TYPE_WANDER_AROUND 0x2
@@ -239,8 +240,10 @@
#define MOVEMENT_ACTION_STOP_LEVITATE 0x99
#define MOVEMENT_ACTION_DESTROY_EXTRA_TASK_IF_AT_TOP 0x9A
#define MOVEMENT_ACTION_FIGURE_8 0x9B
#define MOVEMENT_ACTION_FLY_UP 0x9C
#define MOVEMENT_ACTION_FLY_DOWN 0x9D
// These two are verified correct in FRLG
#define MOVEMENT_ACTION_FLY_UP 0xA4
#define MOVEMENT_ACTION_FLY_DOWN 0xA5
#define MOVEMENT_ACTION_STEP_END 0xFE
include/constants/metatile_labels.h
+10
View File
@@ -37,6 +37,16 @@
#define METATILE_PokemonMansion_Statue_RedEyes_Shade 0x34E
#define METATILE_PokemonMansion_Statue_RedEyes_Basement 0x34F
// Cinnabar Gym
#define METATILE_CinnabarGym_Floor 0x281
#define METATILE_CinnabarGym_Floor_ShadeDiagonal 0x282
#define METATILE_CinnabarGym_Floor_ShadeFull 0x289
#define METATILE_CinnabarGym_Floor_WallRightCorner 0x2C6
#define METATILE_CinnabarGym_Floor_WallLeftCorner 0x2C7
#define METATILE_CinnabarGym_Floor_WallRightEdge 0x2CE
#define METATILE_CinnabarGym_Floor_WallLeftEdge 0x2CF
#define METATILE_CinnabarGym_Wall_RetractedBarrier 0x2D1
// gTileset_82D504C. Below metatile probably needs generic name
#define METATILE_MtEmber_CaveEntrance 0x346
include/constants/pokemon.h
+120
View File
@@ -1,6 +1,97 @@
#ifndef GUARD_CONSTANTS_POKEMON_H
#define GUARD_CONSTANTS_POKEMON_H
// For (Set|Get)(Box)?MonData
#define MON_DATA_PERSONALITY 0
#define MON_DATA_OT_ID 1
#define MON_DATA_NICKNAME 2
#define MON_DATA_LANGUAGE 3
#define MON_DATA_SANITY_IS_BAD_EGG 4
#define MON_DATA_SANITY_HAS_SPECIES 5
#define MON_DATA_SANITY_IS_EGG 6
#define MON_DATA_OT_NAME 7
#define MON_DATA_MARKINGS 8
#define MON_DATA_CHECKSUM 9
#define MON_DATA_ENCRYPT_SEPARATOR 10
#define MON_DATA_SPECIES 11
#define MON_DATA_HELD_ITEM 12
#define MON_DATA_MOVE1 13
#define MON_DATA_MOVE2 14
#define MON_DATA_MOVE3 15
#define MON_DATA_MOVE4 16
#define MON_DATA_PP1 17
#define MON_DATA_PP2 18
#define MON_DATA_PP3 19
#define MON_DATA_PP4 20
#define MON_DATA_PP_BONUSES 21
#define MON_DATA_COOL 22
#define MON_DATA_BEAUTY 23
#define MON_DATA_CUTE 24
#define MON_DATA_EXP 25
#define MON_DATA_HP_EV 26
#define MON_DATA_ATK_EV 27
#define MON_DATA_DEF_EV 28
#define MON_DATA_SPEED_EV 29
#define MON_DATA_SPATK_EV 30
#define MON_DATA_SPDEF_EV 31
#define MON_DATA_FRIENDSHIP 32
#define MON_DATA_SMART 33
#define MON_DATA_POKERUS 34
#define MON_DATA_MET_LOCATION 35
#define MON_DATA_MET_LEVEL 36
#define MON_DATA_MET_GAME 37
#define MON_DATA_POKEBALL 38
#define MON_DATA_HP_IV 39
#define MON_DATA_ATK_IV 40
#define MON_DATA_DEF_IV 41
#define MON_DATA_SPEED_IV 42
#define MON_DATA_SPATK_IV 43
#define MON_DATA_SPDEF_IV 44
#define MON_DATA_IS_EGG 45
#define MON_DATA_ABILITY_NUM 46
#define MON_DATA_TOUGH 47
#define MON_DATA_SHEEN 48
#define MON_DATA_OT_GENDER 49
#define MON_DATA_COOL_RIBBON 50
#define MON_DATA_BEAUTY_RIBBON 51
#define MON_DATA_CUTE_RIBBON 52
#define MON_DATA_SMART_RIBBON 53
#define MON_DATA_TOUGH_RIBBON 54
#define MON_DATA_STATUS 55
#define MON_DATA_LEVEL 56
#define MON_DATA_HP 57
#define MON_DATA_MAX_HP 58
#define MON_DATA_ATK 59
#define MON_DATA_DEF 60
#define MON_DATA_SPEED 61
#define MON_DATA_SPATK 62
#define MON_DATA_SPDEF 63
#define MON_DATA_MAIL 64
#define MON_DATA_SPECIES2 65
#define MON_DATA_IVS 66
#define MON_DATA_CHAMPION_RIBBON 67
#define MON_DATA_WINNING_RIBBON 68
#define MON_DATA_VICTORY_RIBBON 69
#define MON_DATA_ARTIST_RIBBON 70
#define MON_DATA_EFFORT_RIBBON 71
#define MON_DATA_GIFT_RIBBON_1 72
#define MON_DATA_GIFT_RIBBON_2 73
#define MON_DATA_GIFT_RIBBON_3 74
#define MON_DATA_GIFT_RIBBON_4 75
#define MON_DATA_GIFT_RIBBON_5 76
#define MON_DATA_GIFT_RIBBON_6 77
#define MON_DATA_GIFT_RIBBON_7 78
#define MON_DATA_FATEFUL_ENCOUNTER 79
#define MON_DATA_OBEDIENCE 80
#define MON_DATA_KNOWN_MOVES 81
#define MON_DATA_RIBBON_COUNT 82
#define MON_DATA_RIBBONS 83
#define MON_DATA_ATK2 84
#define MON_DATA_DEF2 85
#define MON_DATA_SPEED2 86
#define MON_DATA_SPATK2 87
#define MON_DATA_SPDEF2 88
// Pokemon types
#define TYPE_NORMAL 0x00
#define TYPE_FIGHTING 0x01
@@ -93,4 +184,33 @@
#define PLAYER_HAS_ONE_MON 0x1
#define PLAYER_HAS_ONE_USABLE_MON 0x2
#define MAX_LEVEL 100
#define OT_ID_RANDOM_NO_SHINY 2
#define OT_ID_PRESET 1
#define OT_ID_PLAYER_ID 0
#define MON_GIVEN_TO_PARTY 0x0
#define MON_GIVEN_TO_PC 0x1
#define MON_CANT_GIVE 0x2
#define MON_MALE 0x00
#define MON_FEMALE 0xFE
#define MON_GENDERLESS 0xFF
#define FRIENDSHIP_EVENT_GROW_LEVEL 0x0
#define FRIENDSHIP_EVENT_VITAMIN 0x1
#define FRIENDSHIP_EVENT_BATTLE_ITEM 0x2
#define FRIENDSHIP_EVENT_LEAGUE_BATTLE 0x3
#define FRIENDSHIP_EVENT_LEARN_TMHM 0x4
#define FRIENDSHIP_EVENT_WALKING 0x5
#define FRIENDSHIP_EVENT_FAINT_SMALL 0x6
#define FRIENDSHIP_EVENT_FAINT_OUTSIDE_BATTLE 0x7
#define FRIENDSHIP_EVENT_FAINT_LARGE 0x8
#define PARTY_SIZE 6
#define MAX_TOTAL_EVS 510
#define UNOWN_FORM_COUNT 28
#define MAX_MON_LEVEL 100
#endif // GUARD_CONSTANTS_POKEMON_H
include/dodrio_berry_picking.h
+6
View File
@@ -0,0 +1,6 @@
#ifndef GUARD_DODRIO_BERRY_PICKING_H
#define GUARD_DODRIO_BERRY_PICKING_H
void sub_81507FC(u16 species, MainCallback callback);
#endif //GUARD_DODRIO_BERRY_PICKING_H
include/event_object_80688E4.h
+5
View File
@@ -6,5 +6,10 @@
void FreezeObjectEvents(void);
void FreezeObjectEvent(struct ObjectEvent *);
void FreezeObjectEventsExceptOne(u8 objEventId);
void sub_8069124(u8 a0, bool8 a1);
u32 sub_806916C(u8 a0);
void sub_80691A4(u8 a0, u8 a1);
void sub_8069094(u8 a0, u8 a1);
bool32 sub_8069294(u8 a0);
#endif // GUARD_EVENT_OBJECT_80688E4_H
include/event_object_8097404.h
+1 -1
View File
@@ -14,7 +14,7 @@ extern void *gUnknown_020375B8;
// Exported ROM declarations
void sub_8097AC8(struct Sprite *);
void npc_sync_anim_pause_bits(struct ObjectEvent *);
void UnfreezeObjectEvent(struct ObjectEvent *);
void oamt_npc_ministep_reset(struct Sprite *, u8, u8);
u8 sub_8097F78(struct ObjectEvent *);
bool8 obj_npc_ministep(struct Sprite *sprite);
include/event_object_lock.h
+1
View File
@@ -11,5 +11,6 @@ void sub_8098630(void);
bool8 sub_8098734(void);
void sub_80696C0(void);
bool8 walkrun_is_standing_still(void);
void sub_80696F0(void);
#endif // GUARD_EVENT_OBJECT_LOCK_H
include/event_object_movement.h
+2 -2
View File
@@ -47,7 +47,7 @@ void ObjectEventClearAnimIfSpecialAnimActive(struct ObjectEvent *);
void SpawnObjectEventsInView(s16, s16);
u8 sprite_new(u8, u8, s16, s16, u8, u8);
u8 AddPseudoObjectEvent(u16, SpriteCallback, s16, s16, u8);
u8 show_sprite(u8, u8, u8);
u8 TrySpawnObjectEvent(u8 localId, u8 mapNum, u8 mapGroup);
u8 SpawnSpecialObjectEventParameterized(u8, u8, u8, s16, s16, u8);
u8 SpawnSpecialObjectEvent(struct ObjectEventTemplate *);
void sub_8093038(s16, s16, s16 *, s16 *);
@@ -82,7 +82,7 @@ bool8 ObjectEventIsSpecialAnimActive(struct ObjectEvent *);
u8 ObjectEventClearHeldMovementIfFinished(struct ObjectEvent *);
u8 GetObjectEventIdByXYZ(u16 x, u16 y, u8 z);
void sub_8063E28(struct ObjectEvent *, struct Sprite *);
void ObjectEventSetHeldMovement(struct ObjectEvent *, u8);
bool8 ObjectEventSetHeldMovement(struct ObjectEvent *, u8);
void npc_coords_shift_still(struct ObjectEvent *);
void sub_805FE7C(struct ObjectEvent *, u8);
void SetTrainerMovementType(struct ObjectEvent *, u8);
include/event_scripts.h
+4 -4
View File
@@ -1190,10 +1190,10 @@ extern const u8 EventScript_PC[];
extern const u8 EventScript_RepelWoreOff[];
// battle_message
extern const u8 Text_1A5CF1[];
extern const u8 Text_1A5D31[];
extern const u8 Text_1A5D6E[];
extern const u8 Text_1A5DB1[];
extern const u8 Text_MonSentToBoxInSomeonesPC[];
extern const u8 Text_MonSentToBoxInBillsPC[];
extern const u8 Text_MonSentToBoxSomeonesBoxFull[];
extern const u8 Text_MonSentToBoxBillsBoxFull[];
extern const u8 EventScript_BagItemCanBeRegistered[];
include/field_control_avatar.h
+1
View File
@@ -7,5 +7,6 @@ extern u32 gUnknown_3005078;
void RestartWildEncounterImmunitySteps(void);
void ClearPoisonStepCounter(void);
void SetCableClubWarp(void);
#endif //GUARD_FIELD_CONTROL_AVATAR_H
include/field_fadetransition.h
+2
View File
@@ -17,6 +17,8 @@ void FieldCallback_ReturnToEventScript2(void);
void sub_807DC00(void);
void FadeTransition_FadeInOnReturnToStartMenu(void);
void sub_807DCE4(void);
bool32 sub_807E418(void);
#endif // GUARD_FIELD_FADETRANSITION_H
include/field_player_avatar.h
+1
View File
@@ -35,5 +35,6 @@ bool32 sub_805DAD0(void);
bool32 sub_805DC24(void);
bool8 PartyHasMonWithSurf(void);
bool8 IsPlayerSurfingNorth(void);
void player_get_pos_including_state_based_drift(s16 *x, s16 *y);
#endif //GUARD_FIELD_PLAYER_AVATAR_H
include/field_weather.h
+1 -1
View File
@@ -3,7 +3,7 @@
#include "global.h"
void fade_screen(u8, s8);
void FadeScreen(u8, s8);
void SetSav1Weather(u32);
u8 GetSav1Weather(void);
include/fieldmap.h
+1
View File
@@ -31,5 +31,6 @@ void sub_8059948(u8 a0, u8 a1);
void save_serialize_map(void);
u32 sub_8058F1C(u32 original, u8 bit);
u32 sub_8058F48(s16 x, s16 y, u8 z);
void sub_8059024(s32 x, s32 y, bool32 arg2);
#endif //GUARD_FIELDMAP_H
include/global.fieldmap.h
+3 -3
View File
@@ -275,9 +275,9 @@ enum
struct PlayerAvatar /* 0x202E858 */
{
/*0x00*/ u8 flags;
/*0x01*/ u8 bike;
/*0x02*/ u8 running2;
/*0x03*/ u8 running1;
/*0x01*/ u8 unk1; // used to be bike, but it's not that in Emerald and probably isn't here either. maybe transition flags?
/*0x02*/ u8 runningState; // this is a static running state. 00 is not moving, 01 is turn direction, 02 is moving.
/*0x03*/ u8 tileTransitionState; // this is a transition running state: 00 is not moving, 01 is transition between tiles, 02 means you are on the frame in which you have centered on a tile but are about to keep moving, even if changing directions. 2 is also used for a ledge hop, since you are transitioning.
/*0x04*/ u8 spriteId;
/*0x05*/ u8 objectEventId;
/*0x06*/ u8 unk6;
include/link.h
+1
View File
@@ -278,5 +278,6 @@ bool8 HandleLinkConnection(void);
void sub_800B0B4(void);
void sub_800B110(u32 who);
void sub_800ACBC(u32 status, u8 lastSendQueueCount, u8 lastRecvQueueCount, u8 unk_06);
u8 sub_800A8D4(void);
#endif // GUARD_LINK_H
include/link_rfu.h
+34 -4
View File
@@ -233,9 +233,9 @@ void MG_DrawCheckerboardPattern(void);
void task_add_05_task_del_08FA224_when_no_RfuFunc(void);
bool8 IsLinkRfuTaskFinished(void);
void DestroyWirelessStatusIndicatorSprite(void);
void MEvent_CreateTask_CardOrNewsWithFriend(u8);
void MEvent_CreateTask_CardOrNewsOverWireless(u8);
void MEvent_CreateTask_Leader(u8);
void MEvent_CreateTask_CardOrNewsWithFriend(u32 arg0);
void MEvent_CreateTask_CardOrNewsOverWireless(u32 arg0);
void MEvent_CreateTask_Leader(u32 arg0);
void sub_80F9E2C(void * data);
u8 sub_8116DE0(void);
void sub_80FBB4C(void);
@@ -288,13 +288,43 @@ bool8 sub_80FC6E8(struct UnkRfuStruct_2_Sub_124 * a0, u8 *a1);
void sub_80FC63C(struct UnkRfuStruct_2_Sub_9e8 * a0, u8 *a1);
u8 sub_80FEA34(u8 a0, u16 a1);
void sub_80FDA30(u32 a0);
void InitHostRFUtgtGname(struct GFtgtGname *data, u8 r9, bool32 r2, s32 r3);
void InitHostRFUtgtGname(struct GFtgtGname *data, u8 activity, bool32 r2, s32 r3);
void LinkRfu_syncVBlank_(void);
s32 sub_80FD430(void (*func1)(u8, u8), void (*func2)(u16));
void sub_80FEB3C(void);
void sub_80FAFE0(u8 a0);
bool32 sub_80FA44C(u32 a0);
bool8 sub_80FC1B0(void);
bool8 sub_80F8F40(void);
void sub_80F8F5C(void);
bool32 sub_80FA5D4(void);
bool32 sub_80FC1CC(void);
bool32 sub_80F8F7C(bool32 a0);
bool32 sub_80FA634(u16 a0, const u8 *a1);
void sub_80FA670(u8 a0, u16 a1, const u8 *a2);
u32 sub_80FA6FC(u16 a0, const u8 *a1);
void SetHostRFUtgtGname(u8 a0, u32 a1, u32 a2);
void sub_80FBB8C(u32 a0);
void sub_80FBD4C(const u8 *ptr, u16 a1);
void LinkRfu3_SetGnameUnameFromStaticBuffers(struct GFtgtGname *gname, u8 *uname);
void sub_80FBBD8(void);
void sub_80FA6BC(void);
void sub_80FBF54(const u8 *src, u16 trainerId);
void sub_80FB008(u8 a0, u32 a1, u32 a2);
void RecordMixTrainerNames(void);
void sub_80F8CFC();
void sub_80F8D14();
void sub_80FAF74(bool32 a0, bool32 a1);
void ClearAndInitHostRFUtgtGname(void);
void sub_80F8FA0(void);
void sub_80FAFA0(u32 type, u32 species, u32 level);
bool32 sub_80FBB0C(void);
void sub_80FBC00(void);
void sub_80FBD6C(u32 a0);
void sub_80FC114(const u8 *name, struct GFtgtGname *structPtr, u8 a2);
bool32 PlayerHasMetTrainerBefore(u16 id, u8 *name);
bool8 sub_80FCC3C(struct GFtgtGname *gname, u8 *uname, u8 idx);
bool8 sub_80FCCF4(struct GFtgtGname *gname, u8 *uname, u8 idx);
#include "mevent_server.h"
extern const struct mevent_server_cmd gMEventSrvScript_OtherTrainerCanceled[];
include/mevent.h
+3
View File
@@ -70,5 +70,8 @@ void sub_8143D24(void);
u16 sub_81445C0(u32 command);
void sub_8144714(u32 a0, u32 a1);
u16 *GetMEventProfileECWordsMaybe(void);
void sub_81446C4(void);
bool32 sub_81446D0(u16 a0);
u16 GetWonderCardFlagId(void);
#endif //GUARD_MEVENT_H
include/mevent_server.h
+1
View File
@@ -86,6 +86,7 @@ struct mevent_server_cmd
#define SRV_SEND_NEWS {.instr = 14}
#define SRV_BUFFER_SEND {.instr = 15}
#define SRV_SEND(x, y) {.instr = 18, .flag = x, .parameter = (void *)y}
#define SRV_SENDSTR(x, y) {.instr = 20, .flag = x, .parameter = (void *)y}
#define SRV_BUFFER_CARD {.instr = 26}
#define SRV_BUFFER_NEWS {.instr = 27}
#define SRV_RAM_SCRIPT_IF_VALID {.instr = 28}
include/mystery_gift_menu.h
+3
View File
@@ -7,5 +7,8 @@ void MainCB_FreeAllBuffersAndReturnToInitTitleScreen(void);
void PrintMysteryGiftOrEReaderTopMenu(bool8, bool32);
void c2_mystery_gift(void);
void c2_mystery_gift_e_reader_run(void);
s8 mevent_message_print_and_prompt_yes_no(u8 * textState, u16 * windowId, bool8 yesNoBoxPlacement, const u8 * str);
void MG_DrawTextBorder(u8 windowId);
u16 GetMysteryGiftBaseBlock(void);
#endif //GUARD_MYSTERY_GIFT_MENU_H
include/overworld.h
+2 -1
View File
@@ -62,7 +62,8 @@ extern struct WarpData gUnknown_2031DB4;
extern struct WarpData gUnknown_2031DBC;
extern u8 gUnknown_2031DE0;
extern u8 gUnknown_300502C;
extern u8 gFieldLinkPlayerCount;
extern u8 gLocalLinkPlayerId;
void IncrementGameStat(u8 index);
include/party_menu.h
+1 -1
View File
@@ -68,7 +68,7 @@ void CB2_ChooseMonToGiveItem(void);
void ChooseMonToGiveMailFromMailbox(void);
void InitChooseHalfPartyForBattle(u8 a1);
void ClearSelectedPartyOrder(void);
void sub_81277F4(u8 menuType, MainCallback callback);
void ChooseMonForTradingBoard(u8 menuType, MainCallback callback);
void ChooseMonForMoveTutor(void);
void ChooseMonForWirelessMinigame(void);
void OpenPartyMenuInTutorialBattle(u8 partyAction);
include/pokemon.h
+1 -183
View File
@@ -3,167 +3,7 @@
#include "global.h"
#include "sprite.h"
#define MON_DATA_PERSONALITY 0
#define MON_DATA_OT_ID 1
#define MON_DATA_NICKNAME 2
#define MON_DATA_LANGUAGE 3
#define MON_DATA_SANITY_IS_BAD_EGG 4
#define MON_DATA_SANITY_HAS_SPECIES 5
#define MON_DATA_SANITY_IS_EGG 6
#define MON_DATA_OT_NAME 7
#define MON_DATA_MARKINGS 8
#define MON_DATA_CHECKSUM 9
#define MON_DATA_ENCRYPT_SEPARATOR 10
#define MON_DATA_SPECIES 11
#define MON_DATA_HELD_ITEM 12
#define MON_DATA_MOVE1 13
#define MON_DATA_MOVE2 14
#define MON_DATA_MOVE3 15
#define MON_DATA_MOVE4 16
#define MON_DATA_PP1 17
#define MON_DATA_PP2 18
#define MON_DATA_PP3 19
#define MON_DATA_PP4 20
#define MON_DATA_PP_BONUSES 21
#define MON_DATA_COOL 22
#define MON_DATA_BEAUTY 23
#define MON_DATA_CUTE 24
#define MON_DATA_EXP 25
#define MON_DATA_HP_EV 26
#define MON_DATA_ATK_EV 27
#define MON_DATA_DEF_EV 28
#define MON_DATA_SPEED_EV 29
#define MON_DATA_SPATK_EV 30
#define MON_DATA_SPDEF_EV 31
#define MON_DATA_FRIENDSHIP 32
#define MON_DATA_SMART 33
#define MON_DATA_POKERUS 34
#define MON_DATA_MET_LOCATION 35
#define MON_DATA_MET_LEVEL 36
#define MON_DATA_MET_GAME 37
#define MON_DATA_POKEBALL 38
#define MON_DATA_HP_IV 39
#define MON_DATA_ATK_IV 40
#define MON_DATA_DEF_IV 41
#define MON_DATA_SPEED_IV 42
#define MON_DATA_SPATK_IV 43
#define MON_DATA_SPDEF_IV 44
#define MON_DATA_IS_EGG 45
#define MON_DATA_ABILITY_NUM 46
#define MON_DATA_TOUGH 47
#define MON_DATA_SHEEN 48
#define MON_DATA_OT_GENDER 49
#define MON_DATA_COOL_RIBBON 50
#define MON_DATA_BEAUTY_RIBBON 51
#define MON_DATA_CUTE_RIBBON 52
#define MON_DATA_SMART_RIBBON 53
#define MON_DATA_TOUGH_RIBBON 54
#define MON_DATA_STATUS 55
#define MON_DATA_LEVEL 56
#define MON_DATA_HP 57
#define MON_DATA_MAX_HP 58
#define MON_DATA_ATK 59
#define MON_DATA_DEF 60
#define MON_DATA_SPEED 61
#define MON_DATA_SPATK 62
#define MON_DATA_SPDEF 63
#define MON_DATA_MAIL 64
#define MON_DATA_SPECIES2 65
#define MON_DATA_IVS 66
#define MON_DATA_CHAMPION_RIBBON 67
#define MON_DATA_WINNING_RIBBON 68
#define MON_DATA_VICTORY_RIBBON 69
#define MON_DATA_ARTIST_RIBBON 70
#define MON_DATA_EFFORT_RIBBON 71
#define MON_DATA_GIFT_RIBBON_1 72
#define MON_DATA_GIFT_RIBBON_2 73
#define MON_DATA_GIFT_RIBBON_3 74
#define MON_DATA_GIFT_RIBBON_4 75
#define MON_DATA_GIFT_RIBBON_5 76
#define MON_DATA_GIFT_RIBBON_6 77
#define MON_DATA_GIFT_RIBBON_7 78
#define MON_DATA_FATEFUL_ENCOUNTER 79
#define MON_DATA_OBEDIENCE 80
#define MON_DATA_KNOWN_MOVES 81
#define MON_DATA_RIBBON_COUNT 82
#define MON_DATA_RIBBONS 83
#define MON_DATA_ATK2 84
#define MON_DATA_DEF2 85
#define MON_DATA_SPEED2 86
#define MON_DATA_SPATK2 87
#define MON_DATA_SPDEF2 88
#define MAX_LEVEL 100
#define OT_ID_RANDOM_NO_SHINY 2
#define OT_ID_PRESET 1
#define OT_ID_PLAYER_ID 0
#define MON_GIVEN_TO_PARTY 0x0
#define MON_GIVEN_TO_PC 0x1
#define MON_CANT_GIVE 0x2
#define MON_MALE 0x00
#define MON_FEMALE 0xFE
#define MON_GENDERLESS 0xFF
#define FRIENDSHIP_EVENT_GROW_LEVEL 0x0
#define FRIENDSHIP_EVENT_VITAMIN 0x1
#define FRIENDSHIP_EVENT_BATTLE_ITEM 0x2
#define FRIENDSHIP_EVENT_LEAGUE_BATTLE 0x3
#define FRIENDSHIP_EVENT_LEARN_TMHM 0x4
#define FRIENDSHIP_EVENT_WALKING 0x5
#define FRIENDSHIP_EVENT_FAINT_SMALL 0x6
#define FRIENDSHIP_EVENT_FAINT_OUTSIDE_BATTLE 0x7
#define FRIENDSHIP_EVENT_FAINT_LARGE 0x8
#define TYPE_NORMAL 0x00
#define TYPE_FIGHTING 0x01
#define TYPE_FLYING 0x02
#define TYPE_POISON 0x03
#define TYPE_GROUND 0x04
#define TYPE_ROCK 0x05
#define TYPE_BUG 0x06
#define TYPE_GHOST 0x07
#define TYPE_STEEL 0x08
#define TYPE_MYSTERY 0x09
#define TYPE_FIRE 0x0a
#define TYPE_WATER 0x0b
#define TYPE_GRASS 0x0c
#define TYPE_ELECTRIC 0x0d
#define TYPE_PSYCHIC 0x0e
#define TYPE_ICE 0x0f
#define TYPE_DRAGON 0x10
#define TYPE_DARK 0x11
#define NUMBER_OF_MON_TYPES 0x12
#define PARTY_SIZE 6
#define MAX_TOTAL_EVS 510
#define NUM_STATS 6
#define UNOWN_FORM_COUNT 28
#define MAX_MON_LEVEL 100
enum
{
EGG_GROUP_NONE,
EGG_GROUP_MONSTER,
EGG_GROUP_WATER_1,
EGG_GROUP_BUG,
EGG_GROUP_FLYING,
EGG_GROUP_FIELD,
EGG_GROUP_FAIRY,
EGG_GROUP_GRASS,
EGG_GROUP_HUMAN_LIKE,
EGG_GROUP_WATER_3,
EGG_GROUP_MINERAL,
EGG_GROUP_AMORPHOUS,
EGG_GROUP_WATER_2,
EGG_GROUP_DITTO,
EGG_GROUP_DRAGON,
EGG_GROUP_UNDISCOVERED
};
#include "constants/pokemon.h"
struct PokemonSubstruct0
{
@@ -357,28 +197,6 @@ struct BattlePokemon
/*0x54*/ u32 otId;
};
enum
{
STAT_STAGE_HP, // 0
STAT_STAGE_ATK, // 1
STAT_STAGE_DEF, // 2
STAT_STAGE_SPEED, // 3
STAT_STAGE_SPATK, // 4
STAT_STAGE_SPDEF, // 5
STAT_STAGE_ACC, // 6
STAT_STAGE_EVASION, // 7
};
enum
{
STAT_HP, // 0
STAT_ATK, // 1
STAT_DEF, // 2
STAT_SPD, // 3
STAT_SPATK, // 4
STAT_SPDEF, // 5
};
struct BaseStats
{
/* 0x00 */ u8 baseHP;
include/pokemon_jump.h
+1
View File
@@ -5,5 +5,6 @@
void ResetPokeJumpResults(void);
bool32 IsSpeciesAllowedInPokemonJump(u16 species);
void sub_8147AA8(u16 species, MainCallback callback);
#endif // GUARD_POKEMON_JUMP_H
include/rfu_union_tool.h
+17
View File
@@ -0,0 +1,17 @@
#ifndef GUARD_UNION_ROOM_PLAYER_AVATAR_H
#define GUARD_UNION_ROOM_PLAYER_AVATAR_H
#include "union_room.h"
void sub_811C1C8(void);
void sub_811BAAC(u8 *spriteIds, s32 arg1);
void sub_811BB40(u8 *spriteIds);
void sub_811BB68(void);
void sub_811BECC(struct UnkStruct_URoom *arg0);
void sub_811BEDC(struct UnkStruct_URoom *arg0);
bool32 sub_811BF00(struct UnkStruct_Main0 *arg0, s16 *arg1, s16 *arg2, u8 *arg3);
void sub_811C028(u32 arg0, u32 arg1, struct UnkStruct_Main0 *arg2);
u8 ZeroUnionObjWork(struct UnionObj * ptr);
void sub_811BA78(void);
#endif //GUARD_UNION_ROOM_PLAYER_AVATAR_H
include/save_location.h
+1
View File
@@ -6,6 +6,7 @@
#define POKECENTER_SAVEWARP (1 << 1)
#define LOBBY_SAVEWARP (1 << 2)
#define UNK_SPECIAL_SAVE_WARP_FLAG_3 (1 << 3)
#define CHAMPION_SAVEWARP (1 << 7)
void TrySetMapSaveWarpStatus(void);
bool32 IsCurMapPokeCenter(void);
include/strings.h
+5
View File
@@ -1056,4 +1056,9 @@ extern const u8 gText_DepositHowManyStrVars1[];
extern const u8 gText_DepositedStrVar2StrVar1s[];
extern const u8 gText_NoRoomToStoreItems[];
// union_room_battle
extern const u8 gText_CommStandbyAwaitingOtherPlayer[];
extern const u8 gText_RefusedBattle[];
extern const u8 gText_BattleWasRefused[];
#endif //GUARD_STRINGS_H
include/union_room.h
+56 -53
View File
@@ -2,11 +2,11 @@
#define GUARD_UNION_ROOM_H
#include "global.h"
#include "librfu.h"
#include "link_rfu.h"
struct UnkStruct_Shared
{
struct GFtgtGname field_0;
struct GFtgtGname gname;
u8 ALIGNED(4) playerName[PLAYER_NAME_LENGTH];
};
@@ -28,26 +28,27 @@ struct UnkStruct_x20
u8 field_1F;
};
// These arrays are dynamically allocated but must be
// represented as structs to match.
// Don't ask me why.
// FIXME: Find a way around this.
struct UnkStruct_Main0
{
struct UnkStruct_x20 arr[8];
struct UnkStruct_x20 arr[0];
};
struct UnkStruct_Main4
{
struct UnkStruct_x1C arr[5];
};
struct UnkStruct_Main8
{
struct UnkStruct_x20 arr[5];
struct UnkStruct_x1C arr[0];
};
struct UnkStruct_Leader
{
struct UnkStruct_Main0 *field_0;
struct UnkStruct_Main4 *field_4;
struct UnkStruct_Main8 *field_8;
struct UnkStruct_Main0 * field_0;
struct UnkStruct_Main4 * field_4;
struct UnkStruct_Main0 * field_8;
u8 state;
u8 textState;
u8 field_E;
@@ -67,8 +68,8 @@ struct UnkStruct_Leader
struct UnkStruct_Group
{
struct UnkStruct_Main0 *field_0;
struct UnkStruct_Main4 *field_4;
struct UnkStruct_Main0 * field_0;
struct UnkStruct_Main4 * field_4;
u8 state;
u8 textState;
u8 field_A;
@@ -85,56 +86,56 @@ struct UnkStruct_Group
u8 field_15;
};
struct UnkStruct_8019BA8
struct UnionObj
{
u8 field_0;
u8 field_1;
s8 field_2;
u8 field_3;
u8 state;
u8 gfxId;
s8 animState;
u8 schedAnim;
};
struct UnkStruct_URoom
{
struct UnkStruct_Main0 *field_0;
struct UnkStruct_Main4 *field_4;
struct UnkStruct_Main0 *field_8;
struct UnkStruct_Main4 *field_C;
u16 field_10;
u16 field_12;
u8 state;
u8 stateAfterPrint;
u8 textState;
u8 field_17;
u8 field_18;
u8 field_19;
u8 field_1A;
u8 field_1B;
u8 field_1C;
u8 field_1D;
u8 field_1E;
u8 field_1F;
u8 field_20;
u8 spriteIds[40];
u8 field_49;
u8 field_4A;
u16 field_4C[6];
u8 field_58[0x98 - 0x58];
u16 field_98;
u16 field_9A[3];
struct UnkStruct_8019BA8 field_A0[8];
u8 field_C0[12][15];
u8 field_174[48];
u8 field_1A4[200];
/* 0x000 */ struct UnkStruct_Main0 * field_0;
/* 0x004 */ struct UnkStruct_Main4 * field_4;
/* 0x008 */ struct UnkStruct_Main0 * field_8;
/* 0x00C */ struct UnkStruct_Main4 * field_C;
/* 0x010 */ u16 field_10;
/* 0x012 */ u16 field_12;
/* 0x014 */ u8 state;
/* 0x015 */ u8 stateAfterPrint;
/* 0x016 */ u8 textState;
/* 0x017 */ u8 field_17;
/* 0x018 */ u8 field_18;
/* 0x019 */ u8 field_19;
/* 0x01A */ u8 field_1A;
/* 0x01B */ u8 field_1B;
/* 0x01C */ u8 field_1C;
/* 0x01D */ u8 field_1D;
/* 0x01E */ u8 field_1E;
/* 0x01F */ u8 field_1F;
/* 0x020 */ u8 field_20;
/* 0x021 */ u8 spriteIds[40];
/* 0x049 */ u8 field_49;
/* 0x04A */ u8 field_4A;
/* 0x04C */ u16 field_4C[6];
/* 0x058 */ u8 field_58[4][11];
/* 0x084 */ u16 field_98;
/* 0x086 */ u16 field_9A[3];
/* 0x08C */ struct UnionObj unionObjs[8];
/* 0x0AC */ u8 trainerCardStrbufs[12][15];
/* 0x160 */ u8 field_174[48];
/* 0x190 */ u8 field_1A4[200];
};
union UnkUnion_Main
{
struct UnkStruct_Leader *leader;
struct UnkStruct_Group *group;
struct UnkStruct_URoom *uRoom;
struct UnkStruct_Leader * leader;
struct UnkStruct_Group * group;
struct UnkStruct_URoom * uRoom;
};
struct TradeUnkStruct
struct UnionRoomTrade
{
u16 field_0;
u16 type;
@@ -153,4 +154,6 @@ extern struct GFtgtGnameSub gUnknown_203B064;
extern u16 gUnionRoomOfferedSpecies;
extern u8 gUnionRoomRequestedMonType;
void sub_81173C0(u16 battleFlags);
#endif //GUARD_UNION_ROOM_H
include/union_room_chat.h
+1
View File
@@ -2,6 +2,7 @@
#define GUARD_UNION_ROOM_CHAT_H
void sub_801DD98(void);
void sub_8128420(void);
void copy_strings_to_sav1(void);
#endif // GUARD_UNION_ROOM_CHAT_H
include/union_room_message.h
+114
View File
@@ -0,0 +1,114 @@
#ifndef GUARD_UNION_ROOM_MESSAGE_H
#define GUARD_UNION_ROOM_MESSAGE_H
#include "global.h"
extern const u8 gUnknown_84571AC[];
extern const u8 gUnknown_84571B0[];
extern const u8 gUnknown_84571B4[];
extern const u8 gUnknown_84571B8[];
extern const u8 gUnknown_84571E0[];
extern const u8 gUnknown_8457234[];
extern const u8 gUnknown_8457264[];
extern const u8 *const gUnknown_845742C[][5];
extern const u8 gUnknown_845747C[];
extern const u8 gUnknown_84574A0[];
extern const u8 gUnknown_84574C4[];
extern const u8 gUnknown_84574EC[];
extern const u8 gUnknown_8457514[];
extern const u8 gUnknown_8457530[];
extern const u8 gUnknown_8457554[];
extern const u8 *const gUnknown_8457608[];
extern const u8 gUnknown_8457610[];
extern const u8 *const gUnknown_845767C[];
extern const u8 gUnknown_84576AC[];
extern const u8 gUnknown_84576C4[];
extern const u8 gUnknown_8457700[];
extern const u8 gUnknown_845771C[];
extern const u8 *const gUnknown_8457754[];
extern const u8 gUnknown_845777C[];
extern const u8 gUnknown_84577BC[];
extern const u8 gUnknown_84577F8[];
extern const u8 *const gUnknown_8457838[];
extern const u8 gUnknown_84578BC[];
extern const u8 *const gUnknown_8457A34[];
extern const u8 *const gUnknown_8457B04[][2];
extern const u8 *const gUnknown_8457BCC[];
extern const u8 *const gUnknown_8457C20[];
extern const u8 gUnknown_8457C48[];
extern const u8 gUnknown_8457CA4[];
extern const u8 gUnknown_8457CF8[];
extern const u8 gUnknown_8457D44[];
extern const u8 gUnknown_8457DB8[];
extern const u8 gUnknown_8457E0C[];
extern const u8 gUnknown_8457E28[];
extern const u8 gUnknown_8457E44[];
extern const u8 gUnknown_8457E60[];
extern const u8 *const gUnknown_8457F80[][2];
extern const u8 gUnknown_8457F90[];
extern const u8 *const gUnknown_84580F4[][4];
extern const u8 *const gUnknown_8458230[][2][3];
extern const u8 *const gUnknown_8458314[];
extern const u8 *const gUnknown_84583B4[];
extern const u8 *const gUnknown_845842C[];
extern const u8 gUnknown_8458434[];
extern const u8 gUnknown_845847C[];
extern const u8 gUnknown_84584C0[];
extern const u8 *const gUnknown_8458548[];
extern const u8 *const gUnknown_84585E8[];
extern const u8 *const gUnknown_8458758[2][4];
extern const u8 *const gUnknown_84588BC[2][4];
extern const u8 *const gUnknown_84589AC[2][2];
extern const u8 *const gUnknown_8458A78[2][4];
extern const u8 gUnknown_8458A98[];
extern const u8 gUnknown_8458AB8[];
extern const u8 gUnknown_8458B44[];
extern const u8 gUnknown_8458CD4[];
extern const u8 gUnknown_8458D1C[];
extern const u8 gUnknown_8458D54[];
extern const u8 gUnknown_8458D78[];
extern const u8 gUnknown_8458D9C[];
extern const u8 gUnknown_8458DBC[];
extern const u8 gUnknown_8458DE8[];
extern const u8 gUnknown_8458E10[];
extern const u8 gUnknown_8458E70[];
extern const u8 gUnknown_8458ED0[];
extern const u8 gUnknown_8458F04[];
extern const u8 gUnknown_8458F9C[];
extern const u8 gUnknown_8458FBC[];
extern const u8 gUnknown_8458FC8[];
extern const u8 gUnknown_8458FE4[];
extern const u8 gUnknown_84591DC[];
extern const u8 *const gUnknown_84591B8[];
extern const u8 gUnknown_8459238[];
extern const u8 gUnknown_8459250[];
extern const u8 gUnknown_845928C[];
extern const u8 *const gUnknown_845933C[];
extern const u8 gUnknown_8459344[];
extern const u8 gUnknown_845934C[];
extern const u8 gUnknown_8459354[];
extern const u8 gUnknown_8459360[];
extern const u8 gUnknown_8459368[];
extern const u8 gUnknown_8459370[];
extern const u8 gUnknown_8459378[];
extern const u8 gUnknown_8459394[];
extern const u8 gUnknown_84593A4[];
extern const u8 gUnknown_84593B4[];
extern const u8 gUnknown_84593C4[];
extern const u8 gUnknown_84593D4[];
extern const u8 gUnknown_84593E4[];
extern const u8 gUnknown_84593F4[];
extern const u8 gUnknown_84593DC[];
extern const u8 gUnknown_8459400[];
extern const u8 gUnknown_8459410[];
extern const u8 gUnknown_845941C[];
extern const u8 gUnknown_845942C[];
extern const u8 gUnknown_8459434[];
extern const u8 gUnknown_8459440[];
extern const u8 *const gUnknown_84594B0[];
extern const u8 gUnknown_84594C4[];
extern const u8 gUnknown_8459504[];
extern const u8 *const gUnknown_8459580[];
extern const u8 gUnknown_8459588[];
#endif //GUARD_UNION_ROOM_MESSAGE_H
ld_script.txt
+7 -3
View File
@@ -241,8 +241,9 @@ SECTIONS {
src/mailbox_pc.o(.text);
src/menu.o(.text);
src/quest_log.o(.text);
asm/union_room.o(.text);
asm/union_room_player_avatar.o(.text);
src/union_room.o(.text);
src/rfu_union_tool.o(.text);
src/union_room_battle.o(.text);
asm/pokemon_special_anim.o(.text);
src/party_menu.o(.text);
asm/union_room_chat.o(.text);
@@ -527,7 +528,10 @@ SECTIONS {
data/decorations.o(.rodata);
src/menu.o(.rodata);
src/quest_log.o(.rodata);
data/union_room.o(.rodata);
src/union_room.o(.rodata);
src/rfu_union_tool.o(.rodata);
src/union_room_battle.o(.rodata);
src/union_room_message.o(.rodata);
data/pokemon_special_anim.o(.rodata);
src/party_menu.o(.rodata);
data/union_room_chat.o(.rodata);
src/battle_ai_script_commands.c
+660 -652
View File
File diff suppressed because it is too large Load Diff
src/battle_main.c
+4 -4
View File
@@ -2559,9 +2559,9 @@ static void BattleIntroDrawTrainersOrMonsSprites(void)
{
if (GetBattlerSide(gActiveBattler) == B_SIDE_OPPONENT)
{
if (gBattleTypeFlags & (BATTLE_TYPE_GHOST | BATTLE_TYPE_LEGENDARY))
if (gBattleTypeFlags & (BATTLE_TYPE_GHOST | BATTLE_TYPE_GHOST_UNVEILED))
{
if ((gBattleTypeFlags & (BATTLE_TYPE_GHOST | BATTLE_TYPE_LEGENDARY)) != BATTLE_TYPE_GHOST)
if (!IS_BATTLE_TYPE_GHOST_WITHOUT_SCOPE(gBattleTypeFlags))
HandleSetPokedexFlag(SpeciesToNationalPokedexNum(gBattleMons[gActiveBattler].species), FLAG_SET_SEEN, gBattleMons[gActiveBattler].personality);
}
else if (!(gBattleTypeFlags & (BATTLE_TYPE_EREADER_TRAINER
@@ -2674,7 +2674,7 @@ static void BattleIntroPrintWildMonAttacked(void)
{
gBattleMainFunc = BattleIntroPrintPlayerSendsOut;
PrepareStringBattle(STRINGID_INTROMSG, 0);
if ((gBattleTypeFlags & (BATTLE_TYPE_LEGENDARY | BATTLE_TYPE_GHOST)) == (BATTLE_TYPE_LEGENDARY | BATTLE_TYPE_GHOST))
if (IS_BATTLE_TYPE_GHOST_WITH_SCOPE(gBattleTypeFlags))
{
gBattleScripting.battler = GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT);
BattleScriptExecute(BattleScript_SilphScopeUnveiled);
@@ -4183,7 +4183,7 @@ bool8 TryRunFromBattle(u8 battler)
gProtectStructs[battler].fleeFlag = 2;
++effect;
}
else if ((gBattleTypeFlags & (BATTLE_TYPE_LEGENDARY | BATTLE_TYPE_GHOST)) == BATTLE_TYPE_GHOST)
else if (IS_BATTLE_TYPE_GHOST_WITHOUT_SCOPE(gBattleTypeFlags))
{
if (GetBattlerSide(battler) == B_SIDE_PLAYER)
++effect;
src/battle_message.c
+5 -5
View File
@@ -873,10 +873,10 @@ const u8 *const gBattleStringsTable[] = {
gUnknown_83FDDEB,
gUnknown_83FB484,
gUnknown_83FB4BE,
Text_1A5CF1,
Text_1A5D31,
Text_1A5D6E,
Text_1A5DB1,
Text_MonSentToBoxInSomeonesPC,
Text_MonSentToBoxInBillsPC,
Text_MonSentToBoxSomeonesBoxFull,
Text_MonSentToBoxBillsBoxFull,
sText_PokedudeUsedItem,
gUnknown_83FDA4D,
gUnknown_83FDA7A,
@@ -1517,7 +1517,7 @@ void BufferStringBattle(u16 stringId)
{
if (gBattleTypeFlags & BATTLE_TYPE_GHOST)
{
if (gBattleTypeFlags & BATTLE_TYPE_LEGENDARY)
if (gBattleTypeFlags & BATTLE_TYPE_GHOST_UNVEILED)
stringPtr = gUnknown_83FD30D;
else
stringPtr = gUnknown_83FD2D9;
src/battle_script_commands.c
+1 -1
View File
@@ -7352,7 +7352,7 @@ static void atk95_setsandstorm(void)
static void atk96_weatherdamage(void)
{
if (((gBattleTypeFlags & (BATTLE_TYPE_LEGENDARY | BATTLE_TYPE_GHOST)) == BATTLE_TYPE_GHOST)
if (IS_BATTLE_TYPE_GHOST_WITHOUT_SCOPE(gBattleTypeFlags)
&& (GetBattlerSide(gBattlerAttacker) == B_SIDE_OPPONENT))
{
gBattleMoveDamage = 0;
src/battle_setup.c
+3 -3
View File
@@ -301,7 +301,7 @@ void BattleSetup_StartScriptedWildBattle(void)
{
ScriptContext2_Enable();
gMain.savedCallback = CB2_EndScriptedWildBattle;
gBattleTypeFlags = BATTLE_TYPE_PALACE;
gBattleTypeFlags = BATTLE_TYPE_WILD_SCRIPTED;
CreateBattleStartTask(GetWildBattleTransition(), 0);
IncrementGameStat(GAME_STAT_TOTAL_BATTLES);
IncrementGameStat(GAME_STAT_WILD_BATTLES);
@@ -313,7 +313,7 @@ void ScrSpecial_StartMarowakBattle(void)
gMain.savedCallback = CB2_EndMarowakBattle;
if (CheckBagHasItem(ITEM_SILPH_SCOPE, 1))
{
gBattleTypeFlags = BATTLE_TYPE_GHOST | BATTLE_TYPE_LEGENDARY;
gBattleTypeFlags = BATTLE_TYPE_GHOST | BATTLE_TYPE_GHOST_UNVEILED;
CreateMonWithGenderNatureLetter(gEnemyParty, SPECIES_MAROWAK, 30, 31, MON_FEMALE, NATURE_SERIOUS, 0);
}
else
@@ -342,7 +342,7 @@ void Special_StartLegendaryBattle(void)
ScriptContext2_Enable();
gMain.savedCallback = CB2_EndScriptedWildBattle;
gBattleTypeFlags = BATTLE_TYPE_LEGENDARY | BATTLE_TYPE_ARENA;
gBattleTypeFlags = BATTLE_TYPE_LEGENDARY | BATTLE_TYPE_LEGENDARY_FRLG;
species = GetMonData(&gEnemyParty[0], MON_DATA_SPECIES);
switch (species)
{
src/battle_util.c
+2 -2
View File
@@ -1382,7 +1382,7 @@ u8 AtkCanceller_UnableToUseMove(void)
++gBattleStruct->atkCancellerTracker;
break;
case CANCELLER_GHOST: // GHOST in pokemon tower
if ((gBattleTypeFlags & (BATTLE_TYPE_GHOST | BATTLE_TYPE_LEGENDARY)) == BATTLE_TYPE_GHOST)
if (IS_BATTLE_TYPE_GHOST_WITHOUT_SCOPE(gBattleTypeFlags))
{
if (GetBattlerSide(gBattlerAttacker) == B_SIDE_PLAYER)
gBattlescriptCurrInstr = BattleScript_TooScaredToMove;
@@ -1616,7 +1616,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u8 ability, u8 special, u16 moveA
if (!moveArg)
moveArg = gCurrentMove;
GET_MOVE_TYPE(moveArg, moveType);
if ((gBattleTypeFlags & (BATTLE_TYPE_GHOST | BATTLE_TYPE_LEGENDARY)) == BATTLE_TYPE_GHOST
if (IS_BATTLE_TYPE_GHOST_WITHOUT_SCOPE(gBattleTypeFlags)
&& (gLastUsedAbility == ABILITY_INTIMIDATE || gLastUsedAbility == ABILITY_TRACE))
return effect;
switch (caseID)
src/credits.c
+2 -2
View File
@@ -920,7 +920,7 @@ static s32 RollCredits(void)
case CREDITSSCRCMD_MON:
sCreditsMgr->mainseqno = CREDITSSCENE_MON_DESTROY_ASSETS;
sCreditsMgr->whichMon = sCreditsScript[sCreditsMgr->scrcmdidx].param;
fade_screen(1, 0);
FadeScreen(1, 0);
break;
case CREDITSSCRCMD_THEENDGFX:
sCreditsMgr->mainseqno = CREDITSSCENE_THEEND_DESTROY_ASSETS;
@@ -1342,7 +1342,7 @@ static s32 RollCredits(void)
"\tstrb r0, [r2, 0x9]\n"
"\tmovs r0, 0x1\n"
"\tmovs r1, 0\n"
"\tbl fade_screen\n"
"\tbl FadeScreen\n"
"\tb _080F3E94\n"
"\t.align 2, 0\n"
"_080F3E50: .4byte sCreditsMgr\n"
src/event_object_lock.c
+1 -1
View File
@@ -9,7 +9,7 @@
bool8 walkrun_is_standing_still(void)
{
if (gPlayerAvatar.running1 == 1)
if (gPlayerAvatar.tileTransitionState == 1)
return FALSE;
else
return TRUE;
src/field_fadetransition.c
+11 -11
View File
@@ -56,12 +56,12 @@ void pal_fill_for_maplights(void)
{
case 0:
palette_bg_faded_fill_black();
fade_screen(0, 0);
FadeScreen(0, 0);
palette_bg_faded_fill_black();
break;
case 1:
palette_bg_faded_fill_white();
fade_screen(2, 0);
FadeScreen(2, 0);
palette_bg_faded_fill_white();
break;
}
@@ -73,12 +73,12 @@ static void sub_807DBAC(void)
{
case 0:
palette_bg_faded_fill_black();
fade_screen(0, 3);
FadeScreen(0, 3);
palette_bg_faded_fill_black();
break;
case 1:
palette_bg_faded_fill_white();
fade_screen(2, 3);
FadeScreen(2, 3);
palette_bg_faded_fill_white();
break;
}
@@ -87,7 +87,7 @@ static void sub_807DBAC(void)
void sub_807DC00(void)
{
palette_bg_faded_fill_black();
fade_screen(0, 0);
FadeScreen(0, 0);
palette_bg_faded_fill_black();
}
@@ -95,16 +95,16 @@ void sub_807DC18(void)
{
const struct MapHeader *header = warp1_get_mapheader();
if (header->regionMapSectionId != gMapHeader.regionMapSectionId && sub_80F8110(header->regionMapSectionId, FALSE))
fade_screen(1, 0);
FadeScreen(1, 0);
else
{
switch (sub_80C9D7C(GetCurrentMapType(), header->mapType))
{
case 0:
fade_screen(1, 0);
FadeScreen(1, 0);
break;
case 1:
fade_screen(3, 0);
FadeScreen(3, 0);
break;
}
}
@@ -115,10 +115,10 @@ static void sub_807DC70(void)
switch (sub_80C9D7C(GetCurrentMapType(), warp1_get_mapheader()->mapType))
{
case 0:
fade_screen(1, 3);
FadeScreen(1, 3);
break;
case 1:
fade_screen(3, 3);
FadeScreen(3, 3);
break;
}
}
@@ -654,7 +654,7 @@ static void sub_807E678(u8 taskId)
{
case 0:
ClearLinkCallback_2();
fade_screen(1, 0);
FadeScreen(1, 0);
sub_8055F88();
PlaySE(SE_KAIDAN);
data[0]++;
src/graphics.c
View File

Some files were not shown because too many files have changed in this diff Show More