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

Merge with master

Browse Source
This commit is contained in:
DizzyEggg
2018-07-16 20:23:05 +02:00
parent ee3d505b58 07ef762770
commit ea5ffa3375
1044 changed files with 7296 additions and 7064 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/easy_chat.s
+1 -1
View File
@@ -5988,7 +5988,7 @@ sub_811D0BC: @ 811D0BC
movs r0, 0x1 movs r0, 0x1
movs r1, 0x1 movs r1, 0x1
movs r2, 0xE0 movs r2, 0xE0
bl LoadSav2WindowGfx bl LoadUserWindowBorderGfx
movs r0, 0x1 movs r0, 0x1
movs r1, 0x1 movs r1, 0x1
movs r2, 0xE movs r2, 0xE
asm/field_specials.s
+2 -2
View File
@@ -912,7 +912,7 @@ _0813839C:
adds r0, r5, 0 adds r0, r5, 0
adds r2, r4, 0 adds r2, r4, 0
mov r3, r12 mov r3, r12
bl SpawnSpecialEventObjectParametrized bl SpawnSpecialEventObjectParameterized
adds r0, r5, 0 adds r0, r5, 0
adds r1, r4, 0 adds r1, r4, 0
adds r2, r6, 0 adds r2, r6, 0
@@ -2557,7 +2557,7 @@ SpawnScriptEventObject: @ 8139158
movs r0, 0x7 movs r0, 0x7
movs r1, 0x8 movs r1, 0x8
movs r2, 0x7F movs r2, 0x7F
bl SpawnSpecialEventObjectParametrized bl SpawnSpecialEventObjectParameterized
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
ldr r2, =gEventObjects ldr r2, =gEventObjects
asm/learn_move.s
+1 -1
View File
@@ -1270,7 +1270,7 @@ _081611D4:
ldrb r0, [r0] ldrb r0, [r0]
cmp r0, 0xFF cmp r0, 0xFF
bne _08161210 bne _08161210
ldr r0, =gUnknown_0203CE8C ldr r0, =gTempScrollArrowTemplate
adds r2, r0, 0 adds r2, r0, 0
ldr r1, =gUnknown_085CEBD0 ldr r1, =gUnknown_085CEBD0
ldm r1!, {r3,r5,r6} ldm r1!, {r3,r5,r6}
asm/link_rfu.s
+1 -1
View File
@@ -856,7 +856,7 @@ sub_8011AFC: @ 8011AFC
bl ResetPaletteFade bl ResetPaletteFade
ldr r0, =sub_8011AE8 ldr r0, =sub_8011AE8
bl SetVBlankCallback bl SetVBlankCallback
bl sub_80093CC bl IsWirelessAdapterConnected
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _08011B70 beq _08011B70
asm/macros/map.inc
+23 -6
View File
@@ -34,18 +34,27 @@
inc _num_warps inc _num_warps
.endm .endm
.macro coord_event x, y, byte1, byte2, word1, word2, word3, script .macro coord_event x, y, elevation, trigger, index, script
.2byte \x, \y .2byte \x, \y
.byte \byte1, \byte2 .byte \elevation, 0
.2byte \word1, \word2, \word3 .2byte \trigger, \index, 0
.4byte \script .4byte \script
inc _num_traps inc _num_traps
.endm .endm
.macro bg_event x, y, byte, kind, word, arg6, arg7, arg8 .macro coord_weather_event x, y, elevation, weather
.2byte \x, \y .2byte \x, \y
.byte \byte, \kind .byte \elevation, 0
.2byte \word .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 .if \kind < 5
.4byte \arg6 .4byte \arg6
.else .else
@@ -55,6 +64,14 @@
inc _num_signs inc _num_signs
.endm .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 .macro map_events npcs, warps, traps, signs
.byte _num_npcs, _num_warps, _num_traps, _num_signs .byte _num_npcs, _num_warps, _num_traps, _num_signs
.4byte \npcs, \warps, \traps, \signs .4byte \npcs, \warps, \traps, \signs
asm/party_menu.s
+1 -1
View File
@@ -4396,7 +4396,7 @@ _081B23E8:
movs r0, 0 movs r0, 0
movs r1, 0x4F movs r1, 0x4F
movs r2, 0xD0 movs r2, 0xD0
bl LoadSav2WindowGfx bl LoadUserWindowBorderGfx
bl GetOverworldTextboxPalettePtr bl GetOverworldTextboxPalettePtr
movs r1, 0xE0 movs r1, 0xE0
movs r2, 0x20 movs r2, 0x20
asm/pokemon_storage_system.s
+2 -2
View File
@@ -1837,7 +1837,7 @@ _080C805E:
movs r0, 0x1 movs r0, 0x1
movs r1, 0xB movs r1, 0xB
movs r2, 0xE0 movs r2, 0xE0
bl LoadSav2WindowGfx bl LoadUserWindowBorderGfx
b _080C8198 b _080C8198
.pool .pool
_080C808C: _080C808C:
@@ -6712,7 +6712,7 @@ sub_80CAC1C: @ 80CAC1C
movs r0, 0x1 movs r0, 0x1
movs r1, 0x2 movs r1, 0x2
movs r2, 0xD0 movs r2, 0xD0
bl LoadSav2WindowGfx bl LoadUserWindowBorderGfx
movs r0, 0x20 movs r0, 0x20
str r0, [sp] str r0, [sp]
movs r0, 0x14 movs r0, 0x14
asm/pokemon_summary_screen.s
+3 -3
View File
@@ -2869,7 +2869,7 @@ sub_81C5674: @ 81C5674
movs r1, 0xAC movs r1, 0xAC
movs r2, 0xC movs r2, 0xC
movs r3, 0x94 movs r3, 0x94
bl AddScrollIndicatorArrowPairParametrized bl AddScrollIndicatorArrowPairParameterized
ldr r1, [r4] ldr r1, [r4]
ldr r2, =0x00000816 ldr r2, =0x00000816
adds r1, r2 adds r1, r2
@@ -4868,7 +4868,7 @@ sub_81C67CC: @ 81C67CC
ldrb r0, [r5] ldrb r0, [r5]
movs r1, 0x10 movs r1, 0x10
movs r2, 0x1 movs r2, 0x1
bl sub_81AF15C bl ListMenuSetUnkIndicatorsStructField
ldr r0, =gSaveBlock2Ptr ldr r0, =gSaveBlock2Ptr
ldr r3, [r0] ldr r3, [r0]
movs r0, 0x2 movs r0, 0x2
@@ -5293,7 +5293,7 @@ sub_81C6BD8: @ 81C6BD8
movs r0, 0 movs r0, 0
movs r1, 0x1 movs r1, 0x1
movs r2, 0xE0 movs r2, 0xE0
bl LoadSav2WindowGfx bl LoadUserWindowBorderGfx
movs r0, 0 movs r0, 0
movs r1, 0xA movs r1, 0xA
movs r2, 0xD0 movs r2, 0xD0
asm/pokenav.s
+4 -4
View File
@@ -10101,7 +10101,7 @@ sub_81CC09C: @ 81CC09C
ldrb r0, [r4, 0x14] ldrb r0, [r4, 0x14]
movs r1, 0x1 movs r1, 0x1
movs r2, 0x40 movs r2, 0x40
bl LoadSav2WindowGfx bl LoadUserWindowBorderGfx
ldrb r0, [r4, 0x14] ldrb r0, [r4, 0x14]
movs r1, 0x1 movs r1, 0x1
movs r2, 0x4 movs r2, 0x4
@@ -11351,7 +11351,7 @@ sub_81CCA1C: @ 81CCA1C
lsrs r0, 24 lsrs r0, 24
movs r1, 0x42 movs r1, 0x42
movs r2, 0x40 movs r2, 0x40
bl LoadSav2WindowGfx_ bl LoadUserWindowBorderGfx_
ldrb r0, [r5, 0x8] ldrb r0, [r5, 0x8]
movs r1, 0x42 movs r1, 0x42
movs r2, 0x4 movs r2, 0x4
@@ -21001,7 +21001,7 @@ sub_81D1E90: @ 81D1E90
movs r1, 0xC8 movs r1, 0xC8
movs r2, 0xC movs r2, 0xC
movs r3, 0x94 movs r3, 0x94
bl AddScrollIndicatorArrowPairParametrized bl AddScrollIndicatorArrowPairParameterized
strb r0, [r4, 0x9] strb r0, [r4, 0x9]
add sp, 0x10 add sp, 0x10
pop {r4} pop {r4}
@@ -22282,7 +22282,7 @@ sub_81D2824: @ 81D2824
movs r0, 0 movs r0, 0
movs r1, 0x1 movs r1, 0x1
movs r2, 0xE0 movs r2, 0xE0
bl LoadSav2WindowGfx bl LoadUserWindowBorderGfx
ldr r0, =gUnknown_0860F074 ldr r0, =gUnknown_0860F074
movs r1, 0xF0 movs r1, 0xF0
movs r2, 0x20 movs r2, 0x20
asm/rom_8011DC0.s
+26 -26
View File
@@ -679,7 +679,7 @@ _08012B3C:
bl sub_8013398 bl sub_8013398
strb r0, [r6, 0x13] strb r0, [r6, 0x13]
ldrb r0, [r6, 0x12] ldrb r0, [r6, 0x12]
bl sub_81AE70C bl RedrawListMenu
b _08012E5C b _08012E5C
.pool .pool
_08012B54: _08012B54:
@@ -837,7 +837,7 @@ _08012C5C:
movs r0, 0 movs r0, 0
strb r0, [r1, 0x1B] strb r0, [r1, 0x1B]
ldrb r0, [r6, 0x12] ldrb r0, [r6, 0x12]
bl sub_81AE70C bl RedrawListMenu
ldrb r0, [r6, 0x13] ldrb r0, [r6, 0x13]
adds r0, 0x1 adds r0, 0x1
strb r0, [r6, 0x13] strb r0, [r6, 0x13]
@@ -908,7 +908,7 @@ _08012D04:
ldr r0, [r6] ldr r0, [r6]
bl sub_8013398 bl sub_8013398
ldrb r0, [r6, 0x12] ldrb r0, [r6, 0x12]
bl sub_81AE70C bl RedrawListMenu
_08012D40: _08012D40:
movs r0, 0x4 movs r0, 0x4
strb r0, [r6, 0xC] strb r0, [r6, 0xC]
@@ -1459,7 +1459,7 @@ _08013228:
movs r0, 0x2 movs r0, 0x2
bl PlaySE bl PlaySE
ldrb r0, [r4, 0x12] ldrb r0, [r4, 0x12]
bl sub_81AE70C bl RedrawListMenu
ldr r0, =gStringVar2 ldr r0, =gStringVar2
ldrb r2, [r4, 0x13] ldrb r2, [r4, 0x13]
lsls r2, 5 lsls r2, 5
@@ -1478,7 +1478,7 @@ _0801325C:
movs r1, 0 movs r1, 0
bl sub_8011A64 bl sub_8011A64
ldrb r0, [r4, 0x12] ldrb r0, [r4, 0x12]
bl sub_81AE70C bl RedrawListMenu
strb r5, [r4, 0xC] strb r5, [r4, 0xC]
movs r0, 0x1 movs r0, 0x1
b _08013272 b _08013272
@@ -2373,7 +2373,7 @@ _08013A70:
strb r0, [r6, 0x8] strb r0, [r6, 0x8]
_08013A72: _08013A72:
ldrb r0, [r6, 0xE] ldrb r0, [r6, 0xE]
bl sub_81AE70C bl RedrawListMenu
b _08013B82 b _08013B82
_08013A7A: _08013A7A:
bl sub_8011A74 bl sub_8011A74
@@ -2542,7 +2542,7 @@ sub_8013BD8: @ 8013BD8
movs r1, 0 movs r1, 0
bl CreateWirelessStatusIndicatorSprite bl CreateWirelessStatusIndicatorSprite
ldrb r0, [r4, 0xE] ldrb r0, [r4, 0xE]
bl sub_81AE70C bl RedrawListMenu
ldr r0, =gStringVar1 ldr r0, =gStringVar1
ldrb r2, [r4, 0xF] ldrb r2, [r4, 0xF]
lsls r2, 5 lsls r2, 5
@@ -4281,7 +4281,7 @@ _08014C34:
bl sub_8013398 bl sub_8013398
strb r0, [r5, 0x13] strb r0, [r5, 0x13]
ldrb r0, [r5, 0x12] ldrb r0, [r5, 0x12]
bl sub_81AE70C bl RedrawListMenu
_08014C42: _08014C42:
movs r0, 0x2 movs r0, 0x2
strb r0, [r5, 0xC] strb r0, [r5, 0xC]
@@ -4326,7 +4326,7 @@ _08014C82:
adds r1, r0 adds r1, r0
strb r4, [r1, 0x1B] strb r4, [r1, 0x1B]
ldrb r0, [r5, 0x12] ldrb r0, [r5, 0x12]
bl sub_81AE70C bl RedrawListMenu
movs r0, 0x5 movs r0, 0x5
strb r0, [r5, 0x19] strb r0, [r5, 0x19]
ldrb r1, [r5, 0x13] ldrb r1, [r5, 0x13]
@@ -4396,7 +4396,7 @@ _08014CF2:
movs r0, 0 movs r0, 0
strb r0, [r1, 0x1B] strb r0, [r1, 0x1B]
ldrb r0, [r5, 0x12] ldrb r0, [r5, 0x12]
bl sub_81AE70C bl RedrawListMenu
ldrb r0, [r5, 0x13] ldrb r0, [r5, 0x13]
adds r0, 0x1 adds r0, 0x1
strb r0, [r5, 0x13] strb r0, [r5, 0x13]
@@ -4441,7 +4441,7 @@ _08014D64:
ldr r0, [r5] ldr r0, [r5]
bl sub_8013398 bl sub_8013398
ldrb r0, [r5, 0x12] ldrb r0, [r5, 0x12]
bl sub_81AE70C bl RedrawListMenu
movs r0, 0x2 movs r0, 0x2
strb r0, [r5, 0xC] strb r0, [r5, 0xC]
_08014DA4: _08014DA4:
@@ -4784,7 +4784,7 @@ _080150B8:
bl PlaySE bl PlaySE
_080150CE: _080150CE:
ldrb r0, [r7, 0xE] ldrb r0, [r7, 0xE]
bl sub_81AE70C bl RedrawListMenu
b _080152A0 b _080152A0
_080150D6: _080150D6:
ldrb r0, [r7, 0xE] ldrb r0, [r7, 0xE]
@@ -4818,7 +4818,7 @@ _080150D6:
movs r1, 0 movs r1, 0
bl CreateWirelessStatusIndicatorSprite bl CreateWirelessStatusIndicatorSprite
ldrb r0, [r7, 0xE] ldrb r0, [r7, 0xE]
bl sub_81AE70C bl RedrawListMenu
ldr r0, =gStringVar1 ldr r0, =gStringVar1
ldrb r2, [r7, 0xF] ldrb r2, [r7, 0xF]
lsls r2, 5 lsls r2, 5
@@ -5152,7 +5152,7 @@ _08015436:
b _08015604 b _08015604
_0801543E: _0801543E:
ldrb r0, [r5, 0xE] ldrb r0, [r5, 0xE]
bl sub_81AE70C bl RedrawListMenu
b _08015604 b _08015604
_08015446: _08015446:
ldrb r0, [r5, 0x13] ldrb r0, [r5, 0x13]
@@ -10972,11 +10972,11 @@ _08018574:
movs r0, 0 movs r0, 0
movs r1, 0xA movs r1, 0xA
movs r2, 0xE0 movs r2, 0xE0
bl LoadSav2WindowGfx bl LoadUserWindowBorderGfx
movs r0, 0 movs r0, 0
movs r1, 0x1 movs r1, 0x1
movs r2, 0xF0 movs r2, 0xF0
bl LoadSav2WindowGfx_ bl LoadUserWindowBorderGfx_
movs r4, 0x20 movs r4, 0x20
str r4, [sp] str r4, [sp]
str r4, [sp, 0x4] str r4, [sp, 0x4]
@@ -15907,11 +15907,11 @@ _0801AD8C:
movs r0, 0 movs r0, 0
movs r1, 0x1 movs r1, 0x1
movs r2, 0xD0 movs r2, 0xD0
bl LoadSav2WindowGfx bl LoadUserWindowBorderGfx
movs r0, 0 movs r0, 0
movs r1, 0x1 movs r1, 0x1
movs r2, 0xD0 movs r2, 0xD0
bl LoadSav2WindowGfx_ bl LoadUserWindowBorderGfx_
bl sub_819789C bl sub_819789C
ldr r0, =sub_801AC40 ldr r0, =sub_801AC40
bl SetVBlankCallback bl SetVBlankCallback
@@ -27081,11 +27081,11 @@ sub_8020740: @ 8020740
movs r0, 0x3 movs r0, 0x3
movs r1, 0x1 movs r1, 0x1
movs r2, 0xD0 movs r2, 0xD0
bl LoadSav2WindowGfx bl LoadUserWindowBorderGfx
movs r0, 0x3 movs r0, 0x3
movs r1, 0xA movs r1, 0xA
movs r2, 0x20 movs r2, 0x20
bl LoadSav2WindowGfx_ bl LoadUserWindowBorderGfx_
ldr r0, =gUnknown_0860F074 ldr r0, =gUnknown_0860F074
movs r1, 0xE0 movs r1, 0xE0
movs r2, 0x20 movs r2, 0x20
@@ -30171,7 +30171,7 @@ _0802210C:
ldr r4, =0x0000021d ldr r4, =0x0000021d
adds r1, r4, 0 adds r1, r4, 0
movs r2, 0xD0 movs r2, 0xD0
bl LoadSav2WindowGfx_ bl LoadUserWindowBorderGfx_
ldrb r0, [r5] ldrb r0, [r5]
movs r1, 0 movs r1, 0
adds r2, r4, 0 adds r2, r4, 0
@@ -30370,7 +30370,7 @@ _08022296:
ldr r4, =0x0000021d ldr r4, =0x0000021d
adds r1, r4, 0 adds r1, r4, 0
movs r2, 0xD0 movs r2, 0xD0
bl LoadSav2WindowGfx_ bl LoadUserWindowBorderGfx_
ldrb r0, [r6, 0x2] ldrb r0, [r6, 0x2]
movs r1, 0 movs r1, 0
adds r2, r4, 0 adds r2, r4, 0
@@ -35221,7 +35221,7 @@ sub_80248B0: @ 80248B0
ldr r5, =0x0000021d ldr r5, =0x0000021d
adds r1, r5, 0 adds r1, r5, 0
movs r2, 0xD0 movs r2, 0xD0
bl LoadSav2WindowGfx_ bl LoadUserWindowBorderGfx_
ldrb r4, [r4] ldrb r4, [r4]
bl sub_80247BC bl sub_80247BC
adds r3, r0, 0 adds r3, r0, 0
@@ -41645,7 +41645,7 @@ sub_8027BEC: @ 8027BEC
adds r0, r7, 0 adds r0, r7, 0
adds r1, r4, 0 adds r1, r4, 0
movs r2, 0xD0 movs r2, 0xD0
bl LoadSav2WindowGfx_ bl LoadUserWindowBorderGfx_
adds r0, r7, 0 adds r0, r7, 0
adds r1, r4, 0 adds r1, r4, 0
movs r2, 0xD movs r2, 0xD
@@ -44214,7 +44214,7 @@ sub_802902C: @ 802902C
movs r0, 0 movs r0, 0
movs r1, 0xA movs r1, 0xA
movs r2, 0xB0 movs r2, 0xB0
bl LoadSav2WindowGfx_ bl LoadUserWindowBorderGfx_
pop {r0} pop {r0}
bx r0 bx r0
thumb_func_end sub_802902C thumb_func_end sub_802902C
@@ -54638,7 +54638,7 @@ sub_802E500: @ 802E500
adds r0, r4, 0 adds r0, r4, 0
adds r1, r5, 0 adds r1, r5, 0
movs r2, 0xD0 movs r2, 0xD0
bl LoadSav2WindowGfx_ bl LoadUserWindowBorderGfx_
adds r0, r4, 0 adds r0, r4, 0
adds r1, r5, 0 adds r1, r5, 0
movs r2, 0xD movs r2, 0xD
asm/shop.s
+2 -2
View File
@@ -877,7 +877,7 @@ BuyMenuAddScrollIndicatorArrows: @ 80E01C8
movs r1, 0xAC movs r1, 0xAC
movs r2, 0xC movs r2, 0xC
movs r3, 0x94 movs r3, 0x94
bl AddScrollIndicatorArrowPairParametrized bl AddScrollIndicatorArrowPairParameterized
ldr r1, [r5] ldr r1, [r5]
adds r1, r4 adds r1, r4
strb r0, [r1] strb r0, [r1]
@@ -1157,7 +1157,7 @@ BuyMenuInitWindows: @ 80E0468
movs r0, 0 movs r0, 0
movs r1, 0x1 movs r1, 0x1
movs r2, 0xD0 movs r2, 0xD0
bl LoadSav2WindowGfx bl LoadUserWindowBorderGfx
movs r0, 0 movs r0, 0
movs r1, 0xA movs r1, 0xA
movs r2, 0xE0 movs r2, 0xE0
asm/slot_machine.s
+1 -1
View File
@@ -639,7 +639,7 @@ sub_812AA48: @ 812AA48
lsls r1, 2 lsls r1, 2
movs r0, 0 movs r0, 0
movs r2, 0xE0 movs r2, 0xE0
bl LoadSav2WindowGfx bl LoadUserWindowBorderGfx
movs r0, 0 movs r0, 0
bl PutWindowTilemap bl PutWindowTilemap
pop {r0} pop {r0}
asm/trade.s
+2 -2
View File
@@ -241,11 +241,11 @@ _08077310:
movs r0, 0 movs r0, 0
movs r1, 0x14 movs r1, 0x14
movs r2, 0xC0 movs r2, 0xC0
bl LoadSav2WindowGfx_ bl LoadUserWindowBorderGfx_
movs r0, 0x2 movs r0, 0x2
movs r1, 0x1 movs r1, 0x1
movs r2, 0xE0 movs r2, 0xE0
bl LoadSav2WindowGfx bl LoadUserWindowBorderGfx
bl LoadMonIconPalettes bl LoadMonIconPalettes
ldr r2, =gUnknown_0203229C ldr r2, =gUnknown_0203229C
ldr r0, [r2] ldr r0, [r2]
common_syms/list_menu.txt
+1 -1
View File
@@ -1,2 +1,2 @@
gUnknown_03006300 gListMenuOverride
gMultiuseListMenuTemplate gMultiuseListMenuTemplate
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/event_objects.h"
#include "constants/flags.h" #include "constants/flags.h"
#include "constants/items.h" #include "constants/items.h"
#include "constants/maps.h" #include "constants/maps.h"
#include "constants/secret_bases.h"
#include "constants/vars.h" #include "constants/vars.h"
#include "constants/weather.h"
.include "asm/macros.inc" .include "asm/macros.inc"
.include "constants/constants.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/maps.h"
#include "constants/weather.h"
#include "constants/region_map_sections.h"
#include "constants/songs.h" #include "constants/songs.h"
#include "constants/weather.h"
.include "asm/macros.inc" .include "asm/macros.inc"
.include "constants/constants.inc" .include "constants/constants.inc"
data/maps/AbandonedShip_CaptainsOffice/events.inc
+2 -2
View File
@@ -1,6 +1,6 @@
AbandonedShip_CaptainsOffice_EventObjects: @ 8536A5C 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 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, 1, 1, 1, 0, 0, AbandonedShip_CaptainsOffice_EventScript_29126E, 1100 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 AbandonedShip_CaptainsOffice_MapWarps: @ 8536A8C
warp_def 7, 6, 3, 4, MAP_ABANDONED_SHIP_DECK 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 .4byte 0x0
.2byte MUS_DAN02 .2byte MUS_DAN02
.2byte 195 .2byte 195
.byte 61 .byte MAPSEC_ABANDONED_SHIP
.byte 0 .byte 0
.byte 11 .byte WEATHER_SHADE
.byte 4 .byte MAP_TYPE_UNDERGROUND
.2byte 0 .2byte 0
.byte 15 .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 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 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, 45, 4, 7, 1, 3, AbandonedShip_Corridors_1F_EventScript_2379AE, 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 AbandonedShip_Corridors_1F_MapWarps: @ 85366F0
warp_def 9, 11, 3, 2, MAP_ABANDONED_SHIP_DECK 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 .4byte 0x0
.2byte MUS_DAN02 .2byte MUS_DAN02
.2byte 187 .2byte 187
.byte 61 .byte MAPSEC_ABANDONED_SHIP
.byte 0 .byte 0
.byte 11 .byte WEATHER_SHADE
.byte 4 .byte MAP_TYPE_UNDERGROUND
.2byte 0 .2byte 0
.byte 15 .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 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 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, 14, 0, 0, 1, 4, AbandonedShip_Corridors_B1F_EventScript_237E13, 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 AbandonedShip_Corridors_B1F_MapWarps: @ 8536838
warp_def 6, 4, 3, 2, MAP_ABANDONED_SHIP_ROOMS2_B1F 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 warp_def 8, 2, 3, 9, MAP_ABANDONED_SHIP_CORRIDORS_1F
AbandonedShip_Corridors_B1F_MapBGEvents: @ 8536878 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 AbandonedShip_Corridors_B1F_MapEvents:: @ 8536884
map_events AbandonedShip_Corridors_B1F_EventObjects, AbandonedShip_Corridors_B1F_MapWarps, 0x0, AbandonedShip_Corridors_B1F_MapBGEvents 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 .4byte 0x0
.2byte MUS_DAN02 .2byte MUS_DAN02
.2byte 189 .2byte 189
.byte 61 .byte MAPSEC_ABANDONED_SHIP
.byte 0 .byte 0
.byte 11 .byte WEATHER_SHADE
.byte 4 .byte MAP_TYPE_UNDERGROUND
.2byte 0 .2byte 0
.byte 15 .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 .4byte 0x0
.2byte MUS_DAN02 .2byte MUS_DAN02
.2byte 186 .2byte 186
.byte 61 .byte MAPSEC_ABANDONED_SHIP
.byte 0 .byte 0
.byte 0 .byte WEATHER_NONE
.byte 4 .byte MAP_TYPE_UNDERGROUND
.2byte 0 .2byte 0
.byte 15 .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 warp_def 9, 3, 3, 8, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS
AbandonedShip_HiddenFloorCorridors_MapBGEvents: @ 8536AFC AbandonedShip_HiddenFloorCorridors_MapBGEvents: @ 8536AFC
bg_event 3, 8, 3, 0, 0, AbandonedShip_HiddenFloorCorridors_EventScript_238A19 bg_event 3, 8, 3, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorCorridors_EventScript_238A19
bg_event 6, 8, 3, 0, 0, AbandonedShip_HiddenFloorCorridors_EventScript_238A50 bg_event 6, 8, 3, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorCorridors_EventScript_238A50
bg_event 3, 4, 0, 0, 0, AbandonedShip_HiddenFloorCorridors_EventScript_238A87 bg_event 3, 4, 0, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorCorridors_EventScript_238A87
bg_event 9, 4, 0, 0, 0, AbandonedShip_HiddenFloorCorridors_EventScript_238ABE bg_event 9, 4, 0, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorCorridors_EventScript_238ABE
AbandonedShip_HiddenFloorCorridors_MapEvents:: @ 8536B2C AbandonedShip_HiddenFloorCorridors_MapEvents:: @ 8536B2C
map_events 0x0, AbandonedShip_HiddenFloorCorridors_MapWarps, 0x0, AbandonedShip_HiddenFloorCorridors_MapBGEvents 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 .4byte 0x0
.2byte MUS_DAN02 .2byte MUS_DAN02
.2byte 289 .2byte 289
.byte 61 .byte MAPSEC_ABANDONED_SHIP
.byte 0 .byte 0
.byte 11 .byte WEATHER_SHADE
.byte 4 .byte MAP_TYPE_UNDERGROUND
.2byte 0 .2byte 0
.byte 15 .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 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 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, 1, 0, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_291288, 1078 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, 1, 1, 1, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_2912A2, 1102 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, 1, 1, 1, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_291295, 1101 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 AbandonedShip_HiddenFloorRooms_MapWarps: @ 8536BA0
warp_def 6, 14, 3, 0, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS 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 warp_def 36, 1, 3, 5, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS
AbandonedShip_HiddenFloorRooms_MapBGEvents: @ 8536BE8 AbandonedShip_HiddenFloorRooms_MapBGEvents: @ 8536BE8
bg_event 42, 10, 3, 7, 0, ITEM_ROOM_1_KEY, 31, 0 bg_hidden_item_event 42, 10, 3, ITEM_ROOM_1_KEY, 31
bg_event 20, 5, 3, 7, 0, ITEM_ROOM_2_KEY, 32, 0 bg_hidden_item_event 20, 5, 3, ITEM_ROOM_2_KEY, 32
bg_event 1, 12, 3, 7, 0, ITEM_ROOM_4_KEY, 33, 0 bg_hidden_item_event 1, 12, 3, ITEM_ROOM_4_KEY, 33
bg_event 1, 2, 0, 7, 0, ITEM_ROOM_6_KEY, 34, 0 bg_hidden_item_event 1, 2, 0, ITEM_ROOM_6_KEY, 34
bg_event 8, 5, 3, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_238DF3 bg_event 8, 5, 3, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorRooms_EventScript_238DF3
bg_event 11, 3, 3, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_238DF3 bg_event 11, 3, 3, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorRooms_EventScript_238DF3
bg_event 10, 10, 3, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_238DF3 bg_event 10, 10, 3, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorRooms_EventScript_238DF3
bg_event 16, 3, 3, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_238DF3 bg_event 16, 3, 3, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorRooms_EventScript_238DF3
bg_event 25, 2, 3, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_238DF3 bg_event 25, 2, 3, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorRooms_EventScript_238DF3
bg_event 24, 6, 3, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_238DF3 bg_event 24, 6, 3, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorRooms_EventScript_238DF3
AbandonedShip_HiddenFloorRooms_MapEvents:: @ 8536C60 AbandonedShip_HiddenFloorRooms_MapEvents:: @ 8536C60
map_events AbandonedShip_HiddenFloorRooms_EventObjects, AbandonedShip_HiddenFloorRooms_MapWarps, 0x0, AbandonedShip_HiddenFloorRooms_MapBGEvents 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 .4byte 0x0
.2byte MUS_DAN02 .2byte MUS_DAN02
.2byte 310 .2byte 310
.byte 61 .byte MAPSEC_ABANDONED_SHIP
.byte 0 .byte 0
.byte 11 .byte WEATHER_SHADE
.byte 4 .byte MAP_TYPE_UNDERGROUND
.2byte 0 .2byte 0
.byte 7 .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 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 AbandonedShip_Room_B1F_MapWarps: @ 8536994
warp_def 4, 7, 3, 5, MAP_ABANDONED_SHIP_CORRIDORS_B1F 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 .4byte 0x0
.2byte MUS_DAN02 .2byte MUS_DAN02
.2byte 193 .2byte 193
.byte 61 .byte MAPSEC_ABANDONED_SHIP
.byte 0 .byte 0
.byte 11 .byte WEATHER_SHADE
.byte 4 .byte MAP_TYPE_UNDERGROUND
.2byte 0 .2byte 0
.byte 15 .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 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 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, 8, 0, 0, 1, 1, AbandonedShip_Rooms2_1F_EventScript_23810B, 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, 1, 1, 1, 0, 0, AbandonedShip_Rooms2_1F_EventScript_291261, 1099 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, 10, 1, 1, 1, 3, AbandonedShip_Rooms2_1F_EventScript_238186, 0 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, 9, 1, 1, 1, 3, AbandonedShip_Rooms2_1F_EventScript_23816F, 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 AbandonedShip_Rooms2_1F_MapWarps: @ 8536A30
warp_def 4, 16, 3, 8, MAP_ABANDONED_SHIP_CORRIDORS_1F 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 .4byte 0x0
.2byte MUS_DAN02 .2byte MUS_DAN02
.2byte 194 .2byte 194
.byte 61 .byte MAPSEC_ABANDONED_SHIP
.byte 0 .byte 0
.byte 11 .byte WEATHER_SHADE
.byte 4 .byte MAP_TYPE_UNDERGROUND
.2byte 0 .2byte 0
.byte 15 .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 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 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, 1, 1, 1, 0, 0, AbandonedShip_Rooms2_B1F_EventScript_291247, 1097 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 AbandonedShip_Rooms2_B1F_MapWarps: @ 8536924
warp_def 4, 7, 3, 1, MAP_ABANDONED_SHIP_CORRIDORS_B1F 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 .4byte 0x0
.2byte MUS_DAN02 .2byte MUS_DAN02
.2byte 191 .2byte 191
.byte 61 .byte MAPSEC_ABANDONED_SHIP
.byte 0 .byte 0
.byte 11 .byte WEATHER_SHADE
.byte 4 .byte MAP_TYPE_UNDERGROUND
.2byte 0 .2byte 0
.byte 15 .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 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 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, 1, 1, 1, 0, 0, AbandonedShip_Rooms_1F_EventScript_29122D, 1095 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, 8, 1, 1, 1, 4, AbandonedShip_Rooms_1F_EventScript_237AB3, 0 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, 16, 1, 1, 1, 4, AbandonedShip_Rooms_1F_EventScript_237A9C, 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 AbandonedShip_Rooms_1F_MapWarps: @ 85367C4
warp_def 4, 16, 3, 4, MAP_ABANDONED_SHIP_CORRIDORS_1F 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 .4byte 0x0
.2byte MUS_DAN02 .2byte MUS_DAN02
.2byte 188 .2byte 188
.byte 61 .byte MAPSEC_ABANDONED_SHIP
.byte 0 .byte 0
.byte 11 .byte WEATHER_SHADE
.byte 4 .byte MAP_TYPE_UNDERGROUND
.2byte 0 .2byte 0
.byte 15 .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 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 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, 1, 1, 1, 0, 0, AbandonedShip_Rooms_B1F_EventScript_29123A, 1096 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 AbandonedShip_Rooms_B1F_MapWarps: @ 85368C8
warp_def 4, 1, 3, 2, MAP_ABANDONED_SHIP_CORRIDORS_B1F 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 .4byte 0x0
.2byte MUS_DAN02 .2byte MUS_DAN02
.2byte 190 .2byte 190
.byte 61 .byte MAPSEC_ABANDONED_SHIP
.byte 0 .byte 0
.byte 11 .byte WEATHER_SHADE
.byte 4 .byte MAP_TYPE_UNDERGROUND
.2byte 0 .2byte 0
.byte 15 .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 .4byte 0x0
.2byte MUS_DEEPDEEP .2byte MUS_DEEPDEEP
.2byte 192 .2byte 192
.byte 61 .byte MAPSEC_ABANDONED_SHIP
.byte 0 .byte 0
.byte 14 .byte WEATHER_BUBBLES
.byte 5 .byte MAP_TYPE_UNDERWATER
.2byte 0 .2byte 0
.byte 13 .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 .4byte 0x0
.2byte MUS_DEEPDEEP .2byte MUS_DEEPDEEP
.2byte 196 .2byte 196
.byte 61 .byte MAPSEC_ABANDONED_SHIP
.byte 0 .byte 0
.byte 14 .byte WEATHER_BUBBLES
.byte 5 .byte MAP_TYPE_UNDERWATER
.2byte 0 .2byte 0
.byte 13 .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 .4byte 0x0
.2byte MUS_RG_NANADUNGEON .2byte MUS_RG_NANADUNGEON
.2byte 420 .2byte 420
.byte 210 .byte MAPSEC_ALTERING_CAVE_2
.byte 0 .byte 0
.byte 0 .byte WEATHER_NONE
.byte 4 .byte MAP_TYPE_UNDERGROUND
.2byte 0 .2byte 0
.byte 15 .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 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 AncientTomb_MapWarps: @ 8536CF4
warp_def 8, 29, 3, 0, MAP_ROUTE120 warp_def 8, 29, 3, 0, MAP_ROUTE120
@@ -7,9 +7,9 @@ AncientTomb_MapWarps: @ 8536CF4
warp_def 8, 11, 3, 1, MAP_ANCIENT_TOMB warp_def 8, 11, 3, 1, MAP_ANCIENT_TOMB
AncientTomb_MapBGEvents: @ 8536D0C AncientTomb_MapBGEvents: @ 8536D0C
bg_event 8, 20, 0, 0, 0, AncientTomb_EventScript_239033 bg_event 8, 20, 0, BG_EVENT_PLAYER_FACING_ANY, AncientTomb_EventScript_239033
bg_event 7, 20, 0, 0, 0, AncientTomb_EventScript_239050 bg_event 7, 20, 0, BG_EVENT_PLAYER_FACING_ANY, AncientTomb_EventScript_239050
bg_event 9, 20, 0, 0, 0, AncientTomb_EventScript_239050 bg_event 9, 20, 0, BG_EVENT_PLAYER_FACING_ANY, AncientTomb_EventScript_239050
AncientTomb_MapEvents:: @ 8536D30 AncientTomb_MapEvents:: @ 8536D30
map_events AncientTomb_EventObjects, AncientTomb_MapWarps, 0x0, AncientTomb_MapBGEvents 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 .4byte 0x0
.2byte MUS_MABOROSI .2byte MUS_MABOROSI
.2byte 281 .2byte 281
.byte 83 .byte MAPSEC_ANCIENT_TOMB
.byte 0 .byte 0
.byte 0 .byte WEATHER_NONE
.byte 4 .byte MAP_TYPE_UNDERGROUND
.2byte 0 .2byte 0
.byte 15 .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 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 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, 8, 0, 0, 0, 0, AquaHideout_1F_EventScript_2334C6, 822 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, 50, 13, 5, 1, 3, AquaHideout_1F_EventScript_2334F8, 924 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 AquaHideout_1F_MapWarps: @ 853534C
warp_def 13, 27, 1, 6, MAP_LILYCOVE_CITY 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 .4byte 0x0
.2byte MUS_AJITO .2byte MUS_AJITO
.2byte 143 .2byte 143
.byte 197 .byte MAPSEC_AQUA_HIDEOUT
.byte 0 .byte 0
.byte 0 .byte WEATHER_NONE
.byte 8 .byte MAP_TYPE_INDOOR
.2byte 0 .2byte 0
.byte 8 .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 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 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, 9, 0, 0, 1, 5, AquaHideout_B1F_EventScript_233AB0, 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, 1, 0, 0, 0, 0, AquaHideout_B1F_EventScript_291372, 1071 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, 23, 4, 0, 1, 4, AquaHideout_B1F_EventScript_233AD5, 924 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, 1, 1, 1, 0, 0, AquaHideout_B1F_EventScript_291358, 1124 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, 1, 1, 1, 0, 0, AquaHideout_B1F_EventScript_2339EB, 977 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, 1, 1, 1, 0, 0, AquaHideout_B1F_EventScript_291365, 1132 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, 1, 1, 1, 0, 0, AquaHideout_B1F_EventScript_233A38, 978 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, 7, 1, 1, 1, 4, AquaHideout_B1F_EventScript_233AEC, 924 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 AquaHideout_B1F_MapWarps: @ 8535450
warp_def 29, 1, 3, 2, MAP_AQUA_HIDEOUT_1F 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 .4byte 0x0
.2byte MUS_AJITO .2byte MUS_AJITO
.2byte 144 .2byte 144
.byte 197 .byte MAPSEC_AQUA_HIDEOUT
.byte 0 .byte 0
.byte 0 .byte WEATHER_NONE
.byte 8 .byte MAP_TYPE_INDOOR
.2byte 0 .2byte 0
.byte 8 .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 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 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, 45, 4, 3, 1, 3, AquaHideout_B2F_EventScript_233E8A, 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, 1, 0, 0, 0, 0, AquaHideout_B2F_EventScript_29137F, 1072 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, 9, 0, 0, 0, 0, 0x0, 943 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, 10, 1, 1, 1, 5, AquaHideout_B2F_EventScript_233EAF, 924 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, 9, 1, 1, 1, 5, AquaHideout_B2F_EventScript_233EC6, 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 AquaHideout_B2F_MapWarps: @ 85355BC
warp_def 18, 1, 3, 1, MAP_AQUA_HIDEOUT_B1F 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 warp_def 32, 20, 3, 4, MAP_AQUA_HIDEOUT_B1F
AquaHideout_B2F_MapCoordEvents: @ 853560C AquaHideout_B2F_MapCoordEvents: @ 853560C
coord_event 28, 17, 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, 0, VAR_TEMP_1, 0, 0, AquaHideout_B2F_EventScript_233DE5 coord_event 28, 16, 3, VAR_TEMP_1, 0, AquaHideout_B2F_EventScript_233DE5
AquaHideout_B2F_MapEvents:: @ 853562C AquaHideout_B2F_MapEvents:: @ 853562C
map_events AquaHideout_B2F_EventObjects, AquaHideout_B2F_MapWarps, AquaHideout_B2F_MapCoordEvents, 0x0 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 .4byte 0x0
.2byte MUS_AJITO .2byte MUS_AJITO
.2byte 145 .2byte 145
.byte 197 .byte MAPSEC_AQUA_HIDEOUT
.byte 0 .byte 0
.byte 0 .byte WEATHER_NONE
.byte 8 .byte MAP_TYPE_INDOOR
.2byte 0 .2byte 0
.byte 8 .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 .4byte 0x0
.2byte MUS_AJITO .2byte MUS_AJITO
.2byte 316 .2byte 316
.byte 197 .byte MAPSEC_AQUA_HIDEOUT
.byte 0 .byte 0
.byte 0 .byte WEATHER_NONE
.byte 4 .byte MAP_TYPE_UNDERGROUND
.2byte 0 .2byte 0
.byte 15 .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 .4byte 0x0
.2byte MUS_AJITO .2byte MUS_AJITO
.2byte 317 .2byte 317
.byte 197 .byte MAPSEC_AQUA_HIDEOUT
.byte 0 .byte 0
.byte 0 .byte WEATHER_NONE
.byte 4 .byte MAP_TYPE_UNDERGROUND
.2byte 0 .2byte 0
.byte 15 .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 .4byte 0x0
.2byte MUS_AJITO .2byte MUS_AJITO
.2byte 318 .2byte 318
.byte 197 .byte MAPSEC_AQUA_HIDEOUT
.byte 0 .byte 0
.byte 0 .byte WEATHER_NONE
.byte 4 .byte MAP_TYPE_UNDERGROUND
.2byte 0 .2byte 0
.byte 15 .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 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 ArtisanCave_1F_MapWarps: @ 853778C
warp_def 10, 17, 0, 13, MAP_BATTLE_FRONTIER_OUTSIDE_EAST 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 .4byte 0x0
.2byte MUS_DAN01 .2byte MUS_DAN01
.2byte 401 .2byte 401
.byte 202 .byte MAPSEC_ARTISAN_CAVE
.byte 0 .byte 0
.byte 0 .byte WEATHER_NONE
.byte 4 .byte MAP_TYPE_UNDERGROUND
.2byte 0 .2byte 0
.byte 15 .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 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 ArtisanCave_B1F_MapWarps: @ 8537720
warp_def 8, 48, 0, 10, MAP_BATTLE_FRONTIER_OUTSIDE_WEST warp_def 8, 48, 0, 10, MAP_BATTLE_FRONTIER_OUTSIDE_WEST
warp_def 38, 5, 0, 1, MAP_ARTISAN_CAVE_1F warp_def 38, 5, 0, 1, MAP_ARTISAN_CAVE_1F
ArtisanCave_B1F_MapBGEvents: @ 8537730 ArtisanCave_B1F_MapBGEvents: @ 8537730
bg_event 32, 29, 0, 7, 0, ITEM_ZINC, 102, 0 bg_hidden_item_event 32, 29, 0, ITEM_ZINC, 102
bg_event 27, 8, 0, 7, 0, ITEM_CALCIUM, 101, 0 bg_hidden_item_event 27, 8, 0, ITEM_CALCIUM, 101
bg_event 7, 5, 0, 7, 0, ITEM_PROTEIN, 103, 0 bg_hidden_item_event 7, 5, 0, ITEM_PROTEIN, 103
bg_event 19, 43, 0, 7, 0, ITEM_IRON, 104, 0 bg_hidden_item_event 19, 43, 0, ITEM_IRON, 104
ArtisanCave_B1F_MapEvents:: @ 8537760 ArtisanCave_B1F_MapEvents:: @ 8537760
map_events ArtisanCave_B1F_EventObjects, ArtisanCave_B1F_MapWarps, 0x0, ArtisanCave_B1F_MapBGEvents 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 .4byte 0x0
.2byte MUS_DAN01 .2byte MUS_DAN01
.2byte 400 .2byte 400
.byte 202 .byte MAPSEC_ARTISAN_CAVE
.byte 0 .byte 0
.byte 0 .byte WEATHER_NONE
.byte 4 .byte MAP_TYPE_UNDERGROUND
.2byte 0 .2byte 0
.byte 15 .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 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 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, 8, 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, 7, 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, 7, 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, 10, 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, 9, 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, 9, 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, 10, 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, 8, 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 BattleFrontier_BattleArenaBattleRoom_MapEvents:: @ 853C9C4
map_events BattleFrontier_BattleArenaBattleRoom_EventObjects, 0x0, 0x0, 0x0 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 .4byte 0x0
.2byte MUS_B_ARENA .2byte MUS_B_ARENA
.2byte 356 .2byte 356
.byte 58 .byte MAPSEC_BATTLE_FRONTIER
.byte 0 .byte 0
.byte 0 .byte WEATHER_NONE
.byte 8 .byte MAP_TYPE_INDOOR
.2byte 0 .2byte 0
.byte 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 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 BattleFrontier_BattleArenaCorridor_MapEvents:: @ 853C8D8
map_events BattleFrontier_BattleArenaCorridor_EventObjects, 0x0, 0x0, 0x0 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 .4byte 0x0
.2byte MUS_B_ARENA .2byte MUS_B_ARENA
.2byte 355 .2byte 355
.byte 58 .byte MAPSEC_BATTLE_FRONTIER
.byte 0 .byte 0
.byte 0 .byte WEATHER_NONE
.byte 8 .byte MAP_TYPE_INDOOR
.2byte 0 .2byte 0
.byte 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 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 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, 2, 1, 1, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_2560C1, 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, 9, 1, 1, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_2560AF, 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, 9, 1, 1, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_2560B8, 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, 9, 1, 1, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_2560A6, 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 BattleFrontier_BattleArenaLobby_MapWarps: @ 853C88C
warp_def 7, 12, 3, 1, MAP_BATTLE_FRONTIER_OUTSIDE_EAST warp_def 7, 12, 3, 1, MAP_BATTLE_FRONTIER_OUTSIDE_EAST
BattleFrontier_BattleArenaLobby_MapBGEvents: @ 853C894 BattleFrontier_BattleArenaLobby_MapBGEvents: @ 853C894
bg_event 5, 9, 3, 1, 0, BattleFrontier_BattleArenaLobby_EventScript_256092 bg_event 5, 9, 3, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_BattleArenaLobby_EventScript_256092
bg_event 1, 7, 0, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_2560CA bg_event 1, 7, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_BattleArenaLobby_EventScript_2560CA
BattleFrontier_BattleArenaLobby_MapEvents:: @ 853C8AC BattleFrontier_BattleArenaLobby_MapEvents:: @ 853C8AC
map_events BattleFrontier_BattleArenaLobby_EventObjects, BattleFrontier_BattleArenaLobby_MapWarps, 0x0, BattleFrontier_BattleArenaLobby_MapBGEvents 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 .4byte 0x0
.2byte MUS_B_ARENA .2byte MUS_B_ARENA
.2byte 354 .2byte 354
.byte 58 .byte MAPSEC_BATTLE_FRONTIER
.byte 0 .byte 0
.byte 0 .byte WEATHER_NONE
.byte 8 .byte MAP_TYPE_INDOOR
.2byte 0 .2byte 0
.byte 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 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 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, 8, 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, 8, 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, 8, 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, 8, 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, 8, 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, 8, 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, 8, 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, 8, 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, 8, 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, 8, 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, 8, 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, 7, 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, 8, 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, 9, 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 BattleFrontier_BattleDomeBattleRoom_MapEvents:: @ 853C32C
map_events BattleFrontier_BattleDomeBattleRoom_EventObjects, 0x0, 0x0, 0x0 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 .4byte 0x0
.2byte MUS_B_DOME .2byte MUS_B_DOME
.2byte 335 .2byte 335
.byte 58 .byte MAPSEC_BATTLE_FRONTIER
.byte 0 .byte 0
.byte 0 .byte WEATHER_NONE
.byte 8 .byte MAP_TYPE_INDOOR
.2byte 0 .2byte 0
.byte 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 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 BattleFrontier_BattleDomeCorridor_MapWarps: @ 853C164
warp_def 6, 8, 3, 1, MAP_BATTLE_FRONTIER_OUTSIDE_WEST 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 .4byte 0x0
.2byte MUS_B_DOME1 .2byte MUS_B_DOME1
.2byte 333 .2byte 333
.byte 58 .byte MAPSEC_BATTLE_FRONTIER
.byte 0 .byte 0
.byte 0 .byte WEATHER_NONE
.byte 8 .byte MAP_TYPE_INDOOR
.2byte 0 .2byte 0
.byte 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 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 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, 2, 1, 1, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249E10, 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, 2, 1, 1, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249DFE, 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, 2, 1, 1, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249E07, 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, 2, 1, 1, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249DED, 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, 8, 1, 1, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249A47, 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 BattleFrontier_BattleDomeLobby_MapWarps: @ 853C0F8
warp_def 11, 16, 0, 1, MAP_BATTLE_FRONTIER_OUTSIDE_WEST warp_def 11, 16, 0, 1, MAP_BATTLE_FRONTIER_OUTSIDE_WEST
warp_def 12, 16, 0, 1, MAP_BATTLE_FRONTIER_OUTSIDE_WEST warp_def 12, 16, 0, 1, MAP_BATTLE_FRONTIER_OUTSIDE_WEST
BattleFrontier_BattleDomeLobby_MapBGEvents: @ 853C108 BattleFrontier_BattleDomeLobby_MapBGEvents: @ 853C108
bg_event 4, 10, 0, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249D52 bg_event 4, 10, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_BattleDomeLobby_EventScript_249D52
bg_event 7, 10, 0, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249D84 bg_event 7, 10, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_BattleDomeLobby_EventScript_249D84
bg_event 18, 10, 0, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249D6B bg_event 18, 10, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_BattleDomeLobby_EventScript_249D6B
bg_event 15, 10, 0, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249E34 bg_event 15, 10, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_BattleDomeLobby_EventScript_249E34
BattleFrontier_BattleDomeLobby_MapEvents:: @ 853C138 BattleFrontier_BattleDomeLobby_MapEvents:: @ 853C138
map_events BattleFrontier_BattleDomeLobby_EventObjects, BattleFrontier_BattleDomeLobby_MapWarps, 0x0, BattleFrontier_BattleDomeLobby_MapBGEvents 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 .4byte 0x0
.2byte MUS_B_DOME1 .2byte MUS_B_DOME1
.2byte 332 .2byte 332
.byte 58 .byte MAPSEC_BATTLE_FRONTIER
.byte 0 .byte 0
.byte 0 .byte WEATHER_NONE
.byte 8 .byte MAP_TYPE_INDOOR
.2byte 0 .2byte 0
.byte 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 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 BattleFrontier_BattleDomePreBattleRoom_MapWarps: @ 853C1A0
warp_def 6, 8, 3, 1, MAP_BATTLE_FRONTIER_OUTSIDE_WEST 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 .4byte 0x0
.2byte MUS_B_DOME .2byte MUS_B_DOME
.2byte 334 .2byte 334
.byte 58 .byte MAPSEC_BATTLE_FRONTIER
.byte 0 .byte 0
.byte 0 .byte WEATHER_NONE
.byte 8 .byte MAP_TYPE_INDOOR
.2byte 0 .2byte 0
.byte 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 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 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, 8, 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, 8, 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, 8, 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, 8, 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, 8, 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, 8, 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, 7, 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 BattleFrontier_BattleFactoryBattleRoom_MapEvents:: @ 853CB9C
map_events BattleFrontier_BattleFactoryBattleRoom_EventObjects, 0x0, 0x0, 0x0 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 .4byte 0x0
.2byte MUS_B_FACTORY .2byte MUS_B_FACTORY
.2byte 348 .2byte 348
.byte 58 .byte MAPSEC_BATTLE_FRONTIER
.byte 0 .byte 0
.byte 0 .byte WEATHER_NONE
.byte 8 .byte MAP_TYPE_INDOOR
.2byte 0 .2byte 0
.byte 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 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 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, 2, 1, 1, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_258813, 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, 8, 0, 0, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_25881C, 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, 10, 1, 1, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_258825, 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, 1, 1, 1, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_258830, 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, 8, 1, 1, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_2585DD, 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 BattleFrontier_BattleFactoryLobby_MapWarps: @ 853CA68
warp_def 9, 11, 0, 2, MAP_BATTLE_FRONTIER_OUTSIDE_WEST warp_def 9, 11, 0, 2, MAP_BATTLE_FRONTIER_OUTSIDE_WEST
warp_def 10, 11, 0, 2, MAP_BATTLE_FRONTIER_OUTSIDE_WEST warp_def 10, 11, 0, 2, MAP_BATTLE_FRONTIER_OUTSIDE_WEST
BattleFrontier_BattleFactoryLobby_MapBGEvents: @ 853CA78 BattleFrontier_BattleFactoryLobby_MapBGEvents: @ 853CA78
bg_event 2, 7, 0, 1, 0, BattleFrontier_BattleFactoryLobby_EventScript_2587E1 bg_event 2, 7, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_BattleFactoryLobby_EventScript_2587E1
bg_event 11, 7, 0, 1, 0, BattleFrontier_BattleFactoryLobby_EventScript_2587FA bg_event 11, 7, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_BattleFactoryLobby_EventScript_2587FA
bg_event 9, 4, 0, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_258839 bg_event 9, 4, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_BattleFactoryLobby_EventScript_258839
BattleFrontier_BattleFactoryLobby_MapEvents:: @ 853CA9C BattleFrontier_BattleFactoryLobby_MapEvents:: @ 853CA9C
map_events BattleFrontier_BattleFactoryLobby_EventObjects, BattleFrontier_BattleFactoryLobby_MapWarps, 0x0, BattleFrontier_BattleFactoryLobby_MapBGEvents 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 .4byte 0x0
.2byte MUS_B_FACTORY .2byte MUS_B_FACTORY
.2byte 346 .2byte 346
.byte 58 .byte MAPSEC_BATTLE_FRONTIER
.byte 0 .byte 0
.byte 0 .byte WEATHER_NONE
.byte 8 .byte MAP_TYPE_INDOOR
.2byte 0 .2byte 0
.byte 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 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 BattleFrontier_BattleFactoryPreBattleRoom_MapEvents:: @ 853CAC8
map_events BattleFrontier_BattleFactoryPreBattleRoom_EventObjects, 0x0, 0x0, 0x0 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 .4byte 0x0
.2byte MUS_B_FACTORY .2byte MUS_B_FACTORY
.2byte 347 .2byte 347
.byte 58 .byte MAPSEC_BATTLE_FRONTIER
.byte 0 .byte 0
.byte 0 .byte WEATHER_NONE
.byte 8 .byte MAP_TYPE_INDOOR
.2byte 0 .2byte 0
.byte 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 BattleFrontier_BattlePalaceBattleRoom_EventObjects: @ 853C4FC
object_event 1, EVENT_OBJ_GFX_TRADER, 0, 1, 9, 3, 7, 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, 8, 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, 10, 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, 8, 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, 8, 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 BattleFrontier_BattlePalaceBattleRoom_MapWarps: @ 853C574
warp_def 0, 9, 3, 2, MAP_BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR 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 .4byte 0x0
.2byte MUS_B_PALACE .2byte MUS_B_PALACE
.2byte 344 .2byte 344
.byte 58 .byte MAPSEC_BATTLE_FRONTIER
.byte 0 .byte 0
.byte 0 .byte WEATHER_NONE
.byte 8 .byte MAP_TYPE_INDOOR
.2byte 0 .2byte 0
.byte 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 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 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, 2, 1, 0, 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, 14, 0, 2, 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, 1, 1, 1, 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, 14, 0, 2, 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, 1, 0, 1, 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, 2, 1, 2, 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 BattleFrontier_BattlePalaceCorridor_MapWarps: @ 853C4C8
warp_def 8, 13, 3, 2, MAP_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY 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 .4byte 0x0
.2byte MUS_B_PALACE .2byte MUS_B_PALACE
.2byte 343 .2byte 343
.byte 58 .byte MAPSEC_BATTLE_FRONTIER
.byte 0 .byte 0
.byte 0 .byte WEATHER_NONE
.byte 8 .byte MAP_TYPE_INDOOR
.2byte 0 .2byte 0
.byte 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 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 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, 2, 1, 1, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC82, 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, 8, 1, 1, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC9D, 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, 2, 1, 1, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC8B, 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, 2, 1, 1, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC94, 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, 8, 1, 1, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24D956, 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 BattleFrontier_BattlePalaceLobby_MapWarps: @ 853C3D0
warp_def 12, 11, 0, 2, MAP_BATTLE_FRONTIER_OUTSIDE_EAST 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 warp_def 5, 4, 3, 0, MAP_BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR
BattleFrontier_BattlePalaceLobby_MapBGEvents: @ 853C3E8 BattleFrontier_BattlePalaceLobby_MapBGEvents: @ 853C3E8
bg_event 2, 7, 0, 1, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC50 bg_event 2, 7, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_BattlePalaceLobby_EventScript_24DC50
bg_event 16, 7, 0, 1, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC69 bg_event 16, 7, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_BattlePalaceLobby_EventScript_24DC69
bg_event 10, 4, 0, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DCA6 bg_event 10, 4, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_BattlePalaceLobby_EventScript_24DCA6
BattleFrontier_BattlePalaceLobby_MapEvents:: @ 853C40C BattleFrontier_BattlePalaceLobby_MapEvents:: @ 853C40C
map_events BattleFrontier_BattlePalaceLobby_EventObjects, BattleFrontier_BattlePalaceLobby_MapWarps, 0x0, BattleFrontier_BattlePalaceLobby_MapBGEvents 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 .4byte 0x0
.2byte MUS_B_PALACE .2byte MUS_B_PALACE
.2byte 342 .2byte 342
.byte 58 .byte MAPSEC_BATTLE_FRONTIER
.byte 0 .byte 0
.byte 0 .byte WEATHER_NONE
.byte 8 .byte MAP_TYPE_INDOOR
.2byte 0 .2byte 0
.byte 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 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 BattleFrontier_BattlePikeCorridor_MapEvents:: @ 853CC6C
map_events BattleFrontier_BattlePikeCorridor_EventObjects, 0x0, 0x0, 0x0 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 .4byte 0x0
.2byte MUS_B_TUBE .2byte MUS_B_TUBE
.2byte 350 .2byte 350
.byte 58 .byte MAPSEC_BATTLE_FRONTIER
.byte 0 .byte 0
.byte 0 .byte WEATHER_NONE
.byte 8 .byte MAP_TYPE_INDOOR
.2byte 0 .2byte 0
.byte 4 .byte 4
.byte 0 .byte MAP_BATTLE_SCENE_NORMAL
data/maps/BattleFrontier_BattlePikeLobby/events.inc
+6 -6
View File
@@ -1,8 +1,8 @@
BattleFrontier_BattlePikeLobby_EventObjects: @ 853CBB0 BattleFrontier_BattlePikeLobby_EventObjects: @ 853CBB0
object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 5, 5, 3, 8, 1, 1, 0, 0, BattleFrontier_BattlePikeLobby_EventScript_25B868, 0 object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 5, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattlePikeLobby_EventScript_25B868, 0
object_event 2, EVENT_OBJ_GFX_HIKER, 0, 10, 9, 3, 7, 1, 1, 0, 0, BattleFrontier_BattlePikeLobby_EventScript_25BAAB, 0 object_event 2, EVENT_OBJ_GFX_HIKER, 0, 10, 9, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, BattleFrontier_BattlePikeLobby_EventScript_25BAAB, 0
object_event 3, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 5, 3, 9, 1, 1, 0, 0, BattleFrontier_BattlePikeLobby_EventScript_25BAB4, 0 object_event 3, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_BattlePikeLobby_EventScript_25BAB4, 0
object_event 4, EVENT_OBJ_GFX_BEAUTY, 0, 8, 9, 3, 2, 1, 1, 0, 0, BattleFrontier_BattlePikeLobby_EventScript_25BABD, 0 object_event 4, EVENT_OBJ_GFX_BEAUTY, 0, 8, 9, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePikeLobby_EventScript_25BABD, 0
BattleFrontier_BattlePikeLobby_MapWarps: @ 853CC10 BattleFrontier_BattlePikeLobby_MapWarps: @ 853CC10
warp_def 5, 12, 0, 0, MAP_BATTLE_FRONTIER_OUTSIDE_WEST warp_def 5, 12, 0, 0, MAP_BATTLE_FRONTIER_OUTSIDE_WEST
@@ -10,8 +10,8 @@ BattleFrontier_BattlePikeLobby_MapWarps: @ 853CC10
warp_def 6, 12, 0, 0, MAP_BATTLE_FRONTIER_OUTSIDE_WEST warp_def 6, 12, 0, 0, MAP_BATTLE_FRONTIER_OUTSIDE_WEST
BattleFrontier_BattlePikeLobby_MapBGEvents: @ 853CC28 BattleFrontier_BattlePikeLobby_MapBGEvents: @ 853CC28
bg_event 8, 3, 0, 0, 0, BattleFrontier_BattlePikeLobby_EventScript_25BA80 bg_event 8, 3, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_BattlePikeLobby_EventScript_25BA80
bg_event 1, 3, 0, 0, 0, BattleFrontier_BattlePikeLobby_EventScript_25BAC6 bg_event 1, 3, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_BattlePikeLobby_EventScript_25BAC6
BattleFrontier_BattlePikeLobby_MapEvents:: @ 853CC40 BattleFrontier_BattlePikeLobby_MapEvents:: @ 853CC40
map_events BattleFrontier_BattlePikeLobby_EventObjects, BattleFrontier_BattlePikeLobby_MapWarps, 0x0, BattleFrontier_BattlePikeLobby_MapBGEvents map_events BattleFrontier_BattlePikeLobby_EventObjects, BattleFrontier_BattlePikeLobby_MapWarps, 0x0, BattleFrontier_BattlePikeLobby_MapBGEvents
data/maps/BattleFrontier_BattlePikeLobby/header.inc
+4 -4
View File
@@ -5,11 +5,11 @@ BattleFrontier_BattlePikeLobby: @ 84854F4
.4byte 0x0 .4byte 0x0
.2byte MUS_B_TUBE .2byte MUS_B_TUBE
.2byte 349 .2byte 349
.byte 58 .byte MAPSEC_BATTLE_FRONTIER
.byte 0 .byte 0
.byte 0 .byte WEATHER_NONE
.byte 8 .byte MAP_TYPE_INDOOR
.2byte 0 .2byte 0
.byte 0 .byte 0
.byte 0 .byte MAP_BATTLE_SCENE_NORMAL
data/maps/BattleFrontier_BattlePikeRandomRoom1/events.inc
+9 -9
View File
@@ -1,15 +1,15 @@
BattleFrontier_BattlePikeRandomRoom1_EventObjects: @ 853CD54 BattleFrontier_BattlePikeRandomRoom1_EventObjects: @ 853CD54
object_event 1, EVENT_OBJ_GFX_HIPSTER, 0, 4, 4, 3, 8, 1, 1, 0, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D7ED, 0 object_event 1, EVENT_OBJ_GFX_HIPSTER, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D7ED, 0
object_event 2, EVENT_OBJ_GFX_TRADER, 0, 3, 4, 3, 8, 1, 1, 0, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D88D, 0 object_event 2, EVENT_OBJ_GFX_TRADER, 0, 3, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D88D, 0
BattleFrontier_BattlePikeRandomRoom1_MapCoordEvents: @ 853CD84 BattleFrontier_BattlePikeRandomRoom1_MapCoordEvents: @ 853CD84
coord_event 4, 3, 3, 0, VAR_TEMP_1, 0, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C40A2 coord_event 4, 3, 3, VAR_TEMP_1, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C40A2
coord_event 3, 6, 3, 0, VAR_TEMP_2, 0, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4082 coord_event 3, 6, 3, VAR_TEMP_2, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4082
coord_event 3, 7, 3, 0, VAR_TEMP_3, 1, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C408D coord_event 3, 7, 3, VAR_TEMP_3, 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C408D
coord_event 4, 6, 3, 0, VAR_TEMP_2, 0, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4082 coord_event 4, 6, 3, VAR_TEMP_2, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4082
coord_event 5, 6, 3, 0, VAR_TEMP_2, 0, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4082 coord_event 5, 6, 3, VAR_TEMP_2, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4082
coord_event 4, 7, 3, 0, VAR_TEMP_3, 1, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C408D coord_event 4, 7, 3, VAR_TEMP_3, 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C408D
coord_event 5, 7, 3, 0, VAR_TEMP_3, 1, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C408D coord_event 5, 7, 3, VAR_TEMP_3, 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C408D
BattleFrontier_BattlePikeRandomRoom1_MapEvents:: @ 853CDF4 BattleFrontier_BattlePikeRandomRoom1_MapEvents:: @ 853CDF4
map_events BattleFrontier_BattlePikeRandomRoom1_EventObjects, 0x0, BattleFrontier_BattlePikeRandomRoom1_MapCoordEvents, 0x0 map_events BattleFrontier_BattlePikeRandomRoom1_EventObjects, 0x0, BattleFrontier_BattlePikeRandomRoom1_MapCoordEvents, 0x0
data/maps/BattleFrontier_BattlePikeRandomRoom1/header.inc
+4 -4
View File
@@ -5,11 +5,11 @@ BattleFrontier_BattlePikeRandomRoom1: @ 8485548
.4byte 0x0 .4byte 0x0
.2byte MUS_B_TUBE .2byte MUS_B_TUBE
.2byte 352 .2byte 352
.byte 58 .byte MAPSEC_BATTLE_FRONTIER
.byte 0 .byte 0
.byte 0 .byte WEATHER_NONE
.byte 8 .byte MAP_TYPE_INDOOR
.2byte 0 .2byte 0
.byte 4 .byte 4
.byte 0 .byte MAP_BATTLE_SCENE_NORMAL
data/maps/BattleFrontier_BattlePikeRandomRoom2/events.inc
+1 -1
View File
@@ -1,5 +1,5 @@
BattleFrontier_BattlePikeRandomRoom2_EventObjects: @ 853CE08 BattleFrontier_BattlePikeRandomRoom2_EventObjects: @ 853CE08
object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 2, 4, 3, 8, 1, 1, 0, 0, 0x0, 0 object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 2, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
BattleFrontier_BattlePikeRandomRoom2_MapEvents:: @ 853CE20 BattleFrontier_BattlePikeRandomRoom2_MapEvents:: @ 853CE20
map_events BattleFrontier_BattlePikeRandomRoom2_EventObjects, 0x0, 0x0, 0x0 map_events BattleFrontier_BattlePikeRandomRoom2_EventObjects, 0x0, 0x0, 0x0
data/maps/BattleFrontier_BattlePikeRandomRoom2/header.inc
+4 -4
View File
@@ -5,11 +5,11 @@ BattleFrontier_BattlePikeRandomRoom2: @ 8485564
.4byte 0x0 .4byte 0x0
.2byte MUS_B_TUBE .2byte MUS_B_TUBE
.2byte 353 .2byte 353
.byte 58 .byte MAPSEC_BATTLE_FRONTIER
.byte 0 .byte 0
.byte 0 .byte WEATHER_NONE
.byte 8 .byte MAP_TYPE_INDOOR
.2byte 0 .2byte 0
.byte 4 .byte 4
.byte 0 .byte MAP_BATTLE_SCENE_NORMAL
data/maps/BattleFrontier_BattlePikeRandomRoom3/events.inc
+7 -7
View File
@@ -1,11 +1,11 @@
BattleFrontier_BattlePikeRandomRoom3_MapCoordEvents: @ 853CE34 BattleFrontier_BattlePikeRandomRoom3_MapCoordEvents: @ 853CE34
coord_event 4, 3, 3, 0, VAR_TEMP_1, 0, 0, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4174 coord_event 4, 3, 3, VAR_TEMP_1, 0, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4174
coord_event 3, 18, 3, 0, VAR_TEMP_2, 0, 0, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4202 coord_event 3, 18, 3, VAR_TEMP_2, 0, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4202
coord_event 4, 18, 3, 0, VAR_TEMP_2, 0, 0, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4202 coord_event 4, 18, 3, VAR_TEMP_2, 0, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4202
coord_event 5, 18, 3, 0, VAR_TEMP_2, 0, 0, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4202 coord_event 5, 18, 3, VAR_TEMP_2, 0, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4202
coord_event 3, 19, 3, 0, VAR_TEMP_3, 1, 0, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C420D coord_event 3, 19, 3, VAR_TEMP_3, 1, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C420D
coord_event 4, 19, 3, 0, VAR_TEMP_3, 1, 0, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C420D coord_event 4, 19, 3, VAR_TEMP_3, 1, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C420D
coord_event 5, 19, 3, 0, VAR_TEMP_3, 1, 0, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C420D coord_event 5, 19, 3, VAR_TEMP_3, 1, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C420D
BattleFrontier_BattlePikeRandomRoom3_MapEvents:: @ 853CEA4 BattleFrontier_BattlePikeRandomRoom3_MapEvents:: @ 853CEA4
map_events 0x0, 0x0, BattleFrontier_BattlePikeRandomRoom3_MapCoordEvents, 0x0 map_events 0x0, 0x0, BattleFrontier_BattlePikeRandomRoom3_MapCoordEvents, 0x0
data/maps/BattleFrontier_BattlePikeRandomRoom3/header.inc
+4 -4
View File
@@ -5,11 +5,11 @@ BattleFrontier_BattlePikeRandomRoom3: @ 8485580
.4byte 0x0 .4byte 0x0
.2byte MUS_B_TUBE .2byte MUS_B_TUBE
.2byte 358 .2byte 358
.byte 58 .byte MAPSEC_BATTLE_FRONTIER
.byte 0 .byte 0
.byte 0 .byte WEATHER_NONE
.byte 8 .byte MAP_TYPE_INDOOR
.2byte 0 .2byte 0
.byte 4 .byte 4
.byte 0 .byte MAP_BATTLE_SCENE_NORMAL
data/maps/BattleFrontier_BattlePikeThreePathRoom/events.inc
+11 -11
View File
@@ -1,17 +1,17 @@
BattleFrontier_BattlePikeThreePathRoom_EventObjects: @ 853CC80 BattleFrontier_BattlePikeThreePathRoom_EventObjects: @ 853CC80
object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 4, 10, 3, 10, 0, 0, 0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25C908, 0 object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 4, 10, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25C908, 0
object_event 2, EVENT_OBJ_GFX_WOMAN_6, 0, 8, 5, 3, 8, 0, 0, 0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CABB, 0 object_event 2, EVENT_OBJ_GFX_WOMAN_6, 0, 8, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CABB, 0
BattleFrontier_BattlePikeThreePathRoom_MapCoordEvents: @ 853CCB0 BattleFrontier_BattlePikeThreePathRoom_MapCoordEvents: @ 853CCB0
coord_event 2, 3, 3, 0, VAR_TEMP_1, 0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F4E coord_event 2, 3, 3, VAR_TEMP_1, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F4E
coord_event 6, 3, 3, 0, VAR_TEMP_1, 0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F59 coord_event 6, 3, 3, VAR_TEMP_1, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F59
coord_event 10, 3, 3, 0, VAR_TEMP_1, 0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F64 coord_event 10, 3, 3, VAR_TEMP_1, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F64
coord_event 5, 10, 0, 0, VAR_TEMP_3, 1, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C406D coord_event 5, 10, 0, VAR_TEMP_3, 1, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C406D
coord_event 6, 10, 0, 0, VAR_TEMP_3, 1, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C406D coord_event 6, 10, 0, VAR_TEMP_3, 1, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C406D
coord_event 6, 9, 3, 0, VAR_TEMP_2, 0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4062 coord_event 6, 9, 3, VAR_TEMP_2, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4062
coord_event 5, 9, 3, 0, VAR_TEMP_2, 0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4062 coord_event 5, 9, 3, VAR_TEMP_2, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4062
coord_event 7, 9, 3, 0, VAR_TEMP_2, 0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4062 coord_event 7, 9, 3, VAR_TEMP_2, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4062
coord_event 7, 10, 0, 0, VAR_TEMP_3, 1, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C406D coord_event 7, 10, 0, VAR_TEMP_3, 1, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C406D
BattleFrontier_BattlePikeThreePathRoom_MapEvents:: @ 853CD40 BattleFrontier_BattlePikeThreePathRoom_MapEvents:: @ 853CD40
map_events BattleFrontier_BattlePikeThreePathRoom_EventObjects, 0x0, BattleFrontier_BattlePikeThreePathRoom_MapCoordEvents, 0x0 map_events BattleFrontier_BattlePikeThreePathRoom_EventObjects, 0x0, BattleFrontier_BattlePikeThreePathRoom_MapCoordEvents, 0x0
data/maps/BattleFrontier_BattlePikeThreePathRoom/header.inc
+4 -4
View File
@@ -5,11 +5,11 @@ BattleFrontier_BattlePikeThreePathRoom: @ 848552C
.4byte 0x0 .4byte 0x0
.2byte MUS_B_TUBE .2byte MUS_B_TUBE
.2byte 351 .2byte 351
.byte 58 .byte MAPSEC_BATTLE_FRONTIER
.byte 0 .byte 0
.byte 0 .byte WEATHER_NONE
.byte 8 .byte MAP_TYPE_INDOOR
.2byte 0 .2byte 0
.byte 4 .byte 4
.byte 0 .byte MAP_BATTLE_SCENE_NORMAL
data/maps/BattleFrontier_BattlePointExchangeServiceCorner/events.inc
+9 -9
View File
@@ -1,13 +1,13 @@
BattleFrontier_BattlePointExchangeServiceCorner_EventObjects: @ 853D018 BattleFrontier_BattlePointExchangeServiceCorner_EventObjects: @ 853D018
object_event 1, EVENT_OBJ_GFX_TEALA, 0, 4, 4, 0, 9, 0, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F173, 0 object_event 1, EVENT_OBJ_GFX_TEALA, 0, 4, 4, 0, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F173, 0
object_event 2, EVENT_OBJ_GFX_BOY_4, 0, 0, 5, 0, 10, 1, 1, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7E8, 0 object_event 2, EVENT_OBJ_GFX_BOY_4, 0, 0, 5, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7E8, 0
object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 4, 0, 8, 1, 1, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7DD, 0 object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 4, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7DD, 0
object_event 4, EVENT_OBJ_GFX_SAILOR, 0, 14, 6, 0, 2, 1, 1, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7D4, 0 object_event 4, EVENT_OBJ_GFX_SAILOR, 0, 14, 6, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7D4, 0
object_event 5, EVENT_OBJ_GFX_MAN_6, 0, 1, 9, 0, 2, 1, 1, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7CB, 0 object_event 5, EVENT_OBJ_GFX_MAN_6, 0, 1, 9, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7CB, 0
object_event 6, EVENT_OBJ_GFX_TEALA, 0, 5, 5, 0, 8, 0, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F37C, 0 object_event 6, EVENT_OBJ_GFX_TEALA, 0, 5, 5, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F37C, 0
object_event 7, EVENT_OBJ_GFX_TEALA, 0, 9, 5, 0, 8, 0, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F49F, 0 object_event 7, EVENT_OBJ_GFX_TEALA, 0, 9, 5, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F49F, 0
object_event 8, EVENT_OBJ_GFX_TEALA, 0, 10, 4, 0, 10, 0, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F5F0, 0 object_event 8, EVENT_OBJ_GFX_TEALA, 0, 10, 4, 0, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F5F0, 0
object_event 9, EVENT_OBJ_GFX_GIRL_1, 0, 12, 10, 0, 2, 1, 1, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7F1, 0 object_event 9, EVENT_OBJ_GFX_GIRL_1, 0, 12, 10, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7F1, 0
BattleFrontier_BattlePointExchangeServiceCorner_MapWarps: @ 853D0F0 BattleFrontier_BattlePointExchangeServiceCorner_MapWarps: @ 853D0F0
warp_def 7, 10, 0, 6, MAP_BATTLE_FRONTIER_OUTSIDE_EAST warp_def 7, 10, 0, 6, MAP_BATTLE_FRONTIER_OUTSIDE_EAST
data/maps/BattleFrontier_BattlePointExchangeServiceCorner/header.inc
+4 -4
View File
@@ -5,11 +5,11 @@ BattleFrontier_BattlePointExchangeServiceCorner: @ 84855D4
.4byte 0x0 .4byte 0x0
.2byte MUS_B_TOWER .2byte MUS_B_TOWER
.2byte 398 .2byte 398
.byte 58 .byte MAPSEC_BATTLE_FRONTIER
.byte 0 .byte 0
.byte 0 .byte WEATHER_NONE
.byte 8 .byte MAP_TYPE_INDOOR
.2byte 0 .2byte 0
.byte 0 .byte 0
.byte 0 .byte MAP_BATTLE_SCENE_NORMAL
data/maps/BattleFrontier_BattlePyramidEmptySquare/events.inc
+16 -16
View File
@@ -1,20 +1,20 @@
BattleFrontier_BattlePyramidEmptySquare_EventObjects: @ 853C62C BattleFrontier_BattlePyramidEmptySquare_EventObjects: @ 853C62C
object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 0, 0, 8, 1, 1, 0, 0, 0x0, 0 object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 0, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
object_event 2, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 1, 0, 3, 1, 1, 1, 0, 0, 0x0, 0 object_event 2, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 1, 0, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0
object_event 3, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 2, 0, 3, 1, 1, 1, 0, 0, 0x0, 0 object_event 3, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 2, 0, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0
object_event 4, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 3, 0, 3, 1, 1, 1, 0, 0, 0x0, 0 object_event 4, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 3, 0, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0
object_event 5, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 4, 0, 3, 1, 1, 1, 0, 0, 0x0, 0 object_event 5, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 4, 0, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0
object_event 6, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 5, 0, 3, 1, 1, 1, 0, 0, 0x0, 0 object_event 6, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 5, 0, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0
object_event 7, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 6, 0, 3, 1, 1, 1, 0, 0, 0x0, 0 object_event 7, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 6, 0, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0
object_event 8, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 7, 0, 0, 1, 1, 1, 0, 0, 0x0, 0 object_event 8, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 7, 0, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0
object_event 9, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 1, 3, 1, 1, 1, 0, 0, 0x0, 0 object_event 9, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 1, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0
object_event 10, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 1, 1, 3, 1, 1, 1, 0, 0, 0x0, 0 object_event 10, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 1, 1, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0
object_event 11, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 3, 1, 0, 1, 1, 1, 0, 0, 0x0, 0 object_event 11, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 3, 1, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0
object_event 12, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 4, 1, 0, 1, 1, 1, 0, 0, 0x0, 0 object_event 12, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 4, 1, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0
object_event 13, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 5, 1, 0, 1, 1, 1, 0, 0, 0x0, 0 object_event 13, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 5, 1, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0
object_event 14, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 6, 1, 0, 1, 1, 1, 0, 0, 0x0, 0 object_event 14, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 6, 1, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0
object_event 15, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 7, 1, 0, 1, 1, 1, 0, 0, 0x0, 0 object_event 15, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 7, 1, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0
object_event 16, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 2, 1, 0, 1, 1, 1, 0, 0, 0x0, 0 object_event 16, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 2, 1, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0
BattleFrontier_BattlePyramidEmptySquare_MapEvents:: @ 853C7AC BattleFrontier_BattlePyramidEmptySquare_MapEvents:: @ 853C7AC
map_events BattleFrontier_BattlePyramidEmptySquare_EventObjects, 0x0, 0x0, 0x0 map_events BattleFrontier_BattlePyramidEmptySquare_EventObjects, 0x0, 0x0, 0x0
data/maps/BattleFrontier_BattlePyramidEmptySquare/header.inc
+4 -4
View File
@@ -5,11 +5,11 @@ BattleFrontier_BattlePyramidEmptySquare: @ 8485414
.4byte 0x0 .4byte 0x0
.2byte 65535 .2byte 65535
.2byte 361 .2byte 361
.byte 58 .byte MAPSEC_BATTLE_FRONTIER
.byte 0 .byte 0
.byte 0 .byte WEATHER_NONE
.byte 8 .byte MAP_TYPE_INDOOR
.2byte 0 .2byte 0
.byte 4 .byte 4
.byte 0 .byte MAP_BATTLE_SCENE_NORMAL
data/maps/BattleFrontier_BattlePyramidLobby/events.inc
+6 -6
View File
@@ -1,15 +1,15 @@
BattleFrontier_BattlePyramidLobby_EventObjects: @ 853C598 BattleFrontier_BattlePyramidLobby_EventObjects: @ 853C598
object_event 1, EVENT_OBJ_GFX_HIKER, 0, 7, 12, 4, 8, 1, 1, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_2508B1, 0 object_event 1, EVENT_OBJ_GFX_HIKER, 0, 7, 12, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_2508B1, 0
object_event 2, EVENT_OBJ_GFX_HEX_MANIAC, 0, 14, 13, 4, 9, 1, 1, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_250ACE, 0 object_event 2, EVENT_OBJ_GFX_HEX_MANIAC, 0, 14, 13, 4, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_250ACE, 0
object_event 3, EVENT_OBJ_GFX_WOMAN_4, 0, 2, 15, 4, 2, 1, 1, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_250E83, 0 object_event 3, EVENT_OBJ_GFX_WOMAN_4, 0, 2, 15, 4, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_250E83, 0
object_event 4, EVENT_OBJ_GFX_FAT_MAN, 0, 12, 16, 4, 2, 1, 1, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_250E8C, 0 object_event 4, EVENT_OBJ_GFX_FAT_MAN, 0, 12, 16, 4, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_250E8C, 0
BattleFrontier_BattlePyramidLobby_MapWarps: @ 853C5F8 BattleFrontier_BattlePyramidLobby_MapWarps: @ 853C5F8
warp_def 7, 17, 4, 3, MAP_BATTLE_FRONTIER_OUTSIDE_EAST warp_def 7, 17, 4, 3, MAP_BATTLE_FRONTIER_OUTSIDE_EAST
BattleFrontier_BattlePyramidLobby_MapBGEvents: @ 853C600 BattleFrontier_BattlePyramidLobby_MapBGEvents: @ 853C600
bg_event 5, 12, 0, 1, 0, BattleFrontier_BattlePyramidLobby_EventScript_250D42 bg_event 5, 12, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_BattlePyramidLobby_EventScript_250D42
bg_event 1, 12, 0, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_250E95 bg_event 1, 12, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_BattlePyramidLobby_EventScript_250E95
BattleFrontier_BattlePyramidLobby_MapEvents:: @ 853C618 BattleFrontier_BattlePyramidLobby_MapEvents:: @ 853C618
map_events BattleFrontier_BattlePyramidLobby_EventObjects, BattleFrontier_BattlePyramidLobby_MapWarps, 0x0, BattleFrontier_BattlePyramidLobby_MapBGEvents map_events BattleFrontier_BattlePyramidLobby_EventObjects, BattleFrontier_BattlePyramidLobby_MapWarps, 0x0, BattleFrontier_BattlePyramidLobby_MapBGEvents
data/maps/BattleFrontier_BattlePyramidLobby/header.inc
+4 -4
View File
@@ -5,11 +5,11 @@ BattleFrontier_BattlePyramidLobby: @ 84853F8
.4byte 0x0 .4byte 0x0
.2byte MUS_PYRAMID .2byte MUS_PYRAMID
.2byte 360 .2byte 360
.byte 58 .byte MAPSEC_BATTLE_FRONTIER
.byte 0 .byte 0
.byte 0 .byte WEATHER_NONE
.byte 8 .byte MAP_TYPE_INDOOR
.2byte 0 .2byte 0
.byte 0 .byte 0
.byte 0 .byte MAP_BATTLE_SCENE_NORMAL
data/maps/BattleFrontier_BattlePyramidTop/events.inc
+3 -3
View File
@@ -1,9 +1,9 @@
BattleFrontier_BattlePyramidTop_EventObjects: @ 853C7C0 BattleFrontier_BattlePyramidTop_EventObjects: @ 853C7C0
object_event 1, EVENT_OBJ_GFX_HIKER, 0, 17, 11, 6, 8, 1, 1, 0, 3, BattleFrontier_BattlePyramidTop_EventScript_2551D0, 0 object_event 1, EVENT_OBJ_GFX_HIKER, 0, 17, 11, 6, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 3, BattleFrontier_BattlePyramidTop_EventScript_2551D0, 0
object_event 2, EVENT_OBJ_GFX_BRANDON, 0, 17, 7, 0, 7, 1, 1, 0, 0, 0x0, 0 object_event 2, EVENT_OBJ_GFX_BRANDON, 0, 17, 7, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0
BattleFrontier_BattlePyramidTop_MapCoordEvents: @ 853C7F0 BattleFrontier_BattlePyramidTop_MapCoordEvents: @ 853C7F0
coord_event 17, 9, 4, 0, VAR_TEMP_2, 0, 0, BattleFrontier_BattlePyramidTop_EventScript_255256 coord_event 17, 9, 4, VAR_TEMP_2, 0, BattleFrontier_BattlePyramidTop_EventScript_255256
BattleFrontier_BattlePyramidTop_MapEvents:: @ 853C800 BattleFrontier_BattlePyramidTop_MapEvents:: @ 853C800
map_events BattleFrontier_BattlePyramidTop_EventObjects, 0x0, BattleFrontier_BattlePyramidTop_MapCoordEvents, 0x0 map_events BattleFrontier_BattlePyramidTop_EventObjects, 0x0, BattleFrontier_BattlePyramidTop_MapCoordEvents, 0x0

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