dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2 from pret/master

Browse Source 
sync with source repo
This commit is contained in:
Garak
2018-07-17 09:24:30 -04:00
committed by GitHub
parent e06b63efc9 06b3ce408f
commit 5e46a0fcc5
1128 changed files with 11364 additions and 11344 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/battle_frontier_2.s
+24 -24
View File
@@ -19871,8 +19871,8 @@ _081A4C84:
.pool
thumb_func_end sub_81A4C30
thumb_func_start sub_81A4CB0
sub_81A4CB0: @ 81A4CB0
thumb_func_start GetFrontierBrainTrainerPicIndex
GetFrontierBrainTrainerPicIndex: @ 81A4CB0
push {lr}
ldr r0, =gBattleTypeFlags
ldr r0, [r0]
@@ -19881,7 +19881,7 @@ sub_81A4CB0: @ 81A4CB0
ands r0, r1
cmp r0, 0
beq _081A4CD0
bl sub_8185EA0
bl GetRecordedBattleFrontierFacility
lsls r0, 24
lsrs r0, 24
b _081A4CDA
@@ -19893,7 +19893,7 @@ _081A4CD0:
lsrs r0, 16
_081A4CDA:
ldr r2, =gTrainers
ldr r1, =gUnknown_08611D30
ldr r1, =gFacilityToBrainTrainerId
lsls r0, 1
adds r0, r1
ldrh r1, [r0]
@@ -19905,10 +19905,10 @@ _081A4CDA:
pop {r1}
bx r1
.pool
thumb_func_end sub_81A4CB0
thumb_func_end GetFrontierBrainTrainerPicIndex
thumb_func_start sub_81A4D00
sub_81A4D00: @ 81A4D00
thumb_func_start GetFrontierBrainTrainerClass
GetFrontierBrainTrainerClass: @ 81A4D00
push {lr}
ldr r0, =gBattleTypeFlags
ldr r0, [r0]
@@ -19917,7 +19917,7 @@ sub_81A4D00: @ 81A4D00
ands r0, r1
cmp r0, 0
beq _081A4D20
bl sub_8185EA0
bl GetRecordedBattleFrontierFacility
lsls r0, 24
lsrs r0, 24
b _081A4D2A
@@ -19929,7 +19929,7 @@ _081A4D20:
lsrs r0, 16
_081A4D2A:
ldr r2, =gTrainers
ldr r1, =gUnknown_08611D30
ldr r1, =gFacilityToBrainTrainerId
lsls r0, 1
adds r0, r1
ldrh r1, [r0]
@@ -19941,10 +19941,10 @@ _081A4D2A:
pop {r1}
bx r1
.pool
thumb_func_end sub_81A4D00
thumb_func_end GetFrontierBrainTrainerClass
thumb_func_start sub_81A4D50
sub_81A4D50: @ 81A4D50
thumb_func_start CopyFrontierBrainTrainerName
CopyFrontierBrainTrainerName: @ 81A4D50
push {r4,lr}
adds r4, r0, 0
ldr r0, =gBattleTypeFlags
@@ -19954,7 +19954,7 @@ sub_81A4D50: @ 81A4D50
ands r0, r1
cmp r0, 0
beq _081A4D70
bl sub_8185EA0
bl GetRecordedBattleFrontierFacility
lsls r0, 24
lsrs r0, 24
b _081A4D7A
@@ -19968,7 +19968,7 @@ _081A4D7A:
movs r3, 0
lsls r0, 1
ldr r2, =gTrainers
ldr r1, =gUnknown_08611D30
ldr r1, =gFacilityToBrainTrainerId
adds r0, r1
ldrh r1, [r0]
lsls r0, r1, 2
@@ -19991,7 +19991,7 @@ _081A4D90:
pop {r0}
bx r0
.pool
thumb_func_end sub_81A4D50
thumb_func_end CopyFrontierBrainTrainerName
thumb_func_start sub_81A4DB8
sub_81A4DB8: @ 81A4DB8
@@ -20483,7 +20483,7 @@ sub_81A51A8: @ 81A51A8
ands r0, r1
cmp r0, 0
beq _081A51D4
bl sub_8185EA0
bl GetRecordedBattleFrontierFacility
lsls r0, 24
lsrs r4, r0, 24
bl sub_8185EAC
@@ -20646,29 +20646,29 @@ _081A5328:
ldr r4, =gDisplayedStringBattle
adds r0, r4, 0
movs r1, 0xF
bl BattleHandleAddTextPrinter
bl BattlePutTextOnWindow
ldr r0, =gText_Vs
movs r1, 0x10
bl BattleHandleAddTextPrinter
bl BattlePutTextOnWindow
ldr r0, =gText_OpponentMon1Name
bl BattleStringExpandPlaceholdersToDisplayedString
adds r0, r4, 0
movs r1, 0x11
bl BattleHandleAddTextPrinter
bl BattlePutTextOnWindow
ldr r0, =gText_Mind
movs r1, 0x12
bl BattleHandleAddTextPrinter
bl BattlePutTextOnWindow
ldr r0, =gText_Skill
movs r1, 0x13
bl BattleHandleAddTextPrinter
bl BattlePutTextOnWindow
ldr r0, =gText_Body
movs r1, 0x14
bl BattleHandleAddTextPrinter
bl BattlePutTextOnWindow
ldr r0, =gText_Judgement
bl BattleStringExpandPlaceholdersToDisplayedString
adds r0, r4, 0
movs r1, 0x15
bl BattleHandleAddTextPrinter
bl BattlePutTextOnWindow
b _081A553E
.pool
_081A53B4:
@@ -20752,7 +20752,7 @@ _081A5464:
bl BattleStringExpandPlaceholdersToDisplayedString
ldr r0, =gDisplayedStringBattle
movs r1, 0x15
bl BattleHandleAddTextPrinter
bl BattlePutTextOnWindow
ldrb r0, [r5]
adds r0, 0x1
strb r0, [r5]
asm/battle_tower.s
+3 -3
View File
@@ -1353,7 +1353,7 @@ _08162AD0:
ldr r0, =0x000003fe
cmp r4, r0
bne _08162AE4
bl sub_81A4CB0
bl GetFrontierBrainTrainerPicIndex
lsls r0, 24
lsrs r0, 24
b _08162BCA
@@ -1479,7 +1479,7 @@ _08162C08:
ldr r0, =0x000003fe
cmp r4, r0
bne _08162C1C
bl sub_81A4D00
bl GetFrontierBrainTrainerClass
lsls r0, 24
lsrs r0, 24
b _08162D1E
@@ -1729,7 +1729,7 @@ _08162E54:
cmp r5, r0
bne _08162E68
adds r0, r6, 0
bl sub_81A4D50
bl CopyFrontierBrainTrainerName
b _08162F62
.pool
_08162E68:
asm/contest.s
+2 -2
View File
@@ -6770,8 +6770,8 @@ _080DB1CC:
bl LoadCompressedPalette
adds r0, r5, 0
movs r1, 0
bl sub_806A068
ldr r4, =gUnknown_0202499C
bl SetMultiuseSpriteTemplateToPokemon
ldr r4, =gMultiuseSpriteTemplate
movs r0, 0x2
adds r1, r5, 0
movs r2, 0
asm/contest_link_80F57C4.s
+2 -2
View File
@@ -1420,8 +1420,8 @@ _080F64F2:
bl LoadCompressedObjectPalette
adds r0, r6, 0
movs r1, 0x1
bl sub_806A068
ldr r0, =gUnknown_0202499C
bl SetMultiuseSpriteTemplateToPokemon
ldr r0, =gMultiuseSpriteTemplate
ldrh r1, [r4, 0x4]
strh r1, [r0, 0x2]
movs r1, 0x88
asm/easy_chat.s
+1 -1
View File
@@ -5988,7 +5988,7 @@ sub_811D0BC: @ 811D0BC
movs r0, 0x1
movs r1, 0x1
movs r2, 0xE0
bl sub_809882C
bl LoadUserWindowBorderGfx
movs r0, 0x1
movs r1, 0x1
movs r2, 0xE
asm/field_screen.s
+1 -1
View File
@@ -8656,7 +8656,7 @@ task_mpl_807E3C8: @ 80AF6B0
bl ScriptContext2_Disable
adds r0, r4, 0
bl DestroyTask
bl sub_80984F4
bl ScriptUnfreezeEventObjects
_080AF6CC:
pop {r4}
pop {r0}
asm/field_specials.s
+2 -2
View File
@@ -912,7 +912,7 @@ _0813839C:
adds r0, r5, 0
adds r2, r4, 0
mov r3, r12
bl SpawnSpecialEventObjectParametrized
bl SpawnSpecialEventObjectParameterized
adds r0, r5, 0
adds r1, r4, 0
adds r2, r6, 0
@@ -2557,7 +2557,7 @@ SpawnScriptEventObject: @ 8139158
movs r0, 0x7
movs r1, 0x8
movs r2, 0x7F
bl SpawnSpecialEventObjectParametrized
bl SpawnSpecialEventObjectParameterized
lsls r0, 24
lsrs r0, 24
ldr r2, =gEventObjects
asm/fldeff_80F9BCC.s
+12 -12
View File
@@ -467,7 +467,7 @@ _080F9F54:
thumb_func_start sub_80F9F5C
sub_80F9F5C: @ 80F9F5C
push {lr}
ldr r0, =gUnknown_0203AB40
ldr r0, =gPlayerFacingPosition
ldr r1, =gMapHeader
ldr r1, [r1, 0x4]
bl sub_80E9608
@@ -572,7 +572,7 @@ sub_80FA004: @ 80FA004
lsrs r0, 24
cmp r0, 0x2
bne _080FA0AE
ldr r4, =gUnknown_0203AB40
ldr r4, =gPlayerFacingPosition
adds r1, r4, 0x2
adds r0, r4, 0
bl GetXYCoordsOneStepInFrontOfPlayer
@@ -590,10 +590,10 @@ sub_80FA004: @ 80FA004
cmp r0, 0x1
bne _080FA070
bl sub_80F9F5C
ldr r1, =gUnknown_03005DB0
ldr r0, =FieldCallback_Teleport
ldr r1, =gFieldCallback2
ldr r0, =FieldCallback_PrepareFadeInFromMenu
str r0, [r1]
ldr r1, =gUnknown_0203CEEC
ldr r1, =gPostMenuFieldCallback
ldr r0, =sub_80FA0DC
b _080FA0C0
.pool
@@ -605,10 +605,10 @@ _080FA070:
cmp r0, 0x1
bne _080FA0A0
bl sub_80F9F5C
ldr r1, =gUnknown_03005DB0
ldr r0, =FieldCallback_Teleport
ldr r1, =gFieldCallback2
ldr r0, =FieldCallback_PrepareFadeInFromMenu
str r0, [r1]
ldr r1, =gUnknown_0203CEEC
ldr r1, =gPostMenuFieldCallback
ldr r0, =sub_80FA1E8
b _080FA0C0
.pool
@@ -624,10 +624,10 @@ _080FA0AE:
b _080FA0C4
_080FA0B2:
bl sub_80F9F5C
ldr r1, =gUnknown_03005DB0
ldr r0, =FieldCallback_Teleport
ldr r1, =gFieldCallback2
ldr r0, =FieldCallback_PrepareFadeInFromMenu
str r0, [r1]
ldr r1, =gUnknown_0203CEEC
ldr r1, =gPostMenuFieldCallback
ldr r0, =sub_80FA34C
_080FA0C0:
str r0, [r1]
@@ -824,7 +824,7 @@ sub_80FA234: @ 80FA234
thumb_func_start sub_80FA248
sub_80FA248: @ 80FA248
push {r4,lr}
ldr r1, =gUnknown_0203AB40
ldr r1, =gPlayerFacingPosition
movs r2, 0
ldrsh r0, [r1, r2]
movs r2, 0x2
asm/fldeff_cut.s
-1486
View File
File diff suppressed because it is too large Load Diff
asm/learn_move.s
+1 -1
View File
@@ -1270,7 +1270,7 @@ _081611D4:
ldrb r0, [r0]
cmp r0, 0xFF
bne _08161210
ldr r0, =gUnknown_0203CE8C
ldr r0, =gTempScrollArrowTemplate
adds r2, r0, 0
ldr r1, =gUnknown_085CEBD0
ldm r1!, {r3,r5,r6}
asm/link_rfu.s
+1 -1
View File
@@ -856,7 +856,7 @@ sub_8011AFC: @ 8011AFC
bl ResetPaletteFade
ldr r0, =sub_8011AE8
bl SetVBlankCallback
bl sub_80093CC
bl IsWirelessAdapterConnected
lsls r0, 24
cmp r0, 0
beq _08011B70
asm/macros/battle_script.inc
+3 -3
View File
@@ -511,7 +511,7 @@
.byte \bank
.endm
.macro atk5F
.macro swapattackerwithtarget
.byte 0x5f
.endm
@@ -525,7 +525,7 @@
.byte \bank
.endm
.macro atk62 bank
.macro hidepartystatussummary bank
.byte 0x62
.byte \bank
.endm
@@ -1163,7 +1163,7 @@
.4byte \param0
.endm
.macro snatchsetbanks
.macro snatchsetbattlers
.byte 0xed
.endm
asm/macros/map.inc
+23 -6
View File
@@ -34,18 +34,27 @@
inc _num_warps
.endm
.macro coord_event x, y, byte1, byte2, word1, word2, word3, script
.macro coord_event x, y, elevation, trigger, index, script
.2byte \x, \y
.byte \byte1, \byte2
.2byte \word1, \word2, \word3
.byte \elevation, 0
.2byte \trigger, \index, 0
.4byte \script
inc _num_traps
.endm
.macro bg_event x, y, byte, kind, word, arg6, arg7, arg8
.macro coord_weather_event x, y, elevation, weather
.2byte \x, \y
.byte \byte, \kind
.2byte \word
.byte \elevation, 0
.2byte \weather
.2byte 0, 0
.4byte 0
inc _num_traps
.endm
.macro bg_event x, y, elevation, kind, arg6, arg7, arg8
.2byte \x, \y
.byte \elevation, \kind
.2byte 0
.if \kind < 5
.4byte \arg6
.else
@@ -55,6 +64,14 @@
inc _num_signs
.endm
.macro bg_hidden_item_event x, y, height, item, flag
bg_event \x, \y, \height, 7, \item, \flag, 0
.endm
.macro bg_secret_base_event x, y, height, secret_base_id
bg_event \x, \y, \height, 8, \secret_base_id, 0, 0
.endm
.macro map_events npcs, warps, traps, signs
.byte _num_npcs, _num_warps, _num_traps, _num_signs
.4byte \npcs, \warps, \traps, \signs
asm/party_menu.s
+25 -25
View File
@@ -4396,7 +4396,7 @@ _081B23E8:
movs r0, 0
movs r1, 0x4F
movs r2, 0xD0
bl sub_809882C
bl LoadUserWindowBorderGfx
bl GetOverworldTextboxPalettePtr
movs r1, 0xE0
movs r2, 0x20
@@ -10199,10 +10199,10 @@ _081B5714:
movs r0, 0x5
bl PlaySE
_081B571A:
ldr r0, =gUnknown_03005DB0
ldr r0, =gFieldCallback2
movs r1, 0
str r1, [r0]
ldr r0, =gUnknown_0203CEEC
ldr r0, =gPostMenuFieldCallback
str r1, [r0]
adds r0, r4, 0
bl sub_81B1C1C
@@ -10213,8 +10213,8 @@ _081B572A:
.pool
thumb_func_end sub_81B56D8
thumb_func_start FieldCallback_Teleport
FieldCallback_Teleport: @ 81B5738
thumb_func_start FieldCallback_PrepareFadeInFromMenu
FieldCallback_PrepareFadeInFromMenu: @ 81B5738
push {lr}
bl pal_fill_black
ldr r0, =task_launch_hm_phase_2
@@ -10224,7 +10224,7 @@ FieldCallback_Teleport: @ 81B5738
pop {r1}
bx r1
.pool
thumb_func_end FieldCallback_Teleport
thumb_func_end FieldCallback_PrepareFadeInFromMenu
thumb_func_start task_launch_hm_phase_2
task_launch_hm_phase_2: @ 81B5750
@@ -10241,7 +10241,7 @@ task_launch_hm_phase_2: @ 81B5750
lsls r0, 16
lsrs r0, 16
str r0, [r1]
ldr r0, =gUnknown_0203CEEC
ldr r0, =gPostMenuFieldCallback
ldr r0, [r0]
bl _call_via_r0
adds r0, r4, 0
@@ -10345,10 +10345,10 @@ sub_81B5820: @ 81B5820
lsrs r0, 24
cmp r0, 0x1
bne _081B585C
ldr r1, =gUnknown_03005DB0
ldr r0, =FieldCallback_Teleport
ldr r1, =gFieldCallback2
ldr r0, =FieldCallback_PrepareFadeInFromMenu
str r0, [r1]
ldr r1, =gUnknown_0203CEEC
ldr r1, =gPostMenuFieldCallback
ldr r0, =hm_surf_run_dp02scr
str r0, [r1]
movs r0, 0x1
@@ -10463,10 +10463,10 @@ hm_prepare_waterfall: @ 81B58F0
lsrs r0, 24
cmp r0, 0x1
bne _081B594C
ldr r1, =gUnknown_03005DB0
ldr r0, =FieldCallback_Teleport
ldr r1, =gFieldCallback2
ldr r0, =FieldCallback_PrepareFadeInFromMenu
str r0, [r1]
ldr r1, =gUnknown_0203CEEC
ldr r1, =gPostMenuFieldCallback
ldr r0, =hm2_waterfall
str r0, [r1]
movs r0, 0x1
@@ -10510,10 +10510,10 @@ sub_81B5974: @ 81B5974
b _081B599E
.pool
_081B5990:
ldr r1, =gUnknown_03005DB0
ldr r0, =FieldCallback_Teleport
ldr r1, =gFieldCallback2
ldr r0, =FieldCallback_PrepareFadeInFromMenu
str r0, [r1]
ldr r1, =gUnknown_0203CEEC
ldr r1, =gPostMenuFieldCallback
ldr r0, =sub_81B5958
str r0, [r1]
movs r0, 0x1
@@ -12158,7 +12158,7 @@ sub_81B672C: @ 81B672C
bl sub_81B1B5C
movs r0, 0x2
bl schedule_bg_copy_tilemap_to_vram
bl sub_805EAE8
bl HandleBattleLowHpMusicChange
ldr r1, =gTasks
lsls r0, r5, 2
adds r0, r5
@@ -16079,8 +16079,8 @@ _081B89A6:
bx r1
thumb_func_end sub_81B8984
thumb_func_start sub_81B89AC
sub_81B89AC: @ 81B89AC
thumb_func_start OpenPartyMenuInBattle
OpenPartyMenuInBattle: @ 81B89AC
push {r4,lr}
sub sp, 0xC
adds r4, r0, 0
@@ -16107,7 +16107,7 @@ sub_81B89AC: @ 81B89AC
pop {r0}
bx r0
.pool
thumb_func_end sub_81B89AC
thumb_func_end OpenPartyMenuInBattle
thumb_func_start sub_81B89F0
sub_81B89F0: @ 81B89F0
@@ -16288,7 +16288,7 @@ _081B8B94:
ldrb r0, [r0, 0xB]
cmp r0, 0x4
bne _081B8BA8
bl sub_806E994
bl SetMonPreventsSwitchingString
b _081B8C46
.pool
_081B8BA8:
@@ -17276,7 +17276,7 @@ sub_81B9354: @ 81B9354
sub sp, 0xC
lsls r0, 24
lsrs r0, 24
ldr r2, =gUnknown_03005DB0
ldr r2, =gFieldCallback2
ldr r1, =hm_add_c3_without_phase_2
str r1, [r2]
movs r1, 0
@@ -17308,7 +17308,7 @@ sub_81B9390: @ 81B9390
movs r0, 0xFF
strh r0, [r4]
_081B93A6:
ldr r0, =gUnknown_03005DB0
ldr r0, =gFieldCallback2
ldr r1, =hm_add_c3_without_phase_2
str r1, [r0]
ldr r0, =CB2_ReturnToField
@@ -17417,7 +17417,7 @@ _081B9486:
ldr r1, =gSpecialVar_0x8004
ldrb r0, [r2]
strh r0, [r1]
ldr r1, =gUnknown_03005DB0
ldr r1, =gFieldCallback2
ldr r0, =hm_add_c3_without_phase_2
str r0, [r1]
ldr r0, =CB2_ReturnToField
@@ -17553,7 +17553,7 @@ _081B95A4:
lsrs r0, 24
strh r0, [r4]
_081B95BA:
ldr r0, =gUnknown_03005DB0
ldr r0, =gFieldCallback2
ldr r1, =hm_add_c3_without_phase_2
str r1, [r0]
ldr r0, =CB2_ReturnToField
asm/pokemon_storage_system.s
+2 -2
View File
@@ -1837,7 +1837,7 @@ _080C805E:
movs r0, 0x1
movs r1, 0xB
movs r2, 0xE0
bl sub_809882C
bl LoadUserWindowBorderGfx
b _080C8198
.pool
_080C808C:
@@ -6712,7 +6712,7 @@ sub_80CAC1C: @ 80CAC1C
movs r0, 0x1
movs r1, 0x2
movs r2, 0xD0
bl sub_809882C
bl LoadUserWindowBorderGfx
movs r0, 0x20
str r0, [sp]
movs r0, 0x14
asm/pokemon_summary_screen.s
+8 -8
View File
@@ -1092,7 +1092,7 @@ _081C4750:
bl LoadCompressedObjectPalette
ldrh r0, [r4, 0x4]
movs r1, 0x1
bl sub_806A068
bl SetMultiuseSpriteTemplateToPokemon
_081C4768:
ldrh r0, [r6]
adds r0, 0x1
@@ -1116,7 +1116,7 @@ sub_81C4778: @ 81C4778
bne _081C47AE
adds r0, r1, 0
adds r0, 0xC
bl ShouldPlayNormalPokeCry
bl ShouldPlayNormalMonCry
cmp r0, 0x1
bne _081C47A4
ldrh r0, [r4, 0x2]
@@ -1144,7 +1144,7 @@ sub_81C47B4: @ 81C47B4
ldr r0, =gUnknown_0203CF1C
ldr r6, [r0]
adds r6, 0x70
ldr r0, =gUnknown_0202499C
ldr r0, =gMultiuseSpriteTemplate
movs r1, 0x28
movs r2, 0x40
movs r3, 0x5
@@ -2070,7 +2070,7 @@ sub_81C4F44: @ 81C4F44
cmp r0, 0
bne _081C4F6E
bl overworld_free_bg_tilemaps
ldr r0, =gUnknown_03005DB0
ldr r0, =gFieldCallback2
ldr r1, =hm_add_c3_without_phase_2
str r1, [r0]
ldr r1, =CB2_ReturnToField
@@ -2869,7 +2869,7 @@ sub_81C5674: @ 81C5674
movs r1, 0xAC
movs r2, 0xC
movs r3, 0x94
bl AddScrollIndicatorArrowPairParametrized
bl AddScrollIndicatorArrowPairParameterized
ldr r1, [r4]
ldr r2, =0x00000816
adds r1, r2
@@ -4868,7 +4868,7 @@ sub_81C67CC: @ 81C67CC
ldrb r0, [r5]
movs r1, 0x10
movs r2, 0x1
bl sub_81AF15C
bl ListMenuSetUnkIndicatorsStructField
ldr r0, =gSaveBlock2Ptr
ldr r3, [r0]
movs r0, 0x2
@@ -5293,11 +5293,11 @@ sub_81C6BD8: @ 81C6BD8
movs r0, 0
movs r1, 0x1
movs r2, 0xE0
bl sub_809882C
bl LoadUserWindowBorderGfx
movs r0, 0
movs r1, 0xA
movs r2, 0xD0
bl copy_textbox_border_tile_patterns_to_vram
bl LoadMessageBoxGfx
ldr r0, =gUnknown_0860F074
movs r1, 0xF0
movs r2, 0x20
asm/pokenav.s
+7 -7
View File
@@ -10101,7 +10101,7 @@ sub_81CC09C: @ 81CC09C
ldrb r0, [r4, 0x14]
movs r1, 0x1
movs r2, 0x40
bl sub_809882C
bl LoadUserWindowBorderGfx
ldrb r0, [r4, 0x14]
movs r1, 0x1
movs r2, 0x4
@@ -11351,7 +11351,7 @@ sub_81CCA1C: @ 81CCA1C
lsrs r0, 24
movs r1, 0x42
movs r2, 0x40
bl box_border_load_tiles_and_pal
bl LoadUserWindowBorderGfx_
ldrb r0, [r5, 0x8]
movs r1, 0x42
movs r2, 0x4
@@ -21001,7 +21001,7 @@ sub_81D1E90: @ 81D1E90
movs r1, 0xC8
movs r2, 0xC
movs r3, 0x94
bl AddScrollIndicatorArrowPairParametrized
bl AddScrollIndicatorArrowPairParameterized
strb r0, [r4, 0x9]
add sp, 0x10
pop {r4}
@@ -22282,7 +22282,7 @@ sub_81D2824: @ 81D2824
movs r0, 0
movs r1, 0x1
movs r2, 0xE0
bl sub_809882C
bl LoadUserWindowBorderGfx
ldr r0, =gUnknown_0860F074
movs r1, 0xF0
movs r2, 0x20
@@ -26527,8 +26527,8 @@ _081D4A0E:
bx r1
thumb_func_end EventObjectIsFarawayIslandMew
thumb_func_start unown_chamber_related
unown_chamber_related: @ 81D4A14
thumb_func_start IsMewPlayingHideAndSeek
IsMewPlayingHideAndSeek: @ 81D4A14
push {lr}
ldr r0, =gSaveBlock1Ptr
ldr r0, [r0]
@@ -26557,7 +26557,7 @@ _081D4A50:
_081D4A52:
pop {r1}
bx r1
thumb_func_end unown_chamber_related
thumb_func_end IsMewPlayingHideAndSeek
thumb_func_start sub_81D4A58
sub_81D4A58: @ 81D4A58
asm/rom_8011DC0.s
+26 -26
View File
@@ -679,7 +679,7 @@ _08012B3C:
bl sub_8013398
strb r0, [r6, 0x13]
ldrb r0, [r6, 0x12]
bl sub_81AE70C
bl RedrawListMenu
b _08012E5C
.pool
_08012B54:
@@ -837,7 +837,7 @@ _08012C5C:
movs r0, 0
strb r0, [r1, 0x1B]
ldrb r0, [r6, 0x12]
bl sub_81AE70C
bl RedrawListMenu
ldrb r0, [r6, 0x13]
adds r0, 0x1
strb r0, [r6, 0x13]
@@ -908,7 +908,7 @@ _08012D04:
ldr r0, [r6]
bl sub_8013398
ldrb r0, [r6, 0x12]
bl sub_81AE70C
bl RedrawListMenu
_08012D40:
movs r0, 0x4
strb r0, [r6, 0xC]
@@ -1459,7 +1459,7 @@ _08013228:
movs r0, 0x2
bl PlaySE
ldrb r0, [r4, 0x12]
bl sub_81AE70C
bl RedrawListMenu
ldr r0, =gStringVar2
ldrb r2, [r4, 0x13]
lsls r2, 5
@@ -1478,7 +1478,7 @@ _0801325C:
movs r1, 0
bl sub_8011A64
ldrb r0, [r4, 0x12]
bl sub_81AE70C
bl RedrawListMenu
strb r5, [r4, 0xC]
movs r0, 0x1
b _08013272
@@ -2373,7 +2373,7 @@ _08013A70:
strb r0, [r6, 0x8]
_08013A72:
ldrb r0, [r6, 0xE]
bl sub_81AE70C
bl RedrawListMenu
b _08013B82
_08013A7A:
bl sub_8011A74
@@ -2542,7 +2542,7 @@ sub_8013BD8: @ 8013BD8
movs r1, 0
bl CreateWirelessStatusIndicatorSprite
ldrb r0, [r4, 0xE]
bl sub_81AE70C
bl RedrawListMenu
ldr r0, =gStringVar1
ldrb r2, [r4, 0xF]
lsls r2, 5
@@ -4281,7 +4281,7 @@ _08014C34:
bl sub_8013398
strb r0, [r5, 0x13]
ldrb r0, [r5, 0x12]
bl sub_81AE70C
bl RedrawListMenu
_08014C42:
movs r0, 0x2
strb r0, [r5, 0xC]
@@ -4326,7 +4326,7 @@ _08014C82:
adds r1, r0
strb r4, [r1, 0x1B]
ldrb r0, [r5, 0x12]
bl sub_81AE70C
bl RedrawListMenu
movs r0, 0x5
strb r0, [r5, 0x19]
ldrb r1, [r5, 0x13]
@@ -4396,7 +4396,7 @@ _08014CF2:
movs r0, 0
strb r0, [r1, 0x1B]
ldrb r0, [r5, 0x12]
bl sub_81AE70C
bl RedrawListMenu
ldrb r0, [r5, 0x13]
adds r0, 0x1
strb r0, [r5, 0x13]
@@ -4441,7 +4441,7 @@ _08014D64:
ldr r0, [r5]
bl sub_8013398
ldrb r0, [r5, 0x12]
bl sub_81AE70C
bl RedrawListMenu
movs r0, 0x2
strb r0, [r5, 0xC]
_08014DA4:
@@ -4784,7 +4784,7 @@ _080150B8:
bl PlaySE
_080150CE:
ldrb r0, [r7, 0xE]
bl sub_81AE70C
bl RedrawListMenu
b _080152A0
_080150D6:
ldrb r0, [r7, 0xE]
@@ -4818,7 +4818,7 @@ _080150D6:
movs r1, 0
bl CreateWirelessStatusIndicatorSprite
ldrb r0, [r7, 0xE]
bl sub_81AE70C
bl RedrawListMenu
ldr r0, =gStringVar1
ldrb r2, [r7, 0xF]
lsls r2, 5
@@ -5152,7 +5152,7 @@ _08015436:
b _08015604
_0801543E:
ldrb r0, [r5, 0xE]
bl sub_81AE70C
bl RedrawListMenu
b _08015604
_08015446:
ldrb r0, [r5, 0x13]
@@ -10972,11 +10972,11 @@ _08018574:
movs r0, 0
movs r1, 0xA
movs r2, 0xE0
bl sub_809882C
bl LoadUserWindowBorderGfx
movs r0, 0
movs r1, 0x1
movs r2, 0xF0
bl box_border_load_tiles_and_pal
bl LoadUserWindowBorderGfx_
movs r4, 0x20
str r4, [sp]
str r4, [sp, 0x4]
@@ -15907,11 +15907,11 @@ _0801AD8C:
movs r0, 0
movs r1, 0x1
movs r2, 0xD0
bl sub_809882C
bl LoadUserWindowBorderGfx
movs r0, 0
movs r1, 0x1
movs r2, 0xD0
bl box_border_load_tiles_and_pal
bl LoadUserWindowBorderGfx_
bl sub_819789C
ldr r0, =sub_801AC40
bl SetVBlankCallback
@@ -27081,11 +27081,11 @@ sub_8020740: @ 8020740
movs r0, 0x3
movs r1, 0x1
movs r2, 0xD0
bl sub_809882C
bl LoadUserWindowBorderGfx
movs r0, 0x3
movs r1, 0xA
movs r2, 0x20
bl box_border_load_tiles_and_pal
bl LoadUserWindowBorderGfx_
ldr r0, =gUnknown_0860F074
movs r1, 0xE0
movs r2, 0x20
@@ -30171,7 +30171,7 @@ _0802210C:
ldr r4, =0x0000021d
adds r1, r4, 0
movs r2, 0xD0
bl box_border_load_tiles_and_pal
bl LoadUserWindowBorderGfx_
ldrb r0, [r5]
movs r1, 0
adds r2, r4, 0
@@ -30370,7 +30370,7 @@ _08022296:
ldr r4, =0x0000021d
adds r1, r4, 0
movs r2, 0xD0
bl box_border_load_tiles_and_pal
bl LoadUserWindowBorderGfx_
ldrb r0, [r6, 0x2]
movs r1, 0
adds r2, r4, 0
@@ -35221,7 +35221,7 @@ sub_80248B0: @ 80248B0
ldr r5, =0x0000021d
adds r1, r5, 0
movs r2, 0xD0
bl box_border_load_tiles_and_pal
bl LoadUserWindowBorderGfx_
ldrb r4, [r4]
bl sub_80247BC
adds r3, r0, 0
@@ -41645,7 +41645,7 @@ sub_8027BEC: @ 8027BEC
adds r0, r7, 0
adds r1, r4, 0
movs r2, 0xD0
bl box_border_load_tiles_and_pal
bl LoadUserWindowBorderGfx_
adds r0, r7, 0
adds r1, r4, 0
movs r2, 0xD
@@ -44214,7 +44214,7 @@ sub_802902C: @ 802902C
movs r0, 0
movs r1, 0xA
movs r2, 0xB0
bl box_border_load_tiles_and_pal
bl LoadUserWindowBorderGfx_
pop {r0}
bx r0
thumb_func_end sub_802902C
@@ -54638,7 +54638,7 @@ sub_802E500: @ 802E500
adds r0, r4, 0
adds r1, r5, 0
movs r2, 0xD0
bl box_border_load_tiles_and_pal
bl LoadUserWindowBorderGfx_
adds r0, r4, 0
adds r1, r5, 0
movs r2, 0xD
asm/script_pokemon_util_80F87D8.s
+2 -2
View File
@@ -737,8 +737,8 @@ _080F8DD8:
bl LoadCompressedObjectPalette
adds r0, r6, 0
movs r1, 0x1
bl sub_806A068
ldr r0, =gUnknown_0202499C
bl SetMultiuseSpriteTemplateToPokemon
ldr r0, =gMultiuseSpriteTemplate
ldrh r1, [r4, 0x4]
strh r1, [r0, 0x2]
mov r1, r9
asm/shop.s
+3 -3
View File
@@ -877,7 +877,7 @@ BuyMenuAddScrollIndicatorArrows: @ 80E01C8
movs r1, 0xAC
movs r2, 0xC
movs r3, 0x94
bl AddScrollIndicatorArrowPairParametrized
bl AddScrollIndicatorArrowPairParameterized
ldr r1, [r5]
adds r1, r4
strb r0, [r1]
@@ -1157,11 +1157,11 @@ BuyMenuInitWindows: @ 80E0468
movs r0, 0
movs r1, 0x1
movs r2, 0xD0
bl sub_809882C
bl LoadUserWindowBorderGfx
movs r0, 0
movs r1, 0xA
movs r2, 0xE0
bl copy_textbox_border_tile_patterns_to_vram
bl LoadMessageBoxGfx
movs r0, 0
bl PutWindowTilemap
movs r0, 0x1
asm/slot_machine.s
+2 -2
View File
@@ -634,12 +634,12 @@ sub_812AA48: @ 812AA48
lsls r1, 2
movs r0, 0
movs r2, 0xF0
bl copy_textbox_border_tile_patterns_to_vram
bl LoadMessageBoxGfx
movs r1, 0x85
lsls r1, 2
movs r0, 0
movs r2, 0xE0
bl sub_809882C
bl LoadUserWindowBorderGfx
movs r0, 0
bl PutWindowTilemap
pop {r0}
asm/trade.s
+4 -4
View File
@@ -241,11 +241,11 @@ _08077310:
movs r0, 0
movs r1, 0x14
movs r2, 0xC0
bl box_border_load_tiles_and_pal
bl LoadUserWindowBorderGfx_
movs r0, 0x2
movs r1, 0x1
movs r2, 0xE0
bl sub_809882C
bl LoadUserWindowBorderGfx
bl LoadMonIconPalettes
ldr r2, =gUnknown_0203229C
ldr r0, [r2]
@@ -7174,8 +7174,8 @@ _0807ADE0:
bl GetMonSpritePalStruct
ldrh r0, [r0, 0x4]
adds r1, r4, 0
bl sub_806A068
ldr r0, =gUnknown_0202499C
bl SetMultiuseSpriteTemplateToPokemon
ldr r0, =gMultiuseSpriteTemplate
movs r1, 0x78
movs r2, 0x3C
movs r3, 0x6
common_syms/list_menu.txt
+1 -1
View File
@@ -1,2 +1,2 @@
gUnknown_03006300
gListMenuOverride
gMultiuseListMenuTemplate
common_syms/overworld.txt
+1 -1
View File
@@ -1,5 +1,5 @@
gUnknown_03005DA8
gFieldCallback
gUnknown_03005DB0
gFieldCallback2
gUnknown_03005DB4
gFieldLinkPlayerCount
data/battle_ai_scripts.s
+3 -3
View File
@@ -3382,11 +3382,11 @@ AI_Safari_Flee:
flee
AI_FirstBattle:
if_hp_equal AI_TARGET, 20, BattleAIScript_82DE34D
if_hp_less_than AI_TARGET, 20, BattleAIScript_82DE34D
if_hp_equal AI_TARGET, 20, AI_FirstBattle_Flee
if_hp_less_than AI_TARGET, 20, AI_FirstBattle_Flee
end
BattleAIScript_82DE34D:
AI_FirstBattle_Flee:
flee
AI_Ret:
data/battle_frontier_2.s
+5 -2
View File
@@ -1,5 +1,6 @@
#include "constants/moves.h"
#include "constants/species.h"
#include "constants/trainers.h"
.include "asm/macros.inc"
.include "constants/constants.inc"
@@ -1049,8 +1050,10 @@ gUnknown_08611D08:: @ 8611D08
.4byte gUnknown_085EE3C4
.align 1
gUnknown_08611D30:: @ 8611D30
.2byte 0x0325, 0x0326, 0x0327, 0x0328, 0x0329, 0x032a, 0x032b, 0x0000
gFacilityToBrainTrainerId:: @ 8611D30
.2byte TRAINER_ANABEL, TRAINER_TUCKER, TRAINER_SPENSER
.2byte TRAINER_GRETA, TRAINER_NOLAND, TRAINER_LUCY
.2byte TRAINER_BRANDON
.align 2
gUnknown_08611D40:: @ 8611D40
data/battle_scripts_1.s
+16 -16
View File
@@ -2873,7 +2873,7 @@ BattleScript_FaintedMonTryChooseAnother::
jumpifnotbattletype BATTLE_TYPE_TRAINER, BattleScript_FaintedMonChooseAnother
jumpifbattletype BATTLE_TYPE_LINK, BattleScript_FaintedMonChooseAnother
jumpifbattletype BATTLE_TYPE_x2000000, BattleScript_FaintedMonChooseAnother
jumpifbattletype BATTLE_TYPE_BATTLE_TOWER | BATTLE_TYPE_DOME | BATTLE_TYPE_PALACE | BATTLE_TYPE_ARENA | BATTLE_TYPE_FACTORY | BATTLE_TYPE_PIKE | BATTLE_TYPE_PYRAMID, BattleScript_FaintedMonChooseAnother
jumpifbattletype BATTLE_TYPE_FRONTIER, BattleScript_FaintedMonChooseAnother
jumpifbattletype BATTLE_TYPE_DOUBLE, BattleScript_FaintedMonChooseAnother
jumpifword CMP_COMMON_BITS, gHitMarker, HITMARKER_x400000, BattleScript_FaintedMonChooseAnother
jumpifbyte CMP_EQUAL, sBATTLE_STYLE, 0x1, BattleScript_FaintedMonChooseAnother
@@ -2899,7 +2899,7 @@ BattleScript_FaintedMonTryChooseAnother::
switchindataupdate BS_ATTACKER
hpthresholds BS_ATTACKER
printstring STRINGID_SWITCHINMON
atk62 BS_ATTACKER
hidepartystatussummary BS_ATTACKER
switchinanim BS_ATTACKER, 0x0
waitstate
switchineffects BS_ATTACKER
@@ -2910,7 +2910,7 @@ BattleScript_FaintedMonChooseAnother::
switchindataupdate BS_FAINTED
hpthresholds BS_FAINTED
printstring STRINGID_SWITCHINMON
atk62 BS_FAINTED
hidepartystatussummary BS_FAINTED
switchinanim BS_FAINTED, FALSE
waitstate
various7 BS_ATTACKER
@@ -2933,7 +2933,7 @@ BattleScript_82DA908::
switchindataupdate BS_FAINTED
hpthresholds BS_FAINTED
printstring STRINGID_SWITCHINMON
atk62 BS_FAINTED
hidepartystatussummary BS_FAINTED
switchinanim BS_FAINTED, FALSE
waitstate
switchineffects 5
@@ -2968,7 +2968,7 @@ BattleScript_PayDayMoneyAndPickUpItems::
BattleScript_LocalBattleLost::
jumpifbattletype BATTLE_TYPE_DOME, BattleScript_CheckDomeDrew
jumpifbattletype BATTLE_TYPE_BATTLE_TOWER | BATTLE_TYPE_DOME | BATTLE_TYPE_PALACE | BATTLE_TYPE_ARENA | BATTLE_TYPE_FACTORY | BATTLE_TYPE_PIKE | BATTLE_TYPE_PYRAMID, BattleScript_LocalBattleLostPrintTrainersWinText
jumpifbattletype BATTLE_TYPE_FRONTIER, BattleScript_LocalBattleLostPrintTrainersWinText
jumpifbattletype BATTLE_TYPE_x4000000, BattleScript_LocalBattleLostPrintTrainersWinText
jumpifbattletype BATTLE_TYPE_EREADER_TRAINER, BattleScript_LocalBattleLostEnd
jumpifhalfword CMP_EQUAL, gTrainerBattleOpponent_A, 0x400, BattleScript_LocalBattleLostEnd
@@ -3120,10 +3120,10 @@ BattleScript_PursuitSwitchDmgSetMultihit::
setmultihit 0x2
BattleScript_PursuitSwitchDmgLoop::
jumpifnopursuitswitchdmg BattleScript_DoSwitchOut
atk5F
swapattackerwithtarget
trysetdestinybondtohappen
call BattleScript_PursuitDmgOnSwitchOut
atk5F
swapattackerwithtarget
BattleScript_DoSwitchOut::
decrementmultihit BattleScript_PursuitSwitchDmgLoop
switchoutabilities BS_ATTACKER
@@ -3136,7 +3136,7 @@ BattleScript_DoSwitchOut::
switchindataupdate BS_ATTACKER
hpthresholds BS_ATTACKER
printstring STRINGID_SWITCHINMON
atk62 BS_ATTACKER
hidepartystatussummary BS_ATTACKER
switchinanim BS_ATTACKER, FALSE
waitstate
switchineffects BS_ATTACKER
@@ -3230,7 +3230,7 @@ BattleScript_DamagingWeatherContinues::
playanimation2 BS_ATTACKER, sB_ANIM_ARG1, NULL
setbyte gBattleCommunication, 0x0
BattleScript_DamagingWeatherLoop::
copyarraywithindex gBattlerAttacker, gBattleTurnOrder, gBattleCommunication, 0x1
copyarraywithindex gBattlerAttacker, gBattlerByTurnOrder, gBattleCommunication, 0x1
weatherdamage
jumpifword CMP_EQUAL, gBattleMoveDamage, 0x0, BattleScript_DamagingWeatherLoopIncrement
printfromtable gSandStormHailDmgStringIds
@@ -3710,12 +3710,12 @@ BattleScript_MagicCoatBounce::
BattleScript_SnatchedMove::
attackstring
ppreduce
snatchsetbanks
snatchsetbattlers
playanimation BS_TARGET, B_ANIM_SNATCH_MOVE, NULL
printstring STRINGID_PKMNSNATCHEDMOVE
waitmessage 0x40
orword gHitMarker, HITMARKER_ATTACKSTRING_PRINTED | HITMARKER_NO_PPDEDUCT | HITMARKER_x800000
atk5F
swapattackerwithtarget
return
BattleScript_EnduredMsg::
@@ -3991,7 +3991,7 @@ BattleScript_DrizzleActivates::
pause 0x20
printstring STRINGID_PKMNMADEITRAIN
waitstate
playanimation BS_BANK_0, B_ANIM_RAIN_CONTINUES, NULL
playanimation BS_BATTLER_0, B_ANIM_RAIN_CONTINUES, NULL
call BattleScript_WeatherFormChanges
end3
@@ -4019,7 +4019,7 @@ BattleScript_SandstreamActivates::
pause 0x20
printstring STRINGID_PKMNSXWHIPPEDUPSANDSTORM
waitstate
playanimation BS_BANK_0, B_ANIM_SANDSTORM_CONTINUES, NULL
playanimation BS_BATTLER_0, B_ANIM_SANDSTORM_CONTINUES, NULL
call BattleScript_WeatherFormChanges
end3
@@ -4085,7 +4085,7 @@ BattleScript_DroughtActivates::
pause 0x20
printstring STRINGID_PKMNSXINTENSIFIEDSUN
waitstate
playanimation BS_BANK_0, B_ANIM_SUN_CONTINUES, NULL
playanimation BS_BATTLER_0, B_ANIM_SUN_CONTINUES, NULL
call BattleScript_WeatherFormChanges
end3
@@ -4561,8 +4561,8 @@ BattleScript_82DB973::
end2
BattleScript_82DB992::
various16 BS_BANK_0
various17 BS_BANK_0
various16 BS_BATTLER_0
various17 BS_BATTLER_0
various9 BS_ATTACKER
various15 BS_ATTACKER
printstring STRINGID_TIEDOPPONENTBYREFEREE
data/battle_scripts_2.s
+5 -5
View File
@@ -44,7 +44,7 @@ gBattlescriptsForSafariActions:: @ 82DBD58
.4byte BattleScript_ActionWatchesCarefully
.4byte BattleScript_ActionGetNear
.4byte BattleScript_ActionThrowPokeblock
.4byte BattleScript_82DBEE3
.4byte BattleScript_ActionWallyThrow
BattleScript_BallThrow::
jumpifword CMP_COMMON_BITS, gBattleTypeFlags, BATTLE_TYPE_WALLY_TUTORIAL, BattleScript_BallThrowByWally
@@ -176,17 +176,17 @@ BattleScript_RunByUsingItem::
setbyte gBattleOutcome, B_OUTCOME_RAN
finishturn
BattleScript_ActionWatchesCarefully::
BattleScript_ActionWatchesCarefully:
printstring STRINGID_PKMNWATCHINGCAREFULLY
waitmessage 0x40
end2
BattleScript_ActionGetNear::
BattleScript_ActionGetNear:
printfromtable gSafariGetNearStringIds
waitmessage 0x40
end2
BattleScript_ActionThrowPokeblock::
BattleScript_ActionThrowPokeblock:
printstring STRINGID_THREWPOKEBLOCKATPKMN
waitmessage 0x40
playanimation BS_ATTACKER, B_ANIM_x4, NULL
@@ -194,7 +194,7 @@ BattleScript_ActionThrowPokeblock::
waitmessage 0x40
end2
BattleScript_82DBEE3::
BattleScript_ActionWallyThrow:
printstring STRINGID_RETURNMON
waitmessage 0x40
returnatktoball
data/data2b.s
+3 -7
View File
@@ -235,7 +235,7 @@ gUnknown_082FF704:: @ 82FF704
.2byte 0x0003, 0x0000, 0xffff, 0x0000
.align 2
gUnknown_082FF70C:: @ 82FF70C
gPlayerMonSpriteAnimsTable:: @ 82FF70C
.4byte gUnknown_082FF6EC
.4byte gUnknown_082FF6F4
.4byte gUnknown_082FF6FC
@@ -4684,7 +4684,7 @@ gUnknown_0831AA00:: @ 831AA00
obj_tiles gUnknown_08D77B0C, 0x1000, 0x2710
.align 2
gUnknown_0831AA08:: @ 831AA08
gBattleBgTemplates:: @ 831AA08
.4byte 0x00000580, 0x000005c5, 0x000013e6, 0x000033ab
.align 2
@@ -4743,7 +4743,7 @@ gUnknown_0831AAE0:: @ 831AAE0
null_window_template
.align 2
gUnknown_0831ABA0:: @ 831ABA0
gBattleWindowTemplates:: @ 831ABA0
.4byte gUnknown_0831AA18
.4byte gUnknown_0831AAE0
@@ -4862,7 +4862,3 @@ gUnknown_0831ACC4:: @ 831ACC4
.align 2
gUnknown_0831ACDC:: @ 831ACDC
.4byte gUnknown_0831ACC4
.align 2
gUnknown_0831ACE0:: @ 831ACE0
.byte 0xe0, 0xf0, 0xf0, 0xe0, 0xe0, 0x00, 0x00, 0x00
data/field_effect_scripts.s
+3 -3
View File
@@ -78,11 +78,11 @@ gFieldEffectScript_ExclamationMarkIcon1:: @ 82DBAE0
field_eff_end
gFieldEffectScript_UseCutOnTallGrass:: @ 82DBAE6
field_eff_callnative sub_80D3A6C
field_eff_callnative FldEff_UseCutOnGrass
field_eff_end
gFieldEffectScript_UseCutOnTree:: @ 82DBAEC
field_eff_callnative sub_80D3ABC
field_eff_callnative FldEff_UseCutOnTree
field_eff_end
gFieldEffectScript_Shadow:: @ 82DBAF2
@@ -308,7 +308,7 @@ gFieldEffectScript_Unknown57:: @ 82DBCB8
field_eff_end
gFieldEffectScript_Unknown58:: @ 82DBCC2
field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo6, sub_80D3B00
field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo6, FldEff_CutGrass
field_eff_end
gFieldEffectScript_FieldMoveShowMonInit:: @ 82DBCCC
data/fldeff_cut.s
-32
View File
@@ -1,32 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2, 0
gUnknown_0857C608:: @ 857C608
.byte 0xfe, 0xfe, 0x01, 0x00, 0xff, 0xfe, 0x01, 0x00, 0x00, 0xfe, 0x02, 0x00, 0x01, 0xfe, 0x03, 0x00, 0x02, 0xfe, 0x03, 0x00, 0xfe, 0xff, 0x01, 0x00, 0x02, 0xff, 0x03, 0x00, 0xfe, 0x00, 0x04, 0x00, 0x02, 0x00
.byte 0x06, 0x00, 0xfe, 0x01, 0x07, 0x00, 0x02, 0x01, 0x09, 0x00, 0xfe, 0x02, 0x07, 0x00, 0xff, 0x02, 0x07, 0x00, 0x00, 0x02, 0x08, 0x00, 0x01, 0x02, 0x09, 0x00, 0x02, 0x02, 0x09, 0x00
gUnknown_0857C648:: @ 857C648
.2byte 0
.2byte 0
.2byte 0x1401
.2byte 0
gUnknown_0857C650:: @ 857C650
obj_image_anim_frame 0, 0x1E
obj_image_anim_jump 0
gUnknown_0857C658:: @ 857C658
.4byte gUnknown_0857C650
gUnknown_0857C65C:: @ 857C65C
obj_frame_tiles gFieldEffectObjectPic_ShadowExtraLarge + 0x520, 32
.align 2
gFieldEffectObjectPaletteInfo6:: @ 857C664
obj_pal gFieldEffectObjectPalette6, 0x1000
gUnknown_0857C66C:: @ 857C66C
spr_template -1, 0x1000, gUnknown_0857C648, gUnknown_0857C658, gUnknown_0857C65C, gDummySpriteAffineAnimTable, objc_8097BA8
data/map_events.s
+4
View File
@@ -1,8 +1,12 @@
#include "constants/bg_event_constants.h"
#include "constants/event_object_movement_constants.h"
#include "constants/event_objects.h"
#include "constants/flags.h"
#include "constants/items.h"
#include "constants/maps.h"
#include "constants/secret_bases.h"
#include "constants/vars.h"
#include "constants/weather.h"
.include "asm/macros.inc"
.include "constants/constants.inc"
data/maps.s
+4
View File
@@ -1,5 +1,9 @@
#include "constants/map_types.h"
#include "constants/maps.h"
#include "constants/weather.h"
#include "constants/region_map_sections.h"
#include "constants/songs.h"
#include "constants/weather.h"
.include "asm/macros.inc"
.include "constants/constants.inc"
data/maps/AbandonedShip_CaptainsOffice/events.inc
+2 -2
View File
@@ -1,6 +1,6 @@
AbandonedShip_CaptainsOffice_EventObjects: @ 8536A5C
object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 3, 4, 3, 8, 0, 0, 0, 0, AbandonedShip_CaptainsOffice_EventScript_2387E2, 0
object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 6, 3, 1, 1, 1, 0, 0, AbandonedShip_CaptainsOffice_EventScript_29126E, 1100
object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 3, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, AbandonedShip_CaptainsOffice_EventScript_2387E2, 0
object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_CaptainsOffice_EventScript_29126E, 1100
AbandonedShip_CaptainsOffice_MapWarps: @ 8536A8C
warp_def 7, 6, 3, 4, MAP_ABANDONED_SHIP_DECK
data/maps/AbandonedShip_CaptainsOffice/header.inc
+4 -4
View File
@@ -5,11 +5,11 @@ AbandonedShip_CaptainsOffice: @ 84845A4
.4byte 0x0
.2byte MUS_DAN02
.2byte 195
.byte 61
.byte MAPSEC_ABANDONED_SHIP
.byte 0
.byte 11
.byte 4
.byte WEATHER_SHADE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
.byte 15
.byte 0
.byte MAP_BATTLE_SCENE_NORMAL
data/maps/AbandonedShip_Corridors_1F/events.inc
+2 -2
View File
@@ -1,6 +1,6 @@
AbandonedShip_Corridors_1F_EventObjects: @ 85366C0
object_event 1, EVENT_OBJ_GFX_YOUNGSTER, 0, 17, 7, 3, 2, 1, 1, 0, 0, AbandonedShip_Corridors_1F_EventScript_2379A5, 0
object_event 2, EVENT_OBJ_GFX_TUBER_M, 0, 5, 10, 3, 45, 4, 7, 1, 3, AbandonedShip_Corridors_1F_EventScript_2379AE, 0
object_event 1, EVENT_OBJ_GFX_YOUNGSTER, 0, 17, 7, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, AbandonedShip_Corridors_1F_EventScript_2379A5, 0
object_event 2, EVENT_OBJ_GFX_TUBER_M, 0, 5, 10, 3, MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT, 4, 7, 1, 3, AbandonedShip_Corridors_1F_EventScript_2379AE, 0
AbandonedShip_Corridors_1F_MapWarps: @ 85366F0
warp_def 9, 11, 3, 2, MAP_ABANDONED_SHIP_DECK
data/maps/AbandonedShip_Corridors_1F/header.inc
+4 -4
View File
@@ -5,11 +5,11 @@ AbandonedShip_Corridors_1F: @ 84844C4
.4byte 0x0
.2byte MUS_DAN02
.2byte 187
.byte 61
.byte MAPSEC_ABANDONED_SHIP
.byte 0
.byte 11
.byte 4
.byte WEATHER_SHADE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
.byte 15
.byte 0
.byte MAP_BATTLE_SCENE_NORMAL
data/maps/AbandonedShip_Corridors_B1F/events.inc
+3 -3
View File
@@ -1,6 +1,6 @@
AbandonedShip_Corridors_B1F_EventObjects: @ 8536808
object_event 1, EVENT_OBJ_GFX_TUBER_M, 0, 2, 8, 3, 2, 1, 1, 0, 0, AbandonedShip_Corridors_B1F_EventScript_237DBF, 0
object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 9, 6, 3, 14, 0, 0, 1, 4, AbandonedShip_Corridors_B1F_EventScript_237E13, 0
object_event 1, EVENT_OBJ_GFX_TUBER_M, 0, 2, 8, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, AbandonedShip_Corridors_B1F_EventScript_237DBF, 0
object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 9, 6, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 0, 0, 1, 4, AbandonedShip_Corridors_B1F_EventScript_237E13, 0
AbandonedShip_Corridors_B1F_MapWarps: @ 8536838
warp_def 6, 4, 3, 2, MAP_ABANDONED_SHIP_ROOMS2_B1F
@@ -13,7 +13,7 @@ AbandonedShip_Corridors_B1F_MapWarps: @ 8536838
warp_def 8, 2, 3, 9, MAP_ABANDONED_SHIP_CORRIDORS_1F
AbandonedShip_Corridors_B1F_MapBGEvents: @ 8536878
bg_event 11, 4, 3, 0, 0, AbandonedShip_Corridors_B1F_EventScript_237DC8
bg_event 11, 4, 3, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_Corridors_B1F_EventScript_237DC8
AbandonedShip_Corridors_B1F_MapEvents:: @ 8536884
map_events AbandonedShip_Corridors_B1F_EventObjects, AbandonedShip_Corridors_B1F_MapWarps, 0x0, AbandonedShip_Corridors_B1F_MapBGEvents
data/maps/AbandonedShip_Corridors_B1F/header.inc
+4 -4
View File
@@ -5,11 +5,11 @@ AbandonedShip_Corridors_B1F: @ 84844FC
.4byte 0x0
.2byte MUS_DAN02
.2byte 189
.byte 61
.byte MAPSEC_ABANDONED_SHIP
.byte 0
.byte 11
.byte 4
.byte WEATHER_SHADE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
.byte 15
.byte 0
.byte MAP_BATTLE_SCENE_NORMAL
data/maps/AbandonedShip_Deck/header.inc
+4 -4
View File
@@ -5,11 +5,11 @@ AbandonedShip_Deck: @ 84844A8
.4byte 0x0
.2byte MUS_DAN02
.2byte 186
.byte 61
.byte MAPSEC_ABANDONED_SHIP
.byte 0
.byte 0
.byte 4
.byte WEATHER_NONE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
.byte 15
.byte 0
.byte MAP_BATTLE_SCENE_NORMAL
data/maps/AbandonedShip_HiddenFloorCorridors/events.inc
+4 -4
View File
@@ -7,10 +7,10 @@ AbandonedShip_HiddenFloorCorridors_MapWarps: @ 8536ACC
warp_def 9, 3, 3, 8, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS
AbandonedShip_HiddenFloorCorridors_MapBGEvents: @ 8536AFC
bg_event 3, 8, 3, 0, 0, AbandonedShip_HiddenFloorCorridors_EventScript_238A19
bg_event 6, 8, 3, 0, 0, AbandonedShip_HiddenFloorCorridors_EventScript_238A50
bg_event 3, 4, 0, 0, 0, AbandonedShip_HiddenFloorCorridors_EventScript_238A87
bg_event 9, 4, 0, 0, 0, AbandonedShip_HiddenFloorCorridors_EventScript_238ABE
bg_event 3, 8, 3, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorCorridors_EventScript_238A19
bg_event 6, 8, 3, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorCorridors_EventScript_238A50
bg_event 3, 4, 0, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorCorridors_EventScript_238A87
bg_event 9, 4, 0, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorCorridors_EventScript_238ABE
AbandonedShip_HiddenFloorCorridors_MapEvents:: @ 8536B2C
map_events 0x0, AbandonedShip_HiddenFloorCorridors_MapWarps, 0x0, AbandonedShip_HiddenFloorCorridors_MapBGEvents
data/maps/AbandonedShip_HiddenFloorCorridors/header.inc
+4 -4
View File
@@ -5,11 +5,11 @@ AbandonedShip_HiddenFloorCorridors: @ 84845DC
.4byte 0x0
.2byte MUS_DAN02
.2byte 289
.byte 61
.byte MAPSEC_ABANDONED_SHIP
.byte 0
.byte 11
.byte 4
.byte WEATHER_SHADE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
.byte 15
.byte 0
.byte MAP_BATTLE_SCENE_NORMAL
data/maps/AbandonedShip_HiddenFloorRooms/events.inc
+14 -14
View File
@@ -1,8 +1,8 @@
AbandonedShip_HiddenFloorRooms_EventObjects: @ 8536B40
object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 41, 4, 3, 1, 0, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_29127B, 1077
object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 10, 3, 1, 0, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_291288, 1078
object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 11, 3, 1, 1, 1, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_2912A2, 1102
object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 11, 3, 1, 1, 1, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_291295, 1101
object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 41, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_29127B, 1077
object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_291288, 1078
object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_2912A2, 1102
object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_291295, 1101
AbandonedShip_HiddenFloorRooms_MapWarps: @ 8536BA0
warp_def 6, 14, 3, 0, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS
@@ -16,16 +16,16 @@ AbandonedShip_HiddenFloorRooms_MapWarps: @ 8536BA0
warp_def 36, 1, 3, 5, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS
AbandonedShip_HiddenFloorRooms_MapBGEvents: @ 8536BE8
bg_event 42, 10, 3, 7, 0, ITEM_ROOM_1_KEY, 31, 0
bg_event 20, 5, 3, 7, 0, ITEM_ROOM_2_KEY, 32, 0
bg_event 1, 12, 3, 7, 0, ITEM_ROOM_4_KEY, 33, 0
bg_event 1, 2, 0, 7, 0, ITEM_ROOM_6_KEY, 34, 0
bg_event 8, 5, 3, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_238DF3
bg_event 11, 3, 3, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_238DF3
bg_event 10, 10, 3, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_238DF3
bg_event 16, 3, 3, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_238DF3
bg_event 25, 2, 3, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_238DF3
bg_event 24, 6, 3, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_238DF3
bg_hidden_item_event 42, 10, 3, ITEM_ROOM_1_KEY, 31
bg_hidden_item_event 20, 5, 3, ITEM_ROOM_2_KEY, 32
bg_hidden_item_event 1, 12, 3, ITEM_ROOM_4_KEY, 33
bg_hidden_item_event 1, 2, 0, ITEM_ROOM_6_KEY, 34
bg_event 8, 5, 3, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorRooms_EventScript_238DF3
bg_event 11, 3, 3, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorRooms_EventScript_238DF3
bg_event 10, 10, 3, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorRooms_EventScript_238DF3
bg_event 16, 3, 3, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorRooms_EventScript_238DF3
bg_event 25, 2, 3, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorRooms_EventScript_238DF3
bg_event 24, 6, 3, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorRooms_EventScript_238DF3
AbandonedShip_HiddenFloorRooms_MapEvents:: @ 8536C60
map_events AbandonedShip_HiddenFloorRooms_EventObjects, AbandonedShip_HiddenFloorRooms_MapWarps, 0x0, AbandonedShip_HiddenFloorRooms_MapBGEvents
data/maps/AbandonedShip_HiddenFloorRooms/header.inc
+4 -4
View File
@@ -5,11 +5,11 @@ AbandonedShip_HiddenFloorRooms: @ 84845F8
.4byte 0x0
.2byte MUS_DAN02
.2byte 310
.byte 61
.byte MAPSEC_ABANDONED_SHIP
.byte 0
.byte 11
.byte 4
.byte WEATHER_SHADE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
.byte 7
.byte 0
.byte MAP_BATTLE_SCENE_NORMAL
data/maps/AbandonedShip_Room_B1F/events.inc
+1 -1
View File
@@ -1,5 +1,5 @@
AbandonedShip_Room_B1F_EventObjects: @ 853697C
object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 4, 3, 1, 1, 1, 0, 0, AbandonedShip_Room_B1F_EventScript_291254, 1098
object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_Room_B1F_EventScript_291254, 1098
AbandonedShip_Room_B1F_MapWarps: @ 8536994
warp_def 4, 7, 3, 5, MAP_ABANDONED_SHIP_CORRIDORS_B1F
data/maps/AbandonedShip_Room_B1F/header.inc
+4 -4
View File
@@ -5,11 +5,11 @@ AbandonedShip_Room_B1F: @ 848456C
.4byte 0x0
.2byte MUS_DAN02
.2byte 193
.byte 61
.byte MAPSEC_ABANDONED_SHIP
.byte 0
.byte 11
.byte 4
.byte WEATHER_SHADE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
.byte 15
.byte 0
.byte MAP_BATTLE_SCENE_NORMAL
data/maps/AbandonedShip_Rooms2_1F/events.inc
+5 -5
View File
@@ -1,9 +1,9 @@
AbandonedShip_Rooms2_1F_EventObjects: @ 85369B8
object_event 1, EVENT_OBJ_GFX_MAN_5, 0, 7, 13, 3, 8, 0, 0, 1, 1, AbandonedShip_Rooms2_1F_EventScript_2380A7, 0
object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 6, 13, 3, 8, 0, 0, 1, 1, AbandonedShip_Rooms2_1F_EventScript_23810B, 0
object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 4, 3, 1, 1, 1, 0, 0, AbandonedShip_Rooms2_1F_EventScript_291261, 1099
object_event 4, EVENT_OBJ_GFX_HIKER, 0, 3, 2, 3, 10, 1, 1, 1, 3, AbandonedShip_Rooms2_1F_EventScript_238186, 0
object_event 5, EVENT_OBJ_GFX_TUBER_F, 0, 7, 2, 3, 9, 1, 1, 1, 3, AbandonedShip_Rooms2_1F_EventScript_23816F, 0
object_event 1, EVENT_OBJ_GFX_MAN_5, 0, 7, 13, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, AbandonedShip_Rooms2_1F_EventScript_2380A7, 0
object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 6, 13, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, AbandonedShip_Rooms2_1F_EventScript_23810B, 0
object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_Rooms2_1F_EventScript_291261, 1099
object_event 4, EVENT_OBJ_GFX_HIKER, 0, 3, 2, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 3, AbandonedShip_Rooms2_1F_EventScript_238186, 0
object_event 5, EVENT_OBJ_GFX_TUBER_F, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 3, AbandonedShip_Rooms2_1F_EventScript_23816F, 0
AbandonedShip_Rooms2_1F_MapWarps: @ 8536A30
warp_def 4, 16, 3, 8, MAP_ABANDONED_SHIP_CORRIDORS_1F
data/maps/AbandonedShip_Rooms2_1F/header.inc
+4 -4
View File
@@ -5,11 +5,11 @@ AbandonedShip_Rooms2_1F: @ 8484588
.4byte 0x0
.2byte MUS_DAN02
.2byte 194
.byte 61
.byte MAPSEC_ABANDONED_SHIP
.byte 0
.byte 11
.byte 4
.byte WEATHER_SHADE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
.byte 15
.byte 0
.byte MAP_BATTLE_SCENE_NORMAL
data/maps/AbandonedShip_Rooms2_B1F/events.inc
+2 -2
View File
@@ -1,6 +1,6 @@
AbandonedShip_Rooms2_B1F_EventObjects: @ 85368F4
object_event 1, EVENT_OBJ_GFX_CAMPER, 0, 3, 4, 3, 2, 1, 1, 0, 0, AbandonedShip_Rooms2_B1F_EventScript_238025, 0
object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 13, 3, 3, 1, 1, 1, 0, 0, AbandonedShip_Rooms2_B1F_EventScript_291247, 1097
object_event 1, EVENT_OBJ_GFX_CAMPER, 0, 3, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, AbandonedShip_Rooms2_B1F_EventScript_238025, 0
object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 13, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_Rooms2_B1F_EventScript_291247, 1097
AbandonedShip_Rooms2_B1F_MapWarps: @ 8536924
warp_def 4, 7, 3, 1, MAP_ABANDONED_SHIP_CORRIDORS_B1F
data/maps/AbandonedShip_Rooms2_B1F/header.inc
+4 -4
View File
@@ -5,11 +5,11 @@ AbandonedShip_Rooms2_B1F: @ 8484534
.4byte 0x0
.2byte MUS_DAN02
.2byte 191
.byte 61
.byte MAPSEC_ABANDONED_SHIP
.byte 0
.byte 11
.byte 4
.byte WEATHER_SHADE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
.byte 15
.byte 0
.byte MAP_BATTLE_SCENE_NORMAL
data/maps/AbandonedShip_Rooms_1F/events.inc
+4 -4
View File
@@ -1,8 +1,8 @@
AbandonedShip_Rooms_1F_EventObjects: @ 8536764
object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 12, 5, 3, 2, 1, 1, 0, 0, AbandonedShip_Rooms_1F_EventScript_237A93, 0
object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 5, 3, 1, 1, 1, 0, 0, AbandonedShip_Rooms_1F_EventScript_29122D, 1095
object_event 3, EVENT_OBJ_GFX_BEAUTY, 0, 10, 11, 3, 8, 1, 1, 1, 4, AbandonedShip_Rooms_1F_EventScript_237AB3, 0
object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 10, 16, 3, 16, 1, 1, 1, 4, AbandonedShip_Rooms_1F_EventScript_237A9C, 0
object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 12, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, AbandonedShip_Rooms_1F_EventScript_237A93, 0
object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_Rooms_1F_EventScript_29122D, 1095
object_event 3, EVENT_OBJ_GFX_BEAUTY, 0, 10, 11, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 4, AbandonedShip_Rooms_1F_EventScript_237AB3, 0
object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 10, 16, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 4, AbandonedShip_Rooms_1F_EventScript_237A9C, 0
AbandonedShip_Rooms_1F_MapWarps: @ 85367C4
warp_def 4, 16, 3, 4, MAP_ABANDONED_SHIP_CORRIDORS_1F
data/maps/AbandonedShip_Rooms_1F/header.inc
+4 -4
View File
@@ -5,11 +5,11 @@ AbandonedShip_Rooms_1F: @ 84844E0
.4byte 0x0
.2byte MUS_DAN02
.2byte 188
.byte 61
.byte MAPSEC_ABANDONED_SHIP
.byte 0
.byte 11
.byte 4
.byte WEATHER_SHADE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
.byte 15
.byte 0
.byte MAP_BATTLE_SCENE_NORMAL
data/maps/AbandonedShip_Rooms_B1F/events.inc
+2 -2
View File
@@ -1,6 +1,6 @@
AbandonedShip_Rooms_B1F_EventObjects: @ 8536898
object_event 1, EVENT_OBJ_GFX_FAT_MAN, 0, 25, 6, 3, 9, 0, 0, 0, 0, AbandonedShip_Rooms_B1F_EventScript_237FC6, 0
object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 7, 3, 1, 1, 1, 0, 0, AbandonedShip_Rooms_B1F_EventScript_29123A, 1096
object_event 1, EVENT_OBJ_GFX_FAT_MAN, 0, 25, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, AbandonedShip_Rooms_B1F_EventScript_237FC6, 0
object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_Rooms_B1F_EventScript_29123A, 1096
AbandonedShip_Rooms_B1F_MapWarps: @ 85368C8
warp_def 4, 1, 3, 2, MAP_ABANDONED_SHIP_CORRIDORS_B1F
data/maps/AbandonedShip_Rooms_B1F/header.inc
+4 -4
View File
@@ -5,11 +5,11 @@ AbandonedShip_Rooms_B1F: @ 8484518
.4byte 0x0
.2byte MUS_DAN02
.2byte 190
.byte 61
.byte MAPSEC_ABANDONED_SHIP
.byte 0
.byte 11
.byte 4
.byte WEATHER_SHADE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
.byte 15
.byte 0
.byte MAP_BATTLE_SCENE_NORMAL
data/maps/AbandonedShip_Underwater1/header.inc
+4 -4
View File
@@ -5,11 +5,11 @@ AbandonedShip_Underwater1: @ 8484550
.4byte 0x0
.2byte MUS_DEEPDEEP
.2byte 192
.byte 61
.byte MAPSEC_ABANDONED_SHIP
.byte 0
.byte 14
.byte 5
.byte WEATHER_BUBBLES
.byte MAP_TYPE_UNDERWATER
.2byte 0
.byte 13
.byte 0
.byte MAP_BATTLE_SCENE_NORMAL
data/maps/AbandonedShip_Underwater2/header.inc
+4 -4
View File
@@ -5,11 +5,11 @@ AbandonedShip_Underwater2: @ 84845C0
.4byte 0x0
.2byte MUS_DEEPDEEP
.2byte 196
.byte 61
.byte MAPSEC_ABANDONED_SHIP
.byte 0
.byte 14
.byte 5
.byte WEATHER_BUBBLES
.byte MAP_TYPE_UNDERWATER
.2byte 0
.byte 13
.byte 0
.byte MAP_BATTLE_SCENE_NORMAL
data/maps/AlteringCave/header.inc
+4 -4
View File
@@ -5,11 +5,11 @@ AlteringCave: @ 8484A58
.4byte 0x0
.2byte MUS_RG_NANADUNGEON
.2byte 420
.byte 210
.byte MAPSEC_ALTERING_CAVE_2
.byte 0
.byte 0
.byte 4
.byte WEATHER_NONE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
.byte 15
.byte 0
.byte MAP_BATTLE_SCENE_NORMAL
data/maps/AncientTomb/events.inc
+4 -4
View File
@@ -1,5 +1,5 @@
AncientTomb_EventObjects: @ 8536CDC
object_event 1, EVENT_OBJ_GFX_REGISTEEL, 0, 8, 7, 3, 8, 0, 0, 0, 0, AncientTomb_EventScript_23905A, 937
object_event 1, EVENT_OBJ_GFX_REGISTEEL, 0, 8, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, AncientTomb_EventScript_23905A, 937
AncientTomb_MapWarps: @ 8536CF4
warp_def 8, 29, 3, 0, MAP_ROUTE120
@@ -7,9 +7,9 @@ AncientTomb_MapWarps: @ 8536CF4
warp_def 8, 11, 3, 1, MAP_ANCIENT_TOMB
AncientTomb_MapBGEvents: @ 8536D0C
bg_event 8, 20, 0, 0, 0, AncientTomb_EventScript_239033
bg_event 7, 20, 0, 0, 0, AncientTomb_EventScript_239050
bg_event 9, 20, 0, 0, 0, AncientTomb_EventScript_239050
bg_event 8, 20, 0, BG_EVENT_PLAYER_FACING_ANY, AncientTomb_EventScript_239033
bg_event 7, 20, 0, BG_EVENT_PLAYER_FACING_ANY, AncientTomb_EventScript_239050
bg_event 9, 20, 0, BG_EVENT_PLAYER_FACING_ANY, AncientTomb_EventScript_239050
AncientTomb_MapEvents:: @ 8536D30
map_events AncientTomb_EventObjects, AncientTomb_MapWarps, 0x0, AncientTomb_MapBGEvents
data/maps/AncientTomb/header.inc
+4 -4
View File
@@ -5,11 +5,11 @@ AncientTomb: @ 8484630
.4byte 0x0
.2byte MUS_MABOROSI
.2byte 281
.byte 83
.byte MAPSEC_ANCIENT_TOMB
.byte 0
.byte 0
.byte 4
.byte WEATHER_NONE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
.byte 15
.byte 0
.byte MAP_BATTLE_SCENE_NORMAL
data/maps/AquaHideout_1F/events.inc
+3 -3
View File
@@ -1,7 +1,7 @@
AquaHideout_1F_EventObjects: @ 8535304
object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 13, 11, 3, 8, 0, 0, 0, 0, AquaHideout_1F_EventScript_233494, 821
object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 14, 11, 3, 8, 0, 0, 0, 0, AquaHideout_1F_EventScript_2334C6, 822
object_event 3, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 20, 4, 3, 50, 13, 5, 1, 3, AquaHideout_1F_EventScript_2334F8, 924
object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 13, 11, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, AquaHideout_1F_EventScript_233494, 821
object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 14, 11, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, AquaHideout_1F_EventScript_2334C6, 822
object_event 3, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 20, 4, 3, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT, 13, 5, 1, 3, AquaHideout_1F_EventScript_2334F8, 924
AquaHideout_1F_MapWarps: @ 853534C
warp_def 13, 27, 1, 6, MAP_LILYCOVE_CITY
data/maps/AquaHideout_1F/header.inc
+4 -4
View File
@@ -5,11 +5,11 @@ AquaHideout_1F: @ 8484144
.4byte 0x0
.2byte MUS_AJITO
.2byte 143
.byte 197
.byte MAPSEC_AQUA_HIDEOUT
.byte 0
.byte 0
.byte 8
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 8
.byte 3
.byte MAP_BATTLE_SCENE_AQUA
data/maps/AquaHideout_B1F/events.inc
+9 -9
View File
@@ -1,13 +1,13 @@
AquaHideout_B1F_EventObjects: @ 8535378
object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 28, 16, 3, 8, 0, 0, 1, 4, AquaHideout_B1F_EventScript_233A85, 924
object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 6, 6, 3, 9, 0, 0, 1, 5, AquaHideout_B1F_EventScript_233AB0, 924
object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 12, 3, 1, 0, 0, 0, 0, AquaHideout_B1F_EventScript_291372, 1071
object_event 4, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 20, 18, 3, 23, 4, 0, 1, 4, AquaHideout_B1F_EventScript_233AD5, 924
object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 15, 9, 3, 1, 1, 1, 0, 0, AquaHideout_B1F_EventScript_291358, 1124
object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 9, 3, 1, 1, 1, 0, 0, AquaHideout_B1F_EventScript_2339EB, 977
object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 15, 10, 3, 1, 1, 1, 0, 0, AquaHideout_B1F_EventScript_291365, 1132
object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 10, 3, 1, 1, 1, 0, 0, AquaHideout_B1F_EventScript_233A38, 978
object_event 9, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 28, 21, 3, 7, 1, 1, 1, 4, AquaHideout_B1F_EventScript_233AEC, 924
object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 28, 16, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 4, AquaHideout_B1F_EventScript_233A85, 924
object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 6, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 5, AquaHideout_B1F_EventScript_233AB0, 924
object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, AquaHideout_B1F_EventScript_291372, 1071
object_event 4, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 20, 18, 3, MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE, 4, 0, 1, 4, AquaHideout_B1F_EventScript_233AD5, 924
object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 15, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AquaHideout_B1F_EventScript_291358, 1124
object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AquaHideout_B1F_EventScript_2339EB, 977
object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 15, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AquaHideout_B1F_EventScript_291365, 1132
object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AquaHideout_B1F_EventScript_233A38, 978
object_event 9, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 28, 21, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 4, AquaHideout_B1F_EventScript_233AEC, 924
AquaHideout_B1F_MapWarps: @ 8535450
warp_def 29, 1, 3, 2, MAP_AQUA_HIDEOUT_1F
data/maps/AquaHideout_B1F/header.inc
+4 -4
View File
@@ -5,11 +5,11 @@ AquaHideout_B1F: @ 8484160
.4byte 0x0
.2byte MUS_AJITO
.2byte 144
.byte 197
.byte MAPSEC_AQUA_HIDEOUT
.byte 0
.byte 0
.byte 8
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 8
.byte 3
.byte MAP_BATTLE_SCENE_AQUA
data/maps/AquaHideout_B2F/events.inc
+8 -8
View File
@@ -1,10 +1,10 @@
AquaHideout_B2F_EventObjects: @ 853552C
object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 23, 19, 3, 9, 0, 0, 0, 0, AquaHideout_B2F_EventScript_233E09, 924
object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 23, 10, 3, 45, 4, 3, 1, 3, AquaHideout_B2F_EventScript_233E8A, 924
object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 13, 3, 1, 0, 0, 0, 0, AquaHideout_B2F_EventScript_29137F, 1072
object_event 4, EVENT_OBJ_GFX_SUBMARINE_SHADOW, 0, 19, 20, 1, 9, 0, 0, 0, 0, 0x0, 943
object_event 5, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 7, 5, 3, 10, 1, 1, 1, 5, AquaHideout_B2F_EventScript_233EAF, 924
object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 13, 5, 3, 9, 1, 1, 1, 5, AquaHideout_B2F_EventScript_233EC6, 924
object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 23, 19, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, AquaHideout_B2F_EventScript_233E09, 924
object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 23, 10, 3, MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT, 4, 3, 1, 3, AquaHideout_B2F_EventScript_233E8A, 924
object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, AquaHideout_B2F_EventScript_29137F, 1072
object_event 4, EVENT_OBJ_GFX_SUBMARINE_SHADOW, 0, 19, 20, 1, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, 943
object_event 5, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 7, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 5, AquaHideout_B2F_EventScript_233EAF, 924
object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 13, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 5, AquaHideout_B2F_EventScript_233EC6, 924
AquaHideout_B2F_MapWarps: @ 85355BC
warp_def 18, 1, 3, 1, MAP_AQUA_HIDEOUT_B1F
@@ -19,8 +19,8 @@ AquaHideout_B2F_MapWarps: @ 85355BC
warp_def 32, 20, 3, 4, MAP_AQUA_HIDEOUT_B1F
AquaHideout_B2F_MapCoordEvents: @ 853560C
coord_event 28, 17, 3, 0, VAR_TEMP_1, 0, 0, AquaHideout_B2F_EventScript_233DE5
coord_event 28, 16, 3, 0, VAR_TEMP_1, 0, 0, AquaHideout_B2F_EventScript_233DE5
coord_event 28, 17, 3, VAR_TEMP_1, 0, AquaHideout_B2F_EventScript_233DE5
coord_event 28, 16, 3, VAR_TEMP_1, 0, AquaHideout_B2F_EventScript_233DE5
AquaHideout_B2F_MapEvents:: @ 853562C
map_events AquaHideout_B2F_EventObjects, AquaHideout_B2F_MapWarps, AquaHideout_B2F_MapCoordEvents, 0x0
data/maps/AquaHideout_B2F/header.inc
+4 -4
View File
@@ -5,11 +5,11 @@ AquaHideout_B2F: @ 848417C
.4byte 0x0
.2byte MUS_AJITO
.2byte 145
.byte 197
.byte MAPSEC_AQUA_HIDEOUT
.byte 0
.byte 0
.byte 8
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 8
.byte 3
.byte MAP_BATTLE_SCENE_AQUA
data/maps/AquaHideout_UnusedRubyMap1/header.inc
+4 -4
View File
@@ -5,11 +5,11 @@ AquaHideout_UnusedRubyMap1: @ 84846D8
.4byte 0x0
.2byte MUS_AJITO
.2byte 316
.byte 197
.byte MAPSEC_AQUA_HIDEOUT
.byte 0
.byte 0
.byte 4
.byte WEATHER_NONE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
.byte 15
.byte 2
.byte MAP_BATTLE_SCENE_MAGMA
data/maps/AquaHideout_UnusedRubyMap2/header.inc
+4 -4
View File
@@ -5,11 +5,11 @@ AquaHideout_UnusedRubyMap2: @ 84846F4
.4byte 0x0
.2byte MUS_AJITO
.2byte 317
.byte 197
.byte MAPSEC_AQUA_HIDEOUT
.byte 0
.byte 0
.byte 4
.byte WEATHER_NONE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
.byte 15
.byte 2
.byte MAP_BATTLE_SCENE_MAGMA
data/maps/AquaHideout_UnusedRubyMap3/header.inc
+4 -4
View File
@@ -5,11 +5,11 @@ AquaHideout_UnusedRubyMap3: @ 8484710
.4byte 0x0
.2byte MUS_AJITO
.2byte 318
.byte 197
.byte MAPSEC_AQUA_HIDEOUT
.byte 0
.byte 0
.byte 4
.byte WEATHER_NONE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
.byte 15
.byte 2
.byte MAP_BATTLE_SCENE_MAGMA
data/maps/ArtisanCave_1F/events.inc
+1 -1
View File
@@ -1,5 +1,5 @@
ArtisanCave_1F_EventObjects: @ 8537774
object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 5, 3, 1, 1, 1, 0, 0, ArtisanCave_1F_EventScript_2914D1, 1163
object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, ArtisanCave_1F_EventScript_2914D1, 1163
ArtisanCave_1F_MapWarps: @ 853778C
warp_def 10, 17, 0, 13, MAP_BATTLE_FRONTIER_OUTSIDE_EAST
data/maps/ArtisanCave_1F/header.inc
+4 -4
View File
@@ -5,11 +5,11 @@ ArtisanCave_1F: @ 84849B0
.4byte 0x0
.2byte MUS_DAN01
.2byte 401
.byte 202
.byte MAPSEC_ARTISAN_CAVE
.byte 0
.byte 0
.byte 4
.byte WEATHER_NONE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
.byte 15
.byte 0
.byte MAP_BATTLE_SCENE_NORMAL
data/maps/ArtisanCave_B1F/events.inc
+5 -5
View File
@@ -1,15 +1,15 @@
ArtisanCave_B1F_EventObjects: @ 8537708
object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 32, 38, 3, 1, 1, 1, 0, 0, ArtisanCave_B1F_EventScript_2914C4, 1162
object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 32, 38, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, ArtisanCave_B1F_EventScript_2914C4, 1162
ArtisanCave_B1F_MapWarps: @ 8537720
warp_def 8, 48, 0, 10, MAP_BATTLE_FRONTIER_OUTSIDE_WEST
warp_def 38, 5, 0, 1, MAP_ARTISAN_CAVE_1F
ArtisanCave_B1F_MapBGEvents: @ 8537730
bg_event 32, 29, 0, 7, 0, ITEM_ZINC, 102, 0
bg_event 27, 8, 0, 7, 0, ITEM_CALCIUM, 101, 0
bg_event 7, 5, 0, 7, 0, ITEM_PROTEIN, 103, 0
bg_event 19, 43, 0, 7, 0, ITEM_IRON, 104, 0
bg_hidden_item_event 32, 29, 0, ITEM_ZINC, 102
bg_hidden_item_event 27, 8, 0, ITEM_CALCIUM, 101
bg_hidden_item_event 7, 5, 0, ITEM_PROTEIN, 103
bg_hidden_item_event 19, 43, 0, ITEM_IRON, 104
ArtisanCave_B1F_MapEvents:: @ 8537760
map_events ArtisanCave_B1F_EventObjects, ArtisanCave_B1F_MapWarps, 0x0, ArtisanCave_B1F_MapBGEvents
data/maps/ArtisanCave_B1F/header.inc
+4 -4
View File
@@ -5,11 +5,11 @@ ArtisanCave_B1F: @ 8484994
.4byte 0x0
.2byte MUS_DAN01
.2byte 400
.byte 202
.byte MAPSEC_ARTISAN_CAVE
.byte 0
.byte 0
.byte 4
.byte WEATHER_NONE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
.byte 15
.byte 0
.byte MAP_BATTLE_SCENE_NORMAL
data/maps/BattleFrontier_BattleArenaBattleRoom/events.inc
+9 -9
View File
@@ -1,13 +1,13 @@
BattleFrontier_BattleArenaBattleRoom_EventObjects: @ 853C8EC
object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 5, 3, 3, 8, 1, 1, 0, 0, 0x0, 0
object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 10, 3, 3, 8, 1, 1, 0, 0, 0x0, 0
object_event 3, EVENT_OBJ_GFX_BLACK_BELT, 0, 5, 9, 3, 7, 1, 1, 0, 0, 0x0, 0
object_event 4, EVENT_OBJ_GFX_BLACK_BELT, 0, 10, 9, 3, 7, 1, 1, 0, 0, 0x0, 0
object_event 5, EVENT_OBJ_GFX_BLACK_BELT, 0, 4, 5, 3, 10, 1, 1, 0, 0, 0x0, 0
object_event 6, EVENT_OBJ_GFX_BLACK_BELT, 0, 11, 5, 3, 9, 1, 1, 0, 0, 0x0, 0
object_event 7, EVENT_OBJ_GFX_HIPSTER, 0, 15, 6, 3, 9, 1, 1, 0, 0, 0x0, 0
object_event 8, EVENT_OBJ_GFX_TRADER, 0, 0, 6, 3, 10, 1, 1, 0, 0, 0x0, 0
object_event 9, EVENT_OBJ_GFX_BLACK_BELT, 0, 7, 4, 3, 8, 1, 1, 0, 0, 0x0, 0
object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 5, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 10, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
object_event 3, EVENT_OBJ_GFX_BLACK_BELT, 0, 5, 9, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0
object_event 4, EVENT_OBJ_GFX_BLACK_BELT, 0, 10, 9, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0
object_event 5, EVENT_OBJ_GFX_BLACK_BELT, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, 0x0, 0
object_event 6, EVENT_OBJ_GFX_BLACK_BELT, 0, 11, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, 0x0, 0
object_event 7, EVENT_OBJ_GFX_HIPSTER, 0, 15, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, 0x0, 0
object_event 8, EVENT_OBJ_GFX_TRADER, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, 0x0, 0
object_event 9, EVENT_OBJ_GFX_BLACK_BELT, 0, 7, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
BattleFrontier_BattleArenaBattleRoom_MapEvents:: @ 853C9C4
map_events BattleFrontier_BattleArenaBattleRoom_EventObjects, 0x0, 0x0, 0x0
data/maps/BattleFrontier_BattleArenaBattleRoom/header.inc
+4 -4
View File
@@ -5,11 +5,11 @@ BattleFrontier_BattleArenaBattleRoom: @ 8485484
.4byte 0x0
.2byte MUS_B_ARENA
.2byte 356
.byte 58
.byte MAPSEC_BATTLE_FRONTIER
.byte 0
.byte 0
.byte 8
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 0
.byte 0
.byte MAP_BATTLE_SCENE_NORMAL
data/maps/BattleFrontier_BattleArenaCorridor/events.inc
+1 -1
View File
@@ -1,5 +1,5 @@
BattleFrontier_BattleArenaCorridor_EventObjects: @ 853C8C0
object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 9, 12, 0, 8, 1, 1, 0, 0, 0x0, 0
object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 9, 12, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
BattleFrontier_BattleArenaCorridor_MapEvents:: @ 853C8D8
map_events BattleFrontier_BattleArenaCorridor_EventObjects, 0x0, 0x0, 0x0
data/maps/BattleFrontier_BattleArenaCorridor/header.inc
+4 -4
View File
@@ -5,11 +5,11 @@ BattleFrontier_BattleArenaCorridor: @ 8485468
.4byte 0x0
.2byte MUS_B_ARENA
.2byte 355
.byte 58
.byte MAPSEC_BATTLE_FRONTIER
.byte 0
.byte 0
.byte 8
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 0
.byte 0
.byte MAP_BATTLE_SCENE_NORMAL
data/maps/BattleFrontier_BattleArenaLobby/events.inc
+7 -7
View File
@@ -1,16 +1,16 @@
BattleFrontier_BattleArenaLobby_EventObjects: @ 853C814
object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 7, 7, 0, 8, 1, 1, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_255DF4, 0
object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 2, 10, 3, 2, 1, 1, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_2560C1, 0
object_event 3, EVENT_OBJ_GFX_MAN_6, 0, 14, 11, 3, 9, 1, 1, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_2560AF, 0
object_event 4, EVENT_OBJ_GFX_CAMPER, 0, 14, 12, 3, 9, 1, 1, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_2560B8, 0
object_event 5, EVENT_OBJ_GFX_YOUNGSTER, 0, 14, 10, 3, 9, 1, 1, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_2560A6, 0
object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 7, 7, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_255DF4, 0
object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 2, 10, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_2560C1, 0
object_event 3, EVENT_OBJ_GFX_MAN_6, 0, 14, 11, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_2560AF, 0
object_event 4, EVENT_OBJ_GFX_CAMPER, 0, 14, 12, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_2560B8, 0
object_event 5, EVENT_OBJ_GFX_YOUNGSTER, 0, 14, 10, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_2560A6, 0
BattleFrontier_BattleArenaLobby_MapWarps: @ 853C88C
warp_def 7, 12, 3, 1, MAP_BATTLE_FRONTIER_OUTSIDE_EAST
BattleFrontier_BattleArenaLobby_MapBGEvents: @ 853C894
bg_event 5, 9, 3, 1, 0, BattleFrontier_BattleArenaLobby_EventScript_256092
bg_event 1, 7, 0, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_2560CA
bg_event 5, 9, 3, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_BattleArenaLobby_EventScript_256092
bg_event 1, 7, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_BattleArenaLobby_EventScript_2560CA
BattleFrontier_BattleArenaLobby_MapEvents:: @ 853C8AC
map_events BattleFrontier_BattleArenaLobby_EventObjects, BattleFrontier_BattleArenaLobby_MapWarps, 0x0, BattleFrontier_BattleArenaLobby_MapBGEvents
data/maps/BattleFrontier_BattleArenaLobby/header.inc
+4 -4
View File
@@ -5,11 +5,11 @@ BattleFrontier_BattleArenaLobby: @ 848544C
.4byte 0x0
.2byte MUS_B_ARENA
.2byte 354
.byte 58
.byte MAPSEC_BATTLE_FRONTIER
.byte 0
.byte 0
.byte 8
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 0
.byte 0
.byte MAP_BATTLE_SCENE_NORMAL
data/maps/BattleFrontier_BattleDomeBattleRoom/events.inc
+15 -15
View File
@@ -1,19 +1,19 @@
BattleFrontier_BattleDomeBattleRoom_EventObjects: @ 853C1C4
object_event 1, EVENT_OBJ_GFX_REPORTER_M, 0, 5, 4, 0, 8, 1, 1, 0, 0, 0x0, 0
object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 7, 2, 0, 8, 1, 1, 0, 0, 0x0, 0
object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 9, 2, 0, 8, 1, 1, 0, 0, 0x0, 0
object_event 4, EVENT_OBJ_GFX_BOY_2, 0, 11, 2, 0, 8, 1, 1, 0, 0, 0x0, 0
object_event 5, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 16, 2, 0, 8, 1, 1, 0, 0, 0x0, 0
object_event 6, EVENT_OBJ_GFX_MAN_1, 0, 4, 2, 0, 8, 1, 1, 0, 0, 0x0, 0
object_event 7, EVENT_OBJ_GFX_OLD_MAN_1, 0, 16, 1, 0, 8, 1, 1, 0, 0, 0x0, 0
object_event 8, EVENT_OBJ_GFX_CAMPER, 0, 8, 1, 0, 8, 1, 1, 0, 0, 0x0, 0
object_event 9, EVENT_OBJ_GFX_MAN_2, 0, 0, 4, 0, 8, 1, 1, 0, 0, 0x0, 0
object_event 10, EVENT_OBJ_GFX_FAT_MAN, 0, 12, 1, 0, 8, 1, 1, 0, 0, 0x0, 0
object_event 11, EVENT_OBJ_GFX_GIRL_2, 0, 13, 2, 0, 8, 1, 1, 0, 0, 0x0, 0
object_event 12, EVENT_OBJ_GFX_GIRL_1, 0, 10, 2, 0, 8, 1, 1, 0, 0, 0x0, 0
object_event 13, EVENT_OBJ_GFX_TRADER, 0, 4, 9, 4, 7, 1, 1, 0, 0, 0x0, 0
object_event 14, EVENT_OBJ_GFX_WOMAN_4, 0, 14, 2, 0, 8, 1, 1, 0, 0, 0x0, 0
object_event 15, EVENT_OBJ_GFX_HIPSTER, 0, 11, 6, 0, 9, 1, 1, 0, 0, 0x0, 0
object_event 1, EVENT_OBJ_GFX_REPORTER_M, 0, 5, 4, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 7, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 9, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
object_event 4, EVENT_OBJ_GFX_BOY_2, 0, 11, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
object_event 5, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 16, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
object_event 6, EVENT_OBJ_GFX_MAN_1, 0, 4, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
object_event 7, EVENT_OBJ_GFX_OLD_MAN_1, 0, 16, 1, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
object_event 8, EVENT_OBJ_GFX_CAMPER, 0, 8, 1, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
object_event 9, EVENT_OBJ_GFX_MAN_2, 0, 0, 4, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
object_event 10, EVENT_OBJ_GFX_FAT_MAN, 0, 12, 1, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
object_event 11, EVENT_OBJ_GFX_GIRL_2, 0, 13, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
object_event 12, EVENT_OBJ_GFX_GIRL_1, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
object_event 13, EVENT_OBJ_GFX_TRADER, 0, 4, 9, 4, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0
object_event 14, EVENT_OBJ_GFX_WOMAN_4, 0, 14, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
object_event 15, EVENT_OBJ_GFX_HIPSTER, 0, 11, 6, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, 0x0, 0
BattleFrontier_BattleDomeBattleRoom_MapEvents:: @ 853C32C
map_events BattleFrontier_BattleDomeBattleRoom_EventObjects, 0x0, 0x0, 0x0
data/maps/BattleFrontier_BattleDomeBattleRoom/header.inc
+4 -4
View File
@@ -5,11 +5,11 @@ BattleFrontier_BattleDomeBattleRoom: @ 8485388
.4byte 0x0
.2byte MUS_B_DOME
.2byte 335
.byte 58
.byte MAPSEC_BATTLE_FRONTIER
.byte 0
.byte 0
.byte 8
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 0
.byte 0
.byte MAP_BATTLE_SCENE_NORMAL
data/maps/BattleFrontier_BattleDomeCorridor/events.inc
+1 -1
View File
@@ -1,5 +1,5 @@
BattleFrontier_BattleDomeCorridor_EventObjects: @ 853C14C
object_event 1, EVENT_OBJ_GFX_TEALA, 0, 23, 5, 0, 8, 1, 1, 0, 0, 0x0, 0
object_event 1, EVENT_OBJ_GFX_TEALA, 0, 23, 5, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
BattleFrontier_BattleDomeCorridor_MapWarps: @ 853C164
warp_def 6, 8, 3, 1, MAP_BATTLE_FRONTIER_OUTSIDE_WEST
data/maps/BattleFrontier_BattleDomeCorridor/header.inc
+4 -4
View File
@@ -5,11 +5,11 @@ BattleFrontier_BattleDomeCorridor: @ 8485350
.4byte 0x0
.2byte MUS_B_DOME1
.2byte 333
.byte 58
.byte MAPSEC_BATTLE_FRONTIER
.byte 0
.byte 0
.byte 8
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 0
.byte 0
.byte MAP_BATTLE_SCENE_NORMAL
data/maps/BattleFrontier_BattleDomeLobby/events.inc
+10 -10
View File
@@ -1,20 +1,20 @@
BattleFrontier_BattleDomeLobby_EventObjects: @ 853C068
object_event 1, EVENT_OBJ_GFX_TEALA, 0, 5, 10, 0, 8, 1, 1, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249A35, 0
object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 1, 11, 0, 2, 1, 1, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249E10, 0
object_event 3, EVENT_OBJ_GFX_LASS, 0, 14, 14, 0, 2, 1, 1, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249DFE, 0
object_event 4, EVENT_OBJ_GFX_FAT_MAN, 0, 18, 14, 0, 2, 1, 1, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249E07, 0
object_event 5, EVENT_OBJ_GFX_MANIAC, 0, 8, 14, 0, 2, 1, 1, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249DED, 0
object_event 6, EVENT_OBJ_GFX_TEALA, 0, 17, 10, 0, 8, 1, 1, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249A47, 0
object_event 1, EVENT_OBJ_GFX_TEALA, 0, 5, 10, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249A35, 0
object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 1, 11, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249E10, 0
object_event 3, EVENT_OBJ_GFX_LASS, 0, 14, 14, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249DFE, 0
object_event 4, EVENT_OBJ_GFX_FAT_MAN, 0, 18, 14, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249E07, 0
object_event 5, EVENT_OBJ_GFX_MANIAC, 0, 8, 14, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249DED, 0
object_event 6, EVENT_OBJ_GFX_TEALA, 0, 17, 10, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249A47, 0
BattleFrontier_BattleDomeLobby_MapWarps: @ 853C0F8
warp_def 11, 16, 0, 1, MAP_BATTLE_FRONTIER_OUTSIDE_WEST
warp_def 12, 16, 0, 1, MAP_BATTLE_FRONTIER_OUTSIDE_WEST
BattleFrontier_BattleDomeLobby_MapBGEvents: @ 853C108
bg_event 4, 10, 0, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249D52
bg_event 7, 10, 0, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249D84
bg_event 18, 10, 0, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249D6B
bg_event 15, 10, 0, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249E34
bg_event 4, 10, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_BattleDomeLobby_EventScript_249D52
bg_event 7, 10, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_BattleDomeLobby_EventScript_249D84
bg_event 18, 10, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_BattleDomeLobby_EventScript_249D6B
bg_event 15, 10, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_BattleDomeLobby_EventScript_249E34
BattleFrontier_BattleDomeLobby_MapEvents:: @ 853C138
map_events BattleFrontier_BattleDomeLobby_EventObjects, BattleFrontier_BattleDomeLobby_MapWarps, 0x0, BattleFrontier_BattleDomeLobby_MapBGEvents
data/maps/BattleFrontier_BattleDomeLobby/header.inc
+4 -4
View File
@@ -5,11 +5,11 @@ BattleFrontier_BattleDomeLobby: @ 8485334
.4byte 0x0
.2byte MUS_B_DOME1
.2byte 332
.byte 58
.byte MAPSEC_BATTLE_FRONTIER
.byte 0
.byte 0
.byte 8
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 0
.byte 0
.byte MAP_BATTLE_SCENE_NORMAL
data/maps/BattleFrontier_BattleDomePreBattleRoom/events.inc
+1 -1
View File
@@ -1,5 +1,5 @@
BattleFrontier_BattleDomePreBattleRoom_EventObjects: @ 853C188
object_event 1, EVENT_OBJ_GFX_TEALA, 0, 5, 2, 3, 8, 1, 1, 0, 0, 0x0, 0
object_event 1, EVENT_OBJ_GFX_TEALA, 0, 5, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
BattleFrontier_BattleDomePreBattleRoom_MapWarps: @ 853C1A0
warp_def 6, 8, 3, 1, MAP_BATTLE_FRONTIER_OUTSIDE_WEST
data/maps/BattleFrontier_BattleDomePreBattleRoom/header.inc
+4 -4
View File
@@ -5,11 +5,11 @@ BattleFrontier_BattleDomePreBattleRoom: @ 848536C
.4byte 0x0
.2byte MUS_B_DOME
.2byte 334
.byte 58
.byte MAPSEC_BATTLE_FRONTIER
.byte 0
.byte 0
.byte 8
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 0
.byte 0
.byte MAP_BATTLE_SCENE_NORMAL
data/maps/BattleFrontier_BattleFactoryBattleRoom/events.inc
+8 -8
View File
@@ -1,12 +1,12 @@
BattleFrontier_BattleFactoryBattleRoom_EventObjects: @ 853CADC
object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 6, 0, 8, 1, 1, 0, 0, 0x0, 0
object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 7, 4, 0, 8, 1, 1, 0, 0, 0x0, 0
object_event 3, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 4, 0, 8, 1, 1, 0, 0, 0x0, 0
object_event 4, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 8, 0, 8, 1, 1, 0, 0, 0x0, 0
object_event 5, EVENT_OBJ_GFX_SCIENTIST_1, 0, 12, 4, 0, 8, 1, 1, 0, 0, 0x0, 0
object_event 6, EVENT_OBJ_GFX_SCIENTIST_1, 0, 12, 6, 0, 8, 1, 1, 0, 0, 0x0, 0
object_event 7, EVENT_OBJ_GFX_SCIENTIST_1, 0, 12, 8, 0, 8, 1, 1, 0, 0, 0x0, 0
object_event 8, 255, 0, 5, 11, 0, 7, 1, 1, 0, 0, 0x0, 0
object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 6, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 7, 4, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
object_event 3, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 4, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
object_event 4, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 8, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
object_event 5, EVENT_OBJ_GFX_SCIENTIST_1, 0, 12, 4, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
object_event 6, EVENT_OBJ_GFX_SCIENTIST_1, 0, 12, 6, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
object_event 7, EVENT_OBJ_GFX_SCIENTIST_1, 0, 12, 8, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
object_event 8, 255, 0, 5, 11, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0
BattleFrontier_BattleFactoryBattleRoom_MapEvents:: @ 853CB9C
map_events BattleFrontier_BattleFactoryBattleRoom_EventObjects, 0x0, 0x0, 0x0
data/maps/BattleFrontier_BattleFactoryBattleRoom/header.inc
+4 -4
View File
@@ -5,11 +5,11 @@ BattleFrontier_BattleFactoryBattleRoom: @ 84854D8
.4byte 0x0
.2byte MUS_B_FACTORY
.2byte 348
.byte 58
.byte MAPSEC_BATTLE_FRONTIER
.byte 0
.byte 0
.byte 8
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 0
.byte 0
.byte MAP_BATTLE_SCENE_NORMAL
data/maps/BattleFrontier_BattleFactoryLobby/events.inc
+9 -9
View File
@@ -1,19 +1,19 @@
BattleFrontier_BattleFactoryLobby_EventObjects: @ 853C9D8
object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 4, 7, 0, 8, 1, 1, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_2585CB, 0
object_event 2, EVENT_OBJ_GFX_WOMAN_1, 0, 3, 11, 0, 2, 1, 1, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_258813, 0
object_event 3, EVENT_OBJ_GFX_CAMPER, 0, 14, 11, 0, 8, 0, 0, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_25881C, 0
object_event 4, EVENT_OBJ_GFX_PICNICKER, 0, 13, 11, 0, 10, 1, 1, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_258825, 0
object_event 5, EVENT_OBJ_GFX_FAT_MAN, 0, 6, 10, 0, 1, 1, 1, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_258830, 0
object_event 6, EVENT_OBJ_GFX_SCIENTIST_1, 0, 14, 7, 0, 8, 1, 1, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_2585DD, 0
object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 4, 7, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_2585CB, 0
object_event 2, EVENT_OBJ_GFX_WOMAN_1, 0, 3, 11, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_258813, 0
object_event 3, EVENT_OBJ_GFX_CAMPER, 0, 14, 11, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_25881C, 0
object_event 4, EVENT_OBJ_GFX_PICNICKER, 0, 13, 11, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_258825, 0
object_event 5, EVENT_OBJ_GFX_FAT_MAN, 0, 6, 10, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_258830, 0
object_event 6, EVENT_OBJ_GFX_SCIENTIST_1, 0, 14, 7, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_2585DD, 0
BattleFrontier_BattleFactoryLobby_MapWarps: @ 853CA68
warp_def 9, 11, 0, 2, MAP_BATTLE_FRONTIER_OUTSIDE_WEST
warp_def 10, 11, 0, 2, MAP_BATTLE_FRONTIER_OUTSIDE_WEST
BattleFrontier_BattleFactoryLobby_MapBGEvents: @ 853CA78
bg_event 2, 7, 0, 1, 0, BattleFrontier_BattleFactoryLobby_EventScript_2587E1
bg_event 11, 7, 0, 1, 0, BattleFrontier_BattleFactoryLobby_EventScript_2587FA
bg_event 9, 4, 0, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_258839
bg_event 2, 7, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_BattleFactoryLobby_EventScript_2587E1
bg_event 11, 7, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_BattleFactoryLobby_EventScript_2587FA
bg_event 9, 4, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_BattleFactoryLobby_EventScript_258839
BattleFrontier_BattleFactoryLobby_MapEvents:: @ 853CA9C
map_events BattleFrontier_BattleFactoryLobby_EventObjects, BattleFrontier_BattleFactoryLobby_MapWarps, 0x0, BattleFrontier_BattleFactoryLobby_MapBGEvents
data/maps/BattleFrontier_BattleFactoryLobby/header.inc
+4 -4
View File
@@ -5,11 +5,11 @@ BattleFrontier_BattleFactoryLobby: @ 84854A0
.4byte 0x0
.2byte MUS_B_FACTORY
.2byte 346
.byte 58
.byte MAPSEC_BATTLE_FRONTIER
.byte 0
.byte 0
.byte 8
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 0
.byte 0
.byte MAP_BATTLE_SCENE_NORMAL
data/maps/BattleFrontier_BattleFactoryPreBattleRoom/events.inc
+1 -1
View File
@@ -1,5 +1,5 @@
BattleFrontier_BattleFactoryPreBattleRoom_EventObjects: @ 853CAB0
object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 8, 12, 0, 7, 1, 1, 0, 0, 0x0, 0
object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 8, 12, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0
BattleFrontier_BattleFactoryPreBattleRoom_MapEvents:: @ 853CAC8
map_events BattleFrontier_BattleFactoryPreBattleRoom_EventObjects, 0x0, 0x0, 0x0
data/maps/BattleFrontier_BattleFactoryPreBattleRoom/header.inc
+4 -4
View File
@@ -5,11 +5,11 @@ BattleFrontier_BattleFactoryPreBattleRoom: @ 84854BC
.4byte 0x0
.2byte MUS_B_FACTORY
.2byte 347
.byte 58
.byte MAPSEC_BATTLE_FRONTIER
.byte 0
.byte 0
.byte 8
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 0
.byte 0
.byte MAP_BATTLE_SCENE_NORMAL
data/maps/BattleFrontier_BattlePalaceBattleRoom/events.inc
+5 -5
View File
@@ -1,9 +1,9 @@
BattleFrontier_BattlePalaceBattleRoom_EventObjects: @ 853C4FC
object_event 1, EVENT_OBJ_GFX_TRADER, 0, 1, 9, 3, 7, 1, 1, 0, 0, 0x0, 0
object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 13, 1, 3, 8, 1, 1, 0, 0, 0x0, 0
object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 1, 4, 3, 10, 1, 1, 0, 0, 0x0, 0
object_event 4, EVENT_OBJ_GFX_DUSCLOPS, 0, 13, 1, 3, 8, 1, 1, 0, 0, 0x0, 0
object_event 5, EVENT_OBJ_GFX_AZURILL, 0, 13, 1, 3, 8, 1, 1, 0, 0, 0x0, 0
object_event 1, EVENT_OBJ_GFX_TRADER, 0, 1, 9, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0
object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 13, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, 0x0, 0
object_event 4, EVENT_OBJ_GFX_DUSCLOPS, 0, 13, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
object_event 5, EVENT_OBJ_GFX_AZURILL, 0, 13, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
BattleFrontier_BattlePalaceBattleRoom_MapWarps: @ 853C574
warp_def 0, 9, 3, 2, MAP_BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR
data/maps/BattleFrontier_BattlePalaceBattleRoom/header.inc
+4 -4
View File
@@ -5,11 +5,11 @@ BattleFrontier_BattlePalaceBattleRoom: @ 84853DC
.4byte 0x0
.2byte MUS_B_PALACE
.2byte 344
.byte 58
.byte MAPSEC_BATTLE_FRONTIER
.byte 0
.byte 0
.byte 8
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 0
.byte 0
.byte MAP_BATTLE_SCENE_NORMAL
data/maps/BattleFrontier_BattlePalaceCorridor/events.inc
+7 -7
View File
@@ -1,11 +1,11 @@
BattleFrontier_BattlePalaceCorridor_EventObjects: @ 853C420
object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 8, 12, 3, 7, 1, 1, 0, 0, 0x0, 0
object_event 2, EVENT_OBJ_GFX_AZURILL, 0, 3, 5, 0, 2, 1, 0, 0, 0, 0x0, 0
object_event 3, EVENT_OBJ_GFX_KIRLIA, 0, 12, 6, 0, 14, 0, 2, 0, 0, 0x0, 0
object_event 4, EVENT_OBJ_GFX_PIKACHU, 0, 15, 5, 0, 1, 1, 1, 0, 0, 0x0, 0
object_event 5, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 4, 9, 0, 14, 0, 2, 0, 0, 0x0, 0
object_event 6, EVENT_OBJ_GFX_AZUMARILL, 0, 13, 9, 0, 1, 0, 1, 0, 0, 0x0, 0
object_event 7, EVENT_OBJ_GFX_WINGULL, 0, 3, 10, 0, 2, 1, 2, 0, 0, 0x0, 0
object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 8, 12, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0
object_event 2, EVENT_OBJ_GFX_AZURILL, 0, 3, 5, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 0, 0, 0, 0x0, 0
object_event 3, EVENT_OBJ_GFX_KIRLIA, 0, 12, 6, 0, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 0, 2, 0, 0, 0x0, 0
object_event 4, EVENT_OBJ_GFX_PIKACHU, 0, 15, 5, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0
object_event 5, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 4, 9, 0, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 0, 2, 0, 0, 0x0, 0
object_event 6, EVENT_OBJ_GFX_AZUMARILL, 0, 13, 9, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 1, 0, 0, 0x0, 0
object_event 7, EVENT_OBJ_GFX_WINGULL, 0, 3, 10, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 2, 0, 0, 0x0, 0
BattleFrontier_BattlePalaceCorridor_MapWarps: @ 853C4C8
warp_def 8, 13, 3, 2, MAP_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY
data/maps/BattleFrontier_BattlePalaceCorridor/header.inc
+4 -4
View File
@@ -5,11 +5,11 @@ BattleFrontier_BattlePalaceCorridor: @ 84853C0
.4byte 0x0
.2byte MUS_B_PALACE
.2byte 343
.byte 58
.byte MAPSEC_BATTLE_FRONTIER
.byte 0
.byte 0
.byte 8
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 0
.byte 0
.byte MAP_BATTLE_SCENE_NORMAL
data/maps/BattleFrontier_BattlePalaceLobby/events.inc
+9 -9
View File
@@ -1,10 +1,10 @@
BattleFrontier_BattlePalaceLobby_EventObjects: @ 853C340
object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 5, 6, 0, 8, 1, 1, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24D944, 0
object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 11, 8, 0, 2, 1, 1, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC82, 0
object_event 3, EVENT_OBJ_GFX_MANIAC, 0, 24, 5, 0, 8, 1, 1, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC9D, 0
object_event 4, EVENT_OBJ_GFX_MAN_4, 0, 18, 10, 0, 2, 1, 1, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC8B, 0
object_event 5, EVENT_OBJ_GFX_BEAUTY, 0, 2, 10, 0, 2, 1, 1, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC94, 0
object_event 6, EVENT_OBJ_GFX_OLD_MAN_1, 0, 19, 6, 0, 8, 1, 1, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24D956, 0
object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 5, 6, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24D944, 0
object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 11, 8, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC82, 0
object_event 3, EVENT_OBJ_GFX_MANIAC, 0, 24, 5, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC9D, 0
object_event 4, EVENT_OBJ_GFX_MAN_4, 0, 18, 10, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC8B, 0
object_event 5, EVENT_OBJ_GFX_BEAUTY, 0, 2, 10, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC94, 0
object_event 6, EVENT_OBJ_GFX_OLD_MAN_1, 0, 19, 6, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24D956, 0
BattleFrontier_BattlePalaceLobby_MapWarps: @ 853C3D0
warp_def 12, 11, 0, 2, MAP_BATTLE_FRONTIER_OUTSIDE_EAST
@@ -12,9 +12,9 @@ BattleFrontier_BattlePalaceLobby_MapWarps: @ 853C3D0
warp_def 5, 4, 3, 0, MAP_BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR
BattleFrontier_BattlePalaceLobby_MapBGEvents: @ 853C3E8
bg_event 2, 7, 0, 1, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC50
bg_event 16, 7, 0, 1, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC69
bg_event 10, 4, 0, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DCA6
bg_event 2, 7, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_BattlePalaceLobby_EventScript_24DC50
bg_event 16, 7, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_BattlePalaceLobby_EventScript_24DC69
bg_event 10, 4, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_BattlePalaceLobby_EventScript_24DCA6
BattleFrontier_BattlePalaceLobby_MapEvents:: @ 853C40C
map_events BattleFrontier_BattlePalaceLobby_EventObjects, BattleFrontier_BattlePalaceLobby_MapWarps, 0x0, BattleFrontier_BattlePalaceLobby_MapBGEvents
data/maps/BattleFrontier_BattlePalaceLobby/header.inc
+4 -4
View File
@@ -5,11 +5,11 @@ BattleFrontier_BattlePalaceLobby: @ 84853A4
.4byte 0x0
.2byte MUS_B_PALACE
.2byte 342
.byte 58
.byte MAPSEC_BATTLE_FRONTIER
.byte 0
.byte 0
.byte 8
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 0
.byte 0
.byte MAP_BATTLE_SCENE_NORMAL
data/maps/BattleFrontier_BattlePikeCorridor/events.inc
+1 -1
View File
@@ -1,5 +1,5 @@
BattleFrontier_BattlePikeCorridor_EventObjects: @ 853CC54
object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 6, 6, 3, 8, 1, 1, 0, 0, 0x0, 0
object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 6, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
BattleFrontier_BattlePikeCorridor_MapEvents:: @ 853CC6C
map_events BattleFrontier_BattlePikeCorridor_EventObjects, 0x0, 0x0, 0x0
data/maps/BattleFrontier_BattlePikeCorridor/header.inc
+4 -4
View File
@@ -5,11 +5,11 @@ BattleFrontier_BattlePikeCorridor: @ 8485510
.4byte 0x0
.2byte MUS_B_TUBE
.2byte 350
.byte 58
.byte MAPSEC_BATTLE_FRONTIER
.byte 0
.byte 0
.byte 8
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 4
.byte 0
.byte MAP_BATTLE_SCENE_NORMAL

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