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

Merge pull request #263 from huderlem/event_object_movement

Browse Source 
Sync event object movement with pokeruby
This commit is contained in:
Marcus Huderle
2018-06-14 08:08:51 -05:00
committed by GitHub
parent f810c9ecad e01dd90bb3
commit bebcea4029
2313 changed files with 31349 additions and 38076 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/battle_frontier_1.s
+5 -5
View File
@@ -13887,7 +13887,7 @@ task_prev_quest: @ 81960A8
cmp r0, 0
bne _081960C2
bl ScriptContext2_Enable
bl FreezeMapObjects
bl FreezeEventObjects
bl sub_808B864
bl sub_808BCF4
_081960C2:
@@ -14285,18 +14285,18 @@ sub_81963F0: @ 81963F0
movs r0, 0xFF
movs r1, 0
movs r2, 0
bl GetFieldObjectIdByLocalIdAndMap
bl GetEventObjectIdByLocalIdAndMap
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =gMapObjects
ldr r1, =gEventObjects
adds r0, r1
bl FieldObjectClearAnimIfSpecialAnimFinished
bl EventObjectClearHeldMovementIfFinished
bl sub_80D338C
bl UnfreezeMapObjects
bl UnfreezeEventObjects
bl ScriptContext2_Disable
_08196446:
movs r0, 0x1
asm/battle_frontier_2.s
+18 -18
View File
@@ -12444,7 +12444,7 @@ _081A0C8E:
sub_81A0C9C: @ 81A0C9C
push {lr}
bl ScriptContext2_Enable
bl FreezeMapObjects
bl FreezeEventObjects
bl sub_808B864
bl sub_808BCF4
movs r0, 0
@@ -27213,16 +27213,16 @@ _081A896E:
movs r0, 0xFF
movs r1, 0
movs r2, 0
bl GetFieldObjectIdByLocalIdAndMap
bl GetEventObjectIdByLocalIdAndMap
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =gMapObjects
ldr r1, =gEventObjects
adds r0, r1
bl FieldObjectClearAnimIfSpecialAnimFinished
bl EventObjectClearHeldMovementIfFinished
bl sub_80D338C
pop {r4}
pop {r0}
@@ -27355,7 +27355,7 @@ _081A8A74:
ldr r2, [r6]
ldrb r1, [r2, 0x5]
ldrb r2, [r2, 0x4]
bl GetFieldObjectIdByLocalIdAndMap
bl GetEventObjectIdByLocalIdAndMap
lsls r0, 24
lsrs r0, 24
cmp r0, 0x10
@@ -27511,14 +27511,14 @@ _081A8BB4:
ldr r2, [r1]
ldrb r1, [r2, 0x5]
ldrb r2, [r2, 0x4]
bl GetFieldObjectIdByLocalIdAndMap
bl GetEventObjectIdByLocalIdAndMap
lsls r0, 24
lsrs r2, r0, 24
cmp r2, 0x10
bne _081A8BDC
b _081A8D32
_081A8BDC:
ldr r0, =gMapObjects
ldr r0, =gEventObjects
lsls r1, r2, 3
adds r1, r2
lsls r1, 2
@@ -28521,8 +28521,8 @@ sub_81A9424: @ 81A9424
lsls r1, 4
adds r1, r0
mov r8, r1
ldr r2, =gMapObjects
ldr r0, =gSelectedMapObject
ldr r2, =gEventObjects
ldr r0, =gSelectedEventObject
ldrb r1, [r0]
lsls r0, r1, 3
adds r0, r1
@@ -28569,8 +28569,8 @@ _081A9488:
mov r9, r0
_081A94AE:
ldr r3, =gUnknown_08613ED8
ldr r2, =gMapObjects
ldr r0, =gSelectedMapObject
ldr r2, =gEventObjects
ldr r0, =gSelectedEventObject
ldrb r1, [r0]
lsls r0, r1, 3
adds r0, r1
@@ -29181,7 +29181,7 @@ sub_81A9998: @ 81A9998
mov r8, r0
ldr r1, =0x0000028e
mov r12, r1
ldr r0, =gMapObjects
ldr r0, =gEventObjects
mov r9, r0
_081A99CC:
movs r2, 0
@@ -29194,7 +29194,7 @@ _081A99CE:
cmp r0, r12
bne _081A9A8A
adds r2, 0x7
ldr r0, =gSelectedMapObject
ldr r0, =gSelectedEventObject
ldrb r1, [r0]
lsls r0, r1, 3
adds r0, r1
@@ -29322,7 +29322,7 @@ GetBattlePyramidTrainerFlag: @ 81A9AC4
ldr r1, =0x00000e2a
adds r2, r1
ldr r4, =gBitTable
ldr r3, =gMapObjects
ldr r3, =gEventObjects
lsls r1, r0, 3
adds r1, r0
lsls r1, 2
@@ -29354,8 +29354,8 @@ sub_81A9B04: @ 81A9B04
cmp r0, 0
beq _081A9B2E
movs r0, 0x1
bl GetChosenApproachingTrainerMapObjectId
ldr r1, =gSelectedMapObject
bl GetChosenApproachingTrainerEventObjectId
ldr r1, =gSelectedEventObject
strb r0, [r1]
ldr r0, =gTrainerBattleOpponent_B
ldrh r0, [r0]
@@ -29376,9 +29376,9 @@ sub_81A9B44: @ 81A9B44
lsls r0, 16
lsrs r5, r0, 16
movs r3, 0
ldr r0, =gMapObjects
ldr r0, =gEventObjects
mov r12, r0
ldr r6, =gSelectedMapObject
ldr r6, =gSelectedEventObject
ldr r1, =gSaveBlock1Ptr
mov r10, r1
ldr r7, =gSaveBlock2Ptr
asm/cable_car.s
+3 -3
View File
@@ -1956,7 +1956,7 @@ _08150D86:
str r2, [sp]
movs r2, 0xC8
movs r3, 0x49
bl AddPseudoFieldObject
bl AddPseudoEventObject
lsls r0, 24
lsrs r6, r0, 24
cmp r6, 0x40
@@ -2062,7 +2062,7 @@ _08150E68:
str r2, [sp]
movs r2, 0x80
movs r3, 0x27
bl AddPseudoFieldObject
bl AddPseudoEventObject
lsls r0, 24
lsrs r6, r0, 24
cmp r6, 0x40
@@ -2195,7 +2195,7 @@ _08150F3E:
ldrsh r3, [r3, r4]
movs r4, 0x6A
str r4, [sp]
bl AddPseudoFieldObject
bl AddPseudoEventObject
lsls r0, 24
lsrs r6, r0, 24
cmp r6, 0x40
asm/easy_chat.s
+2 -2
View File
@@ -8988,7 +8988,7 @@ _0811E852:
adds r1, r5, 0
movs r2, 0x4C
movs r3, 0x28
bl AddPseudoFieldObject
bl AddPseudoEventObject
lsls r0, 24
lsrs r2, r0, 24
cmp r2, 0x40
@@ -9019,7 +9019,7 @@ _0811E8A0:
adds r1, r5, 0
movs r2, 0x34
movs r3, 0x28
bl AddPseudoFieldObject
bl AddPseudoEventObject
lsls r0, 24
lsrs r2, r0, 24
cmp r2, 0x40
asm/field_control_avatar.s
+34 -34
View File
@@ -187,9 +187,9 @@ sub_809C014: @ 809C014
ldr r0, =gSpecialVar_LastTalked
movs r1, 0
strh r1, [r0]
ldr r0, =gSelectedMapObject
ldr r0, =gSelectedEventObject
strb r1, [r0]
bl player_get_direction_lower_nybble
bl GetPlayerFacingDirection
lsls r0, 24
lsrs r6, r0, 24
mov r4, sp
@@ -479,13 +479,13 @@ TryGetScriptOnPressingA: @ 809C270
adds r7, r4, 0
adds r1, r5, 0
adds r2, r4, 0
bl TryGetMapObjectScript
bl TryGetEventObjectScript
cmp r0, 0
bne _0809C2BC
adds r0, r6, 0
adds r1, r5, 0
adds r2, r4, 0
bl TryGetInvisibleMapObjectScript
bl TryGetInvisibleEventObjectScript
cmp r0, 0
bne _0809C2BC
adds r0, r6, 0
@@ -547,12 +547,12 @@ _0809C2F0:
lsrs r1, 16
_0809C30E:
ldrb r2, [r4, 0x4]
bl GetFieldObjectIdByXYZ
bl GetEventObjectIdByXYZ
lsls r0, 24
lsrs r3, r0, 24
cmp r3, 0x10
beq _0809C32E
ldr r1, =gMapObjects
ldr r1, =gEventObjects
lsls r2, r3, 3
adds r0, r2, r3
lsls r0, 2
@@ -567,7 +567,7 @@ _0809C32E:
.pool
_0809C33C:
movs r4, 0
ldr r1, =gLinkPlayerMapObjects
ldr r1, =gLinkPlayerEventObjects
_0809C340:
ldrb r0, [r1]
cmp r0, 0x1
@@ -580,7 +580,7 @@ _0809C34C:
adds r4, 0x1
cmp r4, 0x3
ble _0809C340
ldr r0, =gSelectedMapObject
ldr r0, =gSelectedEventObject
strb r3, [r0]
ldr r1, =gSpecialVar_LastTalked
adds r0, r2, r3
@@ -591,7 +591,7 @@ _0809C34C:
ldr r0, =gSpecialVar_Facing
strh r6, [r0]
adds r0, r3, 0
bl GetFieldObjectScriptPointerByFieldObjectId
bl GetEventObjectScriptPointerByEventObjectId
_0809C36E:
pop {r4-r6}
pop {r1}
@@ -599,8 +599,8 @@ _0809C36E:
.pool
thumb_func_end sub_809C2C8
thumb_func_start TryGetMapObjectScript
TryGetMapObjectScript: @ 809C384
thumb_func_start TryGetEventObjectScript
TryGetEventObjectScript: @ 809C384
push {r4-r7,lr}
adds r5, r0, 0
lsls r1, 24
@@ -610,12 +610,12 @@ TryGetMapObjectScript: @ 809C384
ldrh r0, [r5]
ldrh r1, [r5, 0x2]
ldrb r2, [r5, 0x4]
bl GetFieldObjectIdByXYZ
bl GetEventObjectIdByXYZ
lsls r0, 24
lsrs r4, r0, 24
cmp r4, 0x10
beq _0809C3B4
ldr r1, =gMapObjects
ldr r1, =gEventObjects
lsls r2, r4, 3
adds r0, r2, r4
lsls r0, 2
@@ -647,12 +647,12 @@ _0809C3B4:
lsls r1, 16
lsrs r1, 16
ldrb r2, [r5, 0x4]
bl GetFieldObjectIdByXYZ
bl GetEventObjectIdByXYZ
lsls r0, 24
lsrs r4, r0, 24
cmp r4, 0x10
beq _0809C400
ldr r1, =gMapObjects
ldr r1, =gEventObjects
lsls r2, r4, 3
adds r0, r2, r4
lsls r0, 2
@@ -666,7 +666,7 @@ _0809C400:
b _0809C44E
.pool
_0809C40C:
ldr r0, =gSelectedMapObject
ldr r0, =gSelectedEventObject
strb r4, [r0]
ldr r1, =gSpecialVar_LastTalked
adds r0, r2, r4
@@ -684,7 +684,7 @@ _0809C40C:
.pool
_0809C43C:
adds r0, r4, 0
bl GetFieldObjectScriptPointerByFieldObjectId
bl GetEventObjectScriptPointerByEventObjectId
_0809C442:
adds r1, r0, 0
ldr r0, =gSpecialVar_LastTalked
@@ -696,11 +696,11 @@ _0809C44E:
pop {r1}
bx r1
.pool
thumb_func_end TryGetMapObjectScript
thumb_func_end TryGetEventObjectScript
thumb_func_start TryGetInvisibleMapObjectScript
@ signed int TryGetInvisibleMapObjectScript(int a1, int a2, u8 playerFacingDirection)
TryGetInvisibleMapObjectScript: @ 809C458
thumb_func_start TryGetInvisibleEventObjectScript
@ signed int TryGetInvisibleEventObjectScript(int a1, int a2, u8 playerFacingDirection)
TryGetInvisibleEventObjectScript: @ 809C458
push {r4,r5,lr}
lsls r2, 24
lsrs r5, r2, 24
@@ -715,7 +715,7 @@ TryGetInvisibleMapObjectScript: @ 809C458
lsrs r2, 16
ldrb r3, [r0, 0x4]
adds r0, r4, 0
bl FindInvisibleMapObjectByPosition
bl FindInvisibleEventObjectByPosition
cmp r0, 0
beq _0809C4CC
ldr r2, [r0, 0x8]
@@ -799,7 +799,7 @@ _0809C532:
pop {r4,r5}
pop {r1}
bx r1
thumb_func_end TryGetInvisibleMapObjectScript
thumb_func_end TryGetInvisibleEventObjectScript
thumb_func_start TryGetMetatileBehaviorScript
TryGetMetatileBehaviorScript: @ 809C538
@@ -2261,9 +2261,9 @@ sub_809D0F4: @ 809D0F4
.pool
thumb_func_end sub_809D0F4
thumb_func_start FindInvisibleMapObjectByPosition
@ int FindInvisibleMapObjectByPosition(struct mapheader *mapHeader, u16 x, u16 y, u8 elevation)
FindInvisibleMapObjectByPosition: @ 809D11C
thumb_func_start FindInvisibleEventObjectByPosition
@ int FindInvisibleEventObjectByPosition(struct mapheader *mapHeader, u16 x, u16 y, u8 elevation)
FindInvisibleEventObjectByPosition: @ 809D11C
push {r4-r7,lr}
lsls r1, 16
lsrs r7, r1, 16
@@ -2308,7 +2308,7 @@ _0809D164:
pop {r4-r7}
pop {r1}
bx r1
thumb_func_end FindInvisibleMapObjectByPosition
thumb_func_end FindInvisibleEventObjectByPosition
thumb_func_start dive_warp
dive_warp: @ 809D16C
@@ -2447,12 +2447,12 @@ _0809D276:
bx r1
thumb_func_end sub_809D1E8
thumb_func_start GetFieldObjectScriptPointerForComparison
@ u8 *GetFieldObjectScriptPointerForComparison()
GetFieldObjectScriptPointerForComparison: @ 809D280
thumb_func_start GetEventObjectScriptPointerForComparison
@ u8 *GetEventObjectScriptPointerForComparison()
GetEventObjectScriptPointerForComparison: @ 809D280
push {r4,r5,lr}
sub sp, 0x8
bl player_get_direction_upper_nybble
bl GetPlayerMovementDirection
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
@@ -2470,18 +2470,18 @@ GetFieldObjectScriptPointerForComparison: @ 809D280
lsrs r1, 24
mov r0, sp
adds r2, r4, 0
bl TryGetMapObjectScript
bl TryGetEventObjectScript
add sp, 0x8
pop {r4,r5}
pop {r1}
bx r1
thumb_func_end GetFieldObjectScriptPointerForComparison
thumb_func_end GetEventObjectScriptPointerForComparison
thumb_func_start sub_809D2BC
sub_809D2BC: @ 809D2BC
push {r4,lr}
sub sp, 0x8
bl player_get_direction_upper_nybble
bl GetPlayerMovementDirection
mov r4, sp
mov r0, sp
bl player_get_pos_to_and_height
asm/field_effect_helpers.s
+61 -61
View File
@@ -100,7 +100,7 @@ _08153F7A:
sub_8153F98: @ 8153F98
push {lr}
ldrb r0, [r0, 0x5]
bl GetFieldObjectGraphicsInfo
bl GetEventObjectGraphicsInfo
ldrh r0, [r0, 0xA]
subs r0, 0x2
lsls r0, 16
@@ -123,7 +123,7 @@ npc_pal_op: @ 8153FAC
movs r0, 0
strh r0, [r4, 0x32]
ldrb r0, [r5, 0x5]
bl GetFieldObjectGraphicsInfo
bl GetEventObjectGraphicsInfo
ldrb r1, [r0, 0xC]
movs r0, 0x80
ands r0, r1
@@ -172,7 +172,7 @@ npc_pal_op_B: @ 815401C
lsls r1, 24
lsrs r4, r1, 24
ldrb r0, [r0, 0x5]
bl GetFieldObjectGraphicsInfo
bl GetEventObjectGraphicsInfo
adds r2, r0, 0
ldrh r1, [r2, 0x4]
ldr r0, =0x000011ff
@@ -217,7 +217,7 @@ npc_pal_op_A: @ 8154078
lsls r1, 24
lsrs r4, r1, 24
ldrb r0, [r0, 0x5]
bl GetFieldObjectGraphicsInfo
bl GetEventObjectGraphicsInfo
adds r2, r0, 0
ldrh r1, [r2, 0x4]
ldr r0, =0x000011ff
@@ -248,7 +248,7 @@ objc_reflection_maybe: @ 81540A8
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =gMapObjects
ldr r1, =gEventObjects
adds r7, r0, r1
ldrb r1, [r7, 0x4]
lsls r0, r1, 4
@@ -578,16 +578,16 @@ oei_shadow: @ 8154340
ldrb r0, [r5]
ldrb r1, [r5, 0x4]
ldrb r2, [r5, 0x8]
bl GetFieldObjectIdByLocalIdAndMap
bl GetEventObjectIdByLocalIdAndMap
lsls r0, 24
lsrs r0, 24
ldr r2, =gMapObjects
ldr r2, =gEventObjects
lsls r1, r0, 3
adds r1, r0
lsls r1, 2
adds r1, r2
ldrb r0, [r1, 0x5]
bl GetFieldObjectGraphicsInfo
bl GetEventObjectGraphicsInfo
adds r4, r0, 0
ldr r2, =gFieldEffectObjectTemplatePointers
ldr r1, =gUnknown_085CDC3E
@@ -659,7 +659,7 @@ oamc_shadow: @ 81543E4
lsls r2, 24
lsrs r2, 24
mov r3, sp
bl TryGetFieldObjectIdByLocalIdAndMap
bl TryGetEventObjectIdByLocalIdAndMap
lsls r0, 24
cmp r0, 0
beq _08154412
@@ -673,7 +673,7 @@ _08154412:
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =gMapObjects
ldr r1, =gEventObjects
adds r4, r0, r1
ldrb r0, [r4, 0x4]
lsls r1, r0, 4
@@ -877,7 +877,7 @@ _0815459C:
adds r1, r4, 0
adds r2, r7, 0
mov r3, sp
bl TryGetFieldObjectIdByLocalIdAndMap
bl TryGetEventObjectIdByLocalIdAndMap
lsls r0, 24
cmp r0, 0
bne _081545F0
@@ -909,7 +909,7 @@ _08154604:
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =gMapObjects
ldr r1, =gEventObjects
adds r2, r0, r1
ldr r0, [r2, 0x10]
ldr r1, [r5, 0x30]
@@ -931,7 +931,7 @@ _08154624:
_08154632:
adds r0, r5, 0
movs r1, 0
bl sub_80979D4
bl UpdateEventObjectSpriteVisibility
ldrh r1, [r5, 0x2E]
lsls r1, 24
lsrs r1, 24
@@ -1216,7 +1216,7 @@ _0815484C:
adds r1, r7, 0
adds r2, r6, 0
mov r3, sp
bl TryGetFieldObjectIdByLocalIdAndMap
bl TryGetEventObjectIdByLocalIdAndMap
lsls r0, 24
cmp r0, 0
bne _081548A0
@@ -1248,7 +1248,7 @@ _081548B4:
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =gMapObjects
ldr r1, =gEventObjects
adds r2, r0, r1
ldr r0, [r2, 0x10]
ldr r1, [r5, 0x30]
@@ -1262,7 +1262,7 @@ _081548B4:
_081548D4:
adds r0, r5, 0
movs r1, 0
bl sub_80979D4
bl UpdateEventObjectSpriteVisibility
ldrh r1, [r5, 0x2E]
lsls r1, 24
lsrs r1, 24
@@ -1340,13 +1340,13 @@ sub_815496C: @ 815496C
ldrb r0, [r6]
ldrb r1, [r6, 0x4]
ldrb r2, [r6, 0x8]
bl GetFieldObjectIdByLocalIdAndMap
bl GetEventObjectIdByLocalIdAndMap
lsls r0, 24
lsrs r0, 24
lsls r1, r0, 3
adds r1, r0
lsls r1, 2
ldr r0, =gMapObjects
ldr r0, =gEventObjects
adds r5, r1, r0
ldr r0, =gFieldEffectObjectTemplatePointers
ldr r0, [r0, 0x78]
@@ -1428,11 +1428,11 @@ sub_8154A10: @ 8154A10
lsls r2, 24
lsrs r2, 24
mov r3, sp
bl TryGetFieldObjectIdByLocalIdAndMap
bl TryGetEventObjectIdByLocalIdAndMap
lsls r0, 24
cmp r0, 0
bne _08154A4E
ldr r5, =gMapObjects
ldr r5, =gEventObjects
mov r0, sp
ldrb r1, [r0]
lsls r0, r1, 3
@@ -1451,7 +1451,7 @@ _08154A4E:
.pool
_08154A5C:
ldrb r0, [r1, 0x5]
bl GetFieldObjectGraphicsInfo
bl GetEventObjectGraphicsInfo
mov r8, r0
mov r0, sp
ldrb r1, [r0]
@@ -1523,7 +1523,7 @@ _08154AB2:
lsls r1, 29
lsrs r1, 31
adds r0, r4, 0
bl sub_80979D4
bl UpdateEventObjectSpriteVisibility
_08154AF2:
add sp, 0x4
pop {r3}
@@ -1729,7 +1729,7 @@ sub_8154C7C: @ 8154C7C
_08154C92:
adds r0, r1, 0
movs r1, 0
bl sub_80979D4
bl UpdateEventObjectSpriteVisibility
pop {r0}
bx r0
thumb_func_end sub_8154C7C
@@ -1758,7 +1758,7 @@ sub_8154CA0: @ 8154CA0
lsls r1, 29
lsrs r1, 31
adds r0, r4, 0
bl sub_80979D4
bl UpdateEventObjectSpriteVisibility
movs r1, 0x30
ldrsh r0, [r4, r1]
cmp r0, 0x38
@@ -1781,13 +1781,13 @@ sub_8154CEC: @ 8154CEC
ldrb r0, [r6]
ldrb r1, [r6, 0x4]
ldrb r2, [r6, 0x8]
bl GetFieldObjectIdByLocalIdAndMap
bl GetEventObjectIdByLocalIdAndMap
lsls r0, 24
lsrs r0, 24
lsls r1, r0, 3
adds r1, r0
lsls r1, 2
ldr r0, =gMapObjects
ldr r0, =gEventObjects
adds r5, r1, r0
ldr r0, =gFieldEffectObjectTemplatePointers
ldr r0, [r0, 0x34]
@@ -1800,7 +1800,7 @@ sub_8154CEC: @ 8154CEC
cmp r4, 0x40
beq _08154D76
ldrb r0, [r5, 0x5]
bl GetFieldObjectGraphicsInfo
bl GetEventObjectGraphicsInfo
lsls r3, r4, 4
adds r3, r4
lsls r3, 2
@@ -1870,7 +1870,7 @@ sub_8154D90: @ 8154D90
lsls r2, 24
lsrs r2, 24
mov r3, sp
bl TryGetFieldObjectIdByLocalIdAndMap
bl TryGetEventObjectIdByLocalIdAndMap
lsls r0, 24
cmp r0, 0
beq _08154DCA
@@ -1881,7 +1881,7 @@ _08154DC0:
b _08154E0A
_08154DCA:
ldr r3, =gSprites
ldr r2, =gMapObjects
ldr r2, =gEventObjects
mov r0, sp
ldrb r1, [r0]
lsls r0, r1, 3
@@ -1910,7 +1910,7 @@ _08154DCA:
strh r0, [r4, 0x22]
adds r0, r4, 0
movs r1, 0
bl sub_80979D4
bl UpdateEventObjectSpriteVisibility
_08154E0A:
add sp, 0x4
pop {r4}
@@ -2034,13 +2034,13 @@ sub_8154EFC: @ 8154EFC
ldrb r0, [r7]
ldrb r1, [r7, 0x4]
ldrb r2, [r7, 0x8]
bl GetFieldObjectIdByLocalIdAndMap
bl GetEventObjectIdByLocalIdAndMap
lsls r0, 24
lsrs r0, 24
lsls r1, r0, 3
adds r1, r0
lsls r1, 2
ldr r0, =gMapObjects
ldr r0, =gEventObjects
adds r6, r1, r0
ldr r0, =gFieldEffectObjectTemplatePointers
ldr r0, [r0, 0x34]
@@ -2053,7 +2053,7 @@ sub_8154EFC: @ 8154EFC
cmp r5, 0x40
beq _08154F92
ldrb r0, [r6, 0x5]
bl GetFieldObjectGraphicsInfo
bl GetEventObjectGraphicsInfo
adds r4, r0, 0
lsls r0, r5, 4
adds r0, r5
@@ -2123,11 +2123,11 @@ sub_8154FB4: @ 8154FB4
lsls r2, 24
lsrs r2, 24
mov r3, sp
bl TryGetFieldObjectIdByLocalIdAndMap
bl TryGetEventObjectIdByLocalIdAndMap
lsls r0, 24
cmp r0, 0
bne _08154FEE
ldr r2, =gMapObjects
ldr r2, =gEventObjects
mov r0, sp
ldrb r1, [r0]
lsls r0, r1, 3
@@ -2162,7 +2162,7 @@ _08154FFC:
strb r0, [r1]
adds r0, r4, 0
movs r1, 0
bl sub_80979D4
bl UpdateEventObjectSpriteVisibility
ldr r1, [r5, 0x10]
ldr r0, [r4, 0x34]
cmp r1, r0
@@ -2242,13 +2242,13 @@ sub_81550B4: @ 81550B4
ldrb r0, [r6]
ldrb r1, [r6, 0x4]
ldrb r2, [r6, 0x8]
bl GetFieldObjectIdByLocalIdAndMap
bl GetEventObjectIdByLocalIdAndMap
lsls r0, 24
lsrs r0, 24
lsls r1, r0, 3
adds r1, r0
lsls r1, 2
ldr r0, =gMapObjects
ldr r0, =gEventObjects
adds r5, r1, r0
ldr r0, =gFieldEffectObjectTemplatePointers
ldr r0, [r0, 0x7C]
@@ -2328,11 +2328,11 @@ sub_8155158: @ 8155158
lsls r2, 24
lsrs r2, 24
mov r3, sp
bl TryGetFieldObjectIdByLocalIdAndMap
bl TryGetEventObjectIdByLocalIdAndMap
lsls r0, 24
cmp r0, 0
bne _08155192
ldr r5, =gMapObjects
ldr r5, =gEventObjects
mov r0, sp
ldrb r1, [r0]
lsls r0, r1, 3
@@ -2351,7 +2351,7 @@ _08155192:
.pool
_081551A0:
ldrb r0, [r1, 0x5]
bl GetFieldObjectGraphicsInfo
bl GetEventObjectGraphicsInfo
mov r1, sp
ldrb r2, [r1]
lsls r1, r2, 3
@@ -2381,7 +2381,7 @@ _081551A0:
strb r0, [r1]
adds r0, r4, 0
movs r1, 0
bl sub_80979D4
bl UpdateEventObjectSpriteVisibility
_081551E4:
add sp, 0x4
pop {r4,r5}
@@ -2765,7 +2765,7 @@ sub_81554AC: @ 81554AC
movs r2, 0x32
ldrsh r1, [r4, r2]
bl CurrentMapDrawMetatileAt
ldr r2, =gMapObjects
ldr r2, =gEventObjects
ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
@@ -2789,7 +2789,7 @@ sub_815550C: @ 815550C
push {r4,lr}
adds r4, r0, 0
movs r1, 0
bl sub_80979D4
bl UpdateEventObjectSpriteVisibility
adds r0, r4, 0
adds r0, 0x3F
ldrb r1, [r0]
@@ -2972,7 +2972,7 @@ sub_8155658: @ 8155658
lsls r4, r0, 3
adds r4, r0
lsls r4, 2
ldr r0, =gMapObjects
ldr r0, =gEventObjects
adds r4, r0
ldrb r0, [r4, 0x4]
lsls r5, r0, 4
@@ -3319,13 +3319,13 @@ sub_8155900: @ 8155900
ldrb r0, [r7]
ldrb r1, [r7, 0x4]
ldrb r2, [r7, 0x8]
bl GetFieldObjectIdByLocalIdAndMap
bl GetEventObjectIdByLocalIdAndMap
lsls r0, 24
lsrs r0, 24
lsls r1, r0, 3
adds r1, r0
lsls r1, 2
ldr r0, =gMapObjects
ldr r0, =gEventObjects
adds r6, r1, r0
ldr r0, =gFieldEffectObjectTemplatePointers
ldr r0, [r0, 0x74]
@@ -3338,7 +3338,7 @@ sub_8155900: @ 8155900
cmp r4, 0x40
beq _081559A4
ldrb r0, [r6, 0x5]
bl GetFieldObjectGraphicsInfo
bl GetEventObjectGraphicsInfo
adds r5, r0, 0
lsls r0, r4, 4
adds r0, r4
@@ -3415,11 +3415,11 @@ sub_81559BC: @ 81559BC
lsls r2, 24
lsrs r2, 24
mov r3, sp
bl TryGetFieldObjectIdByLocalIdAndMap
bl TryGetEventObjectIdByLocalIdAndMap
lsls r0, 24
cmp r0, 0
bne _081559F6
ldr r2, =gMapObjects
ldr r2, =gEventObjects
mov r0, sp
ldrb r1, [r0]
lsls r0, r1, 3
@@ -3474,7 +3474,7 @@ _08155A46:
strh r6, [r4, 0x20]
strh r5, [r4, 0x22]
ldr r3, =gSprites
ldr r2, =gMapObjects
ldr r2, =gEventObjects
mov r0, sp
ldrb r1, [r0]
lsls r0, r1, 3
@@ -3493,7 +3493,7 @@ _08155A46:
strb r0, [r1]
adds r0, r4, 0
movs r1, 0
bl sub_80979D4
bl UpdateEventObjectSpriteVisibility
_08155A76:
add sp, 0x4
pop {r4-r6}
@@ -3567,7 +3567,7 @@ sub_8155AEC: @ 8155AEC
strh r1, [r4, 0x22]
adds r0, r4, 0
movs r1, 0
bl sub_80979D4
bl UpdateEventObjectSpriteVisibility
ldrh r1, [r4, 0x3E]
ldr r0, =0x00001004
ands r0, r1
@@ -3694,7 +3694,7 @@ ShowDisguiseFieldEffect: @ 8155BD0
ldrb r1, [r5, 0x4]
ldrb r2, [r5, 0x8]
mov r3, sp
bl TryGetFieldObjectIdByLocalIdAndMap
bl TryGetEventObjectIdByLocalIdAndMap
lsls r0, 24
cmp r0, 0
beq _08155C08
@@ -3783,7 +3783,7 @@ sub_8155C88: @ 8155C88
lsls r2, 24
lsrs r2, 24
mov r3, sp
bl TryGetFieldObjectIdByLocalIdAndMap
bl TryGetEventObjectIdByLocalIdAndMap
lsls r0, 24
cmp r0, 0
beq _08155CB8
@@ -3793,7 +3793,7 @@ sub_8155C88: @ 8155C88
adds r0, r5, 0
bl FieldEffectStop
_08155CB8:
ldr r4, =gMapObjects
ldr r4, =gEventObjects
mov r0, sp
ldrb r1, [r0]
lsls r0, r1, 3
@@ -3801,7 +3801,7 @@ _08155CB8:
lsls r0, 2
adds r0, r4
ldrb r0, [r0, 0x5]
bl GetFieldObjectGraphicsInfo
bl GetEventObjectGraphicsInfo
mov r1, sp
ldrb r2, [r1]
lsls r1, r2, 3
@@ -4460,7 +4460,7 @@ sub_8156194: @ 8156194
_081561B2:
adds r0, r4, 0
movs r1, 0
bl sub_80979D4
bl UpdateEventObjectSpriteVisibility
ldrh r0, [r4, 0x2E]
lsls r0, 24
lsrs r0, 24
@@ -4492,7 +4492,7 @@ sub_81561D0: @ 81561D0
_081561EE:
adds r0, r2, 0
movs r1, 0
bl sub_80979D4
bl UpdateEventObjectSpriteVisibility
_081561F6:
pop {r0}
bx r0
@@ -4514,14 +4514,14 @@ _08156212:
lsls r0, r7, 3
adds r0, r7
lsls r0, 2
ldr r1, =gMapObjects
ldr r1, =gEventObjects
adds r4, r0, r1
ldrb r0, [r4]
lsls r0, 31
cmp r0, 0
beq _081562B4
ldrb r0, [r4, 0x5]
bl GetFieldObjectGraphicsInfo
bl GetEventObjectGraphicsInfo
ldrb r1, [r4, 0x4]
lsls r0, r1, 4
adds r0, r1
asm/field_ground_effect.s
-1929
View File
File diff suppressed because it is too large Load Diff
asm/field_player_avatar.s
+204 -204
View File
File diff suppressed because it is too large Load Diff
asm/field_screen.s
+32 -32
View File
@@ -8382,7 +8382,7 @@ _080AF46C:
_080AF480:
movs r0, 0
bl sub_80AF0F4
bl FreezeMapObjects
bl FreezeEventObjects
adds r0, r6, 0
adds r1, r7, 0
bl PlayerGetDestCoords
@@ -8403,17 +8403,17 @@ _080AF4A4:
movs r0, 0xFF
movs r1, 0
movs r2, 0
bl GetFieldObjectIdByLocalIdAndMap
bl GetEventObjectIdByLocalIdAndMap
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =gMapObjects
ldr r1, =gEventObjects
adds r0, r1
movs r1, 0x8
bl FieldObjectSetSpecialAnim
bl EventObjectSetHeldMovement
movs r0, 0x2
strh r0, [r5, 0x8]
b _080AF54A
@@ -8434,16 +8434,16 @@ _080AF4DC:
movs r0, 0xFF
movs r1, 0
movs r2, 0
bl GetFieldObjectIdByLocalIdAndMap
bl GetEventObjectIdByLocalIdAndMap
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =gMapObjects
ldr r1, =gEventObjects
adds r0, r1
bl FieldObjectClearAnimIfSpecialAnimFinished
bl EventObjectClearHeldMovementIfFinished
movs r0, 0x3
strh r0, [r5, 0x8]
b _080AF54A
@@ -8461,7 +8461,7 @@ _080AF520:
cmp r0, 0x1
beq _080AF54A
_080AF536:
bl UnfreezeMapObjects
bl UnfreezeEventObjects
movs r0, 0x4
strh r0, [r5, 0x8]
b _080AF54A
@@ -8508,7 +8508,7 @@ _080AF580:
_080AF58A:
movs r0, 0
bl sub_80AF0F4
bl FreezeMapObjects
bl FreezeEventObjects
adds r0, r6, 0
adds r1, r7, 0
bl PlayerGetDestCoords
@@ -8524,23 +8524,23 @@ _080AF5A2:
movs r0, 0xFF
movs r1, 0
movs r2, 0
bl GetFieldObjectIdByLocalIdAndMap
bl GetEventObjectIdByLocalIdAndMap
lsls r0, 24
lsrs r0, 24
lsls r4, r0, 3
adds r4, r0
lsls r4, 2
ldr r0, =gMapObjects
ldr r0, =gEventObjects
adds r4, r0
bl player_get_direction_lower_nybble
bl GetPlayerFacingDirection
lsls r0, 24
lsrs r0, 24
bl GetGoSpeed0AnimId
bl GetWalkNormalMovementAction
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
bl FieldObjectSetSpecialAnim
bl EventObjectSetHeldMovement
movs r0, 0x2
strh r0, [r5, 0x8]
b _080AF60A
@@ -8550,7 +8550,7 @@ _080AF5EC:
lsls r0, 24
cmp r0, 0
beq _080AF60A
bl UnfreezeMapObjects
bl UnfreezeEventObjects
movs r0, 0x3
strh r0, [r5, 0x8]
b _080AF60A
@@ -8583,7 +8583,7 @@ task_map_chg_seq_0807E2CC: @ 80AF610
b _080AF65A
.pool
_080AF634:
bl FreezeMapObjects
bl FreezeEventObjects
bl ScriptContext2_Enable
ldrh r0, [r4, 0x8]
adds r0, 0x1
@@ -8593,7 +8593,7 @@ _080AF644:
bl sub_80AF71C
cmp r0, 0
beq _080AF65A
bl UnfreezeMapObjects
bl UnfreezeEventObjects
bl ScriptContext2_Disable
adds r0, r5, 0
bl DestroyTask
@@ -8861,7 +8861,7 @@ sub_80AF87C: @ 80AF87C
movs r0, 0x1
bl sub_8085540
bl ScriptContext2_Enable
bl SaveMapObjects
bl SaveEventObjects
bl music_something
bl sub_80AF0B4
movs r0, 0x2D
@@ -9062,7 +9062,7 @@ _080AFA34:
beq _080AFA6C
b _080AFA7C
_080AFA3A:
bl FreezeMapObjects
bl FreezeEventObjects
bl ScriptContext2_Enable
b _080AFA64
_080AFA44:
@@ -9133,7 +9133,7 @@ _080AFAC0:
.4byte _080AFBB8
.4byte _080AFBD4
_080AFAD4:
bl FreezeMapObjects
bl FreezeEventObjects
adds r0, r4, 0
adds r1, r6, 0
bl PlayerGetDestCoords
@@ -9174,20 +9174,20 @@ _080AFB26:
movs r0, 0xFF
movs r1, 0
movs r2, 0
bl GetFieldObjectIdByLocalIdAndMap
bl GetEventObjectIdByLocalIdAndMap
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r4, =gMapObjects
ldr r4, =gEventObjects
adds r0, r4
bl FieldObjectClearAnimIfSpecialAnimActive
bl EventObjectClearHeldMovementIfActive
movs r0, 0xFF
movs r1, 0
movs r2, 0
bl GetFieldObjectIdByLocalIdAndMap
bl GetEventObjectIdByLocalIdAndMap
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -9196,7 +9196,7 @@ _080AFB26:
lsls r0, 2
adds r0, r4
movs r1, 0x9
bl FieldObjectSetSpecialAnim
bl EventObjectSetHeldMovement
movs r0, 0x2
strh r0, [r5, 0x8]
b _080AFBE8
@@ -9218,16 +9218,16 @@ _080AFB6C:
movs r0, 0xFF
movs r1, 0
movs r2, 0
bl GetFieldObjectIdByLocalIdAndMap
bl GetEventObjectIdByLocalIdAndMap
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =gMapObjects
ldr r1, =gEventObjects
adds r0, r1
bl FieldObjectClearAnimIfSpecialAnimFinished
bl EventObjectClearHeldMovementIfFinished
movs r0, 0
bl sub_80AF0F4
movs r0, 0x3
@@ -9290,7 +9290,7 @@ _080AFC1C:
beq _080AFC46
b _080AFC56
_080AFC22:
bl FreezeMapObjects
bl FreezeEventObjects
bl ScriptContext2_Enable
b _080AFC3E
_080AFC2C:
@@ -9982,7 +9982,7 @@ task0A_mpl_807E31C: @ 80B0160
b _080B01B6
.pool
_080B0184:
bl FreezeMapObjects
bl FreezeEventObjects
bl ScriptContext2_Enable
bl sub_808D194
ldrh r0, [r4, 0x8]
@@ -9996,7 +9996,7 @@ _080B0198:
bl sub_808D1B4
cmp r0, 0x1
beq _080B01B6
bl UnfreezeMapObjects
bl UnfreezeEventObjects
bl ScriptContext2_Disable
adds r0, r5, 0
bl DestroyTask
@@ -10033,7 +10033,7 @@ _080B01E4:
beq _080B022A
b _080B023A
_080B01EE:
bl FreezeMapObjects
bl FreezeEventObjects
bl ScriptContext2_Enable
movs r0, 0x2D
bl PlaySE
asm/field_specials.s
+24 -24
View File
@@ -741,8 +741,8 @@ _0813828A:
.pool
thumb_func_end GetLinkPartnerNames
thumb_func_start SpawnLinkPartnerFieldObject
SpawnLinkPartnerFieldObject: @ 81382A0
thumb_func_start SpawnLinkPartnerEventObject
SpawnLinkPartnerEventObject: @ 81382A0
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -766,7 +766,7 @@ SpawnLinkPartnerFieldObject: @ 81382A0
lsls r0, 24
lsrs r0, 24
mov r10, r0
bl player_get_direction_lower_nybble
bl GetPlayerFacingDirection
lsls r0, 24
lsrs r0, 24
adds r1, r0, 0
@@ -912,7 +912,7 @@ _0813839C:
adds r0, r5, 0
adds r2, r4, 0
mov r3, r12
bl SpawnSpecialFieldObjectParametrized
bl SpawnSpecialEventObjectParametrized
adds r0, r5, 0
adds r1, r4, 0
adds r2, r6, 0
@@ -941,7 +941,7 @@ _08138410:
pop {r0}
bx r0
.pool
thumb_func_end SpawnLinkPartnerFieldObject
thumb_func_end SpawnLinkPartnerEventObject
thumb_func_start sub_813842C
sub_813842C: @ 813842C
@@ -971,12 +971,12 @@ _08138454:
ldrb r1, [r0, 0x5]
ldrb r2, [r0, 0x4]
adds r0, r3, 0
bl GetFieldObjectIdByLocalIdAndMap
bl GetEventObjectIdByLocalIdAndMap
lsls r0, 24
lsrs r2, r0, 24
cmp r2, 0x10
beq _081384E6
ldr r1, =gMapObjects
ldr r1, =gEventObjects
lsls r0, r2, 3
adds r0, r2
lsls r0, 2
@@ -1008,15 +1008,15 @@ _081384A8:
beq _081384BC
b _081384E6
_081384B2:
ldr r0, =gFieldObjectPalette33
ldr r0, =gEventObjectPalette33
b _081384C6
.pool
_081384BC:
ldr r0, =gFieldObjectPalette34
ldr r0, =gEventObjectPalette34
b _081384C6
.pool
_081384C4:
ldr r0, =gFieldObjectPalette8
ldr r0, =gEventObjectPalette8
_081384C6:
movs r2, 0x80
lsls r2, 1
@@ -1026,7 +1026,7 @@ _081384C6:
b _081384E6
.pool
_081384D8:
ldr r0, =gFieldObjectPalette17
ldr r0, =gEventObjectPalette17
movs r2, 0x80
lsls r2, 1
adds r1, r3, r2
@@ -1989,7 +1989,7 @@ PCTurnOnEffect_0: @ 8138D10
cmp r0, 0x6
bne _08138D7C
strh r5, [r4, 0xE]
bl player_get_direction_lower_nybble
bl GetPlayerFacingDirection
lsls r0, 24
lsrs r0, 24
adds r1, r0, 0
@@ -2134,7 +2134,7 @@ PCTurnOffEffect: @ 8138E2C
movs r6, 0
movs r5, 0
movs r4, 0
bl player_get_direction_lower_nybble
bl GetPlayerFacingDirection
lsls r0, 24
lsrs r0, 24
adds r1, r0, 0
@@ -2537,8 +2537,8 @@ _0813914A:
.pool
thumb_func_end IsGrassTypeInParty
thumb_func_start SpawnScriptFieldObject
SpawnScriptFieldObject: @ 8139158
thumb_func_start SpawnScriptEventObject
SpawnScriptEventObject: @ 8139158
push {lr}
sub sp, 0x8
ldr r0, =gSaveBlock1Ptr
@@ -2557,10 +2557,10 @@ SpawnScriptFieldObject: @ 8139158
movs r0, 0x7
movs r1, 0x8
movs r2, 0x7F
bl SpawnSpecialFieldObjectParametrized
bl SpawnSpecialEventObjectParametrized
lsls r0, 24
lsrs r0, 24
ldr r2, =gMapObjects
ldr r2, =gEventObjects
lsls r1, r0, 3
adds r1, r0
lsls r1, 2
@@ -2575,10 +2575,10 @@ SpawnScriptFieldObject: @ 8139158
pop {r0}
bx r0
.pool
thumb_func_end SpawnScriptFieldObject
thumb_func_end SpawnScriptEventObject
thumb_func_start RemoveScriptFieldObject
RemoveScriptFieldObject: @ 81391AC
thumb_func_start RemoveScriptEventObject
RemoveScriptEventObject: @ 81391AC
push {lr}
bl GetPlayerAvatarObjectId
lsls r0, 24
@@ -2589,11 +2589,11 @@ RemoveScriptFieldObject: @ 81391AC
ldrb r1, [r0, 0x5]
ldrb r2, [r0, 0x4]
movs r0, 0x7F
bl RemoveFieldObjectByLocalIdAndMap
bl RemoveEventObjectByLocalIdAndMap
pop {r0}
bx r0
.pool
thumb_func_end RemoveScriptFieldObject
thumb_func_end RemoveScriptEventObject
thumb_func_start GetPokeblockNameByMonNature
GetPokeblockNameByMonNature: @ 81391D0
@@ -6327,7 +6327,7 @@ sub_813B0B4: @ 813B0B4
ldrb r2, [r0, 0x4]
movs r0, 0x1
mov r3, sp
bl TryGetFieldObjectIdByLocalIdAndMap
bl TryGetEventObjectIdByLocalIdAndMap
cmp r4, 0
bne _0813B0F0
movs r0, 0xC4
@@ -6377,7 +6377,7 @@ _0813B13A:
adds r0, r5, r0
ldrb r2, [r0]
movs r0, 0x1
bl Overworld_SetMapObjTemplateCoords
bl Overworld_SetEventObjTemplateCoords
add sp, 0x4
pop {r4,r5}
pop {r0}
asm/fldeff_80F9BCC.s
+16 -16
View File
@@ -567,7 +567,7 @@ sub_80FA004: @ 80FA004
ldrh r0, [r0]
cmp r0, 0x1
beq _080FA0AE
bl player_get_direction_lower_nybble
bl GetPlayerFacingDirection
lsls r0, 24
lsrs r0, 24
cmp r0, 0x2
@@ -1493,7 +1493,7 @@ sub_80FA794: @ 80FA794
lsls r1, 16
lsrs r4, r1, 16
adds r6, r4, 0
bl player_get_direction_lower_nybble
bl GetPlayerFacingDirection
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1722,7 +1722,7 @@ _080FA9CA:
sub_80FA9D0: @ 80FA9D0
push {r4,lr}
sub sp, 0x4
ldr r3, =gMapObjects
ldr r3, =gEventObjects
ldr r2, =gPlayerAvatar
ldrb r1, [r2, 0x5]
lsls r0, r1, 3
@@ -1815,7 +1815,7 @@ sub_80FAA7C: @ 80FAA7C
movs r3, 0
ldrsh r0, [r4, r3]
str r0, [r1, 0x18]
bl player_get_direction_lower_nybble
bl GetPlayerFacingDirection
lsls r0, 24
lsrs r0, 24
cmp r0, 0x2
@@ -2312,32 +2312,32 @@ sub_80FAEF0: @ 80FAEF0
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =gMapObjects
ldr r1, =gEventObjects
adds r4, r0, r1
adds r0, r4, 0
bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive
bl EventObjectIsMovementOverridden
lsls r0, 24
cmp r0, 0
beq _080FAF1C
adds r0, r4, 0
bl FieldObjectClearAnimIfSpecialAnimFinished
bl EventObjectClearHeldMovementIfFinished
lsls r0, 24
cmp r0, 0
beq _080FAF4E
_080FAF1C:
bl player_get_direction_lower_nybble
bl GetPlayerFacingDirection
lsls r0, 24
lsrs r0, 24
bl sub_808C228
bl player_get_direction_lower_nybble
bl GetPlayerFacingDirection
lsls r0, 24
lsrs r0, 24
bl GetStepInPlaceDelay16AnimId
bl GetWalkInPlaceNormalMovementAction
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
bl FieldObjectSetSpecialAnim
bl EventObjectSetHeldMovement
ldr r1, =gTasks
lsls r0, r5, 2
adds r0, r5
@@ -2362,10 +2362,10 @@ sub_80FAF64: @ 80FAF64
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =gMapObjects
ldr r1, =gEventObjects
adds r5, r0, r1
adds r0, r5, 0
bl FieldObjectClearAnimIfSpecialAnimFinished
bl EventObjectClearHeldMovementIfFinished
lsls r0, 24
cmp r0, 0
beq _080FAFC8
@@ -2381,15 +2381,15 @@ sub_80FAF64: @ 80FAF64
asrs r0, 16
cmp r0, 0x9
bgt _080FAFC4
bl player_get_direction_lower_nybble
bl GetPlayerFacingDirection
lsls r0, 24
lsrs r0, 24
bl GetStepInPlaceDelay16AnimId
bl GetWalkInPlaceNormalMovementAction
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
adds r0, r5, 0
bl FieldObjectSetSpecialAnim
bl EventObjectSetHeldMovement
b _080FAFC8
.pool
_080FAFC4:
asm/macros/movement.inc
+121 -113
View File
@@ -1,4 +1,4 @@
.macro create_movement name
.macro create_movement_action name
enum _\name
.macro \name
.byte _\name
@@ -6,118 +6,126 @@
.endm
enum_start
create_movement step_00
create_movement step_01
create_movement step_02
create_movement step_03
create_movement slow_step_down
create_movement slow_step_up
create_movement slow_step_left
create_movement slow_step_right
create_movement step_down
create_movement step_up
create_movement step_left
create_movement step_right
create_movement fast_step_down
create_movement fast_step_up
create_movement fast_step_left
create_movement fast_step_right
create_movement step_10
create_movement step_11
create_movement step_12
create_movement step_13
create_movement step_14
create_movement step_15
create_movement step_16
create_movement step_17
create_movement step_18
create_movement step_19
create_movement step_1a
create_movement step_1b
create_movement step_1c
create_movement step_1d
create_movement step_1e
create_movement step_1f
create_movement step_20
create_movement step_21
create_movement step_22
create_movement step_23
create_movement step_24
create_movement step_25
create_movement step_26
create_movement step_27
create_movement step_28
create_movement step_29
create_movement step_2a
create_movement step_2b
create_movement step_2c
create_movement step_2d
create_movement step_2e
create_movement step_2f
create_movement step_30
create_movement step_31
create_movement step_32
create_movement step_33
create_movement step_34
create_movement step_35
create_movement step_36
create_movement step_37
create_movement step_38
create_movement step_39
create_movement step_3a
create_movement step_3b
create_movement step_3c
create_movement step_3d
create_movement step_3e
create_movement step_3f
create_movement step_40
create_movement step_41
create_movement step_42
create_movement step_43
create_movement step_44
create_movement step_45
create_movement step_46
create_movement step_47
create_movement step_48
create_movement step_49
create_movement step_4a
create_movement step_4b
create_movement step_4c
create_movement step_4d
create_movement step_4e
create_movement step_4f
create_movement step_50
create_movement step_51
create_movement step_52
create_movement step_53
create_movement step_54
create_movement step_55
create_movement step_56
create_movement step_57
create_movement step_58
create_movement step_59
create_movement step_5a
create_movement step_5b
create_movement step_5c
create_movement step_5d
create_movement step_5e
create_movement step_5f
create_movement step_60
create_movement step_61
create_movement step_62
create_movement step_63
create_movement_action face_down
create_movement_action face_up
create_movement_action face_left
create_movement_action face_right
create_movement_action walk_slow_down
create_movement_action walk_slow_up
create_movement_action walk_slow_left
create_movement_action walk_slow_right
create_movement_action walk_down
create_movement_action walk_up
create_movement_action walk_left
create_movement_action walk_right
create_movement_action jump_2_down
create_movement_action jump_2_up
create_movement_action jump_2_left
create_movement_action jump_2_right
create_movement_action delay_1
create_movement_action delay_2
create_movement_action delay_4
create_movement_action delay_8
create_movement_action delay_16
create_movement_action walk_fast_down
create_movement_action walk_fast_up
create_movement_action walk_fast_left
create_movement_action walk_fast_right
create_movement_action walk_in_place_slow_down
create_movement_action walk_in_place_slow_up
create_movement_action walk_in_place_slow_left
create_movement_action walk_in_place_slow_right
create_movement_action walk_in_place_down
create_movement_action walk_in_place_up
create_movement_action walk_in_place_left
create_movement_action walk_in_place_right
create_movement_action walk_in_place_fast_down
create_movement_action walk_in_place_fast_up
create_movement_action walk_in_place_fast_left
create_movement_action walk_in_place_fast_right
create_movement_action walk_in_place_fastest_down
create_movement_action walk_in_place_fastest_up
create_movement_action walk_in_place_fastest_left
create_movement_action walk_in_place_fastest_right
create_movement_action ride_water_current_down
create_movement_action ride_water_current_up
create_movement_action ride_water_current_left
create_movement_action ride_water_current_right
create_movement_action walk_fastest_down
create_movement_action walk_fastest_up
create_movement_action walk_fastest_left
create_movement_action walk_fastest_right
create_movement_action slide_down
create_movement_action slide_up
create_movement_action slide_left
create_movement_action slide_right
create_movement_action player_run_down
create_movement_action player_run_up
create_movement_action player_run_left
create_movement_action player_run_right
create_movement_action start_anim_in_direction
create_movement_action jump_special_down
create_movement_action jump_special_up
create_movement_action jump_special_left
create_movement_action jump_special_right
create_movement_action face_player
create_movement_action face_away_player
create_movement_action lock_facing_direction
create_movement_action unlock_facing_direction
create_movement_action jump_down
create_movement_action jump_up
create_movement_action jump_left
create_movement_action jump_right
create_movement_action jump_in_place_down
create_movement_action jump_in_place_up
create_movement_action jump_in_place_left
create_movement_action jump_in_place_right
create_movement_action jump_in_place_down_up
create_movement_action jump_in_place_up_down
create_movement_action jump_in_place_left_right
create_movement_action jump_in_place_right_left
create_movement_action face_original_direction
create_movement_action nurse_joy_bow
create_movement_action enable_jump_landing_ground_effect
create_movement_action disable_jump_landing_ground_effect
create_movement_action disable_anim
create_movement_action restore_anim
create_movement_action set_invisible
create_movement_action set_visible
create_movement_action emote_exclamation_mark
create_movement_action emote_question_mark
create_movement_action emote_heart
create_movement_action reveal_trainer
create_movement_action rock_smash_break
create_movement_action cut_tree
create_movement_action set_fixed_priority
create_movement_action clear_fixed_priority
create_movement_action init_affine_anim
create_movement_action clear_affine_anim
create_movement_action unknown_movement_1
create_movement_action unknown_movement_2
create_movement_action walk_down_start_affine
create_movement_action walk_down_affine
enum_start 0x91
create_movement step_91
create_movement step_92
create_movement step_93
create_movement step_94
create_movement step_95
create_movement step_96
create_movement step_97
create_movement step_98
create_movement step_99
create_movement step_9A
enum_start 0x8C
create_movement_action walk_diag_northwest
create_movement_action walk_diag_northeast
create_movement_action walk_diag_southwest
create_movement_action walk_diag_southeast
create_movement_action walk_slow_diag_northwest
create_movement_action walk_slow_diag_northeast
create_movement_action walk_slow_diag_southwest
create_movement_action walk_slow_diag_southeast
create_movement_action store_lock_anim
create_movement_action free_unlock_anim
create_movement_action walk_left_affine
create_movement_action walk_right_affine
create_movement_action levitate
create_movement_action stop_levitate
create_movement_action destroy_extra_task
create_movement_action figure_8
create_movement_action fly_up
create_movement_action fly_down
enum_start 0xfe
create_movement step_end
create_movement_action step_end
asm/pokenav.s
+19 -19
View File
@@ -25584,7 +25584,7 @@ sub_81D4258: @ 81D4258
ldrb r2, [r0, 0x4]
movs r0, 0x1
mov r3, sp
bl TryGetFieldObjectIdByLocalIdAndMap
bl TryGetEventObjectIdByLocalIdAndMap
mov r0, sp
ldrb r0, [r0]
add sp, 0x4
@@ -25606,7 +25606,7 @@ sub_81D427C: @ 81D427C
lsls r1, r0, 3
adds r1, r0
lsls r1, 2
ldr r2, =gMapObjects
ldr r2, =gEventObjects
adds r5, r1, r2
ldr r4, =gUnknown_030012F8
ldr r3, =gPlayerAvatar
@@ -25644,7 +25644,7 @@ _081D42CA:
mov r8, r0
cmp r0, 0x3
bls _081D42CA
ldr r2, =gMapObjects
ldr r2, =gEventObjects
ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
@@ -25700,7 +25700,7 @@ _081D4356:
_081D4360:
movs r4, 0
mov r8, r4
ldr r6, =gMapObjects
ldr r6, =gEventObjects
mov r10, r6
_081D4368:
ldr r3, =gPlayerAvatar
@@ -25718,7 +25718,7 @@ _081D4368:
ldrsh r2, [r4, r6]
movs r6, 0
ldrsh r0, [r0, r6]
ldr r6, =gMapObjects
ldr r6, =gEventObjects
mov r9, r6
mov r12, r3
adds r7, r1, 0
@@ -25866,7 +25866,7 @@ _081D449E:
ldrsh r1, [r4, r3]
movs r3, 0
ldrsh r0, [r0, r3]
ldr r3, =gMapObjects
ldr r3, =gEventObjects
mov r9, r3
mov r12, r2
cmp r1, r0
@@ -26124,7 +26124,7 @@ _081D46D0:
ldrsh r0, [r0, r3]
cmp r0, 0
bne _081D476E
ldr r2, =gMapObjects
ldr r2, =gEventObjects
ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
@@ -26149,7 +26149,7 @@ _081D46D0:
beq _081D470C
b _081D447C
_081D470C:
ldr r2, =gMapObjects
ldr r2, =gEventObjects
ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
@@ -26203,7 +26203,7 @@ _081D476E:
ldrsh r0, [r0, r2]
cmp r0, 0
bne _081D480C
ldr r2, =gMapObjects
ldr r2, =gEventObjects
ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
@@ -26228,7 +26228,7 @@ _081D476E:
beq _081D47AA
b _081D45AA
_081D47AA:
ldr r2, =gMapObjects
ldr r2, =gEventObjects
ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
@@ -26299,7 +26299,7 @@ sub_81D4834: @ 81D4834
lsls r0, 16
lsls r1, 16
lsrs r4, r1, 16
ldr r3, =gMapObjects
ldr r3, =gEventObjects
ldr r1, =gPlayerAvatar
ldrb r2, [r1, 0x5]
lsls r1, r2, 3
@@ -26350,7 +26350,7 @@ sub_81D4890: @ 81D4890
lsls r1, r0, 3
adds r1, r0
lsls r1, 2
ldr r0, =gMapObjects
ldr r0, =gEventObjects
adds r4, r1, r0
movs r1, 0
ldr r3, =gUnknown_030012FC
@@ -26503,9 +26503,9 @@ _081D49E0:
bx r0
thumb_func_end sub_81D4998
thumb_func_start FieldObjectIsFarawayIslandMew
@ bool8 FieldObjectIsFarawayIslandMew(struct npc_state *fieldObject)
FieldObjectIsFarawayIslandMew: @ 81D49E8
thumb_func_start EventObjectIsFarawayIslandMew
@ bool8 EventObjectIsFarawayIslandMew(struct npc_state *eventObject)
EventObjectIsFarawayIslandMew: @ 81D49E8
push {lr}
adds r2, r0, 0
ldr r0, =gSaveBlock1Ptr
@@ -26525,7 +26525,7 @@ _081D4A0C:
_081D4A0E:
pop {r1}
bx r1
thumb_func_end FieldObjectIsFarawayIslandMew
thumb_func_end EventObjectIsFarawayIslandMew
thumb_func_start unown_chamber_related
unown_chamber_related: @ 81D4A14
@@ -26598,7 +26598,7 @@ sub_81D4A90: @ 81D4A90
lsls r1, r0, 3
adds r1, r0
lsls r1, 2
ldr r0, =gMapObjects
ldr r0, =gEventObjects
adds r5, r1, r0
ldrb r1, [r5, 0x1]
movs r0, 0x21
@@ -29331,7 +29331,7 @@ sub_81D6180: @ 81D6180
thumb_func_end sub_81D6180
thumb_func_start GetTrainerHillTrainerFlag
@ u8 GetTrainerHillTrainerFlag(u8 fieldObjectId)
@ u8 GetTrainerHillTrainerFlag(u8 eventObjectId)
GetTrainerHillTrainerFlag: @ 81D619C
push {r4,lr}
adds r4, r0, 0
@@ -29340,7 +29340,7 @@ GetTrainerHillTrainerFlag: @ 81D619C
bl sub_81D5520
lsls r0, 24
lsrs r0, 23
ldr r2, =gMapObjects
ldr r2, =gEventObjects
lsls r1, r4, 3
adds r1, r4
lsls r1, 2
asm/rom_8011DC0.s
+12 -12
View File
@@ -10551,7 +10551,7 @@ _080181BC:
sub_80181CC: @ 80181CC
push {lr}
bl ScriptContext2_Enable
bl ScriptFreezeMapObjects
bl ScriptFreezeEventObjects
pop {r0}
bx r0
thumb_func_end sub_80181CC
@@ -13578,7 +13578,7 @@ sub_8019AB8: @ 8019AB8
ldr r2, [r1]
ldrb r1, [r2, 0x5]
ldrb r2, [r2, 0x4]
bl RemoveFieldObjectByLocalIdAndMap
bl RemoveEventObjectByLocalIdAndMap
pop {r0}
bx r0
.pool
@@ -13597,7 +13597,7 @@ sub_8019AD8: @ 8019AD8
ldrb r1, [r2, 0x5]
ldrb r2, [r2, 0x4]
mov r3, sp
bl TryGetFieldObjectIdByLocalIdAndMap
bl TryGetEventObjectIdByLocalIdAndMap
lsls r0, 24
cmp r0, 0
bne _08019B30
@@ -13606,16 +13606,16 @@ sub_8019AD8: @ 8019AD8
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =gMapObjects
ldr r1, =gEventObjects
adds r4, r0, r1
adds r0, r4, 0
bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive
bl EventObjectIsMovementOverridden
lsls r0, 24
cmp r0, 0
bne _08019B30
ldrb r1, [r5]
adds r0, r4, 0
bl FieldObjectSetSpecialAnim
bl EventObjectSetHeldMovement
lsls r0, 24
cmp r0, 0
bne _08019B30
@@ -13643,7 +13643,7 @@ sub_8019B3C: @ 8019B3C
ldrb r1, [r2, 0x5]
ldrb r2, [r2, 0x4]
mov r3, sp
bl TryGetFieldObjectIdByLocalIdAndMap
bl TryGetEventObjectIdByLocalIdAndMap
lsls r0, 24
cmp r0, 0
bne _08019B9C
@@ -13652,10 +13652,10 @@ sub_8019B3C: @ 8019B3C
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =gMapObjects
ldr r1, =gEventObjects
adds r4, r0, r1
adds r0, r4, 0
bl FieldObjectClearAnimIfSpecialAnimFinished
bl EventObjectClearHeldMovementIfFinished
lsls r0, 24
cmp r0, 0
bne _08019B84
@@ -13668,11 +13668,11 @@ _08019B84:
cmp r0, 0
bne _08019B96
adds r0, r4, 0
bl npc_sync_anim_pause_bits
bl UnfreezeEventObject
b _08019B9C
_08019B96:
adds r0, r4, 0
bl FreezeMapObject
bl FreezeEventObject
_08019B9C:
movs r0, 0x1
_08019B9E:
@@ -14619,7 +14619,7 @@ sub_801A2A8: @ 801A2A8
b _0801A396
_0801A2C4:
ldr r4, =gUnknown_082F076A
bl player_get_direction_lower_nybble
bl GetPlayerFacingDirection
lsls r0, 24
lsrs r0, 24
adds r0, r4
asm/script_pokemon_util_80F87D8.s
+6 -6
View File
@@ -505,10 +505,10 @@ _080F8BBA:
ldr r2, [r1]
ldrb r1, [r2, 0x5]
ldrb r2, [r2, 0x4]
bl GetFieldObjectIdByLocalIdAndMap
bl GetEventObjectIdByLocalIdAndMap
lsls r0, 24
lsrs r0, 24
ldr r2, =gMapObjects
ldr r2, =gEventObjects
lsls r1, r0, 3
adds r1, r0
lsls r1, 2
@@ -534,12 +534,12 @@ _080F8BBA:
cmp r0, 0
bne _080F8C2C
lsrs r1, r4, 16
ldr r0, =gFieldObjectPalette33
ldr r0, =gEventObjectPalette33
b _080F8C42
.pool
_080F8C2C:
lsrs r1, r4, 16
ldr r0, =gFieldObjectPalette34
ldr r0, =gEventObjectPalette34
b _080F8C42
.pool
_080F8C38:
@@ -547,7 +547,7 @@ _080F8C38:
cmp r0, 0
bne _080F8C50
lsrs r1, r4, 16
ldr r0, =gFieldObjectPalette8
ldr r0, =gEventObjectPalette8
_080F8C42:
movs r2, 0x20
bl LoadPalette
@@ -555,7 +555,7 @@ _080F8C42:
.pool
_080F8C50:
lsrs r1, r4, 16
ldr r0, =gFieldObjectPalette17
ldr r0, =gEventObjectPalette17
movs r2, 0x20
bl LoadPalette
_080F8C5A:
asm/shop.s
+19 -19
View File
@@ -1277,8 +1277,8 @@ BuyMenuDrawGraphics: @ 80E0524
@ void BuyMenuDrawMapGraphics()
BuyMenuDrawMapGraphics: @ 80E0570
push {lr}
bl BuyMenuCollectFieldObjectData
bl BuyMenuDrawFieldObjects
bl BuyMenuCollectEventObjectData
bl BuyMenuDrawEventObjects
bl BuyMenuDrawMapBg
pop {r0}
bx r0
@@ -1525,9 +1525,9 @@ BuyMenuDrawMapMetatileLayer: @ 80E0734
bx lr
thumb_func_end BuyMenuDrawMapMetatileLayer
thumb_func_start BuyMenuCollectFieldObjectData
@ void BuyMenuCollectFieldObjectData()
BuyMenuCollectFieldObjectData: @ 80E075C
thumb_func_start BuyMenuCollectEventObjectData
@ void BuyMenuCollectEventObjectData()
BuyMenuCollectEventObjectData: @ 80E075C
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -1584,7 +1584,7 @@ _080E07AA:
lsls r1, 16
asrs r1, 16
str r3, [sp, 0x10]
bl GetFieldObjectIdByXY
bl GetEventObjectIdByXY
lsls r0, 24
lsrs r6, r0, 24
ldr r3, [sp, 0x10]
@@ -1633,7 +1633,7 @@ _080E07AA:
lsrs r0, 24
mov r1, r12
strh r0, [r1]
ldr r1, =gMapObjects
ldr r1, =gEventObjects
lsls r0, r6, 3
adds r0, r6
lsls r0, 2
@@ -1716,11 +1716,11 @@ _080E08DA:
pop {r0}
bx r0
.pool
thumb_func_end BuyMenuCollectFieldObjectData
thumb_func_end BuyMenuCollectEventObjectData
thumb_func_start BuyMenuDrawFieldObjects
@ void BuyMenuDrawFieldObjects()
BuyMenuDrawFieldObjects: @ 80E08F0
thumb_func_start BuyMenuDrawEventObjects
@ void BuyMenuDrawEventObjects()
BuyMenuDrawEventObjects: @ 80E08F0
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -1730,7 +1730,7 @@ BuyMenuDrawFieldObjects: @ 80E08F0
movs r7, 0
ldr r0, =gUnknown_02039F70
mov r8, r0
ldr r1, =gMapObjects
ldr r1, =gEventObjects
mov r10, r1
ldr r2, =gSprites
mov r9, r2
@@ -1753,7 +1753,7 @@ _080E090A:
lsls r0, 2
add r0, r10
ldrb r0, [r0, 0x5]
bl GetFieldObjectGraphicsInfo
bl GetEventObjectGraphicsInfo
mov r4, r8
ldr r3, [r4]
ldr r2, =0x00002010
@@ -1792,7 +1792,7 @@ _080E090A:
str r0, [sp]
adds r0, r4, 0
ldr r1, =SpriteCallbackDummy
bl AddPseudoFieldObject
bl AddPseudoEventObject
lsls r0, 24
lsrs r4, r0, 24
adds r6, r4, 0
@@ -1801,7 +1801,7 @@ _080E090A:
mov r3, r8
ldr r0, [r3]
adds r0, r1
bl BuyMenuCheckIfFieldObjectOverlapsMenuBg
bl BuyMenuCheckIfEventObjectOverlapsMenuBg
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1850,10 +1850,10 @@ _080E09D8:
pop {r0}
bx r0
.pool
thumb_func_end BuyMenuDrawFieldObjects
thumb_func_end BuyMenuDrawEventObjects
thumb_func_start BuyMenuCheckIfFieldObjectOverlapsMenuBg
BuyMenuCheckIfFieldObjectOverlapsMenuBg: @ 80E0A14
thumb_func_start BuyMenuCheckIfEventObjectOverlapsMenuBg
BuyMenuCheckIfEventObjectOverlapsMenuBg: @ 80E0A14
push {r4,lr}
adds r4, r0, 0
movs r1, 0x2
@@ -1877,7 +1877,7 @@ _080E0A3A:
pop {r4}
pop {r1}
bx r1
thumb_func_end BuyMenuCheckIfFieldObjectOverlapsMenuBg
thumb_func_end BuyMenuCheckIfEventObjectOverlapsMenuBg
thumb_func_start BuyMenuCopyMenuBgToBg1TilemapBuffer
@ void BuyMenuCopyMenuBgToBg1TilemapBuffer()
data/battle_frontier_2.s
+16 -16
View File
@@ -1454,43 +1454,43 @@ gUnknown_08612690:: @ 8612690
.4byte 0x00000400, 0x00000800
gUnknown_08612698:: @ 8612698
step_94
step_right
step_95
store_lock_anim
walk_right
free_unlock_anim
step_end
gUnknown_0861269C:: @ 861269C
step_94
step_down
step_95
store_lock_anim
walk_down
free_unlock_anim
step_end
gUnknown_086126A0:: @ 86126A0
step_94
step_left
step_95
store_lock_anim
walk_left
free_unlock_anim
step_end
gUnknown_086126A4:: @ 86126A4
step_94
step_up
step_95
store_lock_anim
walk_up
free_unlock_anim
step_end
gUnknown_086126A8:: @ 86126A8
step_03
face_right
step_end
gUnknown_086126AA:: @ 86126AA
step_00
face_down
step_end
gUnknown_086126AC:: @ 86126AC
step_02
face_left
step_end
gUnknown_086126AE:: @ 86126AE
step_01
face_up
step_end
@ 86126B0
data/cable_car.s
+7 -7
View File
@@ -1,4 +1,4 @@
#include "constants/map_objects.h"
#include "constants/event_objects.h"
.include "asm/macros.inc"
.include "constants/constants.inc"
@@ -80,14 +80,14 @@ gSpriteTemplate_85CDBCC:: @ 85CDBCC
spr_template 3, 1, gOamData_85CDB94, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, nullsub_58
gCableCarPlayerGraphicsIDs:: @ 85CDBE4
.byte MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL
.byte MAP_OBJ_GFX_RIVAL_MAY_NORMAL
.byte EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL
.byte EVENT_OBJ_GFX_RIVAL_MAY_NORMAL
gMtChimneyHikerGraphicsIDs:: @ 85CDBE6
.byte MAP_OBJ_GFX_HIKER
.byte MAP_OBJ_GFX_CAMPER
.byte MAP_OBJ_GFX_PICNICKER
.byte MAP_OBJ_GFX_ZIGZAGOON_1 @ not used
.byte EVENT_OBJ_GFX_HIKER
.byte EVENT_OBJ_GFX_CAMPER
.byte EVENT_OBJ_GFX_PICNICKER
.byte EVENT_OBJ_GFX_ZIGZAGOON_1 @ not used
.align 1
gMtChimneyHikerCoords:: @ 85CDBEA
data/event_scripts.s
+97 -97
View File
@@ -946,7 +946,7 @@ EventScript_27142F:: @ 827142F
return
Movement_27143A: @ 827143A
step_59
reveal_trainer
step_end
EventScript_ShowTrainerIntroMsg:: @ 827143C
@@ -1523,8 +1523,8 @@ OldaleTown_PokemonCenter_1F_EventScript_271AC5:: @ 8271AC5
end
OldaleTown_PokemonCenter_1F_Movement_271AD0: @ 8271AD0
step_4f
step_12
nurse_joy_bow
delay_4
step_end
Std_ObtainItem:: @ 8271AD3
@@ -2329,13 +2329,13 @@ SlateportCity_Harbor_EventScript_2721E2:: @ 82721E2
return
SlateportCity_Harbor_Movement_2721F0: @ 82721F0
slow_step_right
slow_step_right
slow_step_right
step_right
step_right
step_right
step_right
walk_slow_right
walk_slow_right
walk_slow_right
walk_right
walk_right
walk_right
walk_right
step_end
PetalburgCity_Gym_EventScript_2721F8:: @ 82721F8
@@ -2371,7 +2371,7 @@ EventScript_27222B:: @ 827222B
return
Movement_27224E: @ 827224E
step_up
walk_up
step_end
BattleFrontier_OutsideWest_EventScript_272250:: @ 8272250
@@ -2533,27 +2533,27 @@ Route119_EventScript_2723C1:: @ 82723C1
FortreeCity_Movement_2723C7: @ 82723C7
Route119_Movement_2723C7: @ 82723C7
Route120_Movement_2723C7: @ 82723C7
step_55
step_12
step_54
step_12
step_55
step_12
step_54
step_12
step_55
step_13
step_54
step_13
step_55
step_13
step_54
step_13
step_55
step_14
step_54
step_14
step_55
set_visible
delay_4
set_invisible
delay_4
set_visible
delay_4
set_invisible
delay_4
set_visible
delay_8
set_invisible
delay_8
set_visible
delay_8
set_invisible
delay_8
set_visible
delay_16
set_invisible
delay_16
set_visible
step_end
LittlerootTown_ProfessorBirchsLab_EventScript_2723DD:: @ 82723DD
@@ -2652,7 +2652,7 @@ EverGrandeCity_SidneysRoom_EventScript_27255F:: @ 827255F
return
SlateportCity_Movement_272596: @ 8272596
step_57
emote_question_mark
step_end
AquaHideout_B2F_Movement_272598: @ 8272598
@@ -2697,7 +2697,7 @@ SeafloorCavern_Room9_Movement_272598: @ 8272598
SlateportCity_Movement_272598: @ 8272598
SlateportCity_OceanicMuseum_1F_Movement_272598: @ 8272598
SlateportCity_PokemonFanClub_Movement_272598: @ 8272598
step_56
emote_exclamation_mark
step_end
BattleFrontier_BattleTowerBattleRoom_Movement_27259A: @ 827259A
@@ -2738,9 +2738,9 @@ SeafloorCavern_Room9_Movement_27259A: @ 827259A
SlateportCity_Movement_27259A: @ 827259A
SlateportCity_OceanicMuseum_1F_Movement_27259A: @ 827259A
SlateportCity_PokemonFanClub_Movement_27259A: @ 827259A
step_14
step_14
step_14
delay_16
delay_16
delay_16
step_end
AquaHideout_B2F_Movement_27259E: @ 827259E
@@ -2784,11 +2784,11 @@ SeafloorCavern_Room9_Movement_27259E: @ 827259E
SlateportCity_Movement_27259E: @ 827259E
SlateportCity_SternsShipyard_1F_Movement_27259E: @ 827259E
SootopolisCity_Movement_27259E: @ 827259E
step_3e
face_player
step_end
BattleFrontier_OutsideWest_Movement_2725A0: @ 82725A0
step_3f
face_away_player
step_end
BattleFrontier_Lounge3_Movement_2725A2: @ 82725A2
@@ -2825,7 +2825,7 @@ SlateportCity_OceanicMuseum_2F_Movement_2725A2: @ 82725A2
SlateportCity_SternsShipyard_1F_Movement_2725A2: @ 82725A2
SootopolisCity_Movement_2725A2: @ 82725A2
VerdanturfTown_Movement_2725A2: @ 82725A2
step_4e
face_original_direction
step_end
AquaHideout_B2F_Movement_2725A4: @ 82725A4
@@ -2869,7 +2869,7 @@ SlateportCity_Movement_2725A4: @ 82725A4
SlateportCity_OceanicMuseum_1F_Movement_2725A4: @ 82725A4
SlateportCity_OceanicMuseum_2F_Movement_2725A4: @ 82725A4
SootopolisCity_Movement_2725A4: @ 82725A4
step_27
walk_in_place_fastest_left
step_end
BattleFrontier_BattleTowerCorridor2_Movement_2725A6: @ 82725A6
@@ -2916,7 +2916,7 @@ SlateportCity_Movement_2725A6: @ 82725A6
SlateportCity_OceanicMuseum_2F_Movement_2725A6: @ 82725A6
SootopolisCity_MysteryEventsHouse_1F_Movement_2725A6: @ 82725A6
VerdanturfTown_BattleTentBattleRoom_Movement_2725A6: @ 82725A6
step_26
walk_in_place_fastest_up
step_end
BattleFrontier_BattleFactoryBattleRoom_Movement_2725A8: @ 82725A8
@@ -2959,7 +2959,7 @@ SlateportCity_OceanicMuseum_1F_Movement_2725A8: @ 82725A8
SlateportCity_OceanicMuseum_2F_Movement_2725A8: @ 82725A8
SootopolisCity_Movement_2725A8: @ 82725A8
VerdanturfTown_BattleTentBattleRoom_Movement_2725A8: @ 82725A8
step_28
walk_in_place_fastest_right
step_end
BattleFrontier_OutsideWest_Movement_2725AA: @ 82725AA
@@ -3003,20 +3003,20 @@ SlateportCity_OceanicMuseum_2F_Movement_2725AA: @ 82725AA
SouthernIsland_Exterior_Movement_2725AA: @ 82725AA
VerdanturfTown_BattleTentBattleRoom_Movement_2725AA: @ 82725AA
VictoryRoad_1F_Movement_2725AA: @ 82725AA
step_25
walk_in_place_fastest_down
step_end
RustboroCity_Movement_2725AC: @ 82725AC
step_03
face_right
step_end
RustboroCity_Movement_2725AE: @ 82725AE
step_02
face_left
step_end
BattleFrontier_Mart_Movement_2725B0: @ 82725B0
MeteorFalls_1F_1R_Movement_2725B0: @ 82725B0
step_00
face_down
step_end
MarineCave_End_Movement_2725B2: @ 82725B2
@@ -3025,51 +3025,51 @@ Route118_Movement_2725B2: @ 82725B2
SkyPillar_Top_Movement_2725B2: @ 82725B2
SlateportCity_Movement_2725B2: @ 82725B2
TerraCave_End_Movement_2725B2: @ 82725B2
step_01
face_up
step_end
BattleFrontier_BattleDomeBattleRoom_Movement_2725B4: @ 82725B4
MeteorFalls_1F_1R_Movement_2725B4: @ 82725B4
step_1d
walk_in_place_down
step_end
BattleFrontier_BattlePalaceBattleRoom_Movement_2725B6: @ 82725B6
BattleFrontier_BattleTowerBattleRoom_Movement_2725B6: @ 82725B6
step_1f
walk_in_place_left
step_end
Route121_Movement_2725B8: @ 82725B8
step_20
walk_in_place_right
step_end
EverGrandeCity_SidneysRoom_Movement_2725BA: @ 82725BA
step_up
step_up
step_up
step_up
step_up
step_up
walk_up
walk_up
walk_up
walk_up
walk_up
walk_up
step_end
EverGrandeCity_ChampionsRoom_Movement_2725C1: @ 82725C1
step_up
step_up
step_up
step_up
walk_up
walk_up
walk_up
walk_up
step_end
EverGrandeCity_SidneysRoom_Movement_2725C6: @ 82725C6
step_14
step_14
delay_16
delay_16
step_end
Route110_TrickHouseEntrance_Movement_2725C9: @ 82725C9
step_up
walk_up
step_end
Movement_2725CB:: @ 82725CB
step_up
step_up
walk_up
walk_up
step_end
EventScript_2725CE:: @ 82725CE
@@ -4564,8 +4564,8 @@ SecretBase_RedCave1_EventScript_275BAB:: @ 8275BAB
end
SecretBase_RedCave1_Movement_275BB4: @ 8275BB4
step_up
step_up
walk_up
walk_up
step_end
EventScript_275BB7:: @ 8275BB7
@@ -6041,7 +6041,7 @@ gUnknown_082A8350:: @ 82A8350
end
GraniteCave_B1F_Movement_2A8369: @ 82A8369
step_54
set_invisible
step_end
LilycoveCity_PokemonCenter_1F_EventScript_2A836B:: @ 82A836B
@@ -6549,28 +6549,28 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A89AE:: @ 82A89AE
end
LilycoveCity_PokemonCenter_1F_Movement_2A89B8: @ 82A89B8
step_03
step_13
face_right
delay_8
step_end
LilycoveCity_PokemonCenter_1F_Movement_2A89BB: @ 82A89BB
step_02
step_13
face_left
delay_8
step_end
LilycoveCity_PokemonCenter_1F_Movement_2A89BE: @ 82A89BE
step_00
face_down
step_end
LilycoveCity_PokemonCenter_1F_Movement_2A89C0: @ 82A89C0
step_3e
face_player
step_end
LilycoveCity_PokemonCenter_1F_Movement_2A89C2: @ 82A89C2
step_51
step_48
step_51
step_48
disable_jump_landing_ground_effect
jump_in_place_left
disable_jump_landing_ground_effect
jump_in_place_left
step_end
LilycoveCity_PokemonCenter_1F_EventScript_2A89C7:: @ 82A89C7
@@ -10280,24 +10280,24 @@ BattleFrontier_BattleTowerLobby_EventScript_2B6E93:: @ 82B6E93
end
BattleFrontier_BattleTowerLobby_Movement_2B6E94: @ 82B6E94
step_18
walk_fast_right
BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95
step_15
step_15
step_18
step_18
step_18
step_18
step_18
step_18
step_18
step_18
step_18
step_54
step_31
step_31
step_31
walk_fast_down
walk_fast_down
walk_fast_right
walk_fast_right
walk_fast_right
walk_fast_right
walk_fast_right
walk_fast_right
walk_fast_right
walk_fast_right
walk_fast_right
set_invisible
slide_down
slide_down
slide_down
step_end
gText_082B6EA5:: @ 82B6EA5
@@ -13480,7 +13480,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4271:: @ 82C4271
BattleFrontier_BattlePikeRandomRoom1_Movement_2C427A: @ 82C427A
BattleFrontier_BattlePikeThreePathRoom_Movement_2C427A: @ 82C427A
step_54
set_invisible
step_end
LilycoveCity_ContestLobby_Text_2C427C: @ 82C427C
@@ -14701,7 +14701,7 @@ TrainerHill_Entrance_EventScript_2C83DF:: @ 82C83DF
end
TrainerHill_1F_Movement_2C83EE:: @ 82C83EE
step_54
set_invisible
step_end
EventScript_2C83F0:: @ 82C83F0
data/field_effect_misc.s
+3 -3
View File
@@ -27,7 +27,7 @@ gSpriteImage_858DB78:: @ 858DB78
.align 2
gFieldEffectObjectPalette7:: @ 858DC18
.incbin "graphics/map_objects/palettes/field_effect_object_palette_07.gbapal"
.incbin "graphics/event_objects/palettes/field_effect_object_palette_07.gbapal"
.align 2
gSpriteImage_858DC38:: @ 858DC38
@@ -75,7 +75,7 @@ gSpriteImage_858E138:: @ 858E138
.align 2
gFieldEffectObjectPalette8:: @ 858E1B8
.incbin "graphics/map_objects/palettes/field_effect_object_palette_08.gbapal"
.incbin "graphics/event_objects/palettes/field_effect_object_palette_08.gbapal"
.align 2
gSpriteImage_858E1D8:: @ 858E1D8
@@ -240,5 +240,5 @@ gSpriteAnimTable_858E87C:: @ 858E87C
.align 2
gUnknown_0858E880:: @ 858E880
spr_template 0xffff, 0x1000, gFieldObjectBaseOam_32x8, gSpriteAnimTable_858E87C, gUnknown_0858E84C, gDummySpriteAffineAnimTable, SpriteCallbackDummy
spr_template 0xffff, 0x1000, gEventObjectBaseOam_32x8, gSpriteAnimTable_858E87C, gUnknown_0858E84C, gDummySpriteAffineAnimTable, SpriteCallbackDummy
data/field_effect_scripts.s
+4 -4
View File
@@ -38,7 +38,7 @@ gFieldEffectScriptPointers:: @ 82DB9D4
.4byte gFieldEffectScript_Unknown30
.4byte gFieldEffectScript_UseFly
.4byte gFieldEffectScript_FlyIn
.4byte gFieldEffectScript_ExclamationMarkIcon2
.4byte gFieldEffectScript_QuestionMarkIcon
.4byte gFieldEffectScript_FeetInFlowingWater
.4byte gFieldEffectScript_BikeTireTracks
.4byte gFieldEffectScript_SandDisguisePlaceholder
@@ -74,7 +74,7 @@ gFieldEffectScriptPointers:: @ 82DB9D4
.4byte gFieldEffectScript_Unknown66
gFieldEffectScript_ExclamationMarkIcon1:: @ 82DBAE0
field_eff_callnative FldEff_ExclamationMarkIcon1
field_eff_callnative FldEff_ExclamationMarkIcon
field_eff_end
gFieldEffectScript_UseCutOnTallGrass:: @ 82DBAE6
@@ -206,8 +206,8 @@ gFieldEffectScript_FlyIn:: @ 82DBBE9
field_eff_callnative FldEff_FlyIn
field_eff_end
gFieldEffectScript_ExclamationMarkIcon2:: @ 82DBBEF
field_eff_callnative FldEff_ExclamationMarkIcon2
gFieldEffectScript_QuestionMarkIcon:: @ 82DBBEF
field_eff_callnative FldEff_QuestionMarkIcon
field_eff_end
gFieldEffectScript_FeetInFlowingWater:: @ 82DBBF5
data/field_ground_effect.s
-63
View File
@@ -4,66 +4,3 @@
.section .rodata
.align 2, 0
gUnknown_0850E5DC:: @ 850E5DC
.4byte 0x00000020, 0x00000010
gUnknown_0850E5E4:: @ 850E5E4
.4byte MetatileBehavior_IsTallGrass
.4byte MetatileBehavior_IsLongGrass
.4byte MetatileBehavior_IsPuddle
.4byte MetatileBehavior_IsSurfableWaterOrUnderwater
.4byte MetatileBehavior_IsShallowFlowingWater
.4byte ShouldDoJumpLandingDustEffect
gUnknown_0850E5FC:: @ 850E5FC
.4byte 0x00001000, 0x00002000, 0x00004000, 0x00008000, 0x00004000, 0x00010000
gUnknown_0850E614:: @ 850E614
.4byte MetatileBehavior_IsJumpSouth
.4byte MetatileBehavior_IsJumpNorth
.4byte MetatileBehavior_IsJumpWest
.4byte MetatileBehavior_IsJumpEast
gUnknown_0850E624:: @ 850E624
.byte 0x73, 0x73, 0x53, 0x73, 0x53, 0x73, 0x53, 0x73, 0x53, 0x73, 0x53, 0x73, 0x53, 0x00, 0x00, 0x73
gUnknown_0850E634:: @ 850E634
.byte 0x02, 0x02, 0x02, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x00, 0x00, 0x02
gUnknown_0850E644:: @ 850E644
.byte 0x01, 0x01, 0x01, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x00, 0x00, 0x01
gUnknown_0850E654:: @ 850E654
.4byte DoTracksGroundEffect_None
.4byte DoTracksGroundEffect_Footprints
.4byte DoTracksGroundEffect_BikeTireTracks
gUnknown_0850E660:: @ 850E660
.byte 13, 0
.byte 24, 0
gUnknown_0850E664:: @ 850E664
.byte 0x01, 0x02, 0x07, 0x08, 0x01, 0x02, 0x06, 0x05, 0x05, 0x08, 0x03, 0x04, 0x06, 0x07, 0x03, 0x04
gUnknown_0850E674:: @ 850E674
.4byte GroundEffect_SpawnOnTallGrass
.4byte GroundEffect_StepOnTallGrass
.4byte GroundEffect_SpawnOnLongGrass
.4byte GroundEffect_StepOnLongGrass
.4byte GroundEffect_WaterReflection
.4byte GroundEffect_IceReflection
.4byte GroundEffect_FlowingWater
.4byte GroundEffect_SandTracks
.4byte GroundEffect_DeepSandTracks
.4byte GroundEffect_Ripple
.4byte GroundEffect_StepOnPuddle
.4byte GroundEffect_SandHeap
.4byte GroundEffect_JumpOnTallGrass
.4byte GroundEffect_JumpOnLongGrass
.4byte GroundEffect_JumpOnShallowWater
.4byte GroundEffect_JumpOnWater
.4byte GroundEffect_JumpLandingDust
.4byte GroundEffect_ShortGrass
.4byte GroundEffect_HotSprings
.4byte GroundEffect_Seaweed
data/field_map_obj.s
-1731
View File
File diff suppressed because it is too large Load Diff
data/graphics/field_objects/berry_tree_graphics_tables.inc
-635
View File
@@ -1,635 +0,0 @@
.align 2
gFieldObjectPicTable_PechaBerryTree:: @ 850BE48
obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
obj_tiles gFieldObjectPic_PechaBerryTree_0, 0x100
obj_tiles gFieldObjectPic_PechaBerryTree_1, 0x100
obj_tiles gFieldObjectPic_PechaBerryTree_2, 0x100
obj_tiles gFieldObjectPic_PechaBerryTree_3, 0x100
obj_tiles gFieldObjectPic_PechaBerryTree_4, 0x100
obj_tiles gFieldObjectPic_PechaBerryTree_5, 0x100
.align 2
gBerryTreePaletteSlotTable_Pecha:: @ 850BE90
berry_tree_palette_slot_table 4
.align 2
gFieldObjectPicTable_KelpsyBerryTree:: @ 850BE98
obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
obj_tiles gFieldObjectPic_KelpsyBerryTree_0, 0x100
obj_tiles gFieldObjectPic_KelpsyBerryTree_1, 0x100
obj_tiles gFieldObjectPic_KelpsyBerryTree_2, 0x100
obj_tiles gFieldObjectPic_KelpsyBerryTree_3, 0x100
obj_tiles gFieldObjectPic_KelpsyBerryTree_4, 0x100
obj_tiles gFieldObjectPic_KelpsyBerryTree_5, 0x100
.align 2
gBerryTreePaletteSlotTable_Kelpsy:: @ 850BEE0
berry_tree_palette_slot_table 2
.align 2
gFieldObjectPicTable_WepearBerryTree:: @ 850BEE8
obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
obj_tiles gFieldObjectPic_WepearBerryTree_0, 0x100
obj_tiles gFieldObjectPic_WepearBerryTree_1, 0x100
obj_tiles gFieldObjectPic_WepearBerryTree_2, 0x100
obj_tiles gFieldObjectPic_WepearBerryTree_3, 0x100
obj_tiles gFieldObjectPic_WepearBerryTree_4, 0x100
obj_tiles gFieldObjectPic_WepearBerryTree_5, 0x100
.align 2
gBerryTreePaletteSlotTable_Wepear:: @ 850BF30
berry_tree_palette_slot_table 2
.align 2
gFieldObjectPicTable_IapapaBerryTree:: @ 850BF38
obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
obj_tiles gFieldObjectPic_IapapaBerryTree_0, 0x100
obj_tiles gFieldObjectPic_IapapaBerryTree_1, 0x100
obj_tiles gFieldObjectPic_IapapaBerryTree_2, 0x100
obj_tiles gFieldObjectPic_IapapaBerryTree_3, 0x100
obj_tiles gFieldObjectPic_IapapaBerryTree_4, 0x100
obj_tiles gFieldObjectPic_IapapaBerryTree_5, 0x100
.align 2
gBerryTreePaletteSlotTable_Iapapa:: @ 850BF80
berry_tree_palette_slot_table 3
.align 2
gFieldObjectPicTable_CheriBerryTree:: @ 850BF88
obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
obj_tiles gFieldObjectPic_CheriBerryTree_0, 0x100
obj_tiles gFieldObjectPic_CheriBerryTree_1, 0x100
obj_tiles gFieldObjectPic_CheriBerryTree_2, 0x100
obj_tiles gFieldObjectPic_CheriBerryTree_3, 0x100
obj_tiles gFieldObjectPic_CheriBerryTree_4, 0x100
obj_tiles gFieldObjectPic_CheriBerryTree_5, 0x100
.align 2
gBerryTreePaletteSlotTable_Cheri:: @ 850BFD0
berry_tree_palette_slot_table 4
.align 2
gFieldObjectPicTable_FigyBerryTree:: @ 850BFD8
obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
obj_tiles gFieldObjectPic_FigyBerryTree_0, 0x100
obj_tiles gFieldObjectPic_FigyBerryTree_1, 0x100
obj_tiles gFieldObjectPic_FigyBerryTree_2, 0x100
obj_tiles gFieldObjectPic_FigyBerryTree_3, 0x100
obj_tiles gFieldObjectPic_FigyBerryTree_4, 0x100
obj_tiles gFieldObjectPic_FigyBerryTree_5, 0x100
.align 2
gBerryTreePaletteSlotTable_Figy:: @ 850C020
berry_tree_palette_slot_table 3
.align 2
gFieldObjectPicTable_MagoBerryTree:: @ 850C028
obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
obj_tiles gFieldObjectPic_MagoBerryTree_0, 0x100
obj_tiles gFieldObjectPic_MagoBerryTree_1, 0x100
obj_tiles gFieldObjectPic_MagoBerryTree_2, 0x100
obj_tiles gFieldObjectPic_MagoBerryTree_3, 0x100
obj_tiles gFieldObjectPic_MagoBerryTree_4, 0x100
obj_tiles gFieldObjectPic_MagoBerryTree_5, 0x100
.align 2
gBerryTreePaletteSlotTable_Mago:: @ 850C070
berry_tree_palette_slot_table 3
.align 2
gFieldObjectPicTable_LumBerryTree:: @ 850C078
obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
obj_tiles gFieldObjectPic_LumBerryTree_0, 0x100
obj_tiles gFieldObjectPic_LumBerryTree_1, 0x100
obj_tiles gFieldObjectPic_LumBerryTree_2, 0x100
obj_tiles gFieldObjectPic_LumBerryTree_3, 0x100
obj_tiles gFieldObjectPic_LumBerryTree_4, 0x100
obj_tiles gFieldObjectPic_LumBerryTree_5, 0x100
.align 2
gBerryTreePaletteSlotTable_Lum:: @ 850C0C0
berry_tree_palette_slot_table 4
.align 2
gFieldObjectPicTable_RazzBerryTree:: @ 850C0C8
obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
obj_tiles gFieldObjectPic_RazzBerryTree_0, 0x100
obj_tiles gFieldObjectPic_RazzBerryTree_1, 0x100
obj_tiles gFieldObjectPic_RazzBerryTree_2, 0x100
obj_tiles gFieldObjectPic_RazzBerryTree_3, 0x100
obj_tiles gFieldObjectPic_RazzBerryTree_4, 0x100
obj_tiles gFieldObjectPic_RazzBerryTree_5, 0x100
.align 2
gBerryTreePaletteSlotTable_Razz:: @ 850C110
berry_tree_palette_slot_table 4
.align 2
gFieldObjectPicTable_GrepaBerryTree:: @ 850C118
obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
obj_tiles gFieldObjectPic_GrepaBerryTree_0, 0x100
obj_tiles gFieldObjectPic_GrepaBerryTree_1, 0x100
obj_tiles gFieldObjectPic_GrepaBerryTree_2, 0x100
obj_tiles gFieldObjectPic_GrepaBerryTree_3, 0x100
obj_tiles gFieldObjectPic_GrepaBerryTree_4, 0x100
obj_tiles gFieldObjectPic_GrepaBerryTree_5, 0x100
.align 2
gBerryTreePaletteSlotTable_Grepa:: @ 850C160
berry_tree_palette_slot_table 3
.align 2
gFieldObjectPicTable_RabutaBerryTree:: @ 850C168
obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
obj_tiles gFieldObjectPic_RabutaBerryTree_0, 0x100
obj_tiles gFieldObjectPic_RabutaBerryTree_1, 0x100
obj_tiles gFieldObjectPic_RabutaBerryTree_2, 0x100
obj_tiles gFieldObjectPic_RabutaBerryTree_3, 0x100
obj_tiles gFieldObjectPic_RabutaBerryTree_4, 0x100
obj_tiles gFieldObjectPic_RabutaBerryTree_5, 0x100
.align 2
gBerryTreePaletteSlotTable_Rabuta:: @ 850C1B0
berry_tree_palette_slot_table 4
.align 2
gFieldObjectPicTable_NomelBerryTree:: @ 850C1B8
obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
obj_tiles gFieldObjectPic_NomelBerryTree_0, 0x100
obj_tiles gFieldObjectPic_NomelBerryTree_1, 0x100
obj_tiles gFieldObjectPic_NomelBerryTree_2, 0x100
obj_tiles gFieldObjectPic_NomelBerryTree_3, 0x100
obj_tiles gFieldObjectPic_NomelBerryTree_4, 0x100
obj_tiles gFieldObjectPic_NomelBerryTree_5, 0x100
.align 2
gBerryTreePaletteSlotTable_Nomel:: @ 850C200
berry_tree_palette_slot_table 3
.align 2
gFieldObjectPicTable_LeppaBerryTree:: @ 850C208
obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
obj_tiles gFieldObjectPic_LeppaBerryTree_0, 0x100
obj_tiles gFieldObjectPic_LeppaBerryTree_1, 0x100
obj_tiles gFieldObjectPic_LeppaBerryTree_2, 0x100
obj_tiles gFieldObjectPic_LeppaBerryTree_3, 0x100
obj_tiles gFieldObjectPic_LeppaBerryTree_4, 0x100
obj_tiles gFieldObjectPic_LeppaBerryTree_5, 0x100
.align 2
gBerryTreePaletteSlotTable_Leppa:: @ 850C250
berry_tree_palette_slot_table 3
.align 2
gFieldObjectPicTable_LiechiBerryTree:: @ 850C258
obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
obj_tiles gFieldObjectPic_LiechiBerryTree_0, 0x100
obj_tiles gFieldObjectPic_LiechiBerryTree_1, 0x100
obj_tiles gFieldObjectPic_LiechiBerryTree_2, 0x100
obj_tiles gFieldObjectPic_LiechiBerryTree_3, 0x100
obj_tiles gFieldObjectPic_LiechiBerryTree_4, 0x100
obj_tiles gFieldObjectPic_LiechiBerryTree_5, 0x100
.align 2
gBerryTreePaletteSlotTable_Liechi:: @ 850C2A0
berry_tree_palette_slot_table 4
.align 2
gFieldObjectPicTable_HondewBerryTree:: @ 850C2A8
obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
obj_tiles gFieldObjectPic_HondewBerryTree_0, 0x100
obj_tiles gFieldObjectPic_HondewBerryTree_1, 0x100
obj_tiles gFieldObjectPic_HondewBerryTree_2, 0x100
obj_tiles gFieldObjectPic_HondewBerryTree_3, 0x100
obj_tiles gFieldObjectPic_HondewBerryTree_4, 0x100
obj_tiles gFieldObjectPic_HondewBerryTree_5, 0x100
.align 2
gBerryTreePaletteSlotTable_Hondew:: @ 850C2F0
berry_tree_palette_slot_table 5
.align 2
gFieldObjectPicTable_AguavBerryTree:: @ 850C2F8
obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
obj_tiles gFieldObjectPic_AguavBerryTree_0, 0x100
obj_tiles gFieldObjectPic_AguavBerryTree_1, 0x100
obj_tiles gFieldObjectPic_AguavBerryTree_2, 0x100
obj_tiles gFieldObjectPic_AguavBerryTree_3, 0x100
obj_tiles gFieldObjectPic_AguavBerryTree_4, 0x100
obj_tiles gFieldObjectPic_AguavBerryTree_5, 0x100
.align 2
gBerryTreePaletteSlotTable_Aguav:: @ 850C340
berry_tree_palette_slot_table 4
.align 2
gFieldObjectPicTable_WikiBerryTree:: @ 850C348
obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
obj_tiles gFieldObjectPic_WikiBerryTree_0, 0x100
obj_tiles gFieldObjectPic_WikiBerryTree_1, 0x100
obj_tiles gFieldObjectPic_WikiBerryTree_2, 0x100
obj_tiles gFieldObjectPic_WikiBerryTree_3, 0x100
obj_tiles gFieldObjectPic_WikiBerryTree_4, 0x100
obj_tiles gFieldObjectPic_WikiBerryTree_5, 0x100
.align 2
gBerryTreePaletteSlotTable_Wiki:: @ 850C390
berry_tree_palette_slot_table 3
.align 2
gFieldObjectPicTable_PomegBerryTree:: @ 850C398
obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
obj_tiles gFieldObjectPic_PomegBerryTree_0, 0x100
obj_tiles gFieldObjectPic_PomegBerryTree_1, 0x100
obj_tiles gFieldObjectPic_PomegBerryTree_2, 0x100
obj_tiles gFieldObjectPic_PomegBerryTree_3, 0x100
obj_tiles gFieldObjectPic_PomegBerryTree_4, 0x100
obj_tiles gFieldObjectPic_PomegBerryTree_5, 0x100
.align 2
gBerryTreePaletteSlotTable_Pomeg:: @ 850C3E0
berry_tree_palette_slot_table 3
.align 2
gFieldObjectPicTable_RawstBerryTree:: @ 850C3E8
obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
obj_tiles gFieldObjectPic_RawstBerryTree_0, 0x100
obj_tiles gFieldObjectPic_RawstBerryTree_1, 0x100
obj_tiles gFieldObjectPic_RawstBerryTree_2, 0x100
obj_tiles gFieldObjectPic_RawstBerryTree_3, 0x100
obj_tiles gFieldObjectPic_RawstBerryTree_4, 0x100
obj_tiles gFieldObjectPic_RawstBerryTree_5, 0x100
.align 2
gBerryTreePaletteSlotTable_Rawst:: @ 850C430
berry_tree_palette_slot_table 4
.align 2
gFieldObjectPicTable_SpelonBerryTree:: @ 850C438
obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
obj_tiles gFieldObjectPic_SpelonBerryTree_0, 0x100
obj_tiles gFieldObjectPic_SpelonBerryTree_1, 0x100
obj_tiles gFieldObjectPic_SpelonBerryTree_2, 0x100
obj_tiles gFieldObjectPic_SpelonBerryTree_3, 0x100
obj_tiles gFieldObjectPic_SpelonBerryTree_4, 0x100
obj_tiles gFieldObjectPic_SpelonBerryTree_5, 0x100
.align 2
gBerryTreePaletteSlotTable_Spelon:: @ 850C480
berry_tree_palette_slot_table 3
.align 2
gFieldObjectPicTable_ChestoBerryTree:: @ 850C488
obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
obj_tiles gFieldObjectPic_ChestoBerryTree_0, 0x100
obj_tiles gFieldObjectPic_ChestoBerryTree_1, 0x100
obj_tiles gFieldObjectPic_ChestoBerryTree_2, 0x100
obj_tiles gFieldObjectPic_ChestoBerryTree_3, 0x100
obj_tiles gFieldObjectPic_ChestoBerryTree_4, 0x100
obj_tiles gFieldObjectPic_ChestoBerryTree_5, 0x100
.align 2
gBerryTreePaletteSlotTable_Chesto:: @ 850C4D0
berry_tree_palette_slot_table 2
.align 2
gFieldObjectPicTable_OranBerryTree:: @ 850C4D8
obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
obj_tiles gFieldObjectPic_OranBerryTree_0, 0x100
obj_tiles gFieldObjectPic_OranBerryTree_1, 0x100
obj_tiles gFieldObjectPic_OranBerryTree_2, 0x100
obj_tiles gFieldObjectPic_OranBerryTree_3, 0x100
obj_tiles gFieldObjectPic_OranBerryTree_4, 0x100
obj_tiles gFieldObjectPic_OranBerryTree_5, 0x100
.align 2
gBerryTreePaletteSlotTable_Oran:: @ 850C520
berry_tree_palette_slot_table 2
.align 2
gFieldObjectPicTable_PersimBerryTree:: @ 850C528
obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
obj_tiles gFieldObjectPic_PersimBerryTree_0, 0x100
obj_tiles gFieldObjectPic_PersimBerryTree_1, 0x100
obj_tiles gFieldObjectPic_PersimBerryTree_2, 0x100
obj_tiles gFieldObjectPic_PersimBerryTree_3, 0x100
obj_tiles gFieldObjectPic_PersimBerryTree_4, 0x100
obj_tiles gFieldObjectPic_PersimBerryTree_5, 0x100
.align 2
gBerryTreePaletteSlotTable_Persim:: @ 850C570
berry_tree_palette_slot_table 2
.align 2
gFieldObjectPicTable_SitrusBerryTree:: @ 850C578
obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
obj_tiles gFieldObjectPic_SitrusBerryTree_0, 0x100
obj_tiles gFieldObjectPic_SitrusBerryTree_1, 0x100
obj_tiles gFieldObjectPic_SitrusBerryTree_2, 0x100
obj_tiles gFieldObjectPic_SitrusBerryTree_3, 0x100
obj_tiles gFieldObjectPic_SitrusBerryTree_4, 0x100
obj_tiles gFieldObjectPic_SitrusBerryTree_5, 0x100
.align 2
gBerryTreePaletteSlotTable_Sitrus:: @ 850C5C0
berry_tree_palette_slot_table 4
.align 2
gFieldObjectPicTable_AspearBerryTree:: @ 850C5C8
obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
obj_tiles gFieldObjectPic_AspearBerryTree_0, 0x100
obj_tiles gFieldObjectPic_AspearBerryTree_1, 0x100
obj_tiles gFieldObjectPic_AspearBerryTree_2, 0x100
obj_tiles gFieldObjectPic_AspearBerryTree_3, 0x100
obj_tiles gFieldObjectPic_AspearBerryTree_4, 0x100
obj_tiles gFieldObjectPic_AspearBerryTree_5, 0x100
.align 2
gBerryTreePaletteSlotTable_Aspear:: @ 850C610
berry_tree_palette_slot_table 3
.align 2
gFieldObjectPicTable_PamtreBerryTree:: @ 850C618
obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
obj_tiles gFieldObjectPic_PamtreBerryTree_0, 0x100
obj_tiles gFieldObjectPic_PamtreBerryTree_1, 0x100
obj_tiles gFieldObjectPic_PamtreBerryTree_2, 0x100
obj_tiles gFieldObjectPic_PamtreBerryTree_3, 0x100
obj_tiles gFieldObjectPic_PamtreBerryTree_4, 0x100
obj_tiles gFieldObjectPic_PamtreBerryTree_5, 0x100
.align 2
gBerryTreePaletteSlotTable_Pamtre:: @ 850C660
berry_tree_palette_slot_table 2
.align 2
gFieldObjectPicTable_CornnBerryTree:: @ 850C668
obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
obj_tiles gFieldObjectPic_CornnBerryTree_0, 0x100
obj_tiles gFieldObjectPic_CornnBerryTree_1, 0x100
obj_tiles gFieldObjectPic_CornnBerryTree_2, 0x100
obj_tiles gFieldObjectPic_CornnBerryTree_3, 0x100
obj_tiles gFieldObjectPic_CornnBerryTree_4, 0x100
obj_tiles gFieldObjectPic_CornnBerryTree_5, 0x100
.align 2
gBerryTreePaletteSlotTable_Cornn:: @ 850C6B0
berry_tree_palette_slot_table 2
.align 2
gFieldObjectPicTable_LansatBerryTree:: @ 850C6B8
obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
obj_tiles gFieldObjectPic_LansatBerryTree_0, 0x100
obj_tiles gFieldObjectPic_LansatBerryTree_1, 0x100
obj_tiles gFieldObjectPic_LansatBerryTree_2, 0x100
obj_tiles gFieldObjectPic_LansatBerryTree_3, 0x100
obj_tiles gFieldObjectPic_LansatBerryTree_4, 0x100
obj_tiles gFieldObjectPic_LansatBerryTree_5, 0x100
.align 2
gBerryTreePaletteSlotTable_Lansat:: @ 850C700
berry_tree_palette_slot_table 2
.align 2
gFieldObjectPicTable_DurinBerryTree:: @ 850C708
obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
obj_tiles gFieldObjectPic_DurinBerryTree_0, 0x100
obj_tiles gFieldObjectPic_DurinBerryTree_1, 0x100
obj_tiles gFieldObjectPic_DurinBerryTree_2, 0x100
obj_tiles gFieldObjectPic_DurinBerryTree_3, 0x100
obj_tiles gFieldObjectPic_DurinBerryTree_4, 0x100
obj_tiles gFieldObjectPic_DurinBerryTree_5, 0x100
.align 2
gBerryTreePaletteSlotTable_Durin:: @ 850C750
berry_tree_palette_slot_table 4
.align 2
gFieldObjectPicTable_TamatoBerryTree:: @ 850C758
obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
obj_tiles gFieldObjectPic_TamatoBerryTree_0, 0x100
obj_tiles gFieldObjectPic_TamatoBerryTree_1, 0x100
obj_tiles gFieldObjectPic_TamatoBerryTree_2, 0x100
obj_tiles gFieldObjectPic_TamatoBerryTree_3, 0x100
obj_tiles gFieldObjectPic_TamatoBerryTree_4, 0x100
obj_tiles gFieldObjectPic_TamatoBerryTree_5, 0x100
.align 2
gBerryTreePaletteSlotTable_Tamato:: @ 850C7A0
berry_tree_palette_slot_table 2
.byte MAP_OBJ_GFX_BERRY_TREE_EARLY_STAGES
.byte MAP_OBJ_GFX_BERRY_TREE_EARLY_STAGES
.byte MAP_OBJ_GFX_BERRY_TREE_EARLY_STAGES
.byte MAP_OBJ_GFX_BERRY_TREE_EARLY_STAGES
.byte MAP_OBJ_GFX_BERRY_TREE_EARLY_STAGES
gBerryTreeFieldObjectGraphicsIdTable:: @ 850C7AA
.byte MAP_OBJ_GFX_BERRY_TREE_EARLY_STAGES
.byte MAP_OBJ_GFX_BERRY_TREE_EARLY_STAGES
.byte MAP_OBJ_GFX_BERRY_TREE_LATE_STAGES
.byte MAP_OBJ_GFX_BERRY_TREE_LATE_STAGES
.byte MAP_OBJ_GFX_BERRY_TREE_LATE_STAGES
.align 2
gBerryTreePicTablePointers:: @ 850C7B0
.4byte gFieldObjectPicTable_CheriBerryTree @ Cheri
.4byte gFieldObjectPicTable_ChestoBerryTree @ Chesto
.4byte gFieldObjectPicTable_PechaBerryTree @ Pecha
.4byte gFieldObjectPicTable_RawstBerryTree @ Rawst
.4byte gFieldObjectPicTable_AspearBerryTree @ Aspear
.4byte gFieldObjectPicTable_LeppaBerryTree @ Leppa
.4byte gFieldObjectPicTable_OranBerryTree @ Oran
.4byte gFieldObjectPicTable_PersimBerryTree @ Persim
.4byte gFieldObjectPicTable_LumBerryTree @ Lum
.4byte gFieldObjectPicTable_SitrusBerryTree @ Sitrus
.4byte gFieldObjectPicTable_FigyBerryTree @ Figy
.4byte gFieldObjectPicTable_WikiBerryTree @ Wiki
.4byte gFieldObjectPicTable_MagoBerryTree @ Mago
.4byte gFieldObjectPicTable_AguavBerryTree @ Aguav
.4byte gFieldObjectPicTable_IapapaBerryTree @ Iapapa
.4byte gFieldObjectPicTable_RazzBerryTree @ Razz
.4byte gFieldObjectPicTable_RazzBerryTree @ Bluk
.4byte gFieldObjectPicTable_MagoBerryTree @ Nanab
.4byte gFieldObjectPicTable_WepearBerryTree @ Wepear
.4byte gFieldObjectPicTable_IapapaBerryTree @ Pinap
.4byte gFieldObjectPicTable_PomegBerryTree @ Pomeg
.4byte gFieldObjectPicTable_KelpsyBerryTree @ Kelpsy
.4byte gFieldObjectPicTable_WepearBerryTree @ Qualot
.4byte gFieldObjectPicTable_HondewBerryTree @ Hondew
.4byte gFieldObjectPicTable_GrepaBerryTree @ Grepa
.4byte gFieldObjectPicTable_TamatoBerryTree @ Tamato
.4byte gFieldObjectPicTable_CornnBerryTree @ Cornn
.4byte gFieldObjectPicTable_PomegBerryTree @ Magost
.4byte gFieldObjectPicTable_RabutaBerryTree @ Rabuta
.4byte gFieldObjectPicTable_NomelBerryTree @ Nomel
.4byte gFieldObjectPicTable_SpelonBerryTree @ Spelon
.4byte gFieldObjectPicTable_PamtreBerryTree @ Pamtre
.4byte gFieldObjectPicTable_RabutaBerryTree @ Watmel
.4byte gFieldObjectPicTable_DurinBerryTree @ Durin
.4byte gFieldObjectPicTable_HondewBerryTree @ Belue
.4byte gFieldObjectPicTable_LiechiBerryTree @ Liechi
.4byte gFieldObjectPicTable_HondewBerryTree @ Ganlon
.4byte gFieldObjectPicTable_AguavBerryTree @ Salac
.4byte gFieldObjectPicTable_PomegBerryTree @ Petaya
.4byte gFieldObjectPicTable_GrepaBerryTree @ Apicot
.4byte gFieldObjectPicTable_LansatBerryTree @ Lansat
.4byte gFieldObjectPicTable_CornnBerryTree @ Starf
.4byte gFieldObjectPicTable_DurinBerryTree @ Enigma
.align 2
gBerryTreePaletteSlotTablePointers:: @ 850C85C
.4byte gBerryTreePaletteSlotTable_Cheri @ Cheri
.4byte gBerryTreePaletteSlotTable_Chesto @ Chesto
.4byte gBerryTreePaletteSlotTable_Pecha @ Pecha
.4byte gBerryTreePaletteSlotTable_Rawst @ Rawst
.4byte gBerryTreePaletteSlotTable_Aspear @ Aspear
.4byte gBerryTreePaletteSlotTable_Leppa @ Leppa
.4byte gBerryTreePaletteSlotTable_Oran @ Oran
.4byte gBerryTreePaletteSlotTable_Persim @ Persim
.4byte gBerryTreePaletteSlotTable_Lum @ Lum
.4byte gBerryTreePaletteSlotTable_Sitrus @ Sitrus
.4byte gBerryTreePaletteSlotTable_Figy @ Figy
.4byte gBerryTreePaletteSlotTable_Wiki @ Wiki
.4byte gBerryTreePaletteSlotTable_Mago @ Mago
.4byte gBerryTreePaletteSlotTable_Aguav @ Aguav
.4byte gBerryTreePaletteSlotTable_Iapapa @ Iapapa
.4byte gBerryTreePaletteSlotTable_Razz @ Razz
.4byte gBerryTreePaletteSlotTable_Razz @ Bluk
.4byte gBerryTreePaletteSlotTable_Mago @ Nanab
.4byte gBerryTreePaletteSlotTable_Wepear @ Wepear
.4byte gBerryTreePaletteSlotTable_Iapapa @ Pinap
.4byte gBerryTreePaletteSlotTable_Pomeg @ Pomeg
.4byte gBerryTreePaletteSlotTable_Kelpsy @ Kelpsy
.4byte gBerryTreePaletteSlotTable_Wepear @ Qualot
.4byte gBerryTreePaletteSlotTable_Hondew @ Hondew
.4byte gBerryTreePaletteSlotTable_Grepa @ Grepa
.4byte gBerryTreePaletteSlotTable_Tamato @ Tamato
.4byte gBerryTreePaletteSlotTable_Cornn @ Cornn
.4byte gBerryTreePaletteSlotTable_Pomeg @ Magost
.4byte gBerryTreePaletteSlotTable_Rabuta @ Rabuta
.4byte gBerryTreePaletteSlotTable_Nomel @ Nomel
.4byte gBerryTreePaletteSlotTable_Spelon @ Spelon
.4byte gBerryTreePaletteSlotTable_Pamtre @ Pamtre
.4byte gBerryTreePaletteSlotTable_Rabuta @ Watmel
.4byte gBerryTreePaletteSlotTable_Durin @ Durin
.4byte gBerryTreePaletteSlotTable_Hondew @ Belue
.4byte gBerryTreePaletteSlotTable_Liechi @ Liechi
.4byte gBerryTreePaletteSlotTable_Hondew @ Ganlon
.4byte gBerryTreePaletteSlotTable_Aguav @ Salac
.4byte gBerryTreePaletteSlotTable_Pomeg @ Petaya
.4byte gBerryTreePaletteSlotTable_Grepa @ Apicot
.4byte gBerryTreePaletteSlotTable_Lansat @ Lansat
.4byte gBerryTreePaletteSlotTable_Cornn @ Starf
.4byte gBerryTreePaletteSlotTable_Durin @ Enigma
.align 2
gBerryTreeFieldObjectGraphicsIdTablePointers:: @ 850C908
.4byte gBerryTreeFieldObjectGraphicsIdTable @ Cheri
.4byte gBerryTreeFieldObjectGraphicsIdTable @ Chesto
.4byte gBerryTreeFieldObjectGraphicsIdTable @ Pecha
.4byte gBerryTreeFieldObjectGraphicsIdTable @ Rawst
.4byte gBerryTreeFieldObjectGraphicsIdTable @ Aspear
.4byte gBerryTreeFieldObjectGraphicsIdTable @ Leppa
.4byte gBerryTreeFieldObjectGraphicsIdTable @ Oran
.4byte gBerryTreeFieldObjectGraphicsIdTable @ Persim
.4byte gBerryTreeFieldObjectGraphicsIdTable @ Lum
.4byte gBerryTreeFieldObjectGraphicsIdTable @ Sitrus
.4byte gBerryTreeFieldObjectGraphicsIdTable @ Figy
.4byte gBerryTreeFieldObjectGraphicsIdTable @ Wiki
.4byte gBerryTreeFieldObjectGraphicsIdTable @ Mago
.4byte gBerryTreeFieldObjectGraphicsIdTable @ Aguav
.4byte gBerryTreeFieldObjectGraphicsIdTable @ Iapapa
.4byte gBerryTreeFieldObjectGraphicsIdTable @ Razz
.4byte gBerryTreeFieldObjectGraphicsIdTable @ Bluk
.4byte gBerryTreeFieldObjectGraphicsIdTable @ Nanab
.4byte gBerryTreeFieldObjectGraphicsIdTable @ Wepear
.4byte gBerryTreeFieldObjectGraphicsIdTable @ Pinap
.4byte gBerryTreeFieldObjectGraphicsIdTable @ Pomeg
.4byte gBerryTreeFieldObjectGraphicsIdTable @ Kelpsy
.4byte gBerryTreeFieldObjectGraphicsIdTable @ Qualot
.4byte gBerryTreeFieldObjectGraphicsIdTable @ Hondew
.4byte gBerryTreeFieldObjectGraphicsIdTable @ Grepa
.4byte gBerryTreeFieldObjectGraphicsIdTable @ Tamato
.4byte gBerryTreeFieldObjectGraphicsIdTable @ Cornn
.4byte gBerryTreeFieldObjectGraphicsIdTable @ Magost
.4byte gBerryTreeFieldObjectGraphicsIdTable @ Rabuta
.4byte gBerryTreeFieldObjectGraphicsIdTable @ Nomel
.4byte gBerryTreeFieldObjectGraphicsIdTable @ Spelon
.4byte gBerryTreeFieldObjectGraphicsIdTable @ Pamtre
.4byte gBerryTreeFieldObjectGraphicsIdTable @ Watmel
.4byte gBerryTreeFieldObjectGraphicsIdTable @ Durin
.4byte gBerryTreeFieldObjectGraphicsIdTable @ Belue
.4byte gBerryTreeFieldObjectGraphicsIdTable @ Liechi
.4byte gBerryTreeFieldObjectGraphicsIdTable @ Ganlon
.4byte gBerryTreeFieldObjectGraphicsIdTable @ Salac
.4byte gBerryTreeFieldObjectGraphicsIdTable @ Petaya
.4byte gBerryTreeFieldObjectGraphicsIdTable @ Apicot
.4byte gBerryTreeFieldObjectGraphicsIdTable @ Lansat
.4byte gBerryTreeFieldObjectGraphicsIdTable @ Starf
.4byte gBerryTreeFieldObjectGraphicsIdTable @ Enigma
@ extras
.4byte gBerryTreeFieldObjectGraphicsIdTable
.4byte gBerryTreeFieldObjectGraphicsIdTable
.4byte gBerryTreeFieldObjectGraphicsIdTable
data/graphics/field_objects/field_effect_object_template_pointers.inc
-39
View File
@@ -1,39 +0,0 @@
.align 2
gFieldEffectObjectTemplatePointers:: @ 85059F8
.4byte gFieldEffectObjectTemplate_ShadowSmall
.4byte gFieldEffectObjectTemplate_ShadowMedium
.4byte gFieldEffectObjectTemplate_ShadowLarge
.4byte gFieldEffectObjectTemplate_ShadowExtraLarge
.4byte gFieldEffectObjectTemplate_TallGrass
.4byte gFieldEffectObjectTemplate_Ripple
.4byte gFieldEffectObjectTemplate_Ash
.4byte gFieldEffectObjectTemplate_SurfBlob
.4byte gFieldEffectObjectTemplate_Arrow
.4byte gFieldEffectObjectTemplate_GroundImpactDust
.4byte gFieldEffectObjectTemplate_BikeHopTallGrass
.4byte gFieldEffectObjectTemplate_SandFootprints
.4byte gFieldEffectObjectTemplate_BikeHopBigSplash
.4byte gFieldEffectObjectTemplate_Splash
.4byte gFieldEffectObjectTemplate_BikeHopSmallSplash
.4byte gFieldEffectObjectTemplate_LongGrass
.4byte gFieldEffectObjectTemplate_Unknown16
.4byte gFieldEffectObjectTemplate_Unknown17
.4byte gFieldEffectObjectTemplate_Unknown18
.4byte gFieldEffectObjectTemplate_Unknown19
.4byte gFieldEffectObjectTemplate_Unknown20
.4byte gFieldEffectObjectTemplate_Unknown21
.4byte gFieldEffectObjectTemplate_BerryTreeGrowthSparkle
.4byte gFieldEffectObjectTemplate_DeepSandFootprints
.4byte gFieldEffectObjectTemplate_TreeDisguise
.4byte gFieldEffectObjectTemplate_MountainDisguise
.4byte gFieldEffectObjectTemplate_Bird
.4byte gFieldEffectObjectTemplate_BikeTireTracks
.4byte gFieldEffectObjectTemplate_SandDisguisePlaceholder
.4byte gFieldEffectObjectTemplate_Unknown29
.4byte gFieldEffectObjectTemplate_ShortGrass
.4byte gFieldEffectObjectTemplate_HotSpringsWater
.4byte gFieldEffectObjectTemplate_JumpOutOfAsh
.4byte gFieldEffectObjectTemplate_Unknown33
.4byte gFieldEffectObjectTemplate_Bubbles
.4byte gFieldEffectObjectTemplate_Unknown35
.4byte gFieldEffectObjectTemplate_Rayquaza
data/graphics/field_objects/field_effect_objects.inc
-1208
View File
File diff suppressed because it is too large Load Diff
data/graphics/field_objects/field_object_anims.inc
-1029
View File
File diff suppressed because it is too large Load Diff
data/graphics/field_objects/field_object_graphics.inc
-6530
View File
File diff suppressed because it is too large Load Diff
data/graphics/field_objects/field_object_graphics_info.inc
-4164
View File
File diff suppressed because it is too large Load Diff
data/graphics/field_objects/field_object_graphics_info_pointers.inc
-251
View File
@@ -1,251 +0,0 @@
.align 2
gFieldObjectGraphicsInfoPointers:: @ 8505620
.4byte gFieldObjectGraphicsInfo_BrendanNormal
.4byte gFieldObjectGraphicsInfo_BrendanMachBike
.4byte gFieldObjectGraphicsInfo_BrendanSurfing
.4byte gFieldObjectGraphicsInfo_BrendanFieldMove
.4byte gFieldObjectGraphicsInfo_QuintyPlump
.4byte gFieldObjectGraphicsInfo_LittleBoy1
.4byte gFieldObjectGraphicsInfo_LittleGirl1
.4byte gFieldObjectGraphicsInfo_Boy1
.4byte gFieldObjectGraphicsInfo_Girl1
.4byte gFieldObjectGraphicsInfo_Boy2
.4byte gFieldObjectGraphicsInfo_Girl2
.4byte gFieldObjectGraphicsInfo_LittleBoy2
.4byte gFieldObjectGraphicsInfo_LittleGirl2
.4byte gFieldObjectGraphicsInfo_Boy3
.4byte gFieldObjectGraphicsInfo_Girl3
.4byte gFieldObjectGraphicsInfo_Boy4
.4byte gFieldObjectGraphicsInfo_Woman1
.4byte gFieldObjectGraphicsInfo_FatMan
.4byte gFieldObjectGraphicsInfo_Woman2
.4byte gFieldObjectGraphicsInfo_Man1
.4byte gFieldObjectGraphicsInfo_Woman3
.4byte gFieldObjectGraphicsInfo_OldMan1
.4byte gFieldObjectGraphicsInfo_OldWoman1
.4byte gFieldObjectGraphicsInfo_Man2
.4byte gFieldObjectGraphicsInfo_Woman4
.4byte gFieldObjectGraphicsInfo_Man3
.4byte gFieldObjectGraphicsInfo_Woman5
.4byte gFieldObjectGraphicsInfo_Cook
.4byte gFieldObjectGraphicsInfo_Woman6
.4byte gFieldObjectGraphicsInfo_OldMan2
.4byte gFieldObjectGraphicsInfo_OldWoman2
.4byte gFieldObjectGraphicsInfo_Camper
.4byte gFieldObjectGraphicsInfo_Picnicker
.4byte gFieldObjectGraphicsInfo_Man4
.4byte gFieldObjectGraphicsInfo_Woman7
.4byte gFieldObjectGraphicsInfo_Youngster
.4byte gFieldObjectGraphicsInfo_BugCatcher
.4byte gFieldObjectGraphicsInfo_PsychicM
.4byte gFieldObjectGraphicsInfo_SchoolKidM
.4byte gFieldObjectGraphicsInfo_Maniac
.4byte gFieldObjectGraphicsInfo_HexManiac
.4byte gFieldObjectGraphicsInfo_Rayquaza1
.4byte gFieldObjectGraphicsInfo_SwimmerM
.4byte gFieldObjectGraphicsInfo_SwimmerF
.4byte gFieldObjectGraphicsInfo_BlackBelt
.4byte gFieldObjectGraphicsInfo_Beauty
.4byte gFieldObjectGraphicsInfo_Scientist1
.4byte gFieldObjectGraphicsInfo_Lass
.4byte gFieldObjectGraphicsInfo_Gentleman
.4byte gFieldObjectGraphicsInfo_Sailor
.4byte gFieldObjectGraphicsInfo_Fisherman
.4byte gFieldObjectGraphicsInfo_RunningTriathleteM
.4byte gFieldObjectGraphicsInfo_RunningTriathleteF
.4byte gFieldObjectGraphicsInfo_TuberF
.4byte gFieldObjectGraphicsInfo_TuberM
.4byte gFieldObjectGraphicsInfo_Hiker
.4byte gFieldObjectGraphicsInfo_CyclingTriathleteM
.4byte gFieldObjectGraphicsInfo_CyclingTriathleteF
.4byte gFieldObjectGraphicsInfo_Nurse
.4byte gFieldObjectGraphicsInfo_ItemBall
.4byte gFieldObjectGraphicsInfo_BerryTree
.4byte gFieldObjectGraphicsInfo_BerryTreeEarlyStages
.4byte gFieldObjectGraphicsInfo_BerryTreeLateStages
.4byte gFieldObjectGraphicsInfo_BrendanAcroBike
.4byte gFieldObjectGraphicsInfo_ProfBirch
.4byte gFieldObjectGraphicsInfo_Man5
.4byte gFieldObjectGraphicsInfo_Man6
.4byte gFieldObjectGraphicsInfo_ReporterM
.4byte gFieldObjectGraphicsInfo_ReporterF
.4byte gFieldObjectGraphicsInfo_Bard
.4byte gFieldObjectGraphicsInfo_Anabel
.4byte gFieldObjectGraphicsInfo_Tucker
.4byte gFieldObjectGraphicsInfo_Greta
.4byte gFieldObjectGraphicsInfo_Spenser
.4byte gFieldObjectGraphicsInfo_Noland
.4byte gFieldObjectGraphicsInfo_Lucy
.4byte gFieldObjectGraphicsInfo_UnusedNatuDoll
.4byte gFieldObjectGraphicsInfo_UnusedMagnemiteDoll
.4byte gFieldObjectGraphicsInfo_UnusedSquirtleDoll
.4byte gFieldObjectGraphicsInfo_UnusedWooperDoll
.4byte gFieldObjectGraphicsInfo_UnusedPikachuDoll
.4byte gFieldObjectGraphicsInfo_UnusedPorygon2Doll
.4byte gFieldObjectGraphicsInfo_CuttableTree
.4byte gFieldObjectGraphicsInfo_MartEmployee
.4byte gFieldObjectGraphicsInfo_RooftopSaleWoman
.4byte gFieldObjectGraphicsInfo_Teala
.4byte gFieldObjectGraphicsInfo_BreakableRock
.4byte gFieldObjectGraphicsInfo_PushableBoulder
.4byte gFieldObjectGraphicsInfo_MrBrineysBoat
.4byte gFieldObjectGraphicsInfo_MayNormal
.4byte gFieldObjectGraphicsInfo_MayMachBike
.4byte gFieldObjectGraphicsInfo_MayAcroBike
.4byte gFieldObjectGraphicsInfo_MaySurfing
.4byte gFieldObjectGraphicsInfo_MayFieldMove
.4byte gFieldObjectGraphicsInfo_Truck
.4byte gFieldObjectGraphicsInfo_VigorothCarryingBox
.4byte gFieldObjectGraphicsInfo_VigorothFacingAway
.4byte gFieldObjectGraphicsInfo_BirchsBag
.4byte gFieldObjectGraphicsInfo_EnemyZigzagoon
.4byte gFieldObjectGraphicsInfo_Artist
.4byte gFieldObjectGraphicsInfo_RivalBrendanNormal
.4byte gFieldObjectGraphicsInfo_RivalBrendanMachBike
.4byte gFieldObjectGraphicsInfo_RivalBrendanAcroBike
.4byte gFieldObjectGraphicsInfo_RivalBrendanSurfing
.4byte gFieldObjectGraphicsInfo_RivalBrendanFieldMove
.4byte gFieldObjectGraphicsInfo_RivalMayNormal
.4byte gFieldObjectGraphicsInfo_RivalMayMachBike
.4byte gFieldObjectGraphicsInfo_RivalMayAcroBike
.4byte gFieldObjectGraphicsInfo_RivalMaySurfing
.4byte gFieldObjectGraphicsInfo_RivalMayFieldMove
.4byte gFieldObjectGraphicsInfo_Cameraman
.4byte gFieldObjectGraphicsInfo_BrendanUnderwater
.4byte gFieldObjectGraphicsInfo_MayUnderwater
.4byte gFieldObjectGraphicsInfo_MovingBox
.4byte gFieldObjectGraphicsInfo_CableCar
.4byte gFieldObjectGraphicsInfo_Scientist2
.4byte gFieldObjectGraphicsInfo_Man7
.4byte gFieldObjectGraphicsInfo_AquaMemberM
.4byte gFieldObjectGraphicsInfo_AquaMemberF
.4byte gFieldObjectGraphicsInfo_MagmaMemberM
.4byte gFieldObjectGraphicsInfo_MagmaMemberF
.4byte gFieldObjectGraphicsInfo_Sidney
.4byte gFieldObjectGraphicsInfo_Phoebe
.4byte gFieldObjectGraphicsInfo_Glacia
.4byte gFieldObjectGraphicsInfo_Drake
.4byte gFieldObjectGraphicsInfo_Roxanne
.4byte gFieldObjectGraphicsInfo_Brawly
.4byte gFieldObjectGraphicsInfo_Wattson
.4byte gFieldObjectGraphicsInfo_Flannery
.4byte gFieldObjectGraphicsInfo_Norman
.4byte gFieldObjectGraphicsInfo_Winona
.4byte gFieldObjectGraphicsInfo_Liza
.4byte gFieldObjectGraphicsInfo_Tate
.4byte gFieldObjectGraphicsInfo_Wallace
.4byte gFieldObjectGraphicsInfo_Steven
.4byte gFieldObjectGraphicsInfo_Wally
.4byte gFieldObjectGraphicsInfo_RubySapphireLittleBoy
.4byte gFieldObjectGraphicsInfo_BrendanFishing
.4byte gFieldObjectGraphicsInfo_MayFishing
.4byte gFieldObjectGraphicsInfo_HotSpringsOldWoman
.4byte gFieldObjectGraphicsInfo_SSTidal
.4byte gFieldObjectGraphicsInfo_SubmarineShadow
.4byte gFieldObjectGraphicsInfo_PichuDoll
.4byte gFieldObjectGraphicsInfo_PikachuDoll
.4byte gFieldObjectGraphicsInfo_MarillDoll
.4byte gFieldObjectGraphicsInfo_TogepiDoll
.4byte gFieldObjectGraphicsInfo_CyndaquilDoll
.4byte gFieldObjectGraphicsInfo_ChikoritaDoll
.4byte gFieldObjectGraphicsInfo_TotodileDoll
.4byte gFieldObjectGraphicsInfo_JigglypuffDoll
.4byte gFieldObjectGraphicsInfo_MeowthDoll
.4byte gFieldObjectGraphicsInfo_ClefairyDoll
.4byte gFieldObjectGraphicsInfo_DittoDoll
.4byte gFieldObjectGraphicsInfo_SmoochumDoll
.4byte gFieldObjectGraphicsInfo_TreeckoDoll
.4byte gFieldObjectGraphicsInfo_TorchicDoll
.4byte gFieldObjectGraphicsInfo_MudkipDoll
.4byte gFieldObjectGraphicsInfo_DuskullDoll
.4byte gFieldObjectGraphicsInfo_WynautDoll
.4byte gFieldObjectGraphicsInfo_BaltoyDoll
.4byte gFieldObjectGraphicsInfo_KecleonDoll
.4byte gFieldObjectGraphicsInfo_AzurillDoll
.4byte gFieldObjectGraphicsInfo_SkittyDoll
.4byte gFieldObjectGraphicsInfo_SwabluDoll
.4byte gFieldObjectGraphicsInfo_GulpinDoll
.4byte gFieldObjectGraphicsInfo_LotadDoll
.4byte gFieldObjectGraphicsInfo_SeedotDoll
.4byte gFieldObjectGraphicsInfo_PikaCushion
.4byte gFieldObjectGraphicsInfo_RoundCushion
.4byte gFieldObjectGraphicsInfo_KissCushion
.4byte gFieldObjectGraphicsInfo_ZigzagCushion
.4byte gFieldObjectGraphicsInfo_SpinCushion
.4byte gFieldObjectGraphicsInfo_DiamondCushion
.4byte gFieldObjectGraphicsInfo_BallCushion
.4byte gFieldObjectGraphicsInfo_GrassCushion
.4byte gFieldObjectGraphicsInfo_FireCushion
.4byte gFieldObjectGraphicsInfo_WaterCushion
.4byte gFieldObjectGraphicsInfo_BigSnorlaxDoll
.4byte gFieldObjectGraphicsInfo_BigRhydonDoll
.4byte gFieldObjectGraphicsInfo_BigLaprasDoll
.4byte gFieldObjectGraphicsInfo_BigVenusaurDoll
.4byte gFieldObjectGraphicsInfo_BigCharizardDoll
.4byte gFieldObjectGraphicsInfo_BigBlastoiseDoll
.4byte gFieldObjectGraphicsInfo_BigWailmerDoll
.4byte gFieldObjectGraphicsInfo_BigRegirockDoll
.4byte gFieldObjectGraphicsInfo_BigRegiceDoll
.4byte gFieldObjectGraphicsInfo_BigRegisteelDoll
.4byte gFieldObjectGraphicsInfo_Latias
.4byte gFieldObjectGraphicsInfo_Latios
.4byte gFieldObjectGraphicsInfo_Boy5
.4byte gFieldObjectGraphicsInfo_ContestOldMan
.4byte gFieldObjectGraphicsInfo_BrendanWatering
.4byte gFieldObjectGraphicsInfo_MayWatering
.4byte gFieldObjectGraphicsInfo_BrendanDecorating
.4byte gFieldObjectGraphicsInfo_MayDecorating
.4byte gFieldObjectGraphicsInfo_Archie
.4byte gFieldObjectGraphicsInfo_Maxie
.4byte gFieldObjectGraphicsInfo_Kyogre1
.4byte gFieldObjectGraphicsInfo_Groudon1
.4byte gFieldObjectGraphicsInfo_Fossil
.4byte gFieldObjectGraphicsInfo_Regirock
.4byte gFieldObjectGraphicsInfo_Regice
.4byte gFieldObjectGraphicsInfo_Registeel
.4byte gFieldObjectGraphicsInfo_Skitty
.4byte gFieldObjectGraphicsInfo_Kecleon1
.4byte gFieldObjectGraphicsInfo_Kyogre2
.4byte gFieldObjectGraphicsInfo_Groudon2
.4byte gFieldObjectGraphicsInfo_Rayquaza2
.4byte gFieldObjectGraphicsInfo_Zigzagoon
.4byte gFieldObjectGraphicsInfo_Pikachu
.4byte gFieldObjectGraphicsInfo_Azumarill
.4byte gFieldObjectGraphicsInfo_Wingull
.4byte gFieldObjectGraphicsInfo_Kecleon2
.4byte gFieldObjectGraphicsInfo_TuberMSwimming
.4byte gFieldObjectGraphicsInfo_Azurill
.4byte gFieldObjectGraphicsInfo_Mom
.4byte gFieldObjectGraphicsInfo_LinkBrendan
.4byte gFieldObjectGraphicsInfo_LinkMay
.4byte gFieldObjectGraphicsInfo_Juan
.4byte gFieldObjectGraphicsInfo_Scott
.4byte gFieldObjectGraphicsInfo_Poochyena
.4byte gFieldObjectGraphicsInfo_Kyogre3
.4byte gFieldObjectGraphicsInfo_Groudon3
.4byte gFieldObjectGraphicsInfo_MysteryEventDeliveryman
.4byte gFieldObjectGraphicsInfo_Statue
.4byte gFieldObjectGraphicsInfo_Kirlia
.4byte gFieldObjectGraphicsInfo_Dusclops
.4byte gFieldObjectGraphicsInfo_UnionRoomAttendant
.4byte gFieldObjectGraphicsInfo_Sudowoodo
.4byte gFieldObjectGraphicsInfo_Mew
.4byte gFieldObjectGraphicsInfo_Red
.4byte gFieldObjectGraphicsInfo_Leaf
.4byte gFieldObjectGraphicsInfo_Deoxys
.4byte gFieldObjectGraphicsInfo_BirthIslandStone
.4byte gFieldObjectGraphicsInfo_Brandon
.4byte gFieldObjectGraphicsInfo_RubySapphireBrendan
.4byte gFieldObjectGraphicsInfo_RubySapphireMay
.4byte gFieldObjectGraphicsInfo_Lugia
.4byte gFieldObjectGraphicsInfo_HoOh
.align 2
gMauvilleOldManGraphicsInfoPointers:: @ 85059DC
.4byte gFieldObjectGraphicsInfo_Bard
.4byte gFieldObjectGraphicsInfo_Hipster
.4byte gFieldObjectGraphicsInfo_Trader
.4byte gFieldObjectGraphicsInfo_Storyteller
.4byte gFieldObjectGraphicsInfo_Giddy
.4byte gFieldObjectGraphicsInfo_UnusedMauvilleOldMan1
.4byte gFieldObjectGraphicsInfo_UnusedMauvilleOldMan2
data/graphics/field_objects/field_object_oam.inc
-465
View File
@@ -1,465 +0,0 @@
.align 2
gFieldObjectBaseOam_8x8:: @ 85094EC
.4byte OAM_SIZE_8x8
.2byte 2 << 10 @ priority
.align 2
gFieldObjectBaseOam_16x8:: @ 85094F4
.4byte OAM_SIZE_16x8
.2byte 2 << 10 @ priority
.align 2
gFieldObjectBaseOam_16x16:: @ 85094FC
.4byte OAM_SIZE_16x16
.2byte 2 << 10 @ priority
.align 2
gFieldObjectBaseOam_32x8:: @ 8509504
.4byte OAM_SIZE_32x8
.2byte 2 << 10 @ priority
.align 2
gFieldObjectBaseOam_64x32:: @ 850950C
.4byte OAM_SIZE_64x32
.2byte 2 << 10 @ priority
.align 2
gFieldObjectBaseOam_16x32:: @ 8509514
.4byte OAM_SIZE_16x32
.2byte 2 << 10 @ priority
.align 2
gFieldObjectBaseOam_32x32:: @ 850951C
.4byte OAM_SIZE_32x32
.2byte 2 << 10 @ priority
.align 2
gFieldObjectBaseOam_64x64:: @ 8509524
.4byte OAM_SIZE_64x64
.2byte 2 << 10 @ priority
.align 2
gFieldObjectSpriteOamTable_16x16_0:: @ 850952C
subsprite -8, -8, 2, 0, 16x16
.align 2
gFieldObjectSpriteOamTable_16x16_1:: @ 8509530
subsprite -8, -8, 1, 0, 16x16
.align 2
gFieldObjectSpriteOamTable_16x16_2:: @ 8509534
subsprite -8, -8, 2, 0, 16x8
subsprite -8, 0, 3, 2, 16x8
.align 2
gFieldObjectSpriteOamTable_16x16_3:: @ 850953C
subsprite -8, -8, 2, 0, 16x16
subsprite -8, -8, 3, 0, 16x16
.align 2
gFieldObjectSpriteOamTable_16x16_4:: @ 8509544
subsprite -8, -8, 1, 0, 16x16
subsprite -8, -8, 3, 0, 16x16
.align 2
gFieldObjectSpriteOamTables_16x16:: @ 850954C
.4byte 0 @ number of sprites
.4byte NULL @ unknown
.4byte 1 @ number of sprites
.4byte gFieldObjectSpriteOamTable_16x16_0 @ below high bridge
.4byte 1 @ number of sprites
.4byte gFieldObjectSpriteOamTable_16x16_1 @ above high bridge
.4byte 2 @ number of sprites
.4byte gFieldObjectSpriteOamTable_16x16_2 @ unknown
.4byte 2 @ number of sprites
.4byte gFieldObjectSpriteOamTable_16x16_3 @ long grass below high bridge
.4byte 2 @ number of sprites
.4byte gFieldObjectSpriteOamTable_16x16_4 @ long grass above high bridge
.align 2
gFieldObjectSpriteOamTable_16x32_0:: @ 850957C
subsprite -8, -16, 2, 0, 16x32
.align 2
gFieldObjectSpriteOamTable_16x32_1:: @ 8509580
subsprite -8, -16, 1, 0, 16x32
.align 2
gFieldObjectSpriteOamTable_16x32_2:: @ 8509584
subsprite -8, -16, 2, 0, 16x16
subsprite -8, 0, 2, 4, 16x8
subsprite -8, 8, 3, 6, 16x8
.align 2
gFieldObjectSpriteOamTable_16x32_3:: @ 8509590
subsprite -8, -16, 2, 0, 16x16
subsprite -8, 0, 3, 4, 16x16
.align 2
gFieldObjectSpriteOamTable_16x32_4:: @ 8509598
subsprite -8, -16, 1, 0, 16x16
subsprite -8, 0, 3, 4, 16x16
.align 2
gFieldObjectSpriteOamTables_16x32:: @ 85095A0
.4byte 0 @ number of sprites
.4byte NULL @ unknown
.4byte 1 @ number of sprites
.4byte gFieldObjectSpriteOamTable_16x32_0 @ below high bridge
.4byte 1 @ number of sprites
.4byte gFieldObjectSpriteOamTable_16x32_1 @ above high bridge
.4byte 3 @ number of sprites
.4byte gFieldObjectSpriteOamTable_16x32_2 @ unknown
.4byte 2 @ number of sprites
.4byte gFieldObjectSpriteOamTable_16x32_3 @ long grass below high bridge
.4byte 2 @ number of sprites
.4byte gFieldObjectSpriteOamTable_16x32_4 @ long grass above high bridge
.align 2
gFieldObjectSpriteOamTable_32x32_0:: @ 85095D0
subsprite -16, -16, 2, 0, 32x32
.align 2
gFieldObjectSpriteOamTable_32x32_1:: @ 85095D4
subsprite -16, -16, 1, 0, 32x32
.align 2
gFieldObjectSpriteOamTable_32x32_2:: @ 85095D8
subsprite -16, -16, 2, 0, 32x16
subsprite -16, 0, 2, 8, 32x8
subsprite -16, 8, 3, 12, 32x8
.align 2
gFieldObjectSpriteOamTable_32x32_3:: @ 85095E4
subsprite -16, -16, 2, 0, 32x16
subsprite -16, 0, 3, 8, 32x16
.align 2
gFieldObjectSpriteOamTable_32x32_4:: @ 85095EC
subsprite -16, -16, 1, 0, 32x16
subsprite -16, 0, 3, 8, 32x16
.align 2
gFieldObjectSpriteOamTables_32x32:: @ 85095F4
.4byte 0 @ number of sprites
.4byte NULL @ unknown
.4byte 1 @ number of sprites
.4byte gFieldObjectSpriteOamTable_32x32_0 @ below high bridge
.4byte 1 @ number of sprites
.4byte gFieldObjectSpriteOamTable_32x32_1 @ above high bridge
.4byte 3 @ number of sprites
.4byte gFieldObjectSpriteOamTable_32x32_2 @ unknown
.4byte 2 @ number of sprites
.4byte gFieldObjectSpriteOamTable_32x32_3 @ long grass below high bridge
.4byte 2 @ number of sprites
.4byte gFieldObjectSpriteOamTable_32x32_4 @ long grass above high bridge
.align 2
gFieldObjectSpriteOamTable_Truck_0:: @ 8509624
subsprite -24, -24, 2, 0, 32x8
subsprite 8, -24, 2, 4, 16x8
subsprite -24, -16, 2, 6, 32x8
subsprite 8, -16, 2, 10, 16x8
subsprite -24, -8, 2, 12, 32x8
subsprite 8, -8, 2, 16, 16x8
subsprite -24, 0, 2, 18, 32x8
subsprite 8, 0, 2, 22, 16x8
subsprite -24, 8, 2, 24, 32x8
subsprite 8, 8, 2, 28, 16x8
subsprite -24, 16, 2, 30, 32x8
subsprite 8, 16, 2, 34, 16x8
.align 2
gFieldObjectSpriteOamTables_Truck:: @ 8509654
.4byte 12 @ number of sprites
.4byte gFieldObjectSpriteOamTable_Truck_0 @ unknown
.4byte 12 @ number of sprites
.4byte gFieldObjectSpriteOamTable_Truck_0 @ below high bridge
.4byte 12 @ number of sprites
.4byte gFieldObjectSpriteOamTable_Truck_0 @ above high bridge
.4byte 12 @ number of sprites
.4byte gFieldObjectSpriteOamTable_Truck_0 @ unknown
.4byte 12 @ number of sprites
.4byte gFieldObjectSpriteOamTable_Truck_0 @ long grass below high bridge
.4byte 12 @ number of sprites
.4byte gFieldObjectSpriteOamTable_Truck_0 @ long grass above high bridge
.align 2
gFieldObjectSpriteOamTable_Unused_0:: @ 8509684
subsprite -32, -16, 2, 0, 64x32
.align 2
gFieldObjectSpriteOamTable_Unused_1:: @ 8509688
subsprite -32, -16, 1, 0, 64x32
.align 2
gFieldObjectSpriteOamTable_Unused_2:: @ 850968C
subsprite -32, -16, 2, 0, 64x32
.align 2
gFieldObjectSpriteOamTable_Unused_3:: @ 8509690
subsprite -32, -16, 2, 0, 64x32
.align 2
gFieldObjectSpriteOamTables_Unused:: @ 8509694
.4byte 0 @ number of sprites
.4byte NULL @ unknown
.4byte 1 @ number of sprites
.4byte gFieldObjectSpriteOamTable_Unused_0 @ below high bridge
.4byte 1 @ number of sprites
.4byte gFieldObjectSpriteOamTable_Unused_1 @ above high bridge
.4byte 1 @ number of sprites
.4byte gFieldObjectSpriteOamTable_Unused_2 @ unknown
.4byte 1 @ number of sprites
.4byte gFieldObjectSpriteOamTable_Unused_3 @ long grass below high bridge
.4byte 1 @ number of sprites
.4byte gFieldObjectSpriteOamTable_Unused_3 @ long grass above high bridge
.align 2
gFieldObjectSpriteOamTable_64x64_0:: @ 85096C4
subsprite -32, -32, 2, 0, 64x64
.align 2
gFieldObjectSpriteOamTable_64x64_1:: @ 85096C8
subsprite -32, -32, 1, 0, 64x64
.align 2
gFieldObjectSpriteOamTable_64x64_2:: @ 85096CC
subsprite -32, -32, 2, 0, 64x64
.align 2
gFieldObjectSpriteOamTable_64x64_3:: @ 85096D0
subsprite -32, -32, 2, 0, 64x64
.align 2
gFieldObjectSpriteOamTables_64x64:: @ 85096D4
.4byte 0 @ number of sprites
.4byte NULL @ unknown
.4byte 1 @ number of sprites
.4byte gFieldObjectSpriteOamTable_64x64_0 @ below high bridge
.4byte 1 @ number of sprites
.4byte gFieldObjectSpriteOamTable_64x64_1 @ above high bridge
.4byte 1 @ number of sprites
.4byte gFieldObjectSpriteOamTable_64x64_2 @ unknown
.4byte 1 @ number of sprites
.4byte gFieldObjectSpriteOamTable_64x64_3 @ long grass below high bridge
.4byte 1 @ number of sprites
.4byte gFieldObjectSpriteOamTable_64x64_3 @ long grass above high bridge
.align 2
gFieldObjectSpriteOamTable_SSTidal_0:: @ 8509704
subsprite -48, -20, 2, 0, 32x8
subsprite -16, -20, 2, 4, 32x8
subsprite 16, -20, 2, 8, 32x8
subsprite -48, -12, 2, 12, 32x8
subsprite -16, -12, 2, 16, 32x8
subsprite 16, -12, 2, 20, 32x8
subsprite -48, -4, 2, 24, 32x8
subsprite -16, -4, 2, 28, 32x8
subsprite 16, -4, 2, 32, 32x8
subsprite -48, 4, 2, 36, 32x8
subsprite -16, 4, 2, 40, 32x8
subsprite 16, 4, 2, 44, 32x8
subsprite -48, 12, 2, 48, 32x8
subsprite -16, 12, 2, 52, 32x8
subsprite 16, 12, 2, 56, 32x8
.align 2
gFieldObjectSpriteOamTable_SSTidal_1:: @ 8509740
subsprite -48, -20, 1, 0, 32x8
subsprite -16, -20, 1, 4, 32x8
subsprite 16, -20, 1, 8, 32x8
subsprite -48, -12, 1, 12, 32x8
subsprite -16, -12, 1, 16, 32x8
subsprite 16, -12, 1, 20, 32x8
subsprite -48, -4, 1, 24, 32x8
subsprite -16, -4, 1, 28, 32x8
subsprite 16, -4, 1, 32, 32x8
subsprite -48, 4, 1, 36, 32x8
subsprite -16, 4, 1, 40, 32x8
subsprite 16, 4, 1, 44, 32x8
subsprite -48, 12, 1, 48, 32x8
subsprite -16, 12, 1, 52, 32x8
subsprite 16, 12, 1, 56, 32x8
.align 2
gFieldObjectSpriteOamTable_SSTidal_2:: @ 850977C
subsprite -48, -20, 2, 0, 32x8
subsprite -16, -20, 2, 4, 32x8
subsprite 16, -20, 2, 8, 32x8
subsprite -48, -12, 2, 12, 32x8
subsprite -16, -12, 2, 16, 32x8
subsprite 16, -12, 2, 20, 32x8
subsprite -48, -4, 2, 24, 32x8
subsprite -16, -4, 2, 28, 32x8
subsprite 16, -4, 2, 32, 32x8
subsprite -48, 4, 2, 36, 32x8
subsprite -16, 4, 2, 40, 32x8
subsprite 16, 4, 2, 44, 32x8
subsprite -48, 12, 2, 48, 32x8
subsprite -16, 12, 2, 52, 32x8
subsprite 16, 12, 2, 56, 32x8
.align 2
gFieldObjectSpriteOamTable_SSTidal_3:: @ 85097B8
subsprite -48, -20, 1, 0, 32x8
subsprite -16, -20, 1, 4, 32x8
subsprite 16, -20, 1, 8, 32x8
subsprite -48, -12, 1, 12, 32x8
subsprite -16, -12, 1, 16, 32x8
subsprite 16, -12, 1, 20, 32x8
subsprite -48, -4, 2, 24, 32x8
subsprite -16, -4, 2, 28, 32x8
subsprite 16, -4, 2, 32, 32x8
subsprite -48, 4, 2, 36, 32x8
subsprite -16, 4, 2, 40, 32x8
subsprite 16, 4, 2, 44, 32x8
subsprite -48, 12, 2, 48, 32x8
subsprite -16, 12, 2, 52, 32x8
subsprite 16, 12, 2, 56, 32x8
.align 2
gFieldObjectSpriteOamTables_SSTidal:: @ 85097F4
.4byte 15 @ number of sprites
.4byte gFieldObjectSpriteOamTable_SSTidal_0 @ unknown
.4byte 15 @ number of sprites
.4byte gFieldObjectSpriteOamTable_SSTidal_0 @ below high bridge
.4byte 15 @ number of sprites
.4byte gFieldObjectSpriteOamTable_SSTidal_1 @ above high bridge
.4byte 15 @ number of sprites
.4byte gFieldObjectSpriteOamTable_SSTidal_2 @ unknown
.4byte 15 @ number of sprites
.4byte gFieldObjectSpriteOamTable_SSTidal_3 @ long grass below high bridge
.4byte 15 @ number of sprites
.4byte gFieldObjectSpriteOamTable_SSTidal_3 @ long grass above high bridge
.align 2
gFieldObjectSpriteOamTable_SubmarineShadow_0:: @ 8509824
subsprite -48, -20, 2, 0, 32x8
subsprite -16, -20, 2, 4, 32x8
subsprite 16, -20, 2, 8, 16x8
subsprite 32, -20, 2, 10, 8x8
subsprite -48, -12, 2, 11, 32x8
subsprite -16, -12, 2, 15, 32x8
subsprite 16, -12, 2, 19, 16x8
subsprite 32, -12, 2, 21, 8x8
subsprite -48, -4, 2, 22, 32x8
subsprite -16, -4, 2, 26, 32x8
subsprite 16, -4, 2, 30, 16x8
subsprite 32, -4, 2, 32, 8x8
subsprite -48, 4, 2, 33, 32x8
subsprite -16, 4, 2, 37, 32x8
subsprite 16, 4, 2, 41, 16x8
subsprite 32, 4, 2, 43, 8x8
.align 2
gFieldObjectSpriteOamTable_SubmarineShadow_1:: @ 8509864
subsprite -48, -20, 1, 0, 32x8
subsprite -16, -20, 1, 4, 32x8
subsprite 16, -20, 1, 8, 16x8
subsprite 32, -20, 1, 10, 8x8
subsprite -48, -12, 1, 11, 32x8
subsprite -16, -12, 1, 15, 32x8
subsprite 16, -12, 1, 19, 16x8
subsprite 32, -12, 1, 21, 8x8
subsprite -48, -4, 1, 22, 32x8
subsprite -16, -4, 1, 26, 32x8
subsprite 16, -4, 1, 30, 16x8
subsprite 32, -4, 1, 32, 8x8
subsprite -48, 4, 1, 33, 32x8
subsprite -16, 4, 1, 37, 32x8
subsprite 16, 4, 1, 41, 16x8
subsprite 32, 4, 1, 43, 8x8
.align 2
gFieldObjectSpriteOamTable_SubmarineShadow_2:: @ 85098A4
subsprite -48, -20, 2, 0, 32x8
subsprite -16, -20, 2, 4, 32x8
subsprite 16, -20, 2, 8, 16x8
subsprite 32, -20, 2, 10, 8x8
subsprite -48, -12, 2, 11, 32x8
subsprite -16, -12, 2, 15, 32x8
subsprite 16, -12, 2, 19, 16x8
subsprite 32, -12, 2, 21, 8x8
subsprite -48, -4, 2, 22, 32x8
subsprite -16, -4, 2, 26, 32x8
subsprite 16, -4, 2, 30, 16x8
subsprite 32, -4, 2, 32, 8x8
subsprite -48, 4, 2, 33, 32x8
subsprite -16, 4, 2, 37, 32x8
subsprite 16, 4, 2, 41, 16x8
subsprite 32, 4, 2, 43, 8x8
.align 2
gFieldObjectSpriteOamTable_SubmarineShadow_3:: @ 85098E4
subsprite -48, -20, 1, 0, 32x8
subsprite -16, -20, 1, 4, 32x8
subsprite 16, -20, 1, 8, 16x8
subsprite 32, -20, 1, 10, 8x8
subsprite -48, -12, 1, 11, 32x8
subsprite -16, -12, 1, 15, 32x8
subsprite 16, -12, 1, 19, 16x8
subsprite 32, -12, 1, 21, 8x8
subsprite -48, -4, 2, 22, 32x8
subsprite -16, -4, 2, 26, 32x8
subsprite 16, -4, 2, 30, 16x8
subsprite 32, -4, 2, 32, 8x8
subsprite -48, 4, 2, 33, 32x8
subsprite -16, 4, 2, 37, 32x8
subsprite 16, 4, 2, 41, 16x8
subsprite 32, 4, 2, 43, 8x8
.align 2
gFieldObjectSpriteOamTables_SubmarineShadow:: @ 8509924
.4byte 16 @ number of sprites
.4byte gFieldObjectSpriteOamTable_SubmarineShadow_0 @ unknown
.4byte 16 @ number of sprites
.4byte gFieldObjectSpriteOamTable_SubmarineShadow_0 @ below high bridge
.4byte 16 @ number of sprites
.4byte gFieldObjectSpriteOamTable_SubmarineShadow_1 @ above high bridge
.4byte 16 @ number of sprites
.4byte gFieldObjectSpriteOamTable_SubmarineShadow_2 @ unknown
.4byte 16 @ number of sprites
.4byte gFieldObjectSpriteOamTable_SubmarineShadow_3 @ long grass below high bridge
.4byte 16 @ number of sprites
.4byte gFieldObjectSpriteOamTable_SubmarineShadow_3 @ long grass above high bridge
data/graphics/field_objects/field_object_pic_tables.inc
-2174
View File
File diff suppressed because it is too large Load Diff
data/map_events.s
+1 -1
View File
@@ -1,6 +1,6 @@
#include "constants/flags.h"
#include "constants/items.h"
#include "constants/map_objects.h"
#include "constants/event_objects.h"
#include "constants/vars.h"
.include "asm/macros.inc"
.include "constants/constants.inc"
data/map_obj_8097404.s
-130
View File
@@ -1,130 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnknown_0850E6C4:: @ 850E6C4
.4byte little_step
.4byte little_step
.4byte little_step
.4byte little_step
.4byte little_step
.4byte little_step
.4byte little_step
.4byte little_step
.4byte little_step
.4byte little_step
.4byte little_step
.4byte little_step
.4byte little_step
.4byte little_step
.4byte little_step
.4byte little_step
.align 2
gUnknown_0850E704:: @ 850E704
.4byte double_little_steps
.4byte double_little_steps
.4byte double_little_steps
.4byte double_little_steps
.4byte double_little_steps
.4byte double_little_steps
.4byte double_little_steps
.4byte double_little_steps
.align 2
gUnknown_0850E724:: @ 850E724
.4byte double_little_steps
.4byte triple_little_steps
.4byte triple_little_steps
.4byte double_little_steps
.4byte triple_little_steps
.4byte triple_little_steps
.align 2
gUnknown_0850E73C:: @ 850E73C
.4byte quad_little_steps
.4byte quad_little_steps
.4byte quad_little_steps
.4byte quad_little_steps
.align 2
gUnknown_0850E74C:: @ 850E74C
.4byte oct_little_steps
.4byte oct_little_steps
.align 2
gUnknown_0850E754:: @ 850E754
.4byte gUnknown_0850E6C4
.4byte gUnknown_0850E704
.4byte gUnknown_0850E724
.4byte gUnknown_0850E73C
.4byte gUnknown_0850E74C
.align 1
gUnknown_0850E768:: @ 850E768
.2byte 0x0010, 0x0008, 0x0006, 0x0004, 0x0002
gUnknown_0850E772:: @ 850E772
.byte 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x02, 0x02, 0x01, 0x02, 0x02, 0x01, 0x02, 0x02, 0x01, 0x02, 0x01, 0x01, 0x02, 0x01, 0x01, 0x02, 0x01, 0x01, 0x02, 0x01
.byte 0x01, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00
.byte 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
gUnknown_0850E7BA:: @ 850E7BA
.byte 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00
.byte 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0xff, 0x00, 0x00, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00
.byte 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe
gUnknown_0850E802:: @ 850E802
.byte 0xfc, 0xfa, 0xf8, 0xf6, 0xf5, 0xf4, 0xf4, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8, 0xfa, 0xfc, 0x00, 0x00
gUnknown_0850E812:: @ 850E812
.byte 0x00, 0xfe, 0xfd, 0xfc, 0xfb, 0xfa, 0xfa, 0xfa, 0xfb, 0xfb, 0xfc, 0xfd, 0xfe, 0x00, 0x00, 0x00
gUnknown_0850E822:: @ 850E822
.byte 0xfe, 0xfc, 0xfa, 0xf8, 0xf7, 0xf6, 0xf6, 0xf6, 0xf7, 0xf8, 0xfa, 0xfb, 0xfd, 0xfe, 0x00, 0x00
.align 2
gUnknown_0850E834:: @ 850E834
.4byte gUnknown_0850E802
.4byte gUnknown_0850E812
.4byte gUnknown_0850E822
.align 1
gUnknown_0850E840:: @ 850E840
.byte 0x10, 0x00, 0x10, 0x00, 0x20, 0x00
.align 1
gUnknown_0850E846:: @ 850E846
.byte 0x00, 0x00, 0x01, 0x00
.align 1
gUnknown_0850E84A:: @ 850E84A
.byte 0x20, 0x00, 0x20, 0x00, 0x40, 0x00
.align 1
gUnknown_0850E850:: @ 850E850
.byte 0x01, 0x01, 0x02, 0x00
// referenced in data/field_map_obj.s
.align 2
gUnknown_0850E854::
.4byte sub_8097E50
.4byte sub_80964B8
.align 2
gUnknown_0850E85C::
.4byte sub_8097EF0
.4byte sub_80964B8
.align 2
gUnknown_0850E864::
.4byte sub_80980C0
.4byte sub_80980D0
.4byte sub_8098124
.align 2
gUnknown_0850E870::
.4byte sub_80980F4
.4byte sub_8098108
.4byte sub_8098124
data/maps/events/AbandonedShip_CaptainsOffice.inc
+4 -4
View File
@@ -1,11 +1,11 @@
AbandonedShip_CaptainsOffice_MapObjects: @ 8536A5C
object_event 1, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 3, 4, 3, 8, 0, 0, 0, 0, AbandonedShip_CaptainsOffice_EventScript_2387E2, 0, 0, 0
object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 6, 3, 1, 17, 0, 0, 0, AbandonedShip_CaptainsOffice_EventScript_29126E, 1100, 0, 0
AbandonedShip_CaptainsOffice_EventObjects: @ 8536A5C
object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 3, 4, 3, 8, 0, 0, 0, 0, AbandonedShip_CaptainsOffice_EventScript_2387E2, 0, 0, 0
object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 0, 6, 3, 1, 17, 0, 0, 0, AbandonedShip_CaptainsOffice_EventScript_29126E, 1100, 0, 0
AbandonedShip_CaptainsOffice_MapWarps: @ 8536A8C
warp_def 7, 6, 3, 4, ABANDONED_SHIP_DECK
warp_def 8, 6, 3, 4, ABANDONED_SHIP_DECK
AbandonedShip_CaptainsOffice_MapEvents:: @ 8536A9C
map_events AbandonedShip_CaptainsOffice_MapObjects, AbandonedShip_CaptainsOffice_MapWarps, 0x0, 0x0
map_events AbandonedShip_CaptainsOffice_EventObjects, AbandonedShip_CaptainsOffice_MapWarps, 0x0, 0x0
data/maps/events/AbandonedShip_Corridors_1F.inc
+4 -4
View File
@@ -1,6 +1,6 @@
AbandonedShip_Corridors_1F_MapObjects: @ 85366C0
object_event 1, MAP_OBJ_GFX_YOUNGSTER, 0, 0, 17, 7, 3, 2, 17, 0, 0, 0, AbandonedShip_Corridors_1F_EventScript_2379A5, 0, 0, 0
object_event 2, MAP_OBJ_GFX_TUBER_M, 0, 0, 5, 10, 3, 45, 116, 0, 1, 3, AbandonedShip_Corridors_1F_EventScript_2379AE, 0, 0, 0
AbandonedShip_Corridors_1F_EventObjects: @ 85366C0
object_event 1, EVENT_OBJ_GFX_YOUNGSTER, 0, 0, 17, 7, 3, 2, 17, 0, 0, 0, AbandonedShip_Corridors_1F_EventScript_2379A5, 0, 0, 0
object_event 2, EVENT_OBJ_GFX_TUBER_M, 0, 0, 5, 10, 3, 45, 116, 0, 1, 3, AbandonedShip_Corridors_1F_EventScript_2379AE, 0, 0, 0
AbandonedShip_Corridors_1F_MapWarps: @ 85366F0
warp_def 9, 11, 3, 2, ABANDONED_SHIP_DECK
@@ -17,5 +17,5 @@ AbandonedShip_Corridors_1F_MapWarps: @ 85366F0
warp_def 3, 3, 3, 2, ABANDONED_SHIP_ROOMS_2_1F
AbandonedShip_Corridors_1F_MapEvents:: @ 8536750
map_events AbandonedShip_Corridors_1F_MapObjects, AbandonedShip_Corridors_1F_MapWarps, 0x0, 0x0
map_events AbandonedShip_Corridors_1F_EventObjects, AbandonedShip_Corridors_1F_MapWarps, 0x0, 0x0
data/maps/events/AbandonedShip_Corridors_B1F.inc
+4 -4
View File
@@ -1,6 +1,6 @@
AbandonedShip_Corridors_B1F_MapObjects: @ 8536808
object_event 1, MAP_OBJ_GFX_TUBER_M, 0, 0, 2, 8, 3, 2, 17, 0, 0, 0, AbandonedShip_Corridors_B1F_EventScript_237DBF, 0, 0, 0
object_event 2, MAP_OBJ_GFX_SAILOR, 0, 0, 9, 6, 3, 14, 0, 0, 1, 4, AbandonedShip_Corridors_B1F_EventScript_237E13, 0, 0, 0
AbandonedShip_Corridors_B1F_EventObjects: @ 8536808
object_event 1, EVENT_OBJ_GFX_TUBER_M, 0, 0, 2, 8, 3, 2, 17, 0, 0, 0, AbandonedShip_Corridors_B1F_EventScript_237DBF, 0, 0, 0
object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 0, 9, 6, 3, 14, 0, 0, 1, 4, AbandonedShip_Corridors_B1F_EventScript_237E13, 0, 0, 0
AbandonedShip_Corridors_B1F_MapWarps: @ 8536838
warp_def 6, 4, 3, 2, ABANDONED_SHIP_ROOMS_2_B1F
@@ -16,5 +16,5 @@ AbandonedShip_Corridors_B1F_MapBGEvents: @ 8536878
bg_event 11, 4, 3, 0, 0, AbandonedShip_Corridors_B1F_EventScript_237DC8
AbandonedShip_Corridors_B1F_MapEvents:: @ 8536884
map_events AbandonedShip_Corridors_B1F_MapObjects, 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/events/AbandonedShip_HiddenFloorRooms.inc
+6 -6
View File
@@ -1,8 +1,8 @@
AbandonedShip_HiddenFloorRooms_MapObjects: @ 8536B40
object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 41, 4, 3, 1, 0, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_29127B, 1077, 0, 0
object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 16, 10, 3, 1, 0, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_291288, 1078, 0, 0
object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 5, 11, 3, 1, 17, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_2912A2, 1102, 0, 0
object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 31, 11, 3, 1, 17, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_291295, 1101, 0, 0
AbandonedShip_HiddenFloorRooms_EventObjects: @ 8536B40
object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 41, 4, 3, 1, 0, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_29127B, 1077, 0, 0
object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 16, 10, 3, 1, 0, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_291288, 1078, 0, 0
object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 5, 11, 3, 1, 17, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_2912A2, 1102, 0, 0
object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 31, 11, 3, 1, 17, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_291295, 1101, 0, 0
AbandonedShip_HiddenFloorRooms_MapWarps: @ 8536BA0
warp_def 6, 14, 3, 0, ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS
@@ -28,5 +28,5 @@ AbandonedShip_HiddenFloorRooms_MapBGEvents: @ 8536BE8
bg_event 24, 6, 3, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_238DF3
AbandonedShip_HiddenFloorRooms_MapEvents:: @ 8536C60
map_events AbandonedShip_HiddenFloorRooms_MapObjects, AbandonedShip_HiddenFloorRooms_MapWarps, 0x0, AbandonedShip_HiddenFloorRooms_MapBGEvents
map_events AbandonedShip_HiddenFloorRooms_EventObjects, AbandonedShip_HiddenFloorRooms_MapWarps, 0x0, AbandonedShip_HiddenFloorRooms_MapBGEvents
data/maps/events/AbandonedShip_Room_B1F.inc
+3 -3
View File
@@ -1,10 +1,10 @@
AbandonedShip_Room_B1F_MapObjects: @ 853697C
object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 4, 4, 3, 1, 17, 0, 0, 0, AbandonedShip_Room_B1F_EventScript_291254, 1098, 0, 0
AbandonedShip_Room_B1F_EventObjects: @ 853697C
object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 4, 4, 3, 1, 17, 0, 0, 0, AbandonedShip_Room_B1F_EventScript_291254, 1098, 0, 0
AbandonedShip_Room_B1F_MapWarps: @ 8536994
warp_def 4, 7, 3, 5, ABANDONED_SHIP_CORRIDORS_B1F
warp_def 5, 7, 3, 5, ABANDONED_SHIP_CORRIDORS_B1F
AbandonedShip_Room_B1F_MapEvents:: @ 85369A4
map_events AbandonedShip_Room_B1F_MapObjects, AbandonedShip_Room_B1F_MapWarps, 0x0, 0x0
map_events AbandonedShip_Room_B1F_EventObjects, AbandonedShip_Room_B1F_MapWarps, 0x0, 0x0
data/maps/events/AbandonedShip_Rooms2_1F.inc
+7 -7
View File
@@ -1,9 +1,9 @@
AbandonedShip_Rooms2_1F_MapObjects: @ 85369B8
object_event 1, MAP_OBJ_GFX_MAN_5, 0, 0, 7, 13, 3, 8, 0, 0, 1, 1, AbandonedShip_Rooms2_1F_EventScript_2380A7, 0, 0, 0
object_event 2, MAP_OBJ_GFX_WOMAN_5, 0, 0, 6, 13, 3, 8, 0, 0, 1, 1, AbandonedShip_Rooms2_1F_EventScript_23810B, 0, 0, 0
object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 4, 4, 3, 1, 17, 0, 0, 0, AbandonedShip_Rooms2_1F_EventScript_291261, 1099, 0, 0
object_event 4, MAP_OBJ_GFX_HIKER, 0, 0, 3, 2, 3, 10, 17, 0, 1, 3, AbandonedShip_Rooms2_1F_EventScript_238186, 0, 0, 0
object_event 5, MAP_OBJ_GFX_TUBER_F, 0, 0, 7, 2, 3, 9, 17, 0, 1, 3, AbandonedShip_Rooms2_1F_EventScript_23816F, 0, 0, 0
AbandonedShip_Rooms2_1F_EventObjects: @ 85369B8
object_event 1, EVENT_OBJ_GFX_MAN_5, 0, 0, 7, 13, 3, 8, 0, 0, 1, 1, AbandonedShip_Rooms2_1F_EventScript_2380A7, 0, 0, 0
object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 0, 6, 13, 3, 8, 0, 0, 1, 1, AbandonedShip_Rooms2_1F_EventScript_23810B, 0, 0, 0
object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 4, 4, 3, 1, 17, 0, 0, 0, AbandonedShip_Rooms2_1F_EventScript_291261, 1099, 0, 0
object_event 4, EVENT_OBJ_GFX_HIKER, 0, 0, 3, 2, 3, 10, 17, 0, 1, 3, AbandonedShip_Rooms2_1F_EventScript_238186, 0, 0, 0
object_event 5, EVENT_OBJ_GFX_TUBER_F, 0, 0, 7, 2, 3, 9, 17, 0, 1, 3, AbandonedShip_Rooms2_1F_EventScript_23816F, 0, 0, 0
AbandonedShip_Rooms2_1F_MapWarps: @ 8536A30
warp_def 4, 16, 3, 8, ABANDONED_SHIP_CORRIDORS_1F
@@ -11,5 +11,5 @@ AbandonedShip_Rooms2_1F_MapWarps: @ 8536A30
warp_def 4, 1, 3, 11, ABANDONED_SHIP_CORRIDORS_1F
AbandonedShip_Rooms2_1F_MapEvents:: @ 8536A48
map_events AbandonedShip_Rooms2_1F_MapObjects, AbandonedShip_Rooms2_1F_MapWarps, 0x0, 0x0
map_events AbandonedShip_Rooms2_1F_EventObjects, AbandonedShip_Rooms2_1F_MapWarps, 0x0, 0x0
data/maps/events/AbandonedShip_Rooms2_B1F.inc
+4 -4
View File
@@ -1,6 +1,6 @@
AbandonedShip_Rooms2_B1F_MapObjects: @ 85368F4
object_event 1, MAP_OBJ_GFX_CAMPER, 0, 0, 3, 4, 3, 2, 17, 0, 0, 0, AbandonedShip_Rooms2_B1F_EventScript_238025, 0, 0, 0
object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 13, 3, 3, 1, 17, 0, 0, 0, AbandonedShip_Rooms2_B1F_EventScript_291247, 1097, 0, 0
AbandonedShip_Rooms2_B1F_EventObjects: @ 85368F4
object_event 1, EVENT_OBJ_GFX_CAMPER, 0, 0, 3, 4, 3, 2, 17, 0, 0, 0, AbandonedShip_Rooms2_B1F_EventScript_238025, 0, 0, 0
object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 13, 3, 3, 1, 17, 0, 0, 0, AbandonedShip_Rooms2_B1F_EventScript_291247, 1097, 0, 0
AbandonedShip_Rooms2_B1F_MapWarps: @ 8536924
warp_def 4, 7, 3, 1, ABANDONED_SHIP_CORRIDORS_B1F
@@ -9,5 +9,5 @@ AbandonedShip_Rooms2_B1F_MapWarps: @ 8536924
warp_def 14, 7, 3, 0, ABANDONED_SHIP_CORRIDORS_B1F
AbandonedShip_Rooms2_B1F_MapEvents:: @ 8536944
map_events AbandonedShip_Rooms2_B1F_MapObjects, AbandonedShip_Rooms2_B1F_MapWarps, 0x0, 0x0
map_events AbandonedShip_Rooms2_B1F_EventObjects, AbandonedShip_Rooms2_B1F_MapWarps, 0x0, 0x0
data/maps/events/AbandonedShip_Rooms_1F.inc
+6 -6
View File
@@ -1,8 +1,8 @@
AbandonedShip_Rooms_1F_MapObjects: @ 8536764
object_event 1, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 12, 5, 3, 2, 17, 0, 0, 0, AbandonedShip_Rooms_1F_EventScript_237A93, 0, 0, 0
object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 4, 5, 3, 1, 17, 0, 0, 0, AbandonedShip_Rooms_1F_EventScript_29122D, 1095, 0, 0
object_event 3, MAP_OBJ_GFX_BEAUTY, 0, 0, 10, 11, 3, 8, 17, 0, 1, 4, AbandonedShip_Rooms_1F_EventScript_237AB3, 0, 0, 0
object_event 4, MAP_OBJ_GFX_YOUNGSTER, 0, 0, 10, 16, 3, 16, 17, 0, 1, 4, AbandonedShip_Rooms_1F_EventScript_237A9C, 0, 0, 0
AbandonedShip_Rooms_1F_EventObjects: @ 8536764
object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 12, 5, 3, 2, 17, 0, 0, 0, AbandonedShip_Rooms_1F_EventScript_237A93, 0, 0, 0
object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 4, 5, 3, 1, 17, 0, 0, 0, AbandonedShip_Rooms_1F_EventScript_29122D, 1095, 0, 0
object_event 3, EVENT_OBJ_GFX_BEAUTY, 0, 0, 10, 11, 3, 8, 17, 0, 1, 4, AbandonedShip_Rooms_1F_EventScript_237AB3, 0, 0, 0
object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 0, 10, 16, 3, 16, 17, 0, 1, 4, AbandonedShip_Rooms_1F_EventScript_237A9C, 0, 0, 0
AbandonedShip_Rooms_1F_MapWarps: @ 85367C4
warp_def 4, 16, 3, 4, ABANDONED_SHIP_CORRIDORS_1F
@@ -13,5 +13,5 @@ AbandonedShip_Rooms_1F_MapWarps: @ 85367C4
warp_def 14, 16, 3, 5, ABANDONED_SHIP_CORRIDORS_1F
AbandonedShip_Rooms_1F_MapEvents:: @ 85367F4
map_events AbandonedShip_Rooms_1F_MapObjects, AbandonedShip_Rooms_1F_MapWarps, 0x0, 0x0
map_events AbandonedShip_Rooms_1F_EventObjects, AbandonedShip_Rooms_1F_MapWarps, 0x0, 0x0
data/maps/events/AbandonedShip_Rooms_B1F.inc
+4 -4
View File
@@ -1,6 +1,6 @@
AbandonedShip_Rooms_B1F_MapObjects: @ 8536898
object_event 1, MAP_OBJ_GFX_FAT_MAN, 0, 0, 25, 6, 3, 9, 0, 0, 0, 0, AbandonedShip_Rooms_B1F_EventScript_237FC6, 0, 0, 0
object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 6, 7, 3, 1, 17, 0, 0, 0, AbandonedShip_Rooms_B1F_EventScript_29123A, 1096, 0, 0
AbandonedShip_Rooms_B1F_EventObjects: @ 8536898
object_event 1, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 25, 6, 3, 9, 0, 0, 0, 0, AbandonedShip_Rooms_B1F_EventScript_237FC6, 0, 0, 0
object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 6, 7, 3, 1, 17, 0, 0, 0, AbandonedShip_Rooms_B1F_EventScript_29123A, 1096, 0, 0
AbandonedShip_Rooms_B1F_MapWarps: @ 85368C8
warp_def 4, 1, 3, 2, ABANDONED_SHIP_CORRIDORS_B1F
@@ -8,5 +8,5 @@ AbandonedShip_Rooms_B1F_MapWarps: @ 85368C8
warp_def 22, 1, 3, 4, ABANDONED_SHIP_CORRIDORS_B1F
AbandonedShip_Rooms_B1F_MapEvents:: @ 85368E0
map_events AbandonedShip_Rooms_B1F_MapObjects, AbandonedShip_Rooms_B1F_MapWarps, 0x0, 0x0
map_events AbandonedShip_Rooms_B1F_EventObjects, AbandonedShip_Rooms_B1F_MapWarps, 0x0, 0x0
data/maps/events/AncientTomb.inc
+3 -3
View File
@@ -1,5 +1,5 @@
AncientTomb_MapObjects: @ 8536CDC
object_event 1, MAP_OBJ_GFX_REGISTEEL, 0, 0, 8, 7, 3, 8, 0, 0, 0, 0, AncientTomb_EventScript_23905A, 937, 0, 0
AncientTomb_EventObjects: @ 8536CDC
object_event 1, EVENT_OBJ_GFX_REGISTEEL, 0, 0, 8, 7, 3, 8, 0, 0, 0, 0, AncientTomb_EventScript_23905A, 937, 0, 0
AncientTomb_MapWarps: @ 8536CF4
warp_def 8, 29, 3, 0, ROUTE_120
@@ -12,5 +12,5 @@ AncientTomb_MapBGEvents: @ 8536D0C
bg_event 9, 20, 0, 0, 0, AncientTomb_EventScript_239050
AncientTomb_MapEvents:: @ 8536D30
map_events AncientTomb_MapObjects, AncientTomb_MapWarps, 0x0, AncientTomb_MapBGEvents
map_events AncientTomb_EventObjects, AncientTomb_MapWarps, 0x0, AncientTomb_MapBGEvents
data/maps/events/AquaHideout_1F.inc
+5 -5
View File
@@ -1,7 +1,7 @@
AquaHideout_1F_MapObjects: @ 8535304
object_event 1, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 13, 11, 3, 8, 0, 0, 0, 0, AquaHideout_1F_EventScript_233494, 821, 0, 0
object_event 2, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 14, 11, 3, 8, 0, 0, 0, 0, AquaHideout_1F_EventScript_2334C6, 822, 0, 0
object_event 3, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 20, 4, 3, 50, 93, 0, 1, 3, AquaHideout_1F_EventScript_2334F8, 924, 0, 0
AquaHideout_1F_EventObjects: @ 8535304
object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 13, 11, 3, 8, 0, 0, 0, 0, AquaHideout_1F_EventScript_233494, 821, 0, 0
object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 14, 11, 3, 8, 0, 0, 0, 0, AquaHideout_1F_EventScript_2334C6, 822, 0, 0
object_event 3, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 20, 4, 3, 50, 93, 0, 1, 3, AquaHideout_1F_EventScript_2334F8, 924, 0, 0
AquaHideout_1F_MapWarps: @ 853534C
warp_def 13, 27, 1, 6, LILYCOVE_CITY
@@ -9,5 +9,5 @@ AquaHideout_1F_MapWarps: @ 853534C
warp_def 22, 1, 3, 0, AQUA_HIDEOUT_B1F
AquaHideout_1F_MapEvents:: @ 8535364
map_events AquaHideout_1F_MapObjects, AquaHideout_1F_MapWarps, 0x0, 0x0
map_events AquaHideout_1F_EventObjects, AquaHideout_1F_MapWarps, 0x0, 0x0
data/maps/events/AquaHideout_B1F.inc
+11 -11
View File
@@ -1,13 +1,13 @@
AquaHideout_B1F_MapObjects: @ 8535378
object_event 1, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 28, 16, 3, 8, 0, 0, 1, 4, AquaHideout_B1F_EventScript_233A85, 924, 0, 0
object_event 2, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 6, 6, 3, 9, 0, 0, 1, 5, AquaHideout_B1F_EventScript_233AB0, 924, 0, 0
object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 29, 12, 3, 1, 0, 0, 0, 0, AquaHideout_B1F_EventScript_291372, 1071, 0, 0
object_event 4, MAP_OBJ_GFX_AQUA_MEMBER_F, 0, 0, 20, 18, 3, 23, 4, 0, 1, 4, AquaHideout_B1F_EventScript_233AD5, 924, 0, 0
object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 15, 9, 3, 1, 17, 0, 0, 0, AquaHideout_B1F_EventScript_291358, 1124, 0, 0
object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 16, 9, 3, 1, 17, 0, 0, 0, AquaHideout_B1F_EventScript_2339EB, 977, 0, 0
object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 15, 10, 3, 1, 17, 0, 0, 0, AquaHideout_B1F_EventScript_291365, 1132, 0, 0
object_event 8, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 16, 10, 3, 1, 17, 0, 0, 0, AquaHideout_B1F_EventScript_233A38, 978, 0, 0
object_event 9, MAP_OBJ_GFX_AQUA_MEMBER_F, 0, 0, 28, 21, 3, 7, 17, 0, 1, 4, AquaHideout_B1F_EventScript_233AEC, 924, 0, 0
AquaHideout_B1F_EventObjects: @ 8535378
object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 28, 16, 3, 8, 0, 0, 1, 4, AquaHideout_B1F_EventScript_233A85, 924, 0, 0
object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 6, 6, 3, 9, 0, 0, 1, 5, AquaHideout_B1F_EventScript_233AB0, 924, 0, 0
object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 29, 12, 3, 1, 0, 0, 0, 0, AquaHideout_B1F_EventScript_291372, 1071, 0, 0
object_event 4, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 0, 20, 18, 3, 23, 4, 0, 1, 4, AquaHideout_B1F_EventScript_233AD5, 924, 0, 0
object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 15, 9, 3, 1, 17, 0, 0, 0, AquaHideout_B1F_EventScript_291358, 1124, 0, 0
object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 16, 9, 3, 1, 17, 0, 0, 0, AquaHideout_B1F_EventScript_2339EB, 977, 0, 0
object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 15, 10, 3, 1, 17, 0, 0, 0, AquaHideout_B1F_EventScript_291365, 1132, 0, 0
object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 16, 10, 3, 1, 17, 0, 0, 0, AquaHideout_B1F_EventScript_233A38, 978, 0, 0
object_event 9, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 0, 28, 21, 3, 7, 17, 0, 1, 4, AquaHideout_B1F_EventScript_233AEC, 924, 0, 0
AquaHideout_B1F_MapWarps: @ 8535450
warp_def 29, 1, 3, 2, AQUA_HIDEOUT_1F
@@ -37,5 +37,5 @@ AquaHideout_B1F_MapWarps: @ 8535450
warp_def 48, 17, 3, 19, AQUA_HIDEOUT_B1F
AquaHideout_B1F_MapEvents:: @ 8535518
map_events AquaHideout_B1F_MapObjects, AquaHideout_B1F_MapWarps, 0x0, 0x0
map_events AquaHideout_B1F_EventObjects, AquaHideout_B1F_MapWarps, 0x0, 0x0
data/maps/events/AquaHideout_B2F.inc
+8 -8
View File
@@ -1,10 +1,10 @@
AquaHideout_B2F_MapObjects: @ 853552C
object_event 1, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 23, 19, 3, 9, 0, 0, 0, 0, AquaHideout_B2F_EventScript_233E09, 924, 0, 0
object_event 2, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 23, 10, 3, 45, 52, 0, 1, 3, AquaHideout_B2F_EventScript_233E8A, 924, 0, 0
object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 3, 13, 3, 1, 0, 0, 0, 0, AquaHideout_B2F_EventScript_29137F, 1072, 0, 0
object_event 4, MAP_OBJ_GFX_SUBMARINE_SHADOW, 0, 0, 19, 20, 1, 9, 0, 0, 0, 0, 0x0, 943, 0, 0
object_event 5, MAP_OBJ_GFX_AQUA_MEMBER_F, 0, 0, 7, 5, 3, 10, 17, 0, 1, 5, AquaHideout_B2F_EventScript_233EAF, 924, 0, 0
object_event 6, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 13, 5, 3, 9, 17, 0, 1, 5, AquaHideout_B2F_EventScript_233EC6, 924, 0, 0
AquaHideout_B2F_EventObjects: @ 853552C
object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 23, 19, 3, 9, 0, 0, 0, 0, AquaHideout_B2F_EventScript_233E09, 924, 0, 0
object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 23, 10, 3, 45, 52, 0, 1, 3, AquaHideout_B2F_EventScript_233E8A, 924, 0, 0
object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 3, 13, 3, 1, 0, 0, 0, 0, AquaHideout_B2F_EventScript_29137F, 1072, 0, 0
object_event 4, EVENT_OBJ_GFX_SUBMARINE_SHADOW, 0, 0, 19, 20, 1, 9, 0, 0, 0, 0, 0x0, 943, 0, 0
object_event 5, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 0, 7, 5, 3, 10, 17, 0, 1, 5, AquaHideout_B2F_EventScript_233EAF, 924, 0, 0
object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 13, 5, 3, 9, 17, 0, 1, 5, AquaHideout_B2F_EventScript_233EC6, 924, 0, 0
AquaHideout_B2F_MapWarps: @ 85355BC
warp_def 18, 1, 3, 1, AQUA_HIDEOUT_B1F
@@ -23,5 +23,5 @@ AquaHideout_B2F_MapCoordEvents: @ 853560C
coord_event 28, 16, 3, 0, VAR_TEMP_1, 0, 0, AquaHideout_B2F_EventScript_233DE5
AquaHideout_B2F_MapEvents:: @ 853562C
map_events AquaHideout_B2F_MapObjects, AquaHideout_B2F_MapWarps, AquaHideout_B2F_MapCoordEvents, 0x0
map_events AquaHideout_B2F_EventObjects, AquaHideout_B2F_MapWarps, AquaHideout_B2F_MapCoordEvents, 0x0
data/maps/events/ArtisanCave_1F.inc
+3 -3
View File
@@ -1,10 +1,10 @@
ArtisanCave_1F_MapObjects: @ 8537774
object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 14, 5, 3, 1, 17, 0, 0, 0, ArtisanCave_1F_EventScript_2914D1, 1163, 0, 0
ArtisanCave_1F_EventObjects: @ 8537774
object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 14, 5, 3, 1, 17, 0, 0, 0, ArtisanCave_1F_EventScript_2914D1, 1163, 0, 0
ArtisanCave_1F_MapWarps: @ 853778C
warp_def 10, 17, 0, 13, BATTLE_FRONTIER_OUTSIDE_EAST
warp_def 6, 5, 0, 1, ARTISAN_CAVE_B1F
ArtisanCave_1F_MapEvents:: @ 853779C
map_events ArtisanCave_1F_MapObjects, ArtisanCave_1F_MapWarps, 0x0, 0x0
map_events ArtisanCave_1F_EventObjects, ArtisanCave_1F_MapWarps, 0x0, 0x0
data/maps/events/ArtisanCave_B1F.inc
+3 -3
View File
@@ -1,5 +1,5 @@
ArtisanCave_B1F_MapObjects: @ 8537708
object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 32, 38, 3, 1, 17, 0, 0, 0, ArtisanCave_B1F_EventScript_2914C4, 1162, 0, 0
ArtisanCave_B1F_EventObjects: @ 8537708
object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 32, 38, 3, 1, 17, 0, 0, 0, ArtisanCave_B1F_EventScript_2914C4, 1162, 0, 0
ArtisanCave_B1F_MapWarps: @ 8537720
warp_def 8, 48, 0, 10, BATTLE_FRONTIER_OUTSIDE_WEST
@@ -12,5 +12,5 @@ ArtisanCave_B1F_MapBGEvents: @ 8537730
bg_event 19, 43, 0, 7, 0, ITEM_IRON, 104, 0
ArtisanCave_B1F_MapEvents:: @ 8537760
map_events ArtisanCave_B1F_MapObjects, ArtisanCave_B1F_MapWarps, 0x0, ArtisanCave_B1F_MapBGEvents
map_events ArtisanCave_B1F_EventObjects, ArtisanCave_B1F_MapWarps, 0x0, ArtisanCave_B1F_MapBGEvents
data/maps/events/BattleFrontier_BattleArenaBattleRoom.inc
+11 -11
View File
@@ -1,14 +1,14 @@
BattleFrontier_BattleArenaBattleRoom_MapObjects: @ 853C8EC
object_event 1, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 5, 3, 3, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
object_event 2, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 10, 3, 3, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
object_event 3, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 5, 9, 3, 7, 17, 0, 0, 0, 0x0, 0, 0, 0
object_event 4, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 10, 9, 3, 7, 17, 0, 0, 0, 0x0, 0, 0, 0
object_event 5, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 4, 5, 3, 10, 17, 0, 0, 0, 0x0, 0, 0, 0
object_event 6, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 11, 5, 3, 9, 17, 0, 0, 0, 0x0, 0, 0, 0
object_event 7, MAP_OBJ_GFX_HIPSTER, 0, 0, 15, 6, 3, 9, 17, 0, 0, 0, 0x0, 0, 0, 0
object_event 8, MAP_OBJ_GFX_TRADER, 0, 0, 0, 6, 3, 10, 17, 0, 0, 0, 0x0, 0, 0, 0
object_event 9, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 7, 4, 3, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
BattleFrontier_BattleArenaBattleRoom_EventObjects: @ 853C8EC
object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 5, 3, 3, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 10, 3, 3, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
object_event 3, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 5, 9, 3, 7, 17, 0, 0, 0, 0x0, 0, 0, 0
object_event 4, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 10, 9, 3, 7, 17, 0, 0, 0, 0x0, 0, 0, 0
object_event 5, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 4, 5, 3, 10, 17, 0, 0, 0, 0x0, 0, 0, 0
object_event 6, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 11, 5, 3, 9, 17, 0, 0, 0, 0x0, 0, 0, 0
object_event 7, EVENT_OBJ_GFX_HIPSTER, 0, 0, 15, 6, 3, 9, 17, 0, 0, 0, 0x0, 0, 0, 0
object_event 8, EVENT_OBJ_GFX_TRADER, 0, 0, 0, 6, 3, 10, 17, 0, 0, 0, 0x0, 0, 0, 0
object_event 9, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 7, 4, 3, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
BattleFrontier_BattleArenaBattleRoom_MapEvents:: @ 853C9C4
map_events BattleFrontier_BattleArenaBattleRoom_MapObjects, 0x0, 0x0, 0x0
map_events BattleFrontier_BattleArenaBattleRoom_EventObjects, 0x0, 0x0, 0x0
data/maps/events/BattleFrontier_BattleArenaCorridor.inc
+3 -3
View File
@@ -1,6 +1,6 @@
BattleFrontier_BattleArenaCorridor_MapObjects: @ 853C8C0
object_event 1, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 9, 12, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
BattleFrontier_BattleArenaCorridor_EventObjects: @ 853C8C0
object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 9, 12, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
BattleFrontier_BattleArenaCorridor_MapEvents:: @ 853C8D8
map_events BattleFrontier_BattleArenaCorridor_MapObjects, 0x0, 0x0, 0x0
map_events BattleFrontier_BattleArenaCorridor_EventObjects, 0x0, 0x0, 0x0
data/maps/events/BattleFrontier_BattleArenaLobby.inc
+7 -7
View File
@@ -1,9 +1,9 @@
BattleFrontier_BattleArenaLobby_MapObjects: @ 853C814
object_event 1, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 7, 7, 0, 8, 17, 0, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_255DF4, 0, 0, 0
object_event 2, MAP_OBJ_GFX_WOMAN_7, 0, 0, 2, 10, 3, 2, 17, 0, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_2560C1, 0, 0, 0
object_event 3, MAP_OBJ_GFX_MAN_6, 0, 0, 14, 11, 3, 9, 17, 0, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_2560AF, 0, 0, 0
object_event 4, MAP_OBJ_GFX_CAMPER, 0, 0, 14, 12, 3, 9, 17, 0, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_2560B8, 0, 0, 0
object_event 5, MAP_OBJ_GFX_YOUNGSTER, 0, 0, 14, 10, 3, 9, 17, 0, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_2560A6, 0, 0, 0
BattleFrontier_BattleArenaLobby_EventObjects: @ 853C814
object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 7, 7, 0, 8, 17, 0, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_255DF4, 0, 0, 0
object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 2, 10, 3, 2, 17, 0, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_2560C1, 0, 0, 0
object_event 3, EVENT_OBJ_GFX_MAN_6, 0, 0, 14, 11, 3, 9, 17, 0, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_2560AF, 0, 0, 0
object_event 4, EVENT_OBJ_GFX_CAMPER, 0, 0, 14, 12, 3, 9, 17, 0, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_2560B8, 0, 0, 0
object_event 5, EVENT_OBJ_GFX_YOUNGSTER, 0, 0, 14, 10, 3, 9, 17, 0, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_2560A6, 0, 0, 0
BattleFrontier_BattleArenaLobby_MapWarps: @ 853C88C
warp_def 7, 12, 3, 1, BATTLE_FRONTIER_OUTSIDE_EAST
@@ -13,5 +13,5 @@ BattleFrontier_BattleArenaLobby_MapBGEvents: @ 853C894
bg_event 1, 7, 0, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_2560CA
BattleFrontier_BattleArenaLobby_MapEvents:: @ 853C8AC
map_events BattleFrontier_BattleArenaLobby_MapObjects, BattleFrontier_BattleArenaLobby_MapWarps, 0x0, BattleFrontier_BattleArenaLobby_MapBGEvents
map_events BattleFrontier_BattleArenaLobby_EventObjects, BattleFrontier_BattleArenaLobby_MapWarps, 0x0, BattleFrontier_BattleArenaLobby_MapBGEvents
data/maps/events/BattleFrontier_BattleDomeBattleRoom.inc
+17 -17
View File
@@ -1,20 +1,20 @@
BattleFrontier_BattleDomeBattleRoom_MapObjects: @ 853C1C4
object_event 1, MAP_OBJ_GFX_REPORTER_M, 0, 0, 5, 4, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
object_event 2, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 7, 2, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
object_event 3, MAP_OBJ_GFX_BOY_1, 0, 0, 9, 2, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
object_event 4, MAP_OBJ_GFX_BOY_2, 0, 0, 11, 2, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
object_event 5, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 16, 2, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
object_event 6, MAP_OBJ_GFX_MAN_1, 0, 0, 4, 2, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
object_event 7, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 16, 1, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
object_event 8, MAP_OBJ_GFX_CAMPER, 0, 0, 8, 1, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
object_event 9, MAP_OBJ_GFX_MAN_2, 0, 0, 0, 4, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
object_event 10, MAP_OBJ_GFX_FAT_MAN, 0, 0, 12, 1, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
object_event 11, MAP_OBJ_GFX_GIRL_2, 0, 0, 13, 2, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
object_event 12, MAP_OBJ_GFX_GIRL_1, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
object_event 13, MAP_OBJ_GFX_TRADER, 0, 0, 4, 9, 4, 7, 17, 0, 0, 0, 0x0, 0, 0, 0
object_event 14, MAP_OBJ_GFX_WOMAN_4, 0, 0, 14, 2, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
object_event 15, MAP_OBJ_GFX_HIPSTER, 0, 0, 11, 6, 0, 9, 17, 0, 0, 0, 0x0, 0, 0, 0
BattleFrontier_BattleDomeBattleRoom_EventObjects: @ 853C1C4
object_event 1, EVENT_OBJ_GFX_REPORTER_M, 0, 0, 5, 4, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 7, 2, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 0, 9, 2, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
object_event 4, EVENT_OBJ_GFX_BOY_2, 0, 0, 11, 2, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
object_event 5, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 16, 2, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
object_event 6, EVENT_OBJ_GFX_MAN_1, 0, 0, 4, 2, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
object_event 7, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 16, 1, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
object_event 8, EVENT_OBJ_GFX_CAMPER, 0, 0, 8, 1, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
object_event 9, EVENT_OBJ_GFX_MAN_2, 0, 0, 0, 4, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
object_event 10, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 12, 1, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
object_event 11, EVENT_OBJ_GFX_GIRL_2, 0, 0, 13, 2, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
object_event 12, EVENT_OBJ_GFX_GIRL_1, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
object_event 13, EVENT_OBJ_GFX_TRADER, 0, 0, 4, 9, 4, 7, 17, 0, 0, 0, 0x0, 0, 0, 0
object_event 14, EVENT_OBJ_GFX_WOMAN_4, 0, 0, 14, 2, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
object_event 15, EVENT_OBJ_GFX_HIPSTER, 0, 0, 11, 6, 0, 9, 17, 0, 0, 0, 0x0, 0, 0, 0
BattleFrontier_BattleDomeBattleRoom_MapEvents:: @ 853C32C
map_events BattleFrontier_BattleDomeBattleRoom_MapObjects, 0x0, 0x0, 0x0
map_events BattleFrontier_BattleDomeBattleRoom_EventObjects, 0x0, 0x0, 0x0
data/maps/events/BattleFrontier_BattleDomeCorridor.inc
+3 -3
View File
@@ -1,10 +1,10 @@
BattleFrontier_BattleDomeCorridor_MapObjects: @ 853C14C
object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 23, 5, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
BattleFrontier_BattleDomeCorridor_EventObjects: @ 853C14C
object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 23, 5, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
BattleFrontier_BattleDomeCorridor_MapWarps: @ 853C164
warp_def 6, 8, 3, 1, BATTLE_FRONTIER_OUTSIDE_WEST
warp_def 7, 8, 3, 1, BATTLE_FRONTIER_OUTSIDE_WEST
BattleFrontier_BattleDomeCorridor_MapEvents:: @ 853C174
map_events BattleFrontier_BattleDomeCorridor_MapObjects, BattleFrontier_BattleDomeCorridor_MapWarps, 0x0, 0x0
map_events BattleFrontier_BattleDomeCorridor_EventObjects, BattleFrontier_BattleDomeCorridor_MapWarps, 0x0, 0x0
data/maps/events/BattleFrontier_BattleDomeLobby.inc
+8 -8
View File
@@ -1,10 +1,10 @@
BattleFrontier_BattleDomeLobby_MapObjects: @ 853C068
object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 5, 10, 0, 8, 17, 0, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249A35, 0, 0, 0
object_event 2, MAP_OBJ_GFX_MAN_4, 0, 0, 1, 11, 0, 2, 17, 0, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249E10, 0, 0, 0
object_event 3, MAP_OBJ_GFX_LASS, 0, 0, 14, 14, 0, 2, 17, 0, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249DFE, 0, 0, 0
object_event 4, MAP_OBJ_GFX_FAT_MAN, 0, 0, 18, 14, 0, 2, 17, 0, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249E07, 0, 0, 0
object_event 5, MAP_OBJ_GFX_MANIAC, 0, 0, 8, 14, 0, 2, 17, 0, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249DED, 0, 0, 0
object_event 6, MAP_OBJ_GFX_TEALA, 0, 0, 17, 10, 0, 8, 17, 0, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249A47, 0, 0, 0
BattleFrontier_BattleDomeLobby_EventObjects: @ 853C068
object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 5, 10, 0, 8, 17, 0, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249A35, 0, 0, 0
object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 0, 1, 11, 0, 2, 17, 0, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249E10, 0, 0, 0
object_event 3, EVENT_OBJ_GFX_LASS, 0, 0, 14, 14, 0, 2, 17, 0, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249DFE, 0, 0, 0
object_event 4, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 18, 14, 0, 2, 17, 0, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249E07, 0, 0, 0
object_event 5, EVENT_OBJ_GFX_MANIAC, 0, 0, 8, 14, 0, 2, 17, 0, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249DED, 0, 0, 0
object_event 6, EVENT_OBJ_GFX_TEALA, 0, 0, 17, 10, 0, 8, 17, 0, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249A47, 0, 0, 0
BattleFrontier_BattleDomeLobby_MapWarps: @ 853C0F8
warp_def 11, 16, 0, 1, BATTLE_FRONTIER_OUTSIDE_WEST
@@ -17,5 +17,5 @@ BattleFrontier_BattleDomeLobby_MapBGEvents: @ 853C108
bg_event 15, 10, 0, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249E34
BattleFrontier_BattleDomeLobby_MapEvents:: @ 853C138
map_events BattleFrontier_BattleDomeLobby_MapObjects, BattleFrontier_BattleDomeLobby_MapWarps, 0x0, BattleFrontier_BattleDomeLobby_MapBGEvents
map_events BattleFrontier_BattleDomeLobby_EventObjects, BattleFrontier_BattleDomeLobby_MapWarps, 0x0, BattleFrontier_BattleDomeLobby_MapBGEvents
data/maps/events/BattleFrontier_BattleDomePreBattleRoom.inc
+3 -3
View File
@@ -1,10 +1,10 @@
BattleFrontier_BattleDomePreBattleRoom_MapObjects: @ 853C188
object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 5, 2, 3, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
BattleFrontier_BattleDomePreBattleRoom_EventObjects: @ 853C188
object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 5, 2, 3, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
BattleFrontier_BattleDomePreBattleRoom_MapWarps: @ 853C1A0
warp_def 6, 8, 3, 1, BATTLE_FRONTIER_OUTSIDE_WEST
warp_def 7, 8, 3, 1, BATTLE_FRONTIER_OUTSIDE_WEST
BattleFrontier_BattleDomePreBattleRoom_MapEvents:: @ 853C1B0
map_events BattleFrontier_BattleDomePreBattleRoom_MapObjects, BattleFrontier_BattleDomePreBattleRoom_MapWarps, 0x0, 0x0
map_events BattleFrontier_BattleDomePreBattleRoom_EventObjects, BattleFrontier_BattleDomePreBattleRoom_MapWarps, 0x0, 0x0
data/maps/events/BattleFrontier_BattleFactoryBattleRoom.inc
+9 -9
View File
@@ -1,13 +1,13 @@
BattleFrontier_BattleFactoryBattleRoom_MapObjects: @ 853CADC
object_event 1, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 0, 6, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
object_event 2, MAP_OBJ_GFX_HIPSTER, 0, 0, 7, 4, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
object_event 3, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 0, 4, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
object_event 4, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 0, 8, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
object_event 5, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 12, 4, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
object_event 6, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 12, 6, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
object_event 7, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 12, 8, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
BattleFrontier_BattleFactoryBattleRoom_EventObjects: @ 853CADC
object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 0, 6, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 7, 4, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
object_event 3, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 0, 4, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
object_event 4, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 0, 8, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
object_event 5, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 12, 4, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
object_event 6, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 12, 6, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
object_event 7, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 12, 8, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
object_event 8, 255, 0, 0, 5, 11, 0, 7, 17, 0, 0, 0, 0x0, 0, 0, 0
BattleFrontier_BattleFactoryBattleRoom_MapEvents:: @ 853CB9C
map_events BattleFrontier_BattleFactoryBattleRoom_MapObjects, 0x0, 0x0, 0x0
map_events BattleFrontier_BattleFactoryBattleRoom_EventObjects, 0x0, 0x0, 0x0
data/maps/events/BattleFrontier_BattleFactoryLobby.inc
+8 -8
View File
@@ -1,10 +1,10 @@
BattleFrontier_BattleFactoryLobby_MapObjects: @ 853C9D8
object_event 1, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 4, 7, 0, 8, 17, 0, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_2585CB, 0, 0, 0
object_event 2, MAP_OBJ_GFX_WOMAN_1, 0, 0, 3, 11, 0, 2, 17, 0, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_258813, 0, 0, 0
object_event 3, MAP_OBJ_GFX_CAMPER, 0, 0, 14, 11, 0, 8, 0, 0, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_25881C, 0, 0, 0
object_event 4, MAP_OBJ_GFX_PICNICKER, 0, 0, 13, 11, 0, 10, 17, 0, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_258825, 0, 0, 0
object_event 5, MAP_OBJ_GFX_FAT_MAN, 0, 0, 6, 10, 0, 1, 17, 0, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_258830, 0, 0, 0
object_event 6, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 14, 7, 0, 8, 17, 0, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_2585DD, 0, 0, 0
BattleFrontier_BattleFactoryLobby_EventObjects: @ 853C9D8
object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 4, 7, 0, 8, 17, 0, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_2585CB, 0, 0, 0
object_event 2, EVENT_OBJ_GFX_WOMAN_1, 0, 0, 3, 11, 0, 2, 17, 0, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_258813, 0, 0, 0
object_event 3, EVENT_OBJ_GFX_CAMPER, 0, 0, 14, 11, 0, 8, 0, 0, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_25881C, 0, 0, 0
object_event 4, EVENT_OBJ_GFX_PICNICKER, 0, 0, 13, 11, 0, 10, 17, 0, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_258825, 0, 0, 0
object_event 5, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 6, 10, 0, 1, 17, 0, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_258830, 0, 0, 0
object_event 6, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 14, 7, 0, 8, 17, 0, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_2585DD, 0, 0, 0
BattleFrontier_BattleFactoryLobby_MapWarps: @ 853CA68
warp_def 9, 11, 0, 2, BATTLE_FRONTIER_OUTSIDE_WEST
@@ -16,5 +16,5 @@ BattleFrontier_BattleFactoryLobby_MapBGEvents: @ 853CA78
bg_event 9, 4, 0, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_258839
BattleFrontier_BattleFactoryLobby_MapEvents:: @ 853CA9C
map_events BattleFrontier_BattleFactoryLobby_MapObjects, BattleFrontier_BattleFactoryLobby_MapWarps, 0x0, BattleFrontier_BattleFactoryLobby_MapBGEvents
map_events BattleFrontier_BattleFactoryLobby_EventObjects, BattleFrontier_BattleFactoryLobby_MapWarps, 0x0, BattleFrontier_BattleFactoryLobby_MapBGEvents
data/maps/events/BattleFrontier_BattleFactoryPreBattleRoom.inc
+3 -3
View File
@@ -1,6 +1,6 @@
BattleFrontier_BattleFactoryPreBattleRoom_MapObjects: @ 853CAB0
object_event 1, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 8, 12, 0, 7, 17, 0, 0, 0, 0x0, 0, 0, 0
BattleFrontier_BattleFactoryPreBattleRoom_EventObjects: @ 853CAB0
object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 8, 12, 0, 7, 17, 0, 0, 0, 0x0, 0, 0, 0
BattleFrontier_BattleFactoryPreBattleRoom_MapEvents:: @ 853CAC8
map_events BattleFrontier_BattleFactoryPreBattleRoom_MapObjects, 0x0, 0x0, 0x0
map_events BattleFrontier_BattleFactoryPreBattleRoom_EventObjects, 0x0, 0x0, 0x0
data/maps/events/BattleFrontier_BattlePalaceBattleRoom.inc
+7 -7
View File
@@ -1,14 +1,14 @@
BattleFrontier_BattlePalaceBattleRoom_MapObjects: @ 853C4FC
object_event 1, MAP_OBJ_GFX_TRADER, 0, 0, 1, 9, 3, 7, 17, 0, 0, 0, 0x0, 0, 0, 0
object_event 2, MAP_OBJ_GFX_HIPSTER, 0, 0, 13, 1, 3, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
object_event 3, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 1, 4, 3, 10, 17, 0, 0, 0, 0x0, 0, 0, 0
object_event 4, MAP_OBJ_GFX_DUSCLOPS, 0, 0, 13, 1, 3, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
object_event 5, MAP_OBJ_GFX_AZURILL, 0, 0, 13, 1, 3, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
BattleFrontier_BattlePalaceBattleRoom_EventObjects: @ 853C4FC
object_event 1, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 9, 3, 7, 17, 0, 0, 0, 0x0, 0, 0, 0
object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 13, 1, 3, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 1, 4, 3, 10, 17, 0, 0, 0, 0x0, 0, 0, 0
object_event 4, EVENT_OBJ_GFX_DUSCLOPS, 0, 0, 13, 1, 3, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
object_event 5, EVENT_OBJ_GFX_AZURILL, 0, 0, 13, 1, 3, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
BattleFrontier_BattlePalaceBattleRoom_MapWarps: @ 853C574
warp_def 0, 9, 3, 2, BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR
warp_def 1, 9, 3, 2, BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR
BattleFrontier_BattlePalaceBattleRoom_MapEvents:: @ 853C584
map_events BattleFrontier_BattlePalaceBattleRoom_MapObjects, BattleFrontier_BattlePalaceBattleRoom_MapWarps, 0x0, 0x0
map_events BattleFrontier_BattlePalaceBattleRoom_EventObjects, BattleFrontier_BattlePalaceBattleRoom_MapWarps, 0x0, 0x0
data/maps/events/BattleFrontier_BattlePalaceCorridor.inc
+9 -9
View File
@@ -1,11 +1,11 @@
BattleFrontier_BattlePalaceCorridor_MapObjects: @ 853C420
object_event 1, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 8, 12, 3, 7, 17, 0, 0, 0, 0x0, 0, 0, 0
object_event 2, MAP_OBJ_GFX_AZURILL, 0, 0, 3, 5, 0, 2, 1, 0, 0, 0, 0x0, 0, 0, 0
object_event 3, MAP_OBJ_GFX_KIRLIA, 0, 0, 12, 6, 0, 14, 32, 0, 0, 0, 0x0, 0, 0, 0
object_event 4, MAP_OBJ_GFX_PIKACHU, 0, 0, 15, 5, 0, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
object_event 5, MAP_OBJ_GFX_ZIGZAGOON_2, 0, 0, 4, 9, 0, 14, 32, 0, 0, 0, 0x0, 0, 0, 0
object_event 6, MAP_OBJ_GFX_AZUMARILL, 0, 0, 13, 9, 0, 1, 16, 0, 0, 0, 0x0, 0, 0, 0
object_event 7, MAP_OBJ_GFX_WINGULL, 0, 0, 3, 10, 0, 2, 33, 0, 0, 0, 0x0, 0, 0, 0
BattleFrontier_BattlePalaceCorridor_EventObjects: @ 853C420
object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 8, 12, 3, 7, 17, 0, 0, 0, 0x0, 0, 0, 0
object_event 2, EVENT_OBJ_GFX_AZURILL, 0, 0, 3, 5, 0, 2, 1, 0, 0, 0, 0x0, 0, 0, 0
object_event 3, EVENT_OBJ_GFX_KIRLIA, 0, 0, 12, 6, 0, 14, 32, 0, 0, 0, 0x0, 0, 0, 0
object_event 4, EVENT_OBJ_GFX_PIKACHU, 0, 0, 15, 5, 0, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
object_event 5, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 0, 4, 9, 0, 14, 32, 0, 0, 0, 0x0, 0, 0, 0
object_event 6, EVENT_OBJ_GFX_AZUMARILL, 0, 0, 13, 9, 0, 1, 16, 0, 0, 0, 0x0, 0, 0, 0
object_event 7, EVENT_OBJ_GFX_WINGULL, 0, 0, 3, 10, 0, 2, 33, 0, 0, 0, 0x0, 0, 0, 0
BattleFrontier_BattlePalaceCorridor_MapWarps: @ 853C4C8
warp_def 8, 13, 3, 2, BATTLE_FRONTIER_BATTLE_PALACE_LOBBY
@@ -14,5 +14,5 @@ BattleFrontier_BattlePalaceCorridor_MapWarps: @ 853C4C8
warp_def 10, 3, 3, 0, BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM
BattleFrontier_BattlePalaceCorridor_MapEvents:: @ 853C4E8
map_events BattleFrontier_BattlePalaceCorridor_MapObjects, BattleFrontier_BattlePalaceCorridor_MapWarps, 0x0, 0x0
map_events BattleFrontier_BattlePalaceCorridor_EventObjects, BattleFrontier_BattlePalaceCorridor_MapWarps, 0x0, 0x0
data/maps/events/BattleFrontier_BattlePalaceLobby.inc
+8 -8
View File
@@ -1,10 +1,10 @@
BattleFrontier_BattlePalaceLobby_MapObjects: @ 853C340
object_event 1, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 5, 6, 0, 8, 17, 0, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24D944, 0, 0, 0
object_event 2, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 11, 8, 0, 2, 17, 0, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC82, 0, 0, 0
object_event 3, MAP_OBJ_GFX_MANIAC, 0, 0, 24, 5, 0, 8, 17, 0, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC9D, 0, 0, 0
object_event 4, MAP_OBJ_GFX_MAN_4, 0, 0, 18, 10, 0, 2, 17, 0, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC8B, 0, 0, 0
object_event 5, MAP_OBJ_GFX_BEAUTY, 0, 0, 2, 10, 0, 2, 17, 0, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC94, 0, 0, 0
object_event 6, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 19, 6, 0, 8, 17, 0, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24D956, 0, 0, 0
BattleFrontier_BattlePalaceLobby_EventObjects: @ 853C340
object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 5, 6, 0, 8, 17, 0, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24D944, 0, 0, 0
object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 11, 8, 0, 2, 17, 0, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC82, 0, 0, 0
object_event 3, EVENT_OBJ_GFX_MANIAC, 0, 0, 24, 5, 0, 8, 17, 0, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC9D, 0, 0, 0
object_event 4, EVENT_OBJ_GFX_MAN_4, 0, 0, 18, 10, 0, 2, 17, 0, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC8B, 0, 0, 0
object_event 5, EVENT_OBJ_GFX_BEAUTY, 0, 0, 2, 10, 0, 2, 17, 0, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC94, 0, 0, 0
object_event 6, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 19, 6, 0, 8, 17, 0, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24D956, 0, 0, 0
BattleFrontier_BattlePalaceLobby_MapWarps: @ 853C3D0
warp_def 12, 11, 0, 2, BATTLE_FRONTIER_OUTSIDE_EAST
@@ -17,5 +17,5 @@ BattleFrontier_BattlePalaceLobby_MapBGEvents: @ 853C3E8
bg_event 10, 4, 0, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DCA6
BattleFrontier_BattlePalaceLobby_MapEvents:: @ 853C40C
map_events BattleFrontier_BattlePalaceLobby_MapObjects, BattleFrontier_BattlePalaceLobby_MapWarps, 0x0, BattleFrontier_BattlePalaceLobby_MapBGEvents
map_events BattleFrontier_BattlePalaceLobby_EventObjects, BattleFrontier_BattlePalaceLobby_MapWarps, 0x0, BattleFrontier_BattlePalaceLobby_MapBGEvents
data/maps/events/BattleFrontier_BattlePikeCorridor.inc
+3 -3
View File
@@ -1,6 +1,6 @@
BattleFrontier_BattlePikeCorridor_MapObjects: @ 853CC54
object_event 1, MAP_OBJ_GFX_WOMAN_6, 0, 0, 6, 6, 3, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
BattleFrontier_BattlePikeCorridor_EventObjects: @ 853CC54
object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 0, 6, 6, 3, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
BattleFrontier_BattlePikeCorridor_MapEvents:: @ 853CC6C
map_events BattleFrontier_BattlePikeCorridor_MapObjects, 0x0, 0x0, 0x0
map_events BattleFrontier_BattlePikeCorridor_EventObjects, 0x0, 0x0, 0x0
data/maps/events/BattleFrontier_BattlePikeLobby.inc
+6 -6
View File
@@ -1,8 +1,8 @@
BattleFrontier_BattlePikeLobby_MapObjects: @ 853CBB0
object_event 1, MAP_OBJ_GFX_WOMAN_6, 0, 0, 5, 5, 3, 8, 17, 0, 0, 0, BattleFrontier_BattlePikeLobby_EventScript_25B868, 0, 0, 0
object_event 2, MAP_OBJ_GFX_HIKER, 0, 0, 10, 9, 3, 7, 17, 0, 0, 0, BattleFrontier_BattlePikeLobby_EventScript_25BAAB, 0, 0, 0
object_event 3, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 0, 5, 3, 9, 17, 0, 0, 0, BattleFrontier_BattlePikeLobby_EventScript_25BAB4, 0, 0, 0
object_event 4, MAP_OBJ_GFX_BEAUTY, 0, 0, 8, 9, 3, 2, 17, 0, 0, 0, BattleFrontier_BattlePikeLobby_EventScript_25BABD, 0, 0, 0
BattleFrontier_BattlePikeLobby_EventObjects: @ 853CBB0
object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 0, 5, 5, 3, 8, 17, 0, 0, 0, BattleFrontier_BattlePikeLobby_EventScript_25B868, 0, 0, 0
object_event 2, EVENT_OBJ_GFX_HIKER, 0, 0, 10, 9, 3, 7, 17, 0, 0, 0, BattleFrontier_BattlePikeLobby_EventScript_25BAAB, 0, 0, 0
object_event 3, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 0, 5, 3, 9, 17, 0, 0, 0, BattleFrontier_BattlePikeLobby_EventScript_25BAB4, 0, 0, 0
object_event 4, EVENT_OBJ_GFX_BEAUTY, 0, 0, 8, 9, 3, 2, 17, 0, 0, 0, BattleFrontier_BattlePikeLobby_EventScript_25BABD, 0, 0, 0
BattleFrontier_BattlePikeLobby_MapWarps: @ 853CC10
warp_def 5, 12, 0, 0, BATTLE_FRONTIER_OUTSIDE_WEST
@@ -14,5 +14,5 @@ BattleFrontier_BattlePikeLobby_MapBGEvents: @ 853CC28
bg_event 1, 3, 0, 0, 0, BattleFrontier_BattlePikeLobby_EventScript_25BAC6
BattleFrontier_BattlePikeLobby_MapEvents:: @ 853CC40
map_events BattleFrontier_BattlePikeLobby_MapObjects, BattleFrontier_BattlePikeLobby_MapWarps, 0x0, BattleFrontier_BattlePikeLobby_MapBGEvents
map_events BattleFrontier_BattlePikeLobby_EventObjects, BattleFrontier_BattlePikeLobby_MapWarps, 0x0, BattleFrontier_BattlePikeLobby_MapBGEvents
data/maps/events/BattleFrontier_BattlePikeRandomRoom1.inc
+4 -4
View File
@@ -1,6 +1,6 @@
BattleFrontier_BattlePikeRandomRoom1_MapObjects: @ 853CD54
object_event 1, MAP_OBJ_GFX_HIPSTER, 0, 0, 4, 4, 3, 8, 17, 0, 0, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D7ED, 0, 0, 0
object_event 2, MAP_OBJ_GFX_TRADER, 0, 0, 3, 4, 3, 8, 17, 0, 0, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D88D, 0, 0, 0
BattleFrontier_BattlePikeRandomRoom1_EventObjects: @ 853CD54
object_event 1, EVENT_OBJ_GFX_HIPSTER, 0, 0, 4, 4, 3, 8, 17, 0, 0, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D7ED, 0, 0, 0
object_event 2, EVENT_OBJ_GFX_TRADER, 0, 0, 3, 4, 3, 8, 17, 0, 0, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D88D, 0, 0, 0
BattleFrontier_BattlePikeRandomRoom1_MapCoordEvents: @ 853CD84
coord_event 4, 3, 3, 0, VAR_TEMP_1, 0, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C40A2
@@ -12,5 +12,5 @@ BattleFrontier_BattlePikeRandomRoom1_MapCoordEvents: @ 853CD84
coord_event 5, 7, 3, 0, VAR_TEMP_3, 1, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C408D
BattleFrontier_BattlePikeRandomRoom1_MapEvents:: @ 853CDF4
map_events BattleFrontier_BattlePikeRandomRoom1_MapObjects, 0x0, BattleFrontier_BattlePikeRandomRoom1_MapCoordEvents, 0x0
map_events BattleFrontier_BattlePikeRandomRoom1_EventObjects, 0x0, BattleFrontier_BattlePikeRandomRoom1_MapCoordEvents, 0x0
data/maps/events/BattleFrontier_BattlePikeRandomRoom2.inc
+3 -3
View File
@@ -1,6 +1,6 @@
BattleFrontier_BattlePikeRandomRoom2_MapObjects: @ 853CE08
object_event 1, MAP_OBJ_GFX_WOMAN_6, 0, 0, 2, 4, 3, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
BattleFrontier_BattlePikeRandomRoom2_EventObjects: @ 853CE08
object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 0, 2, 4, 3, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
BattleFrontier_BattlePikeRandomRoom2_MapEvents:: @ 853CE20
map_events BattleFrontier_BattlePikeRandomRoom2_MapObjects, 0x0, 0x0, 0x0
map_events BattleFrontier_BattlePikeRandomRoom2_EventObjects, 0x0, 0x0, 0x0
data/maps/events/BattleFrontier_BattlePikeThreePathRoom.inc
+4 -4
View File
@@ -1,6 +1,6 @@
BattleFrontier_BattlePikeThreePathRoom_MapObjects: @ 853CC80
object_event 1, MAP_OBJ_GFX_WOMAN_6, 0, 0, 4, 10, 3, 10, 0, 0, 0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25C908, 0, 0, 0
object_event 2, MAP_OBJ_GFX_WOMAN_6, 0, 0, 8, 5, 3, 8, 0, 0, 0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CABB, 0, 0, 0
BattleFrontier_BattlePikeThreePathRoom_EventObjects: @ 853CC80
object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 0, 4, 10, 3, 10, 0, 0, 0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25C908, 0, 0, 0
object_event 2, EVENT_OBJ_GFX_WOMAN_6, 0, 0, 8, 5, 3, 8, 0, 0, 0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CABB, 0, 0, 0
BattleFrontier_BattlePikeThreePathRoom_MapCoordEvents: @ 853CCB0
coord_event 2, 3, 3, 0, VAR_TEMP_1, 0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F4E
@@ -14,5 +14,5 @@ BattleFrontier_BattlePikeThreePathRoom_MapCoordEvents: @ 853CCB0
coord_event 7, 10, 0, 0, VAR_TEMP_3, 1, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C406D
BattleFrontier_BattlePikeThreePathRoom_MapEvents:: @ 853CD40
map_events BattleFrontier_BattlePikeThreePathRoom_MapObjects, 0x0, BattleFrontier_BattlePikeThreePathRoom_MapCoordEvents, 0x0
map_events BattleFrontier_BattlePikeThreePathRoom_EventObjects, 0x0, BattleFrontier_BattlePikeThreePathRoom_MapCoordEvents, 0x0
data/maps/events/BattleFrontier_BattlePointExchangeServiceCorner.inc
+11 -11
View File
@@ -1,13 +1,13 @@
BattleFrontier_BattlePointExchangeServiceCorner_MapObjects: @ 853D018
object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 4, 4, 0, 9, 0, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F173, 0, 0, 0
object_event 2, MAP_OBJ_GFX_BOY_4, 0, 0, 0, 5, 0, 10, 17, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7E8, 0, 0, 0
object_event 3, MAP_OBJ_GFX_WOMAN_2, 0, 0, 0, 4, 0, 8, 17, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7DD, 0, 0, 0
object_event 4, MAP_OBJ_GFX_SAILOR, 0, 0, 14, 6, 0, 2, 17, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7D4, 0, 0, 0
object_event 5, MAP_OBJ_GFX_MAN_6, 0, 0, 1, 9, 0, 2, 17, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7CB, 0, 0, 0
object_event 6, MAP_OBJ_GFX_TEALA, 0, 0, 5, 5, 0, 8, 0, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F37C, 0, 0, 0
object_event 7, MAP_OBJ_GFX_TEALA, 0, 0, 9, 5, 0, 8, 0, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F49F, 0, 0, 0
object_event 8, MAP_OBJ_GFX_TEALA, 0, 0, 10, 4, 0, 10, 0, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F5F0, 0, 0, 0
object_event 9, MAP_OBJ_GFX_GIRL_1, 0, 0, 12, 10, 0, 2, 17, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7F1, 0, 0, 0
BattleFrontier_BattlePointExchangeServiceCorner_EventObjects: @ 853D018
object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 4, 4, 0, 9, 0, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F173, 0, 0, 0
object_event 2, EVENT_OBJ_GFX_BOY_4, 0, 0, 0, 5, 0, 10, 17, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7E8, 0, 0, 0
object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 0, 4, 0, 8, 17, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7DD, 0, 0, 0
object_event 4, EVENT_OBJ_GFX_SAILOR, 0, 0, 14, 6, 0, 2, 17, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7D4, 0, 0, 0
object_event 5, EVENT_OBJ_GFX_MAN_6, 0, 0, 1, 9, 0, 2, 17, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7CB, 0, 0, 0
object_event 6, EVENT_OBJ_GFX_TEALA, 0, 0, 5, 5, 0, 8, 0, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F37C, 0, 0, 0
object_event 7, EVENT_OBJ_GFX_TEALA, 0, 0, 9, 5, 0, 8, 0, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F49F, 0, 0, 0
object_event 8, EVENT_OBJ_GFX_TEALA, 0, 0, 10, 4, 0, 10, 0, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F5F0, 0, 0, 0
object_event 9, EVENT_OBJ_GFX_GIRL_1, 0, 0, 12, 10, 0, 2, 17, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7F1, 0, 0, 0
BattleFrontier_BattlePointExchangeServiceCorner_MapWarps: @ 853D0F0
warp_def 7, 10, 0, 6, BATTLE_FRONTIER_OUTSIDE_EAST
@@ -15,5 +15,5 @@ BattleFrontier_BattlePointExchangeServiceCorner_MapWarps: @ 853D0F0
warp_def 8, 10, 0, 6, BATTLE_FRONTIER_OUTSIDE_EAST
BattleFrontier_BattlePointExchangeServiceCorner_MapEvents:: @ 853D108
map_events BattleFrontier_BattlePointExchangeServiceCorner_MapObjects, BattleFrontier_BattlePointExchangeServiceCorner_MapWarps, 0x0, 0x0
map_events BattleFrontier_BattlePointExchangeServiceCorner_EventObjects, BattleFrontier_BattlePointExchangeServiceCorner_MapWarps, 0x0, 0x0
data/maps/events/BattleFrontier_BattlePyramidEmptySquare.inc
+18 -18
View File
@@ -1,21 +1,21 @@
BattleFrontier_BattlePyramidEmptySquare_MapObjects: @ 853C62C
object_event 1, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 0, 0, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
object_event 2, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 1, 0, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
object_event 3, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 2, 0, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
object_event 4, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
object_event 5, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 4, 0, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
object_event 6, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 5, 0, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
object_event 7, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
object_event 8, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 7, 0, 0, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
object_event 9, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 0, 1, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
object_event 10, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 1, 1, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
object_event 11, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 3, 1, 0, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
object_event 12, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 4, 1, 0, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
object_event 13, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 5, 1, 0, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
object_event 14, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 6, 1, 0, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
object_event 15, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 7, 1, 0, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
object_event 16, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 2, 1, 0, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
BattleFrontier_BattlePyramidEmptySquare_EventObjects: @ 853C62C
object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 0, 0, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
object_event 2, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 1, 0, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
object_event 3, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 2, 0, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
object_event 4, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
object_event 5, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 4, 0, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
object_event 6, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 5, 0, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
object_event 7, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
object_event 8, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 7, 0, 0, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
object_event 9, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 0, 1, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
object_event 10, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 1, 1, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
object_event 11, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 3, 1, 0, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
object_event 12, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 4, 1, 0, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
object_event 13, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 5, 1, 0, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
object_event 14, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 6, 1, 0, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
object_event 15, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 7, 1, 0, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
object_event 16, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 2, 1, 0, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
BattleFrontier_BattlePyramidEmptySquare_MapEvents:: @ 853C7AC
map_events BattleFrontier_BattlePyramidEmptySquare_MapObjects, 0x0, 0x0, 0x0
map_events BattleFrontier_BattlePyramidEmptySquare_EventObjects, 0x0, 0x0, 0x0
data/maps/events/BattleFrontier_BattlePyramidLobby.inc
+6 -6
View File
@@ -1,8 +1,8 @@
BattleFrontier_BattlePyramidLobby_MapObjects: @ 853C598
object_event 1, MAP_OBJ_GFX_HIKER, 0, 0, 7, 12, 4, 8, 17, 0, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_2508B1, 0, 0, 0
object_event 2, MAP_OBJ_GFX_HEX_MANIAC, 0, 0, 14, 13, 4, 9, 17, 0, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_250ACE, 0, 0, 0
object_event 3, MAP_OBJ_GFX_WOMAN_4, 0, 0, 2, 15, 4, 2, 17, 0, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_250E83, 0, 0, 0
object_event 4, MAP_OBJ_GFX_FAT_MAN, 0, 0, 12, 16, 4, 2, 17, 0, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_250E8C, 0, 0, 0
BattleFrontier_BattlePyramidLobby_EventObjects: @ 853C598
object_event 1, EVENT_OBJ_GFX_HIKER, 0, 0, 7, 12, 4, 8, 17, 0, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_2508B1, 0, 0, 0
object_event 2, EVENT_OBJ_GFX_HEX_MANIAC, 0, 0, 14, 13, 4, 9, 17, 0, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_250ACE, 0, 0, 0
object_event 3, EVENT_OBJ_GFX_WOMAN_4, 0, 0, 2, 15, 4, 2, 17, 0, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_250E83, 0, 0, 0
object_event 4, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 12, 16, 4, 2, 17, 0, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_250E8C, 0, 0, 0
BattleFrontier_BattlePyramidLobby_MapWarps: @ 853C5F8
warp_def 7, 17, 4, 3, BATTLE_FRONTIER_OUTSIDE_EAST
@@ -12,5 +12,5 @@ BattleFrontier_BattlePyramidLobby_MapBGEvents: @ 853C600
bg_event 1, 12, 0, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_250E95
BattleFrontier_BattlePyramidLobby_MapEvents:: @ 853C618
map_events BattleFrontier_BattlePyramidLobby_MapObjects, BattleFrontier_BattlePyramidLobby_MapWarps, 0x0, BattleFrontier_BattlePyramidLobby_MapBGEvents
map_events BattleFrontier_BattlePyramidLobby_EventObjects, BattleFrontier_BattlePyramidLobby_MapWarps, 0x0, BattleFrontier_BattlePyramidLobby_MapBGEvents
data/maps/events/BattleFrontier_BattlePyramidTop.inc
+4 -4
View File
@@ -1,10 +1,10 @@
BattleFrontier_BattlePyramidTop_MapObjects: @ 853C7C0
object_event 1, MAP_OBJ_GFX_HIKER, 0, 0, 17, 11, 6, 8, 17, 0, 0, 3, BattleFrontier_BattlePyramidTop_EventScript_2551D0, 0, 0, 0
object_event 2, MAP_OBJ_GFX_BRANDON, 0, 0, 17, 7, 0, 7, 17, 0, 0, 0, 0x0, 0, 0, 0
BattleFrontier_BattlePyramidTop_EventObjects: @ 853C7C0
object_event 1, EVENT_OBJ_GFX_HIKER, 0, 0, 17, 11, 6, 8, 17, 0, 0, 3, BattleFrontier_BattlePyramidTop_EventScript_2551D0, 0, 0, 0
object_event 2, EVENT_OBJ_GFX_BRANDON, 0, 0, 17, 7, 0, 7, 17, 0, 0, 0, 0x0, 0, 0, 0
BattleFrontier_BattlePyramidTop_MapCoordEvents: @ 853C7F0
coord_event 17, 9, 4, 0, VAR_TEMP_2, 0, 0, BattleFrontier_BattlePyramidTop_EventScript_255256
BattleFrontier_BattlePyramidTop_MapEvents:: @ 853C800
map_events BattleFrontier_BattlePyramidTop_MapObjects, 0x0, BattleFrontier_BattlePyramidTop_MapCoordEvents, 0x0
map_events BattleFrontier_BattlePyramidTop_EventObjects, 0x0, BattleFrontier_BattlePyramidTop_MapCoordEvents, 0x0
data/maps/events/BattleFrontier_BattleTowerBattleRoom.inc
+5 -5
View File
@@ -1,12 +1,12 @@
BattleFrontier_BattleTowerBattleRoom_MapObjects: @ 853B7D0
object_event 1, MAP_OBJ_GFX_HIPSTER, 0, 0, 5, 1, 3, 8, 0, 0, 0, 0, 0x0, 888, 0, 0
object_event 2, MAP_OBJ_GFX_TEALA, 0, 0, 1, 7, 3, 10, 0, 0, 0, 0, 0x0, 0, 0, 0
object_event 3, MAP_OBJ_GFX_TEALA, 0, 0, 4, 8, 3, 7, 0, 0, 0, 0, 0x0, 0, 0, 0
BattleFrontier_BattleTowerBattleRoom_EventObjects: @ 853B7D0
object_event 1, EVENT_OBJ_GFX_HIPSTER, 0, 0, 5, 1, 3, 8, 0, 0, 0, 0, 0x0, 888, 0, 0
object_event 2, EVENT_OBJ_GFX_TEALA, 0, 0, 1, 7, 3, 10, 0, 0, 0, 0, 0x0, 0, 0, 0
object_event 3, EVENT_OBJ_GFX_TEALA, 0, 0, 4, 8, 3, 7, 0, 0, 0, 0, 0x0, 0, 0, 0
BattleFrontier_BattleTowerBattleRoom_MapWarps: @ 853B818
warp_def 5, 8, 0, 2, BATTLE_FRONTIER_BATTLE_TOWER_LOBBY
warp_def 6, 8, 0, 2, BATTLE_FRONTIER_BATTLE_TOWER_LOBBY
BattleFrontier_BattleTowerBattleRoom_MapEvents:: @ 853B828
map_events BattleFrontier_BattleTowerBattleRoom_MapObjects, BattleFrontier_BattleTowerBattleRoom_MapWarps, 0x0, 0x0
map_events BattleFrontier_BattleTowerBattleRoom_EventObjects, BattleFrontier_BattleTowerBattleRoom_MapWarps, 0x0, 0x0
data/maps/events/BattleFrontier_BattleTowerBattleRoom2.inc
+6 -6
View File
@@ -1,11 +1,11 @@
BattleFrontier_BattleTowerBattleRoom2_MapObjects: @ 853BFC4
object_event 1, MAP_OBJ_GFX_HIPSTER, 0, 0, 5, 1, 3, 8, 0, 0, 0, 0, 0x0, 888, 0, 0
object_event 2, MAP_OBJ_GFX_TEALA, 0, 0, 1, 4, 3, 10, 0, 0, 0, 0, 0x0, 0, 0, 0
object_event 3, MAP_OBJ_GFX_TEALA, 0, 0, 1, 5, 3, 10, 0, 0, 0, 0, 0x0, 0, 0, 0
object_event 4, MAP_OBJ_GFX_TRADER, 0, 0, 4, 1, 3, 8, 0, 0, 0, 0, 0x0, 888, 0, 0
BattleFrontier_BattleTowerBattleRoom2_EventObjects: @ 853BFC4
object_event 1, EVENT_OBJ_GFX_HIPSTER, 0, 0, 5, 1, 3, 8, 0, 0, 0, 0, 0x0, 888, 0, 0
object_event 2, EVENT_OBJ_GFX_TEALA, 0, 0, 1, 4, 3, 10, 0, 0, 0, 0, 0x0, 0, 0, 0
object_event 3, EVENT_OBJ_GFX_TEALA, 0, 0, 1, 5, 3, 10, 0, 0, 0, 0, 0x0, 0, 0, 0
object_event 4, EVENT_OBJ_GFX_TRADER, 0, 0, 4, 1, 3, 8, 0, 0, 0, 0, 0x0, 888, 0, 0
object_event 5, 255, 0, 0, 4, 8, 3, 7, 0, 0, 0, 0, 0x0, 0, 0, 0
object_event 6, 254, 0, 0, 5, 8, 3, 7, 0, 0, 0, 0, 0x0, 0, 0, 0
BattleFrontier_BattleTowerBattleRoom2_MapEvents:: @ 853C054
map_events BattleFrontier_BattleTowerBattleRoom2_MapObjects, 0x0, 0x0, 0x0
map_events BattleFrontier_BattleTowerBattleRoom2_EventObjects, 0x0, 0x0, 0x0
data/maps/events/BattleFrontier_BattleTowerCorridor.inc
+3 -3
View File
@@ -1,6 +1,6 @@
BattleFrontier_BattleTowerCorridor_MapObjects: @ 853B7A4
object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 9, 2, 3, 9, 0, 0, 0, 0, 0x0, 0, 0, 0
BattleFrontier_BattleTowerCorridor_EventObjects: @ 853B7A4
object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 9, 2, 3, 9, 0, 0, 0, 0, 0x0, 0, 0, 0
BattleFrontier_BattleTowerCorridor_MapEvents:: @ 853B7BC
map_events BattleFrontier_BattleTowerCorridor_MapObjects, 0x0, 0x0, 0x0
map_events BattleFrontier_BattleTowerCorridor_EventObjects, 0x0, 0x0, 0x0
data/maps/events/BattleFrontier_BattleTowerCorridor2.inc
+4 -4
View File
@@ -1,9 +1,9 @@
BattleFrontier_BattleTowerCorridor2_MapObjects: @ 853BF50
BattleFrontier_BattleTowerCorridor2_EventObjects: @ 853BF50
object_event 1, 255, 0, 0, 1, 1, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
object_event 2, MAP_OBJ_GFX_TEALA, 0, 0, 14, 3, 3, 7, 17, 0, 0, 0, 0x0, 0, 0, 0
object_event 3, MAP_OBJ_GFX_TEALA, 0, 0, 1, 3, 3, 7, 17, 0, 0, 0, 0x0, 0, 0, 0
object_event 2, EVENT_OBJ_GFX_TEALA, 0, 0, 14, 3, 3, 7, 17, 0, 0, 0, 0x0, 0, 0, 0
object_event 3, EVENT_OBJ_GFX_TEALA, 0, 0, 1, 3, 3, 7, 17, 0, 0, 0, 0x0, 0, 0, 0
object_event 4, 254, 0, 0, 14, 1, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
BattleFrontier_BattleTowerCorridor2_MapEvents:: @ 853BFB0
map_events BattleFrontier_BattleTowerCorridor2_MapObjects, 0x0, 0x0, 0x0
map_events BattleFrontier_BattleTowerCorridor2_EventObjects, 0x0, 0x0, 0x0
data/maps/events/BattleFrontier_BattleTowerElevator.inc
+3 -3
View File
@@ -1,6 +1,6 @@
BattleFrontier_BattleTowerElevator_MapObjects: @ 853B778
object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 1, 5, 3, 7, 0, 0, 0, 0, 0x0, 0, 0, 0
BattleFrontier_BattleTowerElevator_EventObjects: @ 853B778
object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 1, 5, 3, 7, 0, 0, 0, 0, 0x0, 0, 0, 0
BattleFrontier_BattleTowerElevator_MapEvents:: @ 853B790
map_events BattleFrontier_BattleTowerElevator_MapObjects, 0x0, 0x0, 0x0
map_events BattleFrontier_BattleTowerElevator_EventObjects, 0x0, 0x0, 0x0
data/maps/events/BattleFrontier_BattleTowerLobby.inc
+11 -11
View File
@@ -1,13 +1,13 @@
BattleFrontier_BattleTowerLobby_MapObjects: @ 853B638
object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 6, 5, 3, 8, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23E936, 0, 0, 0
object_event 2, MAP_OBJ_GFX_MAN_5, 0, 0, 23, 5, 3, 8, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EEE7, 0, 0, 0
object_event 3, MAP_OBJ_GFX_WOMAN_7, 0, 0, 17, 8, 3, 2, 17, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EFB5, 0, 0, 0
object_event 4, MAP_OBJ_GFX_BOY_1, 0, 0, 15, 9, 3, 2, 17, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EFBE, 0, 0, 0
object_event 5, MAP_OBJ_GFX_REPORTER_F, 0, 0, 11, 9, 3, 10, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_28CB96, 918, 0, 0
object_event 6, MAP_OBJ_GFX_HIPSTER, 0, 0, 1, 5, 3, 8, 17, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_2B688D, 701, 0, 0
object_event 7, MAP_OBJ_GFX_TEALA, 0, 0, 10, 5, 3, 8, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EA9F, 0, 0, 0
object_event 8, MAP_OBJ_GFX_TEALA, 0, 0, 14, 5, 3, 8, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EC08, 0, 0, 0
object_event 9, MAP_OBJ_GFX_TEALA, 0, 0, 18, 5, 3, 8, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23ED74, 0, 0, 0
BattleFrontier_BattleTowerLobby_EventObjects: @ 853B638
object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 6, 5, 3, 8, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23E936, 0, 0, 0
object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 0, 23, 5, 3, 8, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EEE7, 0, 0, 0
object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 17, 8, 3, 2, 17, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EFB5, 0, 0, 0
object_event 4, EVENT_OBJ_GFX_BOY_1, 0, 0, 15, 9, 3, 2, 17, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EFBE, 0, 0, 0
object_event 5, EVENT_OBJ_GFX_REPORTER_F, 0, 0, 11, 9, 3, 10, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_28CB96, 918, 0, 0
object_event 6, EVENT_OBJ_GFX_HIPSTER, 0, 0, 1, 5, 3, 8, 17, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_2B688D, 701, 0, 0
object_event 7, EVENT_OBJ_GFX_TEALA, 0, 0, 10, 5, 3, 8, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EA9F, 0, 0, 0
object_event 8, EVENT_OBJ_GFX_TEALA, 0, 0, 14, 5, 3, 8, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EC08, 0, 0, 0
object_event 9, EVENT_OBJ_GFX_TEALA, 0, 0, 18, 5, 3, 8, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23ED74, 0, 0, 0
BattleFrontier_BattleTowerLobby_MapWarps: @ 853B710
warp_def 12, 9, 3, 0, BATTLE_FRONTIER_OUTSIDE_EAST
@@ -22,5 +22,5 @@ BattleFrontier_BattleTowerLobby_MapBGEvents: @ 853B728
bg_event 2, 1, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23F4BE
BattleFrontier_BattleTowerLobby_MapEvents:: @ 853B764
map_events BattleFrontier_BattleTowerLobby_MapObjects, BattleFrontier_BattleTowerLobby_MapWarps, 0x0, BattleFrontier_BattleTowerLobby_MapBGEvents
map_events BattleFrontier_BattleTowerLobby_EventObjects, BattleFrontier_BattleTowerLobby_MapWarps, 0x0, BattleFrontier_BattleTowerLobby_MapBGEvents
data/maps/events/BattleFrontier_BattleTowerMultiBattleRoom.inc
+9 -9
View File
@@ -1,14 +1,14 @@
BattleFrontier_BattleTowerMultiBattleRoom_MapObjects: @ 853BE64
object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 11, 2, 3, 8, 17, 0, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E7A, 0, 0, 0
object_event 2, MAP_OBJ_GFX_HIPSTER, 0, 0, 2, 10, 3, 1, 17, 0, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F29, 711, 0, 0
object_event 3, MAP_OBJ_GFX_TRADER, 0, 0, 17, 11, 3, 14, 17, 0, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FFB, 712, 0, 0
object_event 4, MAP_OBJ_GFX_STORYTELLER, 0, 0, 6, 9, 3, 1, 17, 0, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244008, 713, 0, 0
object_event 5, MAP_OBJ_GFX_GIDDY, 0, 0, 8, 13, 3, 1, 17, 0, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244015, 714, 0, 0
object_event 6, MAP_OBJ_GFX_PLACEHOLDER_1, 0, 0, 10, 11, 3, 7, 17, 0, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244022, 715, 0, 0
object_event 7, MAP_OBJ_GFX_PLACEHOLDER_2, 0, 0, 13, 10, 3, 10, 17, 0, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_24402F, 716, 0, 0
BattleFrontier_BattleTowerMultiBattleRoom_EventObjects: @ 853BE64
object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 11, 2, 3, 8, 17, 0, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E7A, 0, 0, 0
object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 2, 10, 3, 1, 17, 0, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F29, 711, 0, 0
object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 17, 11, 3, 14, 17, 0, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FFB, 712, 0, 0
object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 6, 9, 3, 1, 17, 0, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244008, 713, 0, 0
object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 8, 13, 3, 1, 17, 0, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244015, 714, 0, 0
object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 10, 11, 3, 7, 17, 0, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244022, 715, 0, 0
object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 13, 10, 3, 10, 17, 0, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_24402F, 716, 0, 0
object_event 8, 246, 0, 0, 15, 13, 3, 15, 17, 0, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_24403C, 864, 0, 0
object_event 9, 247, 0, 0, 4, 12, 3, 10, 17, 0, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244049, 865, 0, 0
BattleFrontier_BattleTowerMultiBattleRoom_MapEvents:: @ 853BF3C
map_events BattleFrontier_BattleTowerMultiBattleRoom_MapObjects, 0x0, 0x0, 0x0
map_events BattleFrontier_BattleTowerMultiBattleRoom_EventObjects, 0x0, 0x0, 0x0
data/maps/events/BattleFrontier_Lounge1.inc
+5 -5
View File
@@ -1,11 +1,11 @@
BattleFrontier_Lounge1_MapObjects: @ 853CFB4
object_event 1, MAP_OBJ_GFX_OLD_MAN_2, 0, 0, 0, 6, 0, 10, 17, 0, 0, 0, BattleFrontier_Lounge1_EventScript_25E775, 0, 0, 0
object_event 2, MAP_OBJ_GFX_BOY_3, 0, 0, 7, 6, 0, 2, 33, 0, 0, 0, BattleFrontier_Lounge1_EventScript_25E94D, 0, 0, 0
object_event 3, MAP_OBJ_GFX_BOY_2, 0, 0, 5, 4, 0, 2, 18, 0, 0, 0, BattleFrontier_Lounge1_EventScript_25E956, 0, 0, 0
BattleFrontier_Lounge1_EventObjects: @ 853CFB4
object_event 1, EVENT_OBJ_GFX_OLD_MAN_2, 0, 0, 0, 6, 0, 10, 17, 0, 0, 0, BattleFrontier_Lounge1_EventScript_25E775, 0, 0, 0
object_event 2, EVENT_OBJ_GFX_BOY_3, 0, 0, 7, 6, 0, 2, 33, 0, 0, 0, BattleFrontier_Lounge1_EventScript_25E94D, 0, 0, 0
object_event 3, EVENT_OBJ_GFX_BOY_2, 0, 0, 5, 4, 0, 2, 18, 0, 0, 0, BattleFrontier_Lounge1_EventScript_25E956, 0, 0, 0
BattleFrontier_Lounge1_MapWarps: @ 853CFFC
warp_def 4, 9, 0, 5, BATTLE_FRONTIER_OUTSIDE_EAST
BattleFrontier_Lounge1_MapEvents:: @ 853D004
map_events BattleFrontier_Lounge1_MapObjects, BattleFrontier_Lounge1_MapWarps, 0x0, 0x0
map_events BattleFrontier_Lounge1_EventObjects, BattleFrontier_Lounge1_MapWarps, 0x0, 0x0
data/maps/events/BattleFrontier_Lounge2.inc
+7 -7
View File
@@ -1,14 +1,14 @@
BattleFrontier_Lounge2_MapObjects: @ 853D11C
object_event 1, MAP_OBJ_GFX_MANIAC, 0, 0, 8, 4, 0, 10, 17, 0, 0, 0, BattleFrontier_Lounge2_EventScript_260643, 0, 0, 0
object_event 2, MAP_OBJ_GFX_MANIAC, 0, 0, 10, 4, 0, 9, 17, 0, 0, 0, BattleFrontier_Lounge2_EventScript_26073C, 0, 0, 0
object_event 3, MAP_OBJ_GFX_MANIAC, 0, 0, 10, 3, 0, 9, 17, 0, 0, 0, BattleFrontier_Lounge2_EventScript_260747, 0, 0, 0
object_event 4, MAP_OBJ_GFX_RUNNING_TRIATHLETE_F, 0, 0, 4, 6, 0, 2, 33, 0, 0, 0, BattleFrontier_Lounge2_EventScript_26075D, 0, 0, 0
object_event 5, MAP_OBJ_GFX_MANIAC, 0, 0, 10, 5, 0, 9, 17, 0, 0, 0, BattleFrontier_Lounge2_EventScript_260752, 0, 0, 0
BattleFrontier_Lounge2_EventObjects: @ 853D11C
object_event 1, EVENT_OBJ_GFX_MANIAC, 0, 0, 8, 4, 0, 10, 17, 0, 0, 0, BattleFrontier_Lounge2_EventScript_260643, 0, 0, 0
object_event 2, EVENT_OBJ_GFX_MANIAC, 0, 0, 10, 4, 0, 9, 17, 0, 0, 0, BattleFrontier_Lounge2_EventScript_26073C, 0, 0, 0
object_event 3, EVENT_OBJ_GFX_MANIAC, 0, 0, 10, 3, 0, 9, 17, 0, 0, 0, BattleFrontier_Lounge2_EventScript_260747, 0, 0, 0
object_event 4, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F, 0, 0, 4, 6, 0, 2, 33, 0, 0, 0, BattleFrontier_Lounge2_EventScript_26075D, 0, 0, 0
object_event 5, EVENT_OBJ_GFX_MANIAC, 0, 0, 10, 5, 0, 9, 17, 0, 0, 0, BattleFrontier_Lounge2_EventScript_260752, 0, 0, 0
BattleFrontier_Lounge2_MapWarps: @ 853D194
warp_def 1, 7, 0, 3, BATTLE_FRONTIER_OUTSIDE_WEST
warp_def 2, 7, 0, 3, BATTLE_FRONTIER_OUTSIDE_WEST
BattleFrontier_Lounge2_MapEvents:: @ 853D1A4
map_events BattleFrontier_Lounge2_MapObjects, BattleFrontier_Lounge2_MapWarps, 0x0, 0x0
map_events BattleFrontier_Lounge2_EventObjects, BattleFrontier_Lounge2_MapWarps, 0x0, 0x0
data/maps/events/BattleFrontier_Lounge3.inc
+7 -7
View File
@@ -1,13 +1,13 @@
BattleFrontier_Lounge3_MapObjects: @ 853D1B8
object_event 1, MAP_OBJ_GFX_HIKER, 0, 0, 4, 6, 0, 7, 17, 0, 0, 0, BattleFrontier_Lounge3_EventScript_261D83, 0, 0, 0
object_event 2, MAP_OBJ_GFX_FAT_MAN, 0, 0, 4, 4, 0, 8, 17, 0, 0, 0, BattleFrontier_Lounge3_EventScript_261FE1, 0, 0, 0
object_event 3, MAP_OBJ_GFX_WOMAN_3, 0, 0, 3, 5, 0, 10, 17, 0, 0, 0, BattleFrontier_Lounge3_EventScript_261FC1, 0, 0, 0
object_event 4, MAP_OBJ_GFX_WOMAN_2, 0, 0, 5, 5, 0, 9, 17, 0, 0, 0, BattleFrontier_Lounge3_EventScript_261FD1, 0, 0, 0
object_event 5, MAP_OBJ_GFX_MAN_4, 0, 0, 0, 6, 0, 2, 48, 0, 0, 0, BattleFrontier_Lounge3_EventScript_261FB8, 0, 0, 0
BattleFrontier_Lounge3_EventObjects: @ 853D1B8
object_event 1, EVENT_OBJ_GFX_HIKER, 0, 0, 4, 6, 0, 7, 17, 0, 0, 0, BattleFrontier_Lounge3_EventScript_261D83, 0, 0, 0
object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 4, 4, 0, 8, 17, 0, 0, 0, BattleFrontier_Lounge3_EventScript_261FE1, 0, 0, 0
object_event 3, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 3, 5, 0, 10, 17, 0, 0, 0, BattleFrontier_Lounge3_EventScript_261FC1, 0, 0, 0
object_event 4, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 5, 5, 0, 9, 17, 0, 0, 0, BattleFrontier_Lounge3_EventScript_261FD1, 0, 0, 0
object_event 5, EVENT_OBJ_GFX_MAN_4, 0, 0, 0, 6, 0, 2, 48, 0, 0, 0, BattleFrontier_Lounge3_EventScript_261FB8, 0, 0, 0
BattleFrontier_Lounge3_MapWarps: @ 853D230
warp_def 4, 9, 0, 9, BATTLE_FRONTIER_OUTSIDE_EAST
BattleFrontier_Lounge3_MapEvents:: @ 853D238
map_events BattleFrontier_Lounge3_MapObjects, BattleFrontier_Lounge3_MapWarps, 0x0, 0x0
map_events BattleFrontier_Lounge3_EventObjects, BattleFrontier_Lounge3_MapWarps, 0x0, 0x0
data/maps/events/BattleFrontier_Lounge4.inc
+5 -5
View File
@@ -1,11 +1,11 @@
BattleFrontier_Lounge4_MapObjects: @ 853D24C
object_event 1, MAP_OBJ_GFX_WOMAN_4, 0, 0, 4, 4, 0, 7, 17, 0, 0, 0, BattleFrontier_Lounge4_EventScript_26358D, 0, 0, 0
object_event 2, MAP_OBJ_GFX_COOK, 0, 0, 6, 6, 0, 2, 17, 0, 0, 0, BattleFrontier_Lounge4_EventScript_263596, 0, 0, 0
object_event 3, MAP_OBJ_GFX_MAN_4, 0, 0, 0, 5, 0, 10, 18, 0, 0, 0, BattleFrontier_Lounge4_EventScript_26359F, 0, 0, 0
BattleFrontier_Lounge4_EventObjects: @ 853D24C
object_event 1, EVENT_OBJ_GFX_WOMAN_4, 0, 0, 4, 4, 0, 7, 17, 0, 0, 0, BattleFrontier_Lounge4_EventScript_26358D, 0, 0, 0
object_event 2, EVENT_OBJ_GFX_COOK, 0, 0, 6, 6, 0, 2, 17, 0, 0, 0, BattleFrontier_Lounge4_EventScript_263596, 0, 0, 0
object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 0, 0, 5, 0, 10, 18, 0, 0, 0, BattleFrontier_Lounge4_EventScript_26359F, 0, 0, 0
BattleFrontier_Lounge4_MapWarps: @ 853D294
warp_def 4, 9, 0, 6, BATTLE_FRONTIER_OUTSIDE_WEST
BattleFrontier_Lounge4_MapEvents:: @ 853D29C
map_events BattleFrontier_Lounge4_MapObjects, BattleFrontier_Lounge4_MapWarps, 0x0, 0x0
map_events BattleFrontier_Lounge4_EventObjects, BattleFrontier_Lounge4_MapWarps, 0x0, 0x0
data/maps/events/BattleFrontier_Lounge5.inc
+6 -6
View File
@@ -1,13 +1,13 @@
BattleFrontier_Lounge5_MapObjects: @ 853D2EC
object_event 1, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 12, 4, 4, 9, 17, 0, 0, 0, BattleFrontier_Lounge5_EventScript_2645C6, 0, 0, 0
object_event 2, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 0, 4, 3, 10, 17, 0, 0, 0, BattleFrontier_Lounge5_EventScript_264617, 0, 0, 0
object_event 3, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 6, 5, 0, 2, 17, 0, 0, 0, BattleFrontier_Lounge5_EventScript_264620, 0, 0, 0
object_event 4, MAP_OBJ_GFX_LITTLE_BOY_2, 0, 0, 11, 7, 0, 1, 17, 0, 0, 0, BattleFrontier_Lounge5_EventScript_264629, 0, 0, 0
BattleFrontier_Lounge5_EventObjects: @ 853D2EC
object_event 1, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 12, 4, 4, 9, 17, 0, 0, 0, BattleFrontier_Lounge5_EventScript_2645C6, 0, 0, 0
object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 0, 4, 3, 10, 17, 0, 0, 0, BattleFrontier_Lounge5_EventScript_264617, 0, 0, 0
object_event 3, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 6, 5, 0, 2, 17, 0, 0, 0, BattleFrontier_Lounge5_EventScript_264620, 0, 0, 0
object_event 4, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 0, 11, 7, 0, 1, 17, 0, 0, 0, BattleFrontier_Lounge5_EventScript_264629, 0, 0, 0
BattleFrontier_Lounge5_MapWarps: @ 853D34C
warp_def 1, 7, 0, 7, BATTLE_FRONTIER_OUTSIDE_EAST
warp_def 2, 7, 0, 7, BATTLE_FRONTIER_OUTSIDE_EAST
BattleFrontier_Lounge5_MapEvents:: @ 853D35C
map_events BattleFrontier_Lounge5_MapObjects, BattleFrontier_Lounge5_MapWarps, 0x0, 0x0
map_events BattleFrontier_Lounge5_EventObjects, BattleFrontier_Lounge5_MapWarps, 0x0, 0x0
data/maps/events/BattleFrontier_Lounge6.inc
+3 -3
View File
@@ -1,9 +1,9 @@
BattleFrontier_Lounge6_MapObjects: @ 853D370
object_event 1, MAP_OBJ_GFX_BEAUTY, 0, 0, 2, 4, 0, 10, 17, 0, 0, 0, BattleFrontier_Lounge6_EventScript_264FED, 0, 0, 0
BattleFrontier_Lounge6_EventObjects: @ 853D370
object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 0, 2, 4, 0, 10, 17, 0, 0, 0, BattleFrontier_Lounge6_EventScript_264FED, 0, 0, 0
BattleFrontier_Lounge6_MapWarps: @ 853D388
warp_def 4, 9, 0, 8, BATTLE_FRONTIER_OUTSIDE_EAST
BattleFrontier_Lounge6_MapEvents:: @ 853D390
map_events BattleFrontier_Lounge6_MapObjects, BattleFrontier_Lounge6_MapWarps, 0x0, 0x0
map_events BattleFrontier_Lounge6_EventObjects, BattleFrontier_Lounge6_MapWarps, 0x0, 0x0
data/maps/events/BattleFrontier_Lounge7.inc
+6 -6
View File
@@ -1,12 +1,12 @@
BattleFrontier_Lounge7_MapObjects: @ 853D3A4
object_event 1, MAP_OBJ_GFX_SAILOR, 0, 0, 0, 7, 0, 2, 17, 0, 0, 0, BattleFrontier_Lounge7_EventScript_2656DB, 0, 0, 0
object_event 2, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 0, 2, 5, 0, 10, 17, 0, 0, 0, BattleFrontier_Lounge7_EventScript_265255, 0, 0, 0
object_event 3, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 0, 6, 5, 0, 9, 17, 0, 0, 0, BattleFrontier_Lounge7_EventScript_265445, 0, 0, 0
object_event 4, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 8, 3, 0, 9, 17, 0, 0, 0, BattleFrontier_Lounge7_EventScript_2656E4, 0, 0, 0
BattleFrontier_Lounge7_EventObjects: @ 853D3A4
object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 0, 0, 7, 0, 2, 17, 0, 0, 0, BattleFrontier_Lounge7_EventScript_2656DB, 0, 0, 0
object_event 2, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 0, 2, 5, 0, 10, 17, 0, 0, 0, BattleFrontier_Lounge7_EventScript_265255, 0, 0, 0
object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 0, 6, 5, 0, 9, 17, 0, 0, 0, BattleFrontier_Lounge7_EventScript_265445, 0, 0, 0
object_event 4, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 8, 3, 0, 9, 17, 0, 0, 0, BattleFrontier_Lounge7_EventScript_2656E4, 0, 0, 0
BattleFrontier_Lounge7_MapWarps: @ 853D404
warp_def 4, 9, 0, 7, BATTLE_FRONTIER_OUTSIDE_WEST
BattleFrontier_Lounge7_MapEvents:: @ 853D40C
map_events BattleFrontier_Lounge7_MapObjects, BattleFrontier_Lounge7_MapWarps, 0x0, 0x0
map_events BattleFrontier_Lounge7_EventObjects, BattleFrontier_Lounge7_MapWarps, 0x0, 0x0
data/maps/events/BattleFrontier_Lounge8.inc
+5 -5
View File
@@ -1,11 +1,11 @@
BattleFrontier_Lounge8_MapObjects: @ 853D4BC
object_event 1, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 4, 5, 0, 2, 34, 0, 0, 0, BattleFrontier_Lounge8_EventScript_2676DC, 0, 0, 0
object_event 2, MAP_OBJ_GFX_MAN_4, 0, 0, 8, 7, 0, 9, 17, 0, 0, 0, BattleFrontier_Lounge8_EventScript_2676CA, 0, 0, 0
object_event 3, MAP_OBJ_GFX_WOMAN_7, 0, 0, 8, 4, 0, 9, 17, 0, 0, 0, BattleFrontier_Lounge8_EventScript_2676D3, 0, 0, 0
BattleFrontier_Lounge8_EventObjects: @ 853D4BC
object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 4, 5, 0, 2, 34, 0, 0, 0, BattleFrontier_Lounge8_EventScript_2676DC, 0, 0, 0
object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 0, 8, 7, 0, 9, 17, 0, 0, 0, BattleFrontier_Lounge8_EventScript_2676CA, 0, 0, 0
object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 8, 4, 0, 9, 17, 0, 0, 0, BattleFrontier_Lounge8_EventScript_2676D3, 0, 0, 0
BattleFrontier_Lounge8_MapWarps: @ 853D504
warp_def 4, 9, 0, 10, BATTLE_FRONTIER_OUTSIDE_EAST
BattleFrontier_Lounge8_MapEvents:: @ 853D50C
map_events BattleFrontier_Lounge8_MapObjects, BattleFrontier_Lounge8_MapWarps, 0x0, 0x0
map_events BattleFrontier_Lounge8_EventObjects, BattleFrontier_Lounge8_MapWarps, 0x0, 0x0
data/maps/events/BattleFrontier_Lounge9.inc
+3 -3
View File
@@ -1,10 +1,10 @@
BattleFrontier_Lounge9_MapObjects: @ 853D520
object_event 1, MAP_OBJ_GFX_GIRL_2, 0, 0, 6, 3, 0, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
BattleFrontier_Lounge9_EventObjects: @ 853D520
object_event 1, EVENT_OBJ_GFX_GIRL_2, 0, 0, 6, 3, 0, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
BattleFrontier_Lounge9_MapWarps: @ 853D538
warp_def 1, 9, 0, 11, BATTLE_FRONTIER_OUTSIDE_EAST
warp_def 2, 9, 0, 11, BATTLE_FRONTIER_OUTSIDE_EAST
BattleFrontier_Lounge9_MapEvents:: @ 853D548
map_events BattleFrontier_Lounge9_MapObjects, BattleFrontier_Lounge9_MapWarps, 0x0, 0x0
map_events BattleFrontier_Lounge9_EventObjects, BattleFrontier_Lounge9_MapWarps, 0x0, 0x0
data/maps/events/BattleFrontier_Mart.inc
+6 -6
View File
@@ -1,13 +1,13 @@
BattleFrontier_Mart_MapObjects: @ 853D68C
object_event 1, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 0, 1, 3, 3, 10, 0, 0, 0, 0, BattleFrontier_Mart_EventScript_267ACC, 0, 0, 0
object_event 2, MAP_OBJ_GFX_OLD_WOMAN_2, 0, 0, 5, 4, 3, 10, 0, 0, 0, 0, BattleFrontier_Mart_EventScript_267B0B, 0, 0, 0
object_event 3, MAP_OBJ_GFX_OLD_MAN_2, 0, 0, 5, 5, 3, 10, 0, 0, 0, 0, BattleFrontier_Mart_EventScript_267B02, 0, 0, 0
object_event 4, MAP_OBJ_GFX_BOY_2, 0, 0, 8, 4, 3, 9, 0, 0, 0, 0, BattleFrontier_Mart_EventScript_267B20, 0, 0, 0
BattleFrontier_Mart_EventObjects: @ 853D68C
object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 0, 1, 3, 3, 10, 0, 0, 0, 0, BattleFrontier_Mart_EventScript_267ACC, 0, 0, 0
object_event 2, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 0, 5, 4, 3, 10, 0, 0, 0, 0, BattleFrontier_Mart_EventScript_267B0B, 0, 0, 0
object_event 3, EVENT_OBJ_GFX_OLD_MAN_2, 0, 0, 5, 5, 3, 10, 0, 0, 0, 0, BattleFrontier_Mart_EventScript_267B02, 0, 0, 0
object_event 4, EVENT_OBJ_GFX_BOY_2, 0, 0, 8, 4, 3, 9, 0, 0, 0, 0, BattleFrontier_Mart_EventScript_267B20, 0, 0, 0
BattleFrontier_Mart_MapWarps: @ 853D6EC
warp_def 3, 7, 0, 4, BATTLE_FRONTIER_OUTSIDE_WEST
warp_def 4, 7, 0, 4, BATTLE_FRONTIER_OUTSIDE_WEST
BattleFrontier_Mart_MapEvents:: @ 853D6FC
map_events BattleFrontier_Mart_MapObjects, BattleFrontier_Mart_MapWarps, 0x0, 0x0
map_events BattleFrontier_Mart_EventObjects, BattleFrontier_Mart_MapWarps, 0x0, 0x0
data/maps/events/BattleFrontier_OutsideEast.inc
+28 -28
View File
@@ -1,30 +1,30 @@
BattleFrontier_OutsideEast_MapObjects: @ 853BB10
object_event 1, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 20, 17, 0, 27, 19, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242C67, 0, 0, 0
object_event 2, MAP_OBJ_GFX_MAN_4, 0, 0, 42, 15, 0, 2, 49, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242C70, 0, 0, 0
object_event 3, MAP_OBJ_GFX_HIKER, 0, 0, 53, 6, 0, 8, 2, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242C79, 0, 0, 0
object_event 4, MAP_OBJ_GFX_HEX_MANIAC, 0, 0, 54, 16, 0, 2, 18, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242C82, 0, 0, 0
object_event 5, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 37, 32, 0, 7, 0, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242C8B, 0, 0, 0
object_event 6, MAP_OBJ_GFX_COOK, 0, 0, 41, 56, 3, 9, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242C94, 0, 0, 0
object_event 7, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 0, 8, 46, 0, 1, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242CBB, 0, 0, 0
object_event 8, MAP_OBJ_GFX_RUNNING_TRIATHLETE_M, 0, 0, 34, 41, 0, 28, 19, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242CE1, 0, 0, 0
object_event 9, MAP_OBJ_GFX_BOY_4, 0, 0, 45, 47, 3, 1, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242CB2, 0, 0, 0
object_event 10, MAP_OBJ_GFX_CYCLING_TRIATHLETE_F, 0, 0, 59, 35, 0, 26, 97, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242CC4, 0, 0, 0
object_event 11, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 18, 40, 0, 1, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242CCD, 0, 0, 0
object_event 12, MAP_OBJ_GFX_MAN_1, 0, 0, 17, 40, 0, 10, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242CD6, 0, 0, 0
object_event 13, MAP_OBJ_GFX_ZIGZAGOON_2, 0, 0, 40, 56, 3, 1, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242C9F, 0, 0, 0
object_event 14, MAP_OBJ_GFX_SUDOWOODO, 0, 0, 54, 62, 3, 8, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242CEA, 842, 0, 0
object_event 15, MAP_OBJ_GFX_MANIAC, 0, 0, 42, 34, 3, 1, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242D79, 0, 0, 0
object_event 16, MAP_OBJ_GFX_GIRL_3, 0, 0, 51, 53, 3, 2, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242D82, 0, 0, 0
object_event 17, MAP_OBJ_GFX_PSYCHIC_M, 0, 0, 62, 18, 0, 46, 98, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242D8B, 0, 0, 0
object_event 18, MAP_OBJ_GFX_MAN_4, 0, 0, 11, 21, 0, 1, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242D94, 0, 0, 0
object_event 19, MAP_OBJ_GFX_WOMAN_7, 0, 0, 10, 21, 0, 10, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242D9D, 0, 0, 0
object_event 20, MAP_OBJ_GFX_WOMAN_7, 0, 0, 16, 30, 0, 2, 35, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242DA6, 0, 0, 0
object_event 21, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 33, 14, 0, 7, 0, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242DAF, 0, 0, 0
object_event 22, MAP_OBJ_GFX_MANIAC, 0, 0, 54, 31, 0, 9, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242DB8, 0, 0, 0
object_event 23, MAP_OBJ_GFX_WOMAN_5, 0, 0, 54, 32, 0, 7, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242DC3, 0, 0, 0
object_event 24, MAP_OBJ_GFX_OLD_WOMAN_2, 0, 0, 58, 55, 3, 17, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242DE9, 0, 0, 0
object_event 25, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 48, 41, 0, 7, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242DE0, 0, 0, 0
object_event 26, MAP_OBJ_GFX_CAMPER, 0, 0, 29, 14, 0, 7, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242E08, 0, 0, 0
BattleFrontier_OutsideEast_EventObjects: @ 853BB10
object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 20, 17, 0, 27, 19, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242C67, 0, 0, 0
object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 0, 42, 15, 0, 2, 49, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242C70, 0, 0, 0
object_event 3, EVENT_OBJ_GFX_HIKER, 0, 0, 53, 6, 0, 8, 2, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242C79, 0, 0, 0
object_event 4, EVENT_OBJ_GFX_HEX_MANIAC, 0, 0, 54, 16, 0, 2, 18, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242C82, 0, 0, 0
object_event 5, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 37, 32, 0, 7, 0, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242C8B, 0, 0, 0
object_event 6, EVENT_OBJ_GFX_COOK, 0, 0, 41, 56, 3, 9, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242C94, 0, 0, 0
object_event 7, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 0, 8, 46, 0, 1, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242CBB, 0, 0, 0
object_event 8, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_M, 0, 0, 34, 41, 0, 28, 19, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242CE1, 0, 0, 0
object_event 9, EVENT_OBJ_GFX_BOY_4, 0, 0, 45, 47, 3, 1, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242CB2, 0, 0, 0
object_event 10, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F, 0, 0, 59, 35, 0, 26, 97, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242CC4, 0, 0, 0
object_event 11, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 18, 40, 0, 1, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242CCD, 0, 0, 0
object_event 12, EVENT_OBJ_GFX_MAN_1, 0, 0, 17, 40, 0, 10, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242CD6, 0, 0, 0
object_event 13, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 0, 40, 56, 3, 1, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242C9F, 0, 0, 0
object_event 14, EVENT_OBJ_GFX_SUDOWOODO, 0, 0, 54, 62, 3, 8, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242CEA, 842, 0, 0
object_event 15, EVENT_OBJ_GFX_MANIAC, 0, 0, 42, 34, 3, 1, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242D79, 0, 0, 0
object_event 16, EVENT_OBJ_GFX_GIRL_3, 0, 0, 51, 53, 3, 2, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242D82, 0, 0, 0
object_event 17, EVENT_OBJ_GFX_PSYCHIC_M, 0, 0, 62, 18, 0, 46, 98, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242D8B, 0, 0, 0
object_event 18, EVENT_OBJ_GFX_MAN_4, 0, 0, 11, 21, 0, 1, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242D94, 0, 0, 0
object_event 19, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 10, 21, 0, 10, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242D9D, 0, 0, 0
object_event 20, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 16, 30, 0, 2, 35, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242DA6, 0, 0, 0
object_event 21, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 33, 14, 0, 7, 0, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242DAF, 0, 0, 0
object_event 22, EVENT_OBJ_GFX_MANIAC, 0, 0, 54, 31, 0, 9, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242DB8, 0, 0, 0
object_event 23, EVENT_OBJ_GFX_WOMAN_5, 0, 0, 54, 32, 0, 7, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242DC3, 0, 0, 0
object_event 24, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 0, 58, 55, 3, 17, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242DE9, 0, 0, 0
object_event 25, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 48, 41, 0, 7, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242DE0, 0, 0, 0
object_event 26, EVENT_OBJ_GFX_CAMPER, 0, 0, 29, 14, 0, 7, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242E08, 0, 0, 0
BattleFrontier_OutsideEast_MapWarps: @ 853BD80
warp_def 16, 14, 0, 0, BATTLE_FRONTIER_BATTLE_TOWER_LOBBY
@@ -53,5 +53,5 @@ BattleFrontier_OutsideEast_MapBGEvents: @ 853BDF0
bg_event 5, 51, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_271E73
BattleFrontier_OutsideEast_MapEvents:: @ 853BE50
map_events BattleFrontier_OutsideEast_MapObjects, BattleFrontier_OutsideEast_MapWarps, 0x0, BattleFrontier_OutsideEast_MapBGEvents
map_events BattleFrontier_OutsideEast_EventObjects, BattleFrontier_OutsideEast_MapWarps, 0x0, BattleFrontier_OutsideEast_MapBGEvents
data/maps/events/BattleFrontier_OutsideWest.inc
+26 -26
View File
@@ -1,28 +1,28 @@
BattleFrontier_OutsideWest_MapObjects: @ 853B350
object_event 1, MAP_OBJ_GFX_BOY_2, 0, 0, 26, 38, 0, 2, 34, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D50F, 0, 0, 0
object_event 2, MAP_OBJ_GFX_SS_TIDAL, 0, 0, 20, 70, 0, 10, 17, 0, 0, 0, 0x0, 0, 0, 0
object_event 3, MAP_OBJ_GFX_BEAUTY, 0, 0, 19, 68, 0, 7, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D3F0, 0, 0, 0
object_event 4, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 26, 20, 0, 5, 8, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D68B, 0, 0, 0
object_event 5, MAP_OBJ_GFX_MAN_4, 0, 0, 27, 30, 0, 2, 49, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D52D, 0, 0, 0
object_event 6, MAP_OBJ_GFX_WOMAN_7, 0, 0, 33, 41, 0, 2, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D69D, 0, 0, 0
object_event 7, MAP_OBJ_GFX_FAT_MAN, 0, 0, 28, 43, 0, 3, 48, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6A6, 0, 0, 0
object_event 8, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 17, 20, 0, 2, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D679, 0, 0, 0
object_event 9, MAP_OBJ_GFX_MANIAC, 0, 0, 13, 44, 0, 7, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D536, 0, 0, 0
object_event 10, MAP_OBJ_GFX_MANIAC, 0, 0, 14, 44, 0, 7, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D53D, 0, 0, 0
object_event 11, MAP_OBJ_GFX_MAN_6, 0, 0, 23, 47, 0, 15, 34, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D694, 0, 0, 0
object_event 12, MAP_OBJ_GFX_GIRL_1, 0, 0, 38, 27, 0, 2, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D5C6, 0, 0, 0
object_event 13, MAP_OBJ_GFX_WOMAN_4, 0, 0, 45, 18, 0, 3, 49, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D635, 0, 0, 0
object_event 14, MAP_OBJ_GFX_CAMPER, 0, 0, 9, 47, 0, 15, 33, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D57F, 0, 0, 0
object_event 15, MAP_OBJ_GFX_LASS, 0, 0, 35, 5, 0, 2, 18, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D682, 0, 0, 0
object_event 16, MAP_OBJ_GFX_MAN_2, 0, 0, 11, 66, 0, 9, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_249E19, 0, 0, 0
object_event 17, MAP_OBJ_GFX_FISHERMAN, 0, 0, 31, 31, 0, 8, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D667, 0, 0, 0
object_event 18, MAP_OBJ_GFX_FISHERMAN, 0, 0, 42, 48, 0, 18, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D518, 0, 0, 0
object_event 19, MAP_OBJ_GFX_FAT_MAN, 0, 0, 38, 22, 0, 3, 48, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6AF, 0, 0, 0
object_event 20, MAP_OBJ_GFX_WOMAN_3, 0, 0, 12, 9, 0, 8, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6B8, 0, 0, 0
object_event 21, MAP_OBJ_GFX_BOY_1, 0, 0, 12, 10, 0, 7, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6C3, 0, 0, 0
object_event 22, MAP_OBJ_GFX_OLD_MAN_2, 0, 0, 11, 10, 0, 23, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6CE, 0, 0, 0
object_event 23, MAP_OBJ_GFX_MAN_5, 0, 0, 8, 5, 0, 8, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6D7, 0, 0, 0
object_event 24, MAP_OBJ_GFX_WOMAN_2, 0, 0, 4, 26, 0, 24, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6EE, 0, 0, 0
BattleFrontier_OutsideWest_EventObjects: @ 853B350
object_event 1, EVENT_OBJ_GFX_BOY_2, 0, 0, 26, 38, 0, 2, 34, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D50F, 0, 0, 0
object_event 2, EVENT_OBJ_GFX_SS_TIDAL, 0, 0, 20, 70, 0, 10, 17, 0, 0, 0, 0x0, 0, 0, 0
object_event 3, EVENT_OBJ_GFX_BEAUTY, 0, 0, 19, 68, 0, 7, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D3F0, 0, 0, 0
object_event 4, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 26, 20, 0, 5, 8, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D68B, 0, 0, 0
object_event 5, EVENT_OBJ_GFX_MAN_4, 0, 0, 27, 30, 0, 2, 49, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D52D, 0, 0, 0
object_event 6, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 33, 41, 0, 2, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D69D, 0, 0, 0
object_event 7, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 28, 43, 0, 3, 48, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6A6, 0, 0, 0
object_event 8, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 17, 20, 0, 2, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D679, 0, 0, 0
object_event 9, EVENT_OBJ_GFX_MANIAC, 0, 0, 13, 44, 0, 7, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D536, 0, 0, 0
object_event 10, EVENT_OBJ_GFX_MANIAC, 0, 0, 14, 44, 0, 7, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D53D, 0, 0, 0
object_event 11, EVENT_OBJ_GFX_MAN_6, 0, 0, 23, 47, 0, 15, 34, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D694, 0, 0, 0
object_event 12, EVENT_OBJ_GFX_GIRL_1, 0, 0, 38, 27, 0, 2, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D5C6, 0, 0, 0
object_event 13, EVENT_OBJ_GFX_WOMAN_4, 0, 0, 45, 18, 0, 3, 49, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D635, 0, 0, 0
object_event 14, EVENT_OBJ_GFX_CAMPER, 0, 0, 9, 47, 0, 15, 33, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D57F, 0, 0, 0
object_event 15, EVENT_OBJ_GFX_LASS, 0, 0, 35, 5, 0, 2, 18, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D682, 0, 0, 0
object_event 16, EVENT_OBJ_GFX_MAN_2, 0, 0, 11, 66, 0, 9, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_249E19, 0, 0, 0
object_event 17, EVENT_OBJ_GFX_FISHERMAN, 0, 0, 31, 31, 0, 8, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D667, 0, 0, 0
object_event 18, EVENT_OBJ_GFX_FISHERMAN, 0, 0, 42, 48, 0, 18, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D518, 0, 0, 0
object_event 19, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 38, 22, 0, 3, 48, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6AF, 0, 0, 0
object_event 20, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 12, 9, 0, 8, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6B8, 0, 0, 0
object_event 21, EVENT_OBJ_GFX_BOY_1, 0, 0, 12, 10, 0, 7, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6C3, 0, 0, 0
object_event 22, EVENT_OBJ_GFX_OLD_MAN_2, 0, 0, 11, 10, 0, 23, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6CE, 0, 0, 0
object_event 23, EVENT_OBJ_GFX_MAN_5, 0, 0, 8, 5, 0, 8, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6D7, 0, 0, 0
object_event 24, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 4, 26, 0, 24, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6EE, 0, 0, 0
BattleFrontier_OutsideWest_MapWarps: @ 853B590
warp_def 42, 27, 0, 0, BATTLE_FRONTIER_BATTLE_PIKE_LOBBY
@@ -45,5 +45,5 @@ BattleFrontier_OutsideWest_MapBGEvents: @ 853B5E8
bg_event 53, 51, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_271E6A
BattleFrontier_OutsideWest_MapEvents:: @ 853B624
map_events BattleFrontier_OutsideWest_MapObjects, BattleFrontier_OutsideWest_MapWarps, 0x0, BattleFrontier_OutsideWest_MapBGEvents
map_events BattleFrontier_OutsideWest_EventObjects, BattleFrontier_OutsideWest_MapWarps, 0x0, BattleFrontier_OutsideWest_MapBGEvents
data/maps/events/BattleFrontier_PokemonCenter_1F.inc
+7 -7
View File
@@ -1,9 +1,9 @@
BattleFrontier_PokemonCenter_1F_MapObjects: @ 853D55C
object_event 1, MAP_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, BattleFrontier_PokemonCenter_1F_EventScript_267908, 0, 0, 0
object_event 2, MAP_OBJ_GFX_SCHOOL_KID_M, 0, 0, 4, 5, 3, 14, 1, 0, 0, 0, BattleFrontier_PokemonCenter_1F_EventScript_267916, 0, 0, 0
object_event 3, MAP_OBJ_GFX_MAN_4, 0, 0, 11, 4, 3, 8, 1, 0, 0, 0, BattleFrontier_PokemonCenter_1F_EventScript_26791F, 0, 0, 0
object_event 4, MAP_OBJ_GFX_PICNICKER, 0, 0, 2, 3, 3, 9, 1, 0, 0, 0, BattleFrontier_PokemonCenter_1F_EventScript_267928, 0, 0, 0
object_event 5, MAP_OBJ_GFX_SKITTY, 0, 0, 1, 3, 3, 10, 1, 0, 0, 0, BattleFrontier_PokemonCenter_1F_EventScript_267931, 0, 0, 0
BattleFrontier_PokemonCenter_1F_EventObjects: @ 853D55C
object_event 1, EVENT_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, BattleFrontier_PokemonCenter_1F_EventScript_267908, 0, 0, 0
object_event 2, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 0, 4, 5, 3, 14, 1, 0, 0, 0, BattleFrontier_PokemonCenter_1F_EventScript_267916, 0, 0, 0
object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 0, 11, 4, 3, 8, 1, 0, 0, 0, BattleFrontier_PokemonCenter_1F_EventScript_26791F, 0, 0, 0
object_event 4, EVENT_OBJ_GFX_PICNICKER, 0, 0, 2, 3, 3, 9, 1, 0, 0, 0, BattleFrontier_PokemonCenter_1F_EventScript_267928, 0, 0, 0
object_event 5, EVENT_OBJ_GFX_SKITTY, 0, 0, 1, 3, 3, 10, 1, 0, 0, 0, BattleFrontier_PokemonCenter_1F_EventScript_267931, 0, 0, 0
BattleFrontier_PokemonCenter_1F_MapWarps: @ 853D5D4
warp_def 7, 8, 3, 12, BATTLE_FRONTIER_OUTSIDE_EAST
@@ -11,5 +11,5 @@ BattleFrontier_PokemonCenter_1F_MapWarps: @ 853D5D4
warp_def 1, 6, 4, 0, BATTLE_FRONTIER_POKEMON_CENTER_2F
BattleFrontier_PokemonCenter_1F_MapEvents:: @ 853D5EC
map_events BattleFrontier_PokemonCenter_1F_MapObjects, BattleFrontier_PokemonCenter_1F_MapWarps, 0x0, 0x0
map_events BattleFrontier_PokemonCenter_1F_EventObjects, BattleFrontier_PokemonCenter_1F_MapWarps, 0x0, 0x0
data/maps/events/BattleFrontier_PokemonCenter_2F.inc
+6 -6
View File
@@ -1,8 +1,8 @@
BattleFrontier_PokemonCenter_2F_MapObjects: @ 853D600
object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, BattleFrontier_PokemonCenter_2F_EventScript_27375B, 0, 0, 0
object_event 2, MAP_OBJ_GFX_TEALA, 0, 0, 2, 2, 0, 8, 17, 0, 0, 0, BattleFrontier_PokemonCenter_2F_EventScript_273761, 0, 0, 0
object_event 3, MAP_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, BattleFrontier_PokemonCenter_2F_EventScript_273767, 0, 0, 0
object_event 4, MAP_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, BattleFrontier_PokemonCenter_2F_EventScript_276B03, 702, 0, 0
BattleFrontier_PokemonCenter_2F_EventObjects: @ 853D600
object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, BattleFrontier_PokemonCenter_2F_EventScript_27375B, 0, 0, 0
object_event 2, EVENT_OBJ_GFX_TEALA, 0, 0, 2, 2, 0, 8, 17, 0, 0, 0, BattleFrontier_PokemonCenter_2F_EventScript_273761, 0, 0, 0
object_event 3, EVENT_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, BattleFrontier_PokemonCenter_2F_EventScript_273767, 0, 0, 0
object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, BattleFrontier_PokemonCenter_2F_EventScript_276B03, 702, 0, 0
BattleFrontier_PokemonCenter_2F_MapWarps: @ 853D660
warp_def 1, 6, 4, 2, BATTLE_FRONTIER_POKEMON_CENTER_1F
@@ -10,5 +10,5 @@ BattleFrontier_PokemonCenter_2F_MapWarps: @ 853D660
warp_def 9, 1, 3, 0, TRADE_CENTER
BattleFrontier_PokemonCenter_2F_MapEvents:: @ 853D678
map_events BattleFrontier_PokemonCenter_2F_MapObjects, BattleFrontier_PokemonCenter_2F_MapWarps, 0x0, 0x0
map_events BattleFrontier_PokemonCenter_2F_EventObjects, BattleFrontier_PokemonCenter_2F_MapWarps, 0x0, 0x0
data/maps/events/BattleFrontier_RankingHall.inc
+5 -5
View File
@@ -1,7 +1,7 @@
BattleFrontier_RankingHall_MapObjects: @ 853CEB8
object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 24, 13, 3, 8, 17, 0, 0, 0, BattleFrontier_RankingHall_EventScript_25E52F, 0, 0, 0
object_event 2, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 4, 10, 3, 2, 17, 0, 0, 0, BattleFrontier_RankingHall_EventScript_25E54A, 0, 0, 0
object_event 3, MAP_OBJ_GFX_BOY_3, 0, 0, 44, 11, 3, 2, 17, 0, 0, 0, BattleFrontier_RankingHall_EventScript_25E573, 0, 0, 0
BattleFrontier_RankingHall_EventObjects: @ 853CEB8
object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 24, 13, 3, 8, 17, 0, 0, 0, BattleFrontier_RankingHall_EventScript_25E52F, 0, 0, 0
object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 4, 10, 3, 2, 17, 0, 0, 0, BattleFrontier_RankingHall_EventScript_25E54A, 0, 0, 0
object_event 3, EVENT_OBJ_GFX_BOY_3, 0, 0, 44, 11, 3, 2, 17, 0, 0, 0, BattleFrontier_RankingHall_EventScript_25E573, 0, 0, 0
BattleFrontier_RankingHall_MapWarps: @ 853CF00
warp_def 26, 14, 3, 4, BATTLE_FRONTIER_OUTSIDE_EAST
@@ -22,5 +22,5 @@ BattleFrontier_RankingHall_MapBGEvents: @ 853CF10
bg_event 36, 8, 0, 0, 0, BattleFrontier_RankingHall_EventScript_25E541
BattleFrontier_RankingHall_MapEvents:: @ 853CFA0
map_events BattleFrontier_RankingHall_MapObjects, BattleFrontier_RankingHall_MapWarps, 0x0, BattleFrontier_RankingHall_MapBGEvents
map_events BattleFrontier_RankingHall_EventObjects, BattleFrontier_RankingHall_MapWarps, 0x0, BattleFrontier_RankingHall_MapBGEvents
data/maps/events/BattleFrontier_ReceptionGate.inc
+7 -7
View File
@@ -1,14 +1,14 @@
BattleFrontier_ReceptionGate_MapObjects: @ 853D420
object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 0, 11, 0, 10, 17, 0, 0, 0, BattleFrontier_ReceptionGate_EventScript_2662FC, 0, 0, 0
object_event 2, MAP_OBJ_GFX_TEALA, 0, 0, 8, 11, 0, 9, 17, 0, 0, 0, BattleFrontier_ReceptionGate_EventScript_266310, 0, 0, 0
object_event 3, MAP_OBJ_GFX_MAN_2, 0, 0, 8, 4, 0, 9, 17, 0, 0, 0, BattleFrontier_ReceptionGate_EventScript_266436, 0, 0, 0
object_event 4, MAP_OBJ_GFX_SCOTT, 0, 0, 4, 5, 3, 8, 17, 0, 0, 0, 0x0, 836, 0, 0
object_event 5, MAP_OBJ_GFX_MAN_2, 0, 0, 0, 4, 0, 10, 17, 0, 0, 0, BattleFrontier_ReceptionGate_EventScript_2664F4, 0, 0, 0
BattleFrontier_ReceptionGate_EventObjects: @ 853D420
object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 0, 11, 0, 10, 17, 0, 0, 0, BattleFrontier_ReceptionGate_EventScript_2662FC, 0, 0, 0
object_event 2, EVENT_OBJ_GFX_TEALA, 0, 0, 8, 11, 0, 9, 17, 0, 0, 0, BattleFrontier_ReceptionGate_EventScript_266310, 0, 0, 0
object_event 3, EVENT_OBJ_GFX_MAN_2, 0, 0, 8, 4, 0, 9, 17, 0, 0, 0, BattleFrontier_ReceptionGate_EventScript_266436, 0, 0, 0
object_event 4, EVENT_OBJ_GFX_SCOTT, 0, 0, 4, 5, 3, 8, 17, 0, 0, 0, 0x0, 836, 0, 0
object_event 5, EVENT_OBJ_GFX_MAN_2, 0, 0, 0, 4, 0, 10, 17, 0, 0, 0, BattleFrontier_ReceptionGate_EventScript_2664F4, 0, 0, 0
BattleFrontier_ReceptionGate_MapWarps: @ 853D498
warp_def 4, 13, 0, 8, BATTLE_FRONTIER_OUTSIDE_WEST
warp_def 4, 1, 0, 9, BATTLE_FRONTIER_OUTSIDE_WEST
BattleFrontier_ReceptionGate_MapEvents:: @ 853D4A8
map_events BattleFrontier_ReceptionGate_MapObjects, BattleFrontier_ReceptionGate_MapWarps, 0x0, 0x0
map_events BattleFrontier_ReceptionGate_EventObjects, BattleFrontier_ReceptionGate_MapWarps, 0x0, 0x0
data/maps/events/BattleFrontier_ScottsHouse.inc
+3 -3
View File
@@ -1,10 +1,10 @@
BattleFrontier_ScottsHouse_MapObjects: @ 853D2B0
object_event 1, MAP_OBJ_GFX_SCOTT, 0, 0, 2, 3, 3, 1, 17, 0, 0, 0, BattleFrontier_ScottsHouse_EventScript_2636A8, 0, 0, 0
BattleFrontier_ScottsHouse_EventObjects: @ 853D2B0
object_event 1, EVENT_OBJ_GFX_SCOTT, 0, 0, 2, 3, 3, 1, 17, 0, 0, 0, BattleFrontier_ScottsHouse_EventScript_2636A8, 0, 0, 0
BattleFrontier_ScottsHouse_MapWarps: @ 853D2C8
warp_def 2, 7, 3, 5, BATTLE_FRONTIER_OUTSIDE_WEST
warp_def 3, 7, 3, 5, BATTLE_FRONTIER_OUTSIDE_WEST
BattleFrontier_ScottsHouse_MapEvents:: @ 853D2D8
map_events BattleFrontier_ScottsHouse_MapObjects, BattleFrontier_ScottsHouse_MapWarps, 0x0, 0x0
map_events BattleFrontier_ScottsHouse_EventObjects, BattleFrontier_ScottsHouse_MapWarps, 0x0, 0x0
data/maps/events/BattlePyramidSquare01.inc
+9 -9
View File
@@ -1,12 +1,12 @@
BattlePyramidSquare01_MapObjects: @ 853A460
object_event 1, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 2, 3, 4, 18, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
object_event 2, MAP_OBJ_GFX_GIRL_3, 0, 0, 5, 3, 4, 17, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
object_event 3, MAP_OBJ_GFX_BOY_4, 0, 0, 2, 6, 4, 16, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
object_event 4, MAP_OBJ_GFX_BOY_2, 0, 0, 6, 6, 4, 9, 17, 0, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 4, 1, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 7, 4, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 4, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
BattlePyramidSquare01_EventObjects: @ 853A460
object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 2, 3, 4, 18, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 0, 5, 3, 4, 17, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
object_event 3, EVENT_OBJ_GFX_BOY_4, 0, 0, 2, 6, 4, 16, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
object_event 4, EVENT_OBJ_GFX_BOY_2, 0, 0, 6, 6, 4, 9, 17, 0, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 4, 1, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 4, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 0, 4, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
BattlePyramidSquare01_MapEvents:: @ 853A508
map_events BattlePyramidSquare01_MapObjects, 0x0, 0x0, 0x0
map_events BattlePyramidSquare01_EventObjects, 0x0, 0x0, 0x0
data/maps/events/BattlePyramidSquare02.inc
+9 -9
View File
@@ -1,12 +1,12 @@
BattlePyramidSquare02_MapObjects: @ 853A51C
object_event 1, MAP_OBJ_GFX_BOY_3, 0, 0, 2, 1, 4, 18, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
object_event 2, MAP_OBJ_GFX_WOMAN_2, 0, 0, 5, 6, 4, 15, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
object_event 3, MAP_OBJ_GFX_FAT_MAN, 0, 0, 2, 6, 4, 16, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
object_event 4, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 5, 1, 4, 17, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 6, 5, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 7, 0, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 2, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
BattlePyramidSquare02_EventObjects: @ 853A51C
object_event 1, EVENT_OBJ_GFX_BOY_3, 0, 0, 2, 1, 4, 18, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 5, 6, 4, 15, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 2, 6, 4, 16, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 5, 1, 4, 17, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 6, 5, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 0, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 0, 2, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
BattlePyramidSquare02_MapEvents:: @ 853A5C4
map_events BattlePyramidSquare02_MapObjects, 0x0, 0x0, 0x0
map_events BattlePyramidSquare02_EventObjects, 0x0, 0x0, 0x0
data/maps/events/BattlePyramidSquare03.inc
+9 -9
View File
@@ -1,12 +1,12 @@
BattlePyramidSquare03_MapObjects: @ 853A5D8
object_event 1, MAP_OBJ_GFX_BOY_1, 0, 0, 2, 1, 4, 18, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
object_event 2, MAP_OBJ_GFX_LITTLE_BOY_2, 0, 0, 6, 1, 4, 17, 17, 0, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
object_event 3, MAP_OBJ_GFX_FISHERMAN, 0, 0, 6, 4, 4, 15, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
object_event 4, MAP_OBJ_GFX_MAN_4, 0, 0, 3, 4, 4, 18, 17, 0, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 4, 2, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 3, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 2, 7, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
BattlePyramidSquare03_EventObjects: @ 853A5D8
object_event 1, EVENT_OBJ_GFX_BOY_1, 0, 0, 2, 1, 4, 18, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 0, 6, 1, 4, 17, 17, 0, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
object_event 3, EVENT_OBJ_GFX_FISHERMAN, 0, 0, 6, 4, 4, 15, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
object_event 4, EVENT_OBJ_GFX_MAN_4, 0, 0, 3, 4, 4, 18, 17, 0, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 4, 2, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 0, 3, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 2, 7, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
BattlePyramidSquare03_MapEvents:: @ 853A680
map_events BattlePyramidSquare03_MapObjects, 0x0, 0x0, 0x0
map_events BattlePyramidSquare03_EventObjects, 0x0, 0x0, 0x0
data/maps/events/BattlePyramidSquare04.inc
+9 -9
View File
@@ -1,12 +1,12 @@
BattlePyramidSquare04_MapObjects: @ 853A694
object_event 1, MAP_OBJ_GFX_WOMAN_3, 0, 0, 7, 2, 4, 17, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
object_event 2, MAP_OBJ_GFX_GIRL_1, 0, 0, 7, 7, 4, 15, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
object_event 3, MAP_OBJ_GFX_BOY_4, 0, 0, 1, 4, 4, 18, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
object_event 4, MAP_OBJ_GFX_GIRL_3, 0, 0, 6, 4, 4, 15, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 2, 6, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 5, 3, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 3, 0, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
BattlePyramidSquare04_EventObjects: @ 853A694
object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 7, 2, 4, 17, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
object_event 2, EVENT_OBJ_GFX_GIRL_1, 0, 0, 7, 7, 4, 15, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
object_event 3, EVENT_OBJ_GFX_BOY_4, 0, 0, 1, 4, 4, 18, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
object_event 4, EVENT_OBJ_GFX_GIRL_3, 0, 0, 6, 4, 4, 15, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 2, 6, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 5, 3, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 3, 0, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
BattlePyramidSquare04_MapEvents:: @ 853A73C
map_events BattlePyramidSquare04_MapObjects, 0x0, 0x0, 0x0
map_events BattlePyramidSquare04_EventObjects, 0x0, 0x0, 0x0
data/maps/events/BattlePyramidSquare05.inc
+9 -9
View File
@@ -1,12 +1,12 @@
BattlePyramidSquare05_MapObjects: @ 853A750
object_event 1, MAP_OBJ_GFX_BOY_2, 0, 0, 6, 4, 4, 7, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
object_event 2, MAP_OBJ_GFX_BOY_2, 0, 0, 3, 7, 4, 16, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
object_event 3, MAP_OBJ_GFX_BOY_2, 0, 0, 3, 1, 4, 8, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
object_event 4, MAP_OBJ_GFX_BOY_2, 0, 0, 6, 0, 4, 17, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 3, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 7, 6, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 4, 3, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
BattlePyramidSquare05_EventObjects: @ 853A750
object_event 1, EVENT_OBJ_GFX_BOY_2, 0, 0, 6, 4, 4, 7, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
object_event 2, EVENT_OBJ_GFX_BOY_2, 0, 0, 3, 7, 4, 16, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
object_event 3, EVENT_OBJ_GFX_BOY_2, 0, 0, 3, 1, 4, 8, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
object_event 4, EVENT_OBJ_GFX_BOY_2, 0, 0, 6, 0, 4, 17, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 0, 3, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 6, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 4, 3, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
BattlePyramidSquare05_MapEvents:: @ 853A7F8
map_events BattlePyramidSquare05_MapObjects, 0x0, 0x0, 0x0
map_events BattlePyramidSquare05_EventObjects, 0x0, 0x0, 0x0

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