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

Merge pull request #262 from PikalaxALT/trainer_see

Browse Source 
Trainer see
This commit is contained in:
PikalaxALT
2020-02-21 20:50:44 -05:00
committed by GitHub
parent 4280723f0e 7624b5e5c0
commit e194cf83d2
113 changed files with 5043 additions and 6323 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/event_object_movement.s
+3014 -1128
View File
File diff suppressed because it is too large Load Diff
asm/field_effect.s
+13 -13
View File
@@ -2238,7 +2238,7 @@ sub_80844BC: @ 80844BC
bl GetPlayerFacingDirection
lsls r0, 24
lsrs r0, 24
bl sub_8063EB8
bl GetFaceDirectionMovementAction
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -2666,7 +2666,7 @@ _0808484A:
bl GetPlayerFacingDirection
lsls r0, 24
lsrs r0, 24
bl sub_8063EB8
bl GetFaceDirectionMovementAction
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -2947,7 +2947,7 @@ sub_8084A5C: @ 8084A5C
ldr r0, _08084AC0 @ =gObjectEvents
adds r4, r0
movs r0, 0x4
bl sub_8063EB8
bl GetFaceDirectionMovementAction
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -3200,7 +3200,7 @@ sub_8084C3C: @ 8084C3C
bl ScriptContext2_Disable
bl UnfreezeObjectEvents
movs r0, 0x4
bl sub_8063F84
bl GetWalkNormalMovementAction
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -4668,7 +4668,7 @@ _0808579E:
lsrs r0, 28
adds r0, r7
ldrb r0, [r0]
bl sub_8063EB8
bl GetFaceDirectionMovementAction
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -7130,7 +7130,7 @@ sub_8086AB4: @ 8086AB4
ldr r0, _08086B28 @ =gObjectEvents
adds r4, r0
movs r0, 0x2
bl sub_805C808
bl GetPlayerAvatarGraphicsIdByStateId
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -7194,7 +7194,7 @@ sub_8086B30: @ 8086B30
strb r0, [r5]
ldrb r0, [r4, 0x18]
lsrs r0, 4
bl sub_8063EB8
bl GetFaceDirectionMovementAction
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -7361,7 +7361,7 @@ _08086CA4:
beq _08086CC0
movs r0, 0x2
_08086CAE:
bl sub_805C808
bl GetPlayerAvatarGraphicsIdByStateId
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -7370,7 +7370,7 @@ _08086CAE:
b _08086CD2
_08086CC0:
movs r0, 0
bl sub_805C808
bl GetPlayerAvatarGraphicsIdByStateId
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -7380,7 +7380,7 @@ _08086CD2:
ldrb r0, [r4, 0x18]
lsls r0, 28
lsrs r0, 28
bl sub_8063EB8
bl GetFaceDirectionMovementAction
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -7804,7 +7804,7 @@ sub_8086FFC: @ 8086FFC
ldr r0, _08087064 @ =gObjectEvents
adds r4, r0
movs r0, 0x2
bl sub_805C808
bl GetPlayerAvatarGraphicsIdByStateId
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -8463,7 +8463,7 @@ _080874F2:
bl sub_80DC44C
_0808751A:
movs r0, 0x2
bl sub_805C808
bl GetPlayerAvatarGraphicsIdByStateId
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -8790,7 +8790,7 @@ fishE: @ 8087780
bl sub_80DC44C
_080877B4:
adds r0, r7, 0
bl sub_805C808
bl GetPlayerAvatarGraphicsIdByStateId
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
asm/field_ground_effect.s
-1894
View File
File diff suppressed because it is too large Load Diff
asm/field_player_avatar.s
+20 -20
View File
@@ -1120,7 +1120,7 @@ sub_805BBA8: @ 805BBA8
adds r1, r5, 0
adds r2, r4, 0
adds r3, r6, 0
bl npc_block_way
bl GetCollisionAtCoords
lsls r0, 24
lsrs r0, 24
mov r1, sp
@@ -1323,7 +1323,7 @@ sub_805BCEC: @ 805BCEC
ldrsh r2, [r5, r0]
adds r0, r4, 0
adds r3, r7, 0
bl npc_block_way
bl GetCollisionAtCoords
lsls r0, 24
cmp r0, 0
bne _0805BDA0
@@ -1840,7 +1840,7 @@ sub_805C104: @ 805C104
push {lr}
lsls r0, 24
lsrs r0, 24
bl sub_8063F84
bl GetWalkNormalMovementAction
lsls r0, 24
lsrs r0, 24
movs r1, 0x2
@@ -1976,7 +1976,7 @@ PlayerFaceDirection: @ 805C1F4
push {lr}
lsls r0, 24
lsrs r0, 24
bl sub_8063EB8
bl GetFaceDirectionMovementAction
lsls r0, 24
lsrs r0, 24
movs r1, 0x1
@@ -2065,7 +2065,7 @@ _0805C27E:
ldrb r0, [r0, 0x18]
lsls r0, 28
lsrs r0, 28
bl sub_8063EB8
bl GetFaceDirectionMovementAction
lsls r0, 24
lsrs r0, 24
bl sub_805BFFC
@@ -2759,8 +2759,8 @@ GetPlayerAvatarGraphicsIdByStateIdAndGender: @ 805C7E0
_0805C7F4: .4byte gUnknown_835B874
thumb_func_end GetPlayerAvatarGraphicsIdByStateIdAndGender
thumb_func_start sub_805C7F8
sub_805C7F8: @ 805C7F8
thumb_func_start GetHoennLinkPartnerGraphicsIdByGender
GetHoennLinkPartnerGraphicsIdByGender: @ 805C7F8
lsls r0, 24
lsrs r0, 24
ldr r1, _0805C804 @ =gUnknown_835B880
@@ -2769,10 +2769,10 @@ sub_805C7F8: @ 805C7F8
bx lr
.align 2, 0
_0805C804: .4byte gUnknown_835B880
thumb_func_end sub_805C7F8
thumb_func_end GetHoennLinkPartnerGraphicsIdByGender
thumb_func_start sub_805C808
sub_805C808: @ 805C808
thumb_func_start GetPlayerAvatarGraphicsIdByStateId
GetPlayerAvatarGraphicsIdByStateId: @ 805C808
push {lr}
lsls r0, 24
lsrs r0, 24
@@ -2785,7 +2785,7 @@ sub_805C808: @ 805C808
bx r1
.align 2, 0
_0805C820: .4byte gPlayerAvatar
thumb_func_end sub_805C808
thumb_func_end GetPlayerAvatarGraphicsIdByStateId
thumb_func_start sub_805C824
sub_805C824: @ 805C824
@@ -2906,7 +2906,7 @@ IsPlayerFacingSurfableFishableWater: @ 805C8B0
lsls r3, 28
lsrs r3, 28
adds r0, r4, 0
bl npc_block_way
bl GetCollisionAtCoords
lsls r0, 24
lsrs r0, 24
cmp r0, 0x3
@@ -3252,7 +3252,7 @@ sub_805CB70: @ 805CB70
ldr r0, _0805CBB0 @ =gObjectEvents
adds r4, r0
movs r0, 0x3
bl sub_805C808
bl GetPlayerAvatarGraphicsIdByStateId
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -3285,7 +3285,7 @@ sub_805CBB8: @ 805CBB8
cmp r0, 0
bne _0805CBD8
movs r0, 0x5
bl sub_805C808
bl GetPlayerAvatarGraphicsIdByStateId
lsls r0, 24
lsrs r0, 24
b _0805CBE0
@@ -3713,7 +3713,7 @@ PlayerAvatar_DoSecretBaseMatJump: @ 805CEEC
ldrb r0, [r4, 0x18]
lsls r0, 28
lsrs r0, 28
bl sub_806413C
bl GetJumpInPlaceMovementAction
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -3846,7 +3846,7 @@ sub_805CFEC: @ 805CFEC
add r0, sp
ldrb r6, [r0]
adds r0, r6, 0
bl sub_8063EB8
bl GetFaceDirectionMovementAction
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -4129,7 +4129,7 @@ sub_805D240: @ 805D240
cmp r0, 0
beq _0805D2AE
movs r0, 0
bl sub_805C808
bl GetPlayerAvatarGraphicsIdByStateId
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -4138,7 +4138,7 @@ sub_805D240: @ 805D240
ldrb r0, [r4, 0x18]
lsls r0, 28
lsrs r0, 28
bl sub_8063EB8
bl GetFaceDirectionMovementAction
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -5450,7 +5450,7 @@ _0805DC9A:
ldrsh r0, [r5, r3]
adds r0, r1
ldrb r0, [r0]
bl sub_8063EB8
bl GetFaceDirectionMovementAction
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -5618,7 +5618,7 @@ _0805DDE4:
lsrs r0, 28
adds r0, r4
ldrb r0, [r0]
bl sub_8063EB8
bl GetFaceDirectionMovementAction
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
asm/overworld.s
+2 -2
View File
@@ -7190,7 +7190,7 @@ SpawnLinkPlayerObjectEvent: @ 805839C
lsls r2, 24
lsrs r2, 24
mov r8, r2
bl sub_805DF30
bl GetIndexOfFirstInactiveObjectEvent
adds r6, r0, 0
lsls r6, 24
lsrs r6, 24
@@ -7880,7 +7880,7 @@ _080588BC:
ldrb r0, [r4]
lsls r0, 30
lsrs r0, 31
bl sub_805C7F8
bl GetHoennLinkPartnerGraphicsIdByGender
_080588C6:
lsls r0, 24
lsrs r0, 24
asm/trainer_see.s
-1628
View File
File diff suppressed because it is too large Load Diff
data/event_object_movement.s
+922 -846
View File
File diff suppressed because it is too large Load Diff
data/field_effect_scripts.s
+12 -12
View File
@@ -2,7 +2,7 @@
.section script_data, "aw", %progbits
.align 2
gUnknown_81D96AC:: @ 81D96AC
.4byte gFldEffScript_ExclamationMarkIcon1
.4byte gFldEffScript_ExclamationMarkIcon
.4byte gFldEffScript_UseCutOnGrass
.4byte gFldEffScript_UseCutOnTree
.4byte gFldEffScript_Shadow
@@ -35,7 +35,7 @@ gUnknown_81D96AC:: @ 81D96AC
.4byte gFldEffScript_NpcflyOut
.4byte gFldEffScript_UseFly
.4byte gFldEffScript_FlyIn
.4byte gFldEffScript_ExclamationMarkIcon2
.4byte gFldEffScript_QuestionMarkIcon
.4byte gFldEffScript_FeetInFlowingWater
.4byte gFldEffScript_BikeTireTracks
.4byte gFldEffScript_SandDisguise
@@ -66,14 +66,14 @@ gUnknown_81D96AC:: @ 81D96AC
.4byte gFldEffScript_PcturnOn
.4byte gFldEffScript_HallOfFameRecord
.4byte gFldEffScript_UseTeleport
.4byte gFldEffScript_Unk40
.4byte gFldEffScript_SmileyFaceIcon
.4byte gFldEffScript_Unk41
.4byte gFldEffScript_Unk42
.4byte gFldEffScript_DoubleExclMarkIcon
.4byte gFldEffScript_Unk43
.4byte gFldEffScript_Unk44
.4byte gFldEffScript_Unk45
gFldEffScript_ExclamationMarkIcon1:: @ 81D97C4
gFldEffScript_ExclamationMarkIcon:: @ 81D97C4
callnative FldEff_ExclamationMarkIcon1
end
@@ -203,8 +203,8 @@ gFldEffScript_FlyIn:: @ 81D98BE
callnative FldEff_FlyIn
end
gFldEffScript_ExclamationMarkIcon2:: @ 81D98C4
callnative sub_8082624
gFldEffScript_QuestionMarkIcon:: @ 81D98C4
callnative FldEff_QuestionMarkIcon
end
gFldEffScript_FeetInFlowingWater:: @ 81D98CA
@@ -257,7 +257,7 @@ gFldEffScript_Pokeball:: @ 81D9920
end
gFldEffScript_HeartIcon:: @ 81D992B
callnative sub_80825B4
callnative FldEff_XIcon
end
gFldEffScript_Nop47:: @ 81D9931
@@ -321,16 +321,16 @@ gFldEffScript_UseTeleport:: @ 81D9986
callnative FldEff_UseTeleport
end
gFldEffScript_Unk40:: @ 81D998C
callnative sub_80825EC
gFldEffScript_SmileyFaceIcon:: @ 81D998C
callnative FldEff_SmileyFaceIcon
end
gFldEffScript_Unk41:: @ 81D9992
callnative sub_8086BA8
end
gFldEffScript_Unk42:: @ 81D9998
callnative sub_808257C
gFldEffScript_DoubleExclMarkIcon:: @ 81D9998
callnative FldEff_DoubleExclMarkIcon
end
gFldEffScript_Unk43:: @ 81D999E
data/field_ground_effect.s
-63
View File
@@ -1,63 +0,0 @@
.section .rodata
.align 2
gUnknown_83A7024:: @ 83A7024
.4byte 0x00000020, 0x00000010
gUnknown_83A702C:: @ 83A702C
.4byte MetatileBehavior_IsTallGrass_2
.4byte MetatileBehavior_IsLongGrass
.4byte MetatileBehavior_IsPuddle
.4byte MetatileBehavior_IsSurfable
.4byte MetatileBehavior_IsWaterfallBottom
.4byte MetatileBehavior_UnusedReturnTrue
gUnknown_83A7044:: @ 83A7044
.4byte 0x00001000, 0x00002000, 0x00004000, 0x00008000, 0x00004000, 0x00010000
gUnknown_83A705C:: @ 83A705C
.4byte MetatileBehavior_IsJumpSouth
.4byte MetatileBehavior_IsJumpNorth
.4byte MetatileBehavior_IsJumpWest
.4byte MetatileBehavior_IsJumpEast
gUnknown_83A706C:: @ 83A706C
.byte 0x73, 0x73, 0x53, 0x73, 0x53, 0x73, 0x53, 0x73, 0x53, 0x73, 0x53, 0x73, 0x53, 0x00, 0x00, 0x73
gUnknown_83A707C:: @ 83A707C
.byte 0x02, 0x02, 0x02, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x00, 0x00, 0x02
gUnknown_83A708C:: @ 83A708C
.byte 0x01, 0x01, 0x01, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x00, 0x00, 0x01
gUnknown_83A709C:: @ 83A709C
.4byte nullsub_26
.4byte DoTracksGroundEffect_Footprints
.4byte DoTracksGroundEffect_BikeTireTracks
gUnknown_83A70A8:: @ 83A70A8
.byte 0x0d, 0x00, 0x18, 0x00
gUnknown_83A70AC:: @ 83A70AC
.byte 0x01, 0x02, 0x07, 0x08, 0x01, 0x02, 0x06, 0x05, 0x05, 0x08, 0x03, 0x04, 0x06, 0x07, 0x03, 0x04
gUnknown_83A70BC:: @ 83A70BC
.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_player_avatar.s
+24 -9
View File
@@ -1,3 +1,4 @@
#include "constants/object_events.h"
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
@@ -36,11 +37,11 @@ gUnknown_835B820:: @ 835B820
.align 2
gUnknown_835B828:: @ 835B828
.4byte MetatileBehavior_ReturnFalse_14
.4byte MetatileBehavior_ReturnFalse_15
.4byte MetatileBehavior_ReturnFalse_16
.4byte MetatileBehavior_ReturnFalse_17
.4byte MetatileBehavior_ReturnFalse_18
.4byte MetatileBehavior_ReturnFalse_14 // Related to Acro Bike
.4byte MetatileBehavior_ReturnFalse_15 // Related to Acro Bike
.4byte MetatileBehavior_ReturnFalse_16 // Related to Acro Bike
.4byte MetatileBehavior_ReturnFalse_17 // Related to Acro Bike
.4byte MetatileBehavior_ReturnFalse_18 // Related to Acro Bike
gUnknown_835B83C:: @ 835B83C
.byte 0x09, 0x0a, 0x0b, 0x0c, 0x0d
@@ -63,16 +64,30 @@ gUnknown_835B864:: @ 835B864
.4byte MetatileBehavior_IsEastArrowWarp
gUnknown_835B874:: @ 835B874
.byte 0x00, 0x07, 0x01, 0x08, 0x02, 0x09, 0x03, 0x0a, 0x04, 0x0b, 0x05, 0x0c
.byte OBJECT_EVENT_GFX_RED_NORMAL, OBJECT_EVENT_GFX_GREEN_NORMAL
.byte OBJECT_EVENT_GFX_RED_BIKE, OBJECT_EVENT_GFX_GREEN_BIKE
.byte OBJECT_EVENT_GFX_RED_SURF, OBJECT_EVENT_GFX_GREEN_SURF
.byte OBJECT_EVENT_GFX_RED_ITEM, OBJECT_EVENT_GFX_GREEN_ITEM
.byte OBJECT_EVENT_GFX_RED_FISH, OBJECT_EVENT_GFX_GREEN_FISH
.byte OBJECT_EVENT_GFX_RED_ITEM_COPY, OBJECT_EVENT_GFX_GREEN_ITEM_COPY
gUnknown_835B880:: @ 835B880
.byte 0x0e, 0x0f
.byte OBJECT_EVENT_GFX_RS_BRENDAN
.byte OBJECT_EVENT_GFX_RS_MAY
gUnknown_835B882:: @ 835B882
.byte 0x00, 0x01, 0x01, 0x02, 0x02, 0x08, 0x07, 0x01, 0x08, 0x02, 0x09, 0x08
@ Male
.byte OBJECT_EVENT_GFX_RED_NORMAL, 0x01
.byte OBJECT_EVENT_GFX_RED_BIKE, 0x02
.byte OBJECT_EVENT_GFX_RED_SURF, 0x08
@ Female
.byte OBJECT_EVENT_GFX_GREEN_NORMAL, 0x01
.byte OBJECT_EVENT_GFX_GREEN_BIKE, 0x02
.byte OBJECT_EVENT_GFX_GREEN_SURF, 0x08
gUnknown_835B88E:: @ 835B88E
.byte 0x06, 0x0d
.byte OBJECT_EVENT_GFX_RED_VS_SEEKER
.byte OBJECT_EVENT_GFX_GREEN_VS_SEEKER
gUnknown_835B890:: @ 835B890
.4byte MetatileBehavior_IsSouthArrowWarp
data/maps/CeladonCity_GameCorner/scripts.inc
+2 -2
View File
@@ -257,8 +257,8 @@ CeladonCity_GameCorner_EventScript_SlotMachine:: @ 816C96C
setfieldeffectarg 0, 255
setfieldeffectarg 1, 10
setfieldeffectarg 2, 14
dofieldeffect FLDEFF_UNK_40
waitfieldeffect FLDEFF_UNK_40 @ Smile icon?
dofieldeffect FLDEFF_SMILEY_FACE_ICON
waitfieldeffect FLDEFF_SMILEY_FACE_ICON
specialvar VAR_RESULT, Special_GetRandomSlotMachine
playslotmachine VAR_RESULT
releaseall
data/trainer_see.s
-97
View File
@@ -1,97 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnknown_83C6AC8::
.incbin "graphics/object_events/emoticons.4bpp"
gUnknown_83C7248:: @ 83C7248
.4byte IsTrainerInRangeSouth
.4byte IsTrainerInRangeNorth
.4byte IsTrainerInRangeWest
.4byte IsTrainerInRangeEast
gUnknown_83C7258:: @ 83C7258
.4byte sub_8081F34
.4byte sub_8081F38
.4byte sub_8081F90
.4byte sub_8081FD0
.4byte sub_808202C
.4byte sub_80820BC
.4byte sub_8082100
.4byte sub_8082134
.4byte sub_8082150
.4byte sub_8082184
.4byte sub_80821DC
.4byte sub_8082250
.4byte sub_808226C
.4byte sub_80822CC
.4byte sub_808237C
gUnknown_83C7294:: @ 83C7294
.4byte sub_8082150
.4byte sub_8082184
.4byte sub_80821DC
.4byte sub_8082250
gOamData_83C72A4::
.4byte 0x40000000, 0x00000400
gSpriteImages_83C72AC::
.4byte gUnknown_83C6AC8 + 0x000, 0x80
.4byte gUnknown_83C6AC8 + 0x080, 0x80
.4byte gUnknown_83C6AC8 + 0x100, 0x80
.4byte gUnknown_83C6AC8 + 0x300, 0x80
.4byte gUnknown_83C6AC8 + 0x380, 0x80
.4byte gUnknown_83C6AC8 + 0x400, 0x80
.4byte gUnknown_83C6AC8 + 0x180, 0x80
.4byte gUnknown_83C6AC8 + 0x200, 0x80
.4byte gUnknown_83C6AC8 + 0x280, 0x80
.4byte gUnknown_83C6AC8 + 0x480, 0x80
.4byte gUnknown_83C6AC8 + 0x500, 0x80
.4byte gUnknown_83C6AC8 + 0x580, 0x80
.4byte gUnknown_83C6AC8 + 0x600, 0x80
.4byte gUnknown_83C6AC8 + 0x680, 0x80
.4byte gUnknown_83C6AC8 + 0x700, 0x80
gAnimCmd_83C7324::
obj_image_anim_frame 0x0000, 0x0004
obj_image_anim_frame 0x0001, 0x0004
obj_image_anim_frame 0x0002, 0x0034
obj_image_anim_end
gAnimCmd_83C7334::
obj_image_anim_frame 0x0006, 0x0004
obj_image_anim_frame 0x0007, 0x0004
obj_image_anim_frame 0x0008, 0x0034
obj_image_anim_end
gAnimCmd_83C7344::
obj_image_anim_frame 0x0003, 0x0004
obj_image_anim_frame 0x0004, 0x0004
obj_image_anim_frame 0x0005, 0x0034
obj_image_anim_end
gAnimCmd_83C7354::
obj_image_anim_frame 0x0009, 0x0004
obj_image_anim_frame 0x000a, 0x0004
obj_image_anim_frame 0x000b, 0x0034
obj_image_anim_end
gAnimCmd_83C7364::
obj_image_anim_frame 0x000c, 0x0004
obj_image_anim_frame 0x000d, 0x0004
obj_image_anim_frame 0x000e, 0x0034
obj_image_anim_end
gSpriteAnimTable_83C7374::
.4byte gAnimCmd_83C7324
.4byte gAnimCmd_83C7334
.4byte gAnimCmd_83C7344
.4byte gAnimCmd_83C7354
.4byte gAnimCmd_83C7364
gUnknown_83C7388:: @ 83C7388
spr_template 65535, 65535, gOamData_83C72A4, gSpriteAnimTable_83C7374, gSpriteImages_83C72AC, gDummySpriteAffineAnimTable, objc_exclamation_mark_probably
include/constants/event_object_movement.h
+170 -153
View File
@@ -88,163 +88,180 @@
#define MOVEMENT_ACTION_FACE_UP 0x1
#define MOVEMENT_ACTION_FACE_LEFT 0x2
#define MOVEMENT_ACTION_FACE_RIGHT 0x3
#define MOVEMENT_ACTION_WALK_SLOW_DOWN 0x4
#define MOVEMENT_ACTION_WALK_SLOW_UP 0x5
#define MOVEMENT_ACTION_WALK_SLOW_LEFT 0x6
#define MOVEMENT_ACTION_WALK_SLOW_RIGHT 0x7
#define MOVEMENT_ACTION_WALK_NORMAL_DOWN 0x8
#define MOVEMENT_ACTION_WALK_NORMAL_UP 0x9
#define MOVEMENT_ACTION_WALK_NORMAL_LEFT 0xA
#define MOVEMENT_ACTION_WALK_NORMAL_RIGHT 0xB
#define MOVEMENT_ACTION_JUMP_2_DOWN 0xC
#define MOVEMENT_ACTION_JUMP_2_UP 0xD
#define MOVEMENT_ACTION_JUMP_2_LEFT 0xE
#define MOVEMENT_ACTION_JUMP_2_RIGHT 0xF
#define MOVEMENT_ACTION_DELAY_1 0x10
#define MOVEMENT_ACTION_DELAY_2 0x11
#define MOVEMENT_ACTION_DELAY_4 0x12
#define MOVEMENT_ACTION_DELAY_8 0x13
#define MOVEMENT_ACTION_DELAY_16 0x14
#define MOVEMENT_ACTION_WALK_FAST_DOWN 0x15
#define MOVEMENT_ACTION_WALK_FAST_UP 0x16
#define MOVEMENT_ACTION_WALK_FAST_LEFT 0x17
#define MOVEMENT_ACTION_WALK_FAST_RIGHT 0x18
#define MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_DOWN 0x19
#define MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_UP 0x1A
#define MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_LEFT 0x1B
#define MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_RIGHT 0x1C
#define MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_DOWN 0x1D
#define MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_UP 0x1E
#define MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_LEFT 0x1F
#define MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_RIGHT 0x20
#define MOVEMENT_ACTION_WALK_IN_PLACE_FAST_DOWN 0x21
#define MOVEMENT_ACTION_WALK_IN_PLACE_FAST_UP 0x22
#define MOVEMENT_ACTION_WALK_IN_PLACE_FAST_LEFT 0x23
#define MOVEMENT_ACTION_WALK_IN_PLACE_FAST_RIGHT 0x24
#define MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_DOWN 0x25
#define MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_UP 0x26
#define MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_LEFT 0x27
#define MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_RIGHT 0x28
#define MOVEMENT_ACTION_RIDE_WATER_CURRENT_DOWN 0x29
#define MOVEMENT_ACTION_RIDE_WATER_CURRENT_UP 0x2A
#define MOVEMENT_ACTION_RIDE_WATER_CURRENT_LEFT 0x2B
#define MOVEMENT_ACTION_RIDE_WATER_CURRENT_RIGHT 0x2C
#define MOVEMENT_ACTION_WALK_FASTEST_DOWN 0x2D
#define MOVEMENT_ACTION_WALK_FASTEST_UP 0x2E
#define MOVEMENT_ACTION_WALK_FASTEST_LEFT 0x2F
#define MOVEMENT_ACTION_WALK_FASTEST_RIGHT 0x30
#define MOVEMENT_ACTION_SLIDE_DOWN 0x31
#define MOVEMENT_ACTION_SLIDE_UP 0x32
#define MOVEMENT_ACTION_SLIDE_LEFT 0x33
#define MOVEMENT_ACTION_SLIDE_RIGHT 0x34
#define MOVEMENT_ACTION_PLAYER_RUN_DOWN 0x35
#define MOVEMENT_ACTION_PLAYER_RUN_UP 0x36
#define MOVEMENT_ACTION_PLAYER_RUN_LEFT 0x37
#define MOVEMENT_ACTION_PLAYER_RUN_RIGHT 0x38
#define MOVEMENT_ACTION_START_ANIM_IN_DIRECTION 0x39
#define MOVEMENT_ACTION_JUMP_SPECIAL_DOWN 0x3A
#define MOVEMENT_ACTION_JUMP_SPECIAL_UP 0x3B
#define MOVEMENT_ACTION_JUMP_SPECIAL_LEFT 0x3C
#define MOVEMENT_ACTION_JUMP_SPECIAL_RIGHT 0x3D
#define MOVEMENT_ACTION_FACE_PLAYER 0x3E
#define MOVEMENT_ACTION_FACE_AWAY_PLAYER 0x3F
#define MOVEMENT_ACTION_LOCK_FACING_DIRECTION 0x40
#define MOVEMENT_ACTION_UNLOCK_FACING_DIRECTION 0x41
#define MOVEMENT_ACTION_JUMP_DOWN 0x42
#define MOVEMENT_ACTION_JUMP_UP 0x43
#define MOVEMENT_ACTION_JUMP_LEFT 0x44
#define MOVEMENT_ACTION_JUMP_RIGHT 0x45
#define MOVEMENT_ACTION_JUMP_IN_PLACE_DOWN 0x46
#define MOVEMENT_ACTION_JUMP_IN_PLACE_UP 0x47
#define MOVEMENT_ACTION_JUMP_IN_PLACE_LEFT 0x48
#define MOVEMENT_ACTION_JUMP_IN_PLACE_RIGHT 0x49
#define MOVEMENT_ACTION_JUMP_IN_PLACE_DOWN_UP 0x4A
#define MOVEMENT_ACTION_JUMP_IN_PLACE_UP_DOWN 0x4B
#define MOVEMENT_ACTION_JUMP_IN_PLACE_LEFT_RIGHT 0x4C
#define MOVEMENT_ACTION_JUMP_IN_PLACE_RIGHT_LEFT 0x4D
#define MOVEMENT_ACTION_FACE_ORIGINAL_DIRECTION 0x4E
#define MOVEMENT_ACTION_NURSE_JOY_BOW_DOWN 0x4F
#define MOVEMENT_ACTION_ENABLE_JUMP_LANDING_GROUND_EFFECT 0x50
#define MOVEMENT_ACTION_DISABLE_JUMP_LANDING_GROUND_EFFECT 0x51
#define MOVEMENT_ACTION_DISABLE_ANIMATION 0x52
#define MOVEMENT_ACTION_RESTORE_ANIMATION 0x53
#define MOVEMENT_ACTION_SET_INVISIBLE 0x54
#define MOVEMENT_ACTION_SET_VISIBLE 0x55
#define MOVEMENT_ACTION_EMOTE_EXCLAMATION_MARK 0x56
#define MOVEMENT_ACTION_EMOTE_QUESTION_MARK 0x57
#define MOVEMENT_ACTION_EMOTE_HEART 0x58
#define MOVEMENT_ACTION_REVEAL_TRAINER 0x59
#define MOVEMENT_ACTION_ROCK_SMASH_BREAK 0x5A
#define MOVEMENT_ACTION_CUT_TREE 0x5B
#define MOVEMENT_ACTION_SET_FIXED_PRIORITY 0x5C
#define MOVEMENT_ACTION_CLEAR_FIXED_PRIORITY 0x5D
#define MOVEMENT_ACTION_INIT_AFFINE_ANIM 0x5E
#define MOVEMENT_ACTION_CLEAR_AFFINE_ANIM 0x5F
#define MOVEMENT_ACTION_HIDE_REFLECTION 0x60
#define MOVEMENT_ACTION_SHOW_REFLECTION 0x61
#define MOVEMENT_ACTION_WALK_DOWN_START_AFFINE 0x62
#define MOVEMENT_ACTION_WALK_DOWN_AFFINE 0x63
#define MOVEMENT_ACTION_ACRO_WHEELIE_FACE_DOWN 0x64
#define MOVEMENT_ACTION_ACRO_WHEELIE_FACE_UP 0x65
#define MOVEMENT_ACTION_ACRO_WHEELIE_FACE_LEFT 0x66
#define MOVEMENT_ACTION_ACRO_WHEELIE_FACE_RIGHT 0x67
#define MOVEMENT_ACTION_ACRO_POP_WHEELIE_DOWN 0x68
#define MOVEMENT_ACTION_ACRO_POP_WHEELIE_UP 0x69
#define MOVEMENT_ACTION_ACRO_POP_WHEELIE_LEFT 0x6A
#define MOVEMENT_ACTION_ACRO_POP_WHEELIE_RIGHT 0x6B
#define MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_DOWN 0x6C
#define MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_UP 0x6D
#define MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_LEFT 0x6E
#define MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_RIGHT 0x6F
#define MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_DOWN 0x70
#define MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_UP 0x71
#define MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_LEFT 0x72
#define MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_RIGHT 0x73
#define MOVEMENT_ACTION_ACRO_WHEELIE_HOP_DOWN 0x74
#define MOVEMENT_ACTION_ACRO_WHEELIE_HOP_UP 0x75
#define MOVEMENT_ACTION_ACRO_WHEELIE_HOP_LEFT 0x76
#define MOVEMENT_ACTION_ACRO_WHEELIE_HOP_RIGHT 0x77
#define MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_DOWN 0x78
#define MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_UP 0x79
#define MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_LEFT 0x7A
#define MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_RIGHT 0x7B
#define MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_DOWN 0x7C
#define MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_UP 0x7D
#define MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_LEFT 0x7E
#define MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_RIGHT 0x7F
#define MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_DOWN 0x80
#define MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_UP 0x81
#define MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_LEFT 0x82
#define MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_RIGHT 0x83
#define MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_DOWN 0x84
#define MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_UP 0x85
#define MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_LEFT 0x86
#define MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_RIGHT 0x87
#define MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_DOWN 0x88
#define MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_UP 0x89
#define MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_LEFT 0x8A
#define MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_RIGHT 0x8B
#define MOVEMENT_ACTION_WALK_NORMAL_DIAGONAL_UP_LEFT 0x8C
#define MOVEMENT_ACTION_WALK_NORMAL_DIAGONAL_UP_RIGHT 0x8D
#define MOVEMENT_ACTION_WALK_NORMAL_DIAGONAL_DOWN_LEFT 0x8E
#define MOVEMENT_ACTION_WALK_NORMAL_DIAGONAL_DOWN_RIGHT 0x8F
#define MOVEMENT_ACTION_WALK_SLOW_DIAGONAL_UP_LEFT 0x90
#define MOVEMENT_ACTION_WALK_SLOW_DIAGONAL_UP_RIGHT 0x91
#define MOVEMENT_ACTION_WALK_SLOW_DIAGONAL_DOWN_LEFT 0x92
#define MOVEMENT_ACTION_WALK_SLOW_DIAGONAL_DOWN_RIGHT 0x93
#define MOVEMENT_ACTION_STORE_AND_LOCK_ANIM 0x94
#define MOVEMENT_ACTION_FREE_AND_UNLOCK_ANIM 0x95
#define MOVEMENT_ACTION_WALK_LEFT_AFFINE 0x96
#define MOVEMENT_ACTION_WALK_RIGHT_AFFINE 0x97
#define MOVEMENT_ACTION_LEVITATE 0x98
#define MOVEMENT_ACTION_STOP_LEVITATE 0x99
#define MOVEMENT_ACTION_DESTROY_EXTRA_TASK_IF_AT_TOP 0x9A
#define MOVEMENT_ACTION_FIGURE_8 0x9B
#define MOVEMENT_ACTION_FACE_DOWN_FAST 0x4
#define MOVEMENT_ACTION_FACE_UP_FAST 0x5
#define MOVEMENT_ACTION_FACE_LEFT_FAST 0x6
#define MOVEMENT_ACTION_FACE_RIGHT_FAST 0x7
#define MOVEMENT_ACTION_WALK_SLOWEST_DOWN 0x8
#define MOVEMENT_ACTION_WALK_SLOWEST_UP 0x9
#define MOVEMENT_ACTION_WALK_SLOWEST_LEFT 0xA
#define MOVEMENT_ACTION_WALK_SLOWEST_RIGHT 0xB
#define MOVEMENT_ACTION_WALK_SLOW_DOWN 0xC
#define MOVEMENT_ACTION_WALK_SLOW_UP 0xD
#define MOVEMENT_ACTION_WALK_SLOW_LEFT 0xE
#define MOVEMENT_ACTION_WALK_SLOW_RIGHT 0xF
#define MOVEMENT_ACTION_WALK_NORMAL_DOWN 0x10
#define MOVEMENT_ACTION_WALK_NORMAL_UP 0x11
#define MOVEMENT_ACTION_WALK_NORMAL_LEFT 0x12
#define MOVEMENT_ACTION_WALK_NORMAL_RIGHT 0x13
#define MOVEMENT_ACTION_JUMP_2_DOWN 0x14
#define MOVEMENT_ACTION_JUMP_2_UP 0x15
#define MOVEMENT_ACTION_JUMP_2_LEFT 0x16
#define MOVEMENT_ACTION_JUMP_2_RIGHT 0x17
#define MOVEMENT_ACTION_DELAY_1 0x18
#define MOVEMENT_ACTION_DELAY_2 0x19
#define MOVEMENT_ACTION_DELAY_4 0x1A
#define MOVEMENT_ACTION_DELAY_8 0x1B
#define MOVEMENT_ACTION_DELAY_16 0x1C
#define MOVEMENT_ACTION_WALK_FAST_DOWN 0x1D
#define MOVEMENT_ACTION_WALK_FAST_UP 0x1E
#define MOVEMENT_ACTION_WALK_FAST_LEFT 0x1F
#define MOVEMENT_ACTION_WALK_FAST_RIGHT 0x20
#define MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_DOWN 0x21
#define MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_UP 0x22
#define MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_LEFT 0x23
#define MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_RIGHT 0x24
#define MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_DOWN 0x25
#define MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_UP 0x26
#define MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_LEFT 0x27
#define MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_RIGHT 0x28
#define MOVEMENT_ACTION_WALK_IN_PLACE_FAST_DOWN 0x29
#define MOVEMENT_ACTION_WALK_IN_PLACE_FAST_UP 0x2A
#define MOVEMENT_ACTION_WALK_IN_PLACE_FAST_LEFT 0x2B
#define MOVEMENT_ACTION_WALK_IN_PLACE_FAST_RIGHT 0x2C
#define MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_DOWN 0x2D
#define MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_UP 0x2E
#define MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_LEFT 0x2F
#define MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_RIGHT 0x30
#define MOVEMENT_ACTION_FACE_DOWN_SLOW 0x31
#define MOVEMENT_ACTION_FACE_UP_SLOW 0x32
#define MOVEMENT_ACTION_FACE_LEFT_SLOW 0x33
#define MOVEMENT_ACTION_FACE_RIGHT_SLOW 0x34
#define MOVEMENT_ACTION_WALK_FASTEST_DOWN 0x35
#define MOVEMENT_ACTION_WALK_FASTEST_UP 0x36
#define MOVEMENT_ACTION_WALK_FASTEST_LEFT 0x37
#define MOVEMENT_ACTION_WALK_FASTEST_RIGHT 0x38
#define MOVEMENT_ACTION_SLIDE_DOWN 0x39
#define MOVEMENT_ACTION_SLIDE_UP 0x3A
#define MOVEMENT_ACTION_SLIDE_LEFT 0x3B
#define MOVEMENT_ACTION_SLIDE_RIGHT 0x3C
#define MOVEMENT_ACTION_PLAYER_RUN_DOWN 0x3D
#define MOVEMENT_ACTION_PLAYER_RUN_UP 0x3E
#define MOVEMENT_ACTION_PLAYER_RUN_LEFT 0x3F
#define MOVEMENT_ACTION_PLAYER_RUN_RIGHT 0x40
#define MOVEMENT_ACTION_PLAYER_RUN_DOWN_SLOW 0x41
#define MOVEMENT_ACTION_PLAYER_RUN_UP_SLOW 0x42
#define MOVEMENT_ACTION_PLAYER_RUN_LEFT_SLOW 0x43
#define MOVEMENT_ACTION_PLAYER_RUN_RIGHT_SLOW 0x44
#define MOVEMENT_ACTION_UNKNOWN_STEP_45 0x45
#define MOVEMENT_ACTION_JUMP_SPECIAL_DOWN 0x46
#define MOVEMENT_ACTION_JUMP_SPECIAL_UP 0x47
#define MOVEMENT_ACTION_JUMP_SPECIAL_LEFT 0x48
#define MOVEMENT_ACTION_JUMP_SPECIAL_RIGHT 0x49
#define MOVEMENT_ACTION_FACE_PLAYER 0x4A
#define MOVEMENT_ACTION_FACE_AWAY_PLAYER 0x4B
#define MOVEMENT_ACTION_LOCK_FACING_DIRECTION 0x4C
#define MOVEMENT_ACTION_UNLOCK_FACING_DIRECTION 0x4D
#define MOVEMENT_ACTION_JUMP_DOWN 0x4E
#define MOVEMENT_ACTION_JUMP_UP 0x4F
#define MOVEMENT_ACTION_JUMP_LEFT 0x50
#define MOVEMENT_ACTION_JUMP_RIGHT 0x51
#define MOVEMENT_ACTION_JUMP_IN_PLACE_DOWN 0x52
#define MOVEMENT_ACTION_JUMP_IN_PLACE_UP 0x53
#define MOVEMENT_ACTION_JUMP_IN_PLACE_LEFT 0x54
#define MOVEMENT_ACTION_JUMP_IN_PLACE_RIGHT 0x55
#define MOVEMENT_ACTION_JUMP_IN_PLACE_DOWN_UP 0x56
#define MOVEMENT_ACTION_JUMP_IN_PLACE_UP_DOWN 0x57
#define MOVEMENT_ACTION_JUMP_IN_PLACE_LEFT_RIGHT 0x58
#define MOVEMENT_ACTION_JUMP_IN_PLACE_RIGHT_LEFT 0x59
#define MOVEMENT_ACTION_FACE_ORIGINAL_DIRECTION 0x5A
#define MOVEMENT_ACTION_NURSE_JOY_BOW_DOWN 0x5B
#define MOVEMENT_ACTION_ENABLE_JUMP_LANDING_GROUND_EFFECT 0x5C
#define MOVEMENT_ACTION_DISABLE_JUMP_LANDING_GROUND_EFFECT 0x5D
#define MOVEMENT_ACTION_DISABLE_ANIMATION 0x5E
#define MOVEMENT_ACTION_RESTORE_ANIMATION 0x5F
#define MOVEMENT_ACTION_SET_INVISIBLE 0x60
#define MOVEMENT_ACTION_SET_VISIBLE 0x61
#define MOVEMENT_ACTION_EMOTE_EXCLAMATION_MARK 0x62
#define MOVEMENT_ACTION_EMOTE_QUESTION_MARK 0x63
#define MOVEMENT_ACTION_EMOTE_X 0x64
#define MOVEMENT_ACTION_EMOTE_DOUBLE_EXCL_MARK 0x65
#define MOVEMENT_ACTION_EMOTE_SMILE 0x66
#define MOVEMENT_ACTION_REVEAL_TRAINER 0x67
#define MOVEMENT_ACTION_ROCK_SMASH_BREAK 0x68
#define MOVEMENT_ACTION_CUT_TREE 0x69
#define MOVEMENT_ACTION_SET_FIXED_PRIORITY 0x6A
#define MOVEMENT_ACTION_CLEAR_FIXED_PRIORITY 0x6B
#define MOVEMENT_ACTION_INIT_AFFINE_ANIM 0x6C
#define MOVEMENT_ACTION_CLEAR_AFFINE_ANIM 0x6D
// These still exist in FRLG for some reason. They're not used by anything obvious.
#define MOVEMENT_ACTION_WALK_DOWN_START_AFFINE 0x6E
#define MOVEMENT_ACTION_WALK_DOWN_AFFINE 0x6F
#define MOVEMENT_ACTION_ACRO_WHEELIE_FACE_DOWN 0x70
#define MOVEMENT_ACTION_ACRO_WHEELIE_FACE_UP 0x71
#define MOVEMENT_ACTION_ACRO_WHEELIE_FACE_LEFT 0x72
#define MOVEMENT_ACTION_ACRO_WHEELIE_FACE_RIGHT 0x73
#define MOVEMENT_ACTION_ACRO_POP_WHEELIE_DOWN 0x74
#define MOVEMENT_ACTION_ACRO_POP_WHEELIE_UP 0x75
#define MOVEMENT_ACTION_ACRO_POP_WHEELIE_LEFT 0x76
#define MOVEMENT_ACTION_ACRO_POP_WHEELIE_RIGHT 0x77
#define MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_DOWN 0x78
#define MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_UP 0x79
#define MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_LEFT 0x7A
#define MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_RIGHT 0x7B
#define MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_DOWN 0x7C
#define MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_UP 0x7D
#define MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_LEFT 0x7E
#define MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_RIGHT 0x7F
#define MOVEMENT_ACTION_ACRO_WHEELIE_HOP_DOWN 0x80
#define MOVEMENT_ACTION_ACRO_WHEELIE_HOP_UP 0x81
#define MOVEMENT_ACTION_ACRO_WHEELIE_HOP_LEFT 0x82
#define MOVEMENT_ACTION_ACRO_WHEELIE_HOP_RIGHT 0x83
#define MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_DOWN 0x84
#define MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_UP 0x85
#define MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_LEFT 0x86
#define MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_RIGHT 0x87
#define MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_DOWN 0x88
#define MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_UP 0x89
#define MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_LEFT 0x8A
#define MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_RIGHT 0x8B
#define MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_DOWN 0x8C
#define MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_UP 0x8D
#define MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_LEFT 0x8E
#define MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_RIGHT 0x8F
#define MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_DOWN 0x90
#define MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_UP 0x91
#define MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_LEFT 0x92
#define MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_RIGHT 0x93
#define MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_DOWN 0x94
#define MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_UP 0x95
#define MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_LEFT 0x96
#define MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_RIGHT 0x97
// 98-A3 are unknown
#define MOVEMENT_ACTION_0x98 0x98
#define MOVEMENT_ACTION_0x99 0x99
#define MOVEMENT_ACTION_0x9A 0x9A
#define MOVEMENT_ACTION_0x9B 0x9B
#define MOVEMENT_ACTION_0x9C 0x9C
#define MOVEMENT_ACTION_0x9D 0x9D
#define MOVEMENT_ACTION_0x9E 0x9E
#define MOVEMENT_ACTION_0x9F 0x9F
#define MOVEMENT_ACTION_0xA0 0xA0
#define MOVEMENT_ACTION_0xA1 0xA1
#define MOVEMENT_ACTION_0xA2 0xA2
#define MOVEMENT_ACTION_0xA3 0xA3
// These two are verified correct in FRLG
#define MOVEMENT_ACTION_FLY_UP 0xA4
#define MOVEMENT_ACTION_FLY_DOWN 0xA5
// Duplicates of JUMP_SPECIAL?
#define MOVEMENT_ACTION_0xA6 0xA6
#define MOVEMENT_ACTION_0xA7 0xA7
#define MOVEMENT_ACTION_0xA8 0xA8
#define MOVEMENT_ACTION_0xA9 0xA9
#define MOVEMENT_ACTION_STEP_END 0xFE
#endif // GUARD_CONSTANTS_EVENT_OBJECT_MOVEMENT_H
include/constants/field_effects.h
+6 -6
View File
@@ -1,7 +1,7 @@
#ifndef GUARD_CONSTANTS_FIELD_EFFECTS_H
#define GUARD_CONSTANTS_FIELD_EFFECTS_H
#define FLDEFF_EXCLAMATION_MARK_ICON_1 0
#define FLDEFF_EXCLAMATION_MARK_ICON 0
#define FLDEFF_USE_CUT_ON_GRASS 1
#define FLDEFF_USE_CUT_ON_TREE 2
#define FLDEFF_SHADOW 3
@@ -34,7 +34,7 @@
#define FLDEFF_NPCFLY_OUT 30
#define FLDEFF_USE_FLY 31
#define FLDEFF_FLY_IN 32
#define FLDEFF_EXCLAMATION_MARK_ICON_2 33
#define FLDEFF_QUESTION_MARK_ICON 33
#define FLDEFF_FEET_IN_FLOWING_WATER 34
#define FLDEFF_BIKE_TIRE_TRACKS 35
#define FLDEFF_SAND_DISGUISE 36
@@ -47,7 +47,7 @@
#define FLDEFF_USE_WATERFALL 43
#define FLDEFF_USE_DIVE 44
#define FLDEFF_POKEBALL 45
#define FLDEFF_HEART_ICON 46
#define FLDEFF_X_ICON 46
#define FLDEFF_NOP_47 47
#define FLDEFF_NOP_48 48
#define FLDEFF_POP_OUT_OF_ASH 49
@@ -65,11 +65,11 @@
#define FLDEFF_PCTURN_ON 61
#define FLDEFF_HALL_OF_FAME_RECORD 62
#define FLDEFF_USE_TELEPORT 63
#define FLDEFF_UNK_40 64 // TODO: game corner smile icon?
#define FLDEFF_SMILEY_FACE_ICON 64
#define FLDEFF_UNK_41 65 // TODO: related to vs_seeker
#define FLDEFF_UNK_42 66 // TODO: related to trainer see
#define FLDEFF_DOUBLE_EXCL_MARK_ICON 66
#define FLDEFF_UNK_43 67 // TODO: related to deoxys
#define FLDEFF_UNK_44 68 // TODO: related to trainer see
#define FLDEFF_UNK_44 68 // TODO: related to ???
#define FLDEFF_UNK_45 69 // TODO: related to fame checker photos
#endif // GUARD_CONSTANTS_FIELD_EFFECTS_H
include/constants/movement_commands.h
-121
View File
@@ -1,121 +0,0 @@
#ifndef GUARD_CONSTANTS_MOVEMENT_COMMANDS_H
#define GUARD_CONSTANTS_MOVEMENT_COMMANDS_H
enum
{
face_down,
face_up,
face_left,
face_right,
face_down_fast,
face_up_fast,
face_left_fast,
face_right_fast,
walk_slowest_down,
walk_slowest_up,
walk_slowest_left,
walk_slowest_right,
walk_slow_down,
walk_slow_up,
walk_slow_left,
walk_slow_right,
walk_down,
walk_up,
walk_left,
walk_right,
jump_2_down,
jump_2_up,
jump_2_left,
jump_2_right,
delay_1,
delay_2,
delay_4,
delay_8,
delay_16,
walk_fast_down,
walk_fast_up,
walk_fast_left,
walk_fast_right,
walk_in_place_slow_down,
walk_in_place_slow_up,
walk_in_place_slow_left,
walk_in_place_slow_right,
walk_in_place_down,
walk_in_place_up,
walk_in_place_left,
walk_in_place_right,
walk_in_place_fast_down,
walk_in_place_fast_up,
walk_in_place_fast_left,
walk_in_place_fast_right,
walk_in_place_fastest_down,
walk_in_place_fastest_up,
walk_in_place_fastest_left,
walk_in_place_fastest_right,
face_down_slow,
face_up_slow,
face_left_slow,
face_right_slow,
walk_fastest_down,
walk_fastest_up,
walk_fastest_left,
walk_fastest_right,
slide_down,
slide_up,
slide_left,
slide_right,
player_run_down,
player_run_up,
player_run_left,
player_run_right,
player_run_down_slow,
player_run_up_slow,
player_run_left_slow,
player_run_right_slow,
step_45,
jump_down_run,
jump_up_run,
jump_left_run,
jump_right_run,
face_player,
face_away_player,
lock_facing_direction,
unlock_facing_direction,
jump_down,
jump_up,
jump_left,
jump_right,
jump_in_place_down,
jump_in_place_up,
jump_in_place_left,
jump_in_place_right,
jump_in_place_down_up,
jump_in_place_up_down,
jump_in_place_left_right,
jump_in_place_right_left,
face_original_direction,
nurse_joy_bow,
enable_jump_landing_ground_effect,
disable_jump_landing_ground_effect,
disable_anim,
restore_anim,
set_invisible,
set_visible,
emote_exclamation_mark,
emote_question_mark,
emote_x,
emote_double_exclamation_mark,
emote_smile,
step_67,
rock_smash_break,
cut_tree,
step_91 = 0x91,
step_92,
step_96 = 0x96,
step_end = 0xfe,
};
#endif //GUARD_CONSTANTS_MOVEMENT_COMMANDS_H
include/constants/object_events.h
+2 -2
View File
@@ -3,14 +3,14 @@
#define OBJECT_EVENT_GFX_RED_NORMAL 0
#define OBJECT_EVENT_GFX_RED_BIKE 1
#define OBJECT_EVENT_GFX_RED_RUN 2
#define OBJECT_EVENT_GFX_RED_SURF 2
#define OBJECT_EVENT_GFX_RED_ITEM 3
#define OBJECT_EVENT_GFX_RED_FISH 4
#define OBJECT_EVENT_GFX_RED_ITEM_COPY 5
#define OBJECT_EVENT_GFX_RED_VS_SEEKER 6
#define OBJECT_EVENT_GFX_GREEN_NORMAL 7
#define OBJECT_EVENT_GFX_GREEN_BIKE 8
#define OBJECT_EVENT_GFX_GREEN_RUN 9
#define OBJECT_EVENT_GFX_GREEN_SURF 9
#define OBJECT_EVENT_GFX_GREEN_ITEM 10
#define OBJECT_EVENT_GFX_GREEN_FISH 11
#define OBJECT_EVENT_GFX_GREEN_ITEM_COPY 12
include/event_object_80688E4.h
-15
View File
@@ -1,15 +0,0 @@
#ifndef GUARD_EVENT_OBJECT_80688E4_H
#define GUARD_EVENT_OBJECT_80688E4_H
#include "global.h"
void FreezeObjectEvents(void);
bool8 FreezeObjectEvent(struct ObjectEvent *);
void FreezeObjectEventsExceptOne(u8 objEventId);
void RfuUnionObjectSetFacingDirection(u8 objectEventId, u8 direction);
void RfuUnionObjectToggleInvisibility(u8 objectEventId, bool32 invisible);
bool32 RfuUnionObjectIsInvisible(u8 objectEventId);
void RfuUnionObjectStartWarp(u8 objectEventId, u8 animNo);
bool32 RfuUnionObjectIsWarping(u8 objectEventId);
#endif // GUARD_EVENT_OBJECT_80688E4_H
include/event_object_8097404.h
-34
View File
@@ -1,34 +0,0 @@
//
// Created by scott on 9/7/2017.
//
#ifndef GUARD_EVENT_OBJECT_8097404_H
#define GUARD_EVENT_OBJECT_8097404_H
#include "global.h"
// Exported type declarations
// Exported RAM declarations
extern void *gUnknown_020375B8;
// Exported ROM declarations
void sub_8097AC8(struct Sprite *);
void UnfreezeObjectEvent(struct ObjectEvent *);
void oamt_npc_ministep_reset(struct Sprite *, u8, u8);
u8 sub_8097F78(struct ObjectEvent *);
bool8 obj_npc_ministep(struct Sprite *sprite);
bool8 sub_80976EC(struct Sprite *sprite);
void sub_80976DC(struct Sprite *, u8);
void sub_809783C(struct Sprite *, u8, u8, u8);
void DoShadowFieldEffect(struct ObjectEvent *);
u8 sub_809785C(struct Sprite *);
u8 sub_80978E4(struct Sprite *);
void obj_anim_image_set_and_seek(struct Sprite *, u8, u8);
bool8 sub_80979BC(struct Sprite *);
void sub_8097750(struct Sprite *);
bool8 sub_8097758(struct Sprite *);
void sub_8097FA4(struct ObjectEvent *);
void sub_8098044(u8);
#endif // GUARD_EVENT_OBJECT_8097404_H
include/event_object_movement.h
+23 -5
View File
@@ -48,7 +48,7 @@ void SpawnObjectEventsInView(s16, s16);
u8 sprite_new(u8, u8, s16, s16, u8, u8);
u8 AddPseudoObjectEvent(u16, SpriteCallback, s16, s16, u8);
u8 TrySpawnObjectEvent(u8 localId, u8 mapNum, u8 mapGroup);
u8 SpawnSpecialObjectEventParameterized(u8, u8, u8, s16, s16, u8);
int SpawnSpecialObjectEventParameterized(u8, u8, u8, s16, s16, u8);
u8 SpawnSpecialObjectEvent(struct ObjectEventTemplate *);
void sub_8093038(s16, s16, s16 *, s16 *);
void CameraObjectReset1(void);
@@ -65,7 +65,7 @@ void sub_808E82C(u8, u8, u8, s16, s16);
void sub_805F400(u8, u8, u8);
void sub_805F3A8(u8, u8, u8, u8);
void sub_808E75C(s16, s16);
void ObjectEventGetLocalIdAndMap(struct ObjectEvent *, u8 *, u8 *, u8 *);
void ObjectEventGetLocalIdAndMap(struct ObjectEvent * objectEvent, u8 *localId, u8 *mapNum, u8 *mapGroup);
void npc_coords_shift(struct ObjectEvent *, s16, s16);
void sub_808EB08(struct ObjectEvent *, s16, s16);
void sub_805FE94(u8, u8, u8);
@@ -76,7 +76,7 @@ u8 GetStepInPlaceDelay4AnimId(u32);
u8 GetStepInPlaceDelay8AnimId(u32);
u8 GetStepInPlaceDelay16AnimId(u32);
u8 GetStepInPlaceDelay32AnimId(u32);
u8 npc_block_way(struct ObjectEvent *, s16, s16, u32);
u8 GetCollisionAtCoords(struct ObjectEvent *, s16, s16, u32);
void MoveCoords(u8, s16 *, s16 *);
bool8 ObjectEventIsSpecialAnimActive(struct ObjectEvent *);
u8 ObjectEventClearHeldMovementIfFinished(struct ObjectEvent *);
@@ -84,7 +84,7 @@ u8 GetObjectEventIdByXYZ(u16 x, u16 y, u8 z);
void sub_8063E28(struct ObjectEvent *, struct Sprite *);
bool8 ObjectEventSetHeldMovement(struct ObjectEvent *, u8);
void npc_coords_shift_still(struct ObjectEvent *);
void sub_805FE7C(struct ObjectEvent *, u8);
void TryOverrideTemplateCoordsForObjectEvent(struct ObjectEvent *, u8);
void SetTrainerMovementType(struct ObjectEvent *, u8);
u8 sub_80634F0(u8 direction);
u8 sub_8063500(u8 a0);
@@ -93,11 +93,29 @@ u8 sub_805EB44(u8, u8, s16, s16);
void npc_paltag_set_load(u8 mode);
bool8 ObjectEventIsMovementOverridden(struct ObjectEvent *objectEvent);
u8 ObjectEventCheckHeldMovementStatus(struct ObjectEvent *objectEvent);
u8 sub_8063F84(u8 direction);
u8 GetWalkNormalMovementAction(u8 direction);
u8 GetTrainerFacingDirectionMovementType(u8 direction);
void CameraObjectSetFollowedObjectId(u8 spriteId);
void UnfreezeObjectEvents(void);
void TurnObjectEvent(u8, u8);
const u8 *GetObjectEventScriptPointerByObjectEventId(u8 objectEventId);
u8 GetIndexOfFirstInactiveObjectEvent(void);
u8 GetCollisionFlagsAtCoords(struct ObjectEvent * objectEvent, s16 x, s16 y, u8 direction);
u8 GetFaceDirectionMovementAction(u8 direction);
u8 GetJumpInPlaceMovementAction(u8 direction);
u8 sub_8063FB0(u8 direction);
void OverrideTemplateCoordsForObjectEvent(struct ObjectEvent *);
void sub_805C774(void);
void FreezeObjectEvents(void);
bool8 FreezeObjectEvent(struct ObjectEvent *);
void UnfreezeObjectEvent(struct ObjectEvent *);
void FreezeObjectEventsExceptOne(u8 objEventId);
void RfuUnionObjectSetFacingDirection(u8 objectEventId, u8 direction);
void RfuUnionObjectToggleInvisibility(u8 objectEventId, bool32 invisible);
bool32 RfuUnionObjectIsInvisible(u8 objectEventId);
void RfuUnionObjectStartWarp(u8 objectEventId, u8 animNo);
bool32 RfuUnionObjectIsWarping(u8 objectEventId);
// Exported data declarations
include/field_player_avatar.h
+1 -1
View File
@@ -16,7 +16,7 @@ void sub_808D074(u8);
void sub_805C270(void);
void sub_805C780(void);
void GetXYCoordsOneStepInFrontOfPlayer(s16 *xPtr, s16 *yPtr);
u8 sub_805C808(u8);
u8 GetPlayerAvatarGraphicsIdByStateId(u8);
void SetPlayerAvatarStateMask(u8 mask);
void sub_805D9C4(struct Sprite *sprite);
void sub_805D154(u8 direction);
include/global.fieldmap.h
+3 -3
View File
@@ -205,9 +205,9 @@ struct ObjectEvent
/*0x0A*/ u8 mapGroup;
/*0x0B*/ u8 mapobj_unk_0B_0:4;
u8 elevation:4;
/*0x0C*/ struct Coords16 coords1;
/*0x10*/ struct Coords16 coords2;
/*0x14*/ struct Coords16 coords3;
/*0x0C*/ struct Coords16 initialCoords;
/*0x10*/ struct Coords16 currentCoords;
/*0x14*/ struct Coords16 previousCoords;
/*0x18*/ u8 facingDirection:4; //current direction?
/*0x18*/ u8 placeholder18:4;
/*0x19*/ union ObjectEventRange range;
include/quest_log.h
+1
View File
@@ -49,5 +49,6 @@ void *QuestLogGetFlagOrVarPtr(bool8 isFlag, u16 idx);
void QuestLogSetFlagOrVar(bool8 isFlag, u16 idx, u16 value);
void sub_8110840(void *oldSave);
void sub_8112F18(u8 windowId);
bool8 sub_8111C2C(void);
#endif //GUARD_QUEST_LOG_H
include/trainer_see.h
+7 -3
View File
@@ -3,8 +3,12 @@
#include "global.h"
void sub_80B4578(struct ObjectEvent *);
u8 sub_80B47BC(void);
void sub_8155D78(struct ObjectEvent *);
bool8 CheckForTrainersWantingBattle(void);
void MovementAction_RevealTrainer_RunTrainerSeeFuncList(struct ObjectEvent *var);
u8 FldEff_ExclamationMarkIcon1(void);
u8 FldEff_DoubleExclMarkIcon(void);
u8 FldEff_XIcon(void);
u8 FldEff_SmileyFaceIcon(void);
u8 FldEff_QuestionMarkIcon(void);
#endif //GUARD_TRAINER_SEE_H
ld_script.txt
+4 -6
View File
@@ -94,8 +94,7 @@ SECTIONS {
src/field_door.o(.text);
asm/field_player_avatar.o(.text);
asm/event_object_movement.o(.text);
asm/field_ground_effect.o(.text);
src/event_object_80688E4.o(.text);
src/event_object_80688E4.o(.text); /* event_object_movement */
asm/field_message_box.o(.text);
src/event_object_lock.o(.text);
src/text_window_graphics.o(.text);
@@ -122,7 +121,7 @@ SECTIONS {
src/field_screen_effect.o(.text);
src/battle_setup.o(.text);
asm/cable_club.o(.text);
asm/trainer_see.o(.text);
src/trainer_see.o(.text);
src/wild_encounter.o(.text);
asm/field_effect.o(.text);
src/scanline_effect.o(.text);
@@ -426,8 +425,7 @@ SECTIONS {
src/field_door.o(.rodata);
data/field_player_avatar.o(.rodata);
data/event_object_movement.o(.rodata);
data/field_ground_effect.o(.rodata);
src/event_object_80688E4.o(.rodata);
src/event_object_80688E4.o(.rodata); /* event_object_movement */
src/scrcmd.o(.rodata);
src/coord_event_weather.o(.rodata);
src/field_tasks.o(.rodata);
@@ -444,7 +442,7 @@ SECTIONS {
src/field_screen_effect.o(.rodata);
src/battle_setup.o(.rodata);
data/cable_club.o(.rodata);
data/trainer_see.o(.rodata);
src/trainer_see.o(.rodata);
src/wild_encounter.o(.rodata);
data/field_effect.o(.rodata);
src/option_menu.o(.rodata);
src/bag.c
-2
View File
@@ -1,5 +1,4 @@
#include "global.h"
#include "task.h"
#include "palette.h"
#include "item_menu.h"
#include "text.h"
@@ -9,7 +8,6 @@
#include "new_menu_helpers.h"
#include "menu.h"
#include "money.h"
#include "bag.h"
#include "strings.h"
static const u16 sBagWindowPalF[] = INCBIN_U16("data/bag/bag_window_pal.gbapal");
src/battle_anim_effects_1.c
-6
View File
@@ -1,15 +1,9 @@
#include "global.h"
#include "malloc.h"
#include "battle_anim.h"
#include "battle_interface.h"
#include "decompress.h"
#include "gpu_regs.h"
#include "graphics.h"
#include "main.h"
#include "math_util.h"
#include "palette.h"
#include "random.h"
#include "scanline_effect.h"
#include "sound.h"
#include "trig.h"
#include "util.h"
src/battle_anim_effects_2.c
-1
View File
@@ -5,7 +5,6 @@
#include "decompress.h"
#include "gpu_regs.h"
#include "graphics.h"
#include "main.h"
#include "math_util.h"
#include "palette.h"
#include "random.h"
src/battle_controller_link_opponent.c
-7
View File
@@ -1,27 +1,20 @@
#include "global.h"
#include "bg.h"
#include "data.h"
#include "link.h"
#include "main.h"
#include "m4a.h"
#include "palette.h"
#include "pokeball.h"
#include "pokemon.h"
#include "reshow_battle_screen.h"
#include "sound.h"
#include "string_util.h"
#include "task.h"
#include "text.h"
#include "util.h"
#include "window.h"
#include "battle.h"
#include "battle_ai_script_commands.h"
#include "battle_anim.h"
#include "battle_controllers.h"
#include "battle_interface.h"
#include "battle_message.h"
#include "battle_setup.h"
#include "battle_tower.h"
#include "constants/battle_anim.h"
#include "constants/songs.h"
#include "constants/facility_trainer_classes.h"
src/battle_controller_link_partner.c
-8
View File
@@ -1,9 +1,6 @@
#include "global.h"
#include "bg.h"
#include "data.h"
#include "link.h"
#include "main.h"
#include "m4a.h"
#include "palette.h"
#include "pokeball.h"
#include "pokemon.h"
@@ -12,16 +9,11 @@
#include "task.h"
#include "text.h"
#include "util.h"
#include "window.h"
#include "battle.h"
#include "battle_ai_script_commands.h"
#include "battle_anim.h"
#include "battle_controllers.h"
#include "battle_interface.h"
#include "battle_message.h"
#include "battle_setup.h"
#include "battle_tower.h"
#include "reshow_battle_screen.h"
#include "constants/battle_anim.h"
#include "constants/songs.h"
src/battle_controller_opponent.c
-8
View File
@@ -1,15 +1,10 @@
#include "global.h"
#include "bg.h"
#include "data.h"
#include "item.h"
#include "link.h"
#include "main.h"
#include "m4a.h"
#include "task.h"
#include "text.h"
#include "util.h"
#include "window.h"
#include "palette.h"
#include "pokeball.h"
#include "pokemon.h"
#include "random.h"
@@ -20,15 +15,12 @@
#include "battle_controllers.h"
#include "battle_message.h"
#include "battle_interface.h"
#include "battle_setup.h"
#include "battle_tower.h"
#include "battle_gfx_sfx_util.h"
#include "battle_ai_script_commands.h"
#include "battle_ai_switch_items.h"
#include "trainer_tower.h"
#include "reshow_battle_screen.h"
#include "constants/battle_anim.h"
#include "constants/items.h"
#include "constants/moves.h"
#include "constants/songs.h"
src/battle_controller_player.c
-2
View File
@@ -10,7 +10,6 @@
#include "party_menu.h"
#include "pokeball.h"
#include "pokemon.h"
#include "random.h"
#include "sound.h"
#include "strings.h"
#include "string_util.h"
@@ -24,7 +23,6 @@
#include "battle_controllers.h"
#include "battle_interface.h"
#include "battle_message.h"
#include "battle_setup.h"
#include "battle_script_commands.h"
#include "reshow_battle_screen.h"
#include "constants/battle_anim.h"
src/battle_controller_pokedude.c
-2
View File
@@ -11,7 +11,6 @@
#include "link.h"
#include "sound.h"
#include "event_data.h"
#include "item.h"
#include "item_menu.h"
#include "text.h"
#include "strings.h"
@@ -25,7 +24,6 @@
#include "reshow_battle_screen.h"
#include "teachy_tv.h"
#include "constants/songs.h"
#include "constants/items.h"
#include "constants/moves.h"
#include "constants/pokemon.h"
#include "constants/trainers.h"
src/battle_controller_safari.c
-4
View File
@@ -9,16 +9,12 @@
#include "item_menu.h"
#include "link.h"
#include "main.h"
#include "m4a.h"
#include "palette.h"
#include "pokeball.h"
#include "pokemon.h"
#include "reshow_battle_screen.h"
#include "sound.h"
#include "task.h"
#include "text.h"
#include "util.h"
#include "window.h"
#include "strings.h"
#include "constants/songs.h"
#include "constants/battle_anim.h"
src/battle_gfx_sfx_util.c
-2
View File
@@ -13,8 +13,6 @@
#include "party_menu.h"
#include "battle.h"
#include "battle_main.h"
#include "battle_controllers.h"
#include "battle_ai_script_commands.h"
#include "battle_anim.h"
#include "battle_interface.h"
#include "constants/battle_anim.h"
src/battle_interface.c
-1
View File
@@ -12,7 +12,6 @@
#include "safari_zone.h"
#include "sound.h"
#include "string_util.h"
#include "strings.h"
#include "text.h"
#include "window.h"
#include "constants/songs.h"
src/battle_main.c
-4
View File
@@ -8,13 +8,11 @@
#include "battle_message.h"
#include "battle_scripts.h"
#include "battle_setup.h"
#include "battle_tower.h"
#include "battle_string_ids.h"
#include "berry.h"
#include "bg.h"
#include "data.h"
#include "decompress.h"
#include "dma3.h"
#include "event_data.h"
#include "evolution_scene.h"
#include "graphics.h"
@@ -40,14 +38,12 @@
#include "sound.h"
#include "sprite.h"
#include "string_util.h"
#include "strings.h"
#include "task.h"
#include "text.h"
#include "trig.h"
#include "vs_seeker.h"
#include "util.h"
#include "window.h"
#include "cable_club.h"
#include "constants/abilities.h"
#include "constants/battle_move_effects.h"
#include "constants/battle_setup.h"
src/battle_message.c
-1
View File
@@ -22,7 +22,6 @@
#include "constants/moves.h"
#include "constants/items.h"
#include "constants/trainer_classes.h"
#include "constants/trainer_tower.h"
struct BattleWindowText
{
src/battle_script_commands.c
-3
View File
@@ -3,7 +3,6 @@
#include "util.h"
#include "pokemon.h"
#include "random.h"
#include "data.h"
#include "text.h"
#include "sound.h"
#include "pokedex.h"
@@ -14,7 +13,6 @@
#include "bg.h"
#include "string_util.h"
#include "pokemon_icon.h"
#include "m4a.h"
#include "mail.h"
#include "event_data.h"
#include "strings.h"
@@ -30,7 +28,6 @@
#include "battle.h"
#include "battle_message.h"
#include "battle_anim.h"
#include "battle_setup.h"
#include "battle_ai_script_commands.h"
#include "battle_scripts.h"
#include "battle_string_ids.h"
src/battle_setup.c
+1 -4
View File
@@ -13,7 +13,7 @@
#include "strings.h"
#include "string_util.h"
#include "event_data.h"
#include "event_object_80688E4.h"
#include "event_object_movement.h"
#include "metatile_behavior.h"
#include "event_scripts.h"
#include "fldeff.h"
@@ -22,10 +22,8 @@
#include "field_player_avatar.h"
#include "field_screen_effect.h"
#include "field_message_box.h"
#include "event_object_movement.h"
#include "vs_seeker.h"
#include "battle.h"
#include "battle_setup.h"
#include "battle_transition.h"
#include "battle_controllers.h"
#include "constants/battle_setup.h"
@@ -37,7 +35,6 @@
#include "constants/pokemon.h"
#include "constants/trainers.h"
#include "constants/trainer_classes.h"
#include "constants/maps.h"
enum
{
src/battle_util2.c
-1
View File
@@ -5,7 +5,6 @@
#include "pokemon.h"
#include "malloc.h"
#include "trainer_tower.h"
#include "battle_util2.h"
void AllocateBattleResources(void)
{
src/berry_fix_program.c
-5
View File
@@ -1,17 +1,12 @@
#include "global.h"
#include "gpu_regs.h"
#include "multiboot.h"
#include "malloc.h"
#include "bg.h"
#include "graphics.h"
#include "main.h"
#include "sprite.h"
#include "task.h"
#include "scanline_effect.h"
#include "window.h"
#include "text.h"
#include "help_system.h"
#include "menu.h"
#include "m4a.h"
// Static type declarations
src/credits.c
-2
View File
@@ -11,8 +11,6 @@
#include "decompress.h"
#include "graphics.h"
#include "strings.h"
#include "menu.h"
#include "field_weather.h"
#include "trainer_pokemon_sprites.h"
#include "sound.h"
#include "constants/species.h"
src/daycare.c
-1
View File
@@ -1,7 +1,6 @@
#include "global.h"
#include "gflib.h"
#include "battle.h"
#include "daycare.h"
#include "constants/species.h"
#include "constants/items.h"
#include "mail_data.h"
src/decompress.c
-1
View File
@@ -2,7 +2,6 @@
#include "malloc.h"
#include "decompress.h"
#include "pokemon.h"
#include "text.h"
#include "constants/species.h"
extern const struct CompressedSpriteSheet gMonFrontPicTable[];
src/digit_obj_util.c
-1
View File
@@ -3,7 +3,6 @@
#include "decompress.h"
#include "digit_obj_util.h"
#include "main.h"
#include "battle.h"
struct DigitPrinterAlloc
{
src/diploma.c
-2
View File
@@ -4,7 +4,6 @@
#include "dynamic_placeholder_text_util.h"
#include "gba/macro.h"
#include "gpu_regs.h"
#include "gpu_regs.h"
#include "main.h"
#include "malloc.h"
#include "menu.h"
@@ -19,7 +18,6 @@
#include "task.h"
#include "text.h"
#include "window.h"
#include "diploma.h"
struct Diploma
{
src/dynamic_placeholder_text_util.c
+2 -3
View File
@@ -1,6 +1,5 @@
#include "global.h"
#include "text.h"
#include "dynamic_placeholder_text_util.h"
#include "string_util.h"
#include "constants/object_events.h"
@@ -10,10 +9,10 @@ static const u8 sTextColorTable[] =
{
// [LOW_NYBBLE / 2] = 0xXY, // HIGH_NYBBLE
[OBJECT_EVENT_GFX_RED_NORMAL / 2] = 0x00, // OBJECT_EVENT_GFX_RED_BIKE
[OBJECT_EVENT_GFX_RED_RUN / 2] = 0x00, // OBJECT_EVENT_GFX_RED_ITEM
[OBJECT_EVENT_GFX_RED_SURF / 2] = 0x00, // OBJECT_EVENT_GFX_RED_ITEM
[OBJECT_EVENT_GFX_RED_FISH / 2] = 0x00, // OBJECT_EVENT_GFX_RED_ITEM_COPY
[OBJECT_EVENT_GFX_RED_VS_SEEKER / 2] = 0x10, // OBJECT_EVENT_GFX_GREEN_NORMAL
[OBJECT_EVENT_GFX_GREEN_BIKE / 2] = 0x11, // OBJECT_EVENT_GFX_GREEN_RUN
[OBJECT_EVENT_GFX_GREEN_BIKE / 2] = 0x11, // OBJECT_EVENT_GFX_GREEN_SURF
[OBJECT_EVENT_GFX_GREEN_ITEM / 2] = 0x11, // OBJECT_EVENT_GFX_GREEN_FISH
[OBJECT_EVENT_GFX_GREEN_ITEM_COPY / 2] = 0x11, // OBJECT_EVENT_GFX_GREEN_VS_SEEKER
[OBJECT_EVENT_GFX_RS_BRENDAN / 2] = 0x10, // OBJECT_EVENT_GFX_RS_MAY
src/easy_chat.c
-15
View File
@@ -1,33 +1,18 @@
#include "global.h"
#include "malloc.h"
#include "bg.h"
#include "data.h"
#include "decompress.h"
#include "dynamic_placeholder_text_util.h"
#include "easy_chat.h"
#include "event_data.h"
#include "field_message_box.h"
#include "field_weather.h"
#include "gpu_regs.h"
#include "graphics.h"
#include "main.h"
#include "mevent.h"
#include "menu.h"
#include "mail.h"
#include "overworld.h"
#include "palette.h"
#include "pokedex.h"
#include "random.h"
#include "sound.h"
#include "string_util.h"
#include "strings.h"
#include "task.h"
#include "text_window.h"
#include "window.h"
#include "constants/easy_chat.h"
#include "constants/object_events.h"
#include "constants/flags.h"
#include "constants/songs.h"
#include "constants/species.h"
struct Unk203A120
src/event_object_80688E4.c
+1 -1
View File
@@ -1,5 +1,4 @@
#include "global.h"
#include "event_object_80688E4.h"
#include "event_object_movement.h"
#include "field_effect.h"
#include "field_ground_effect.h"
@@ -204,6 +203,7 @@ void sub_8068BBC(struct Sprite *sprite, u8 direction)
sprite->tStepNo = 0;
}
// used by an_walk_any_2
bool8 sub_8068BCC(struct Sprite *sprite)
{
if (!(sprite->tDelay & 1))
src/event_object_lock.c
-2
View File
@@ -3,9 +3,7 @@
#include "field_player_avatar.h"
#include "event_object_movement.h"
#include "script_movement.h"
#include "event_object_80688E4.h"
#include "event_data.h"
#include "event_object_lock.h"
bool8 walkrun_is_standing_still(void)
{
src/evolution_scene.c
-2
View File
@@ -31,8 +31,6 @@
#include "text.h"
#include "text_window.h"
#include "trig.h"
#include "trade.h"
#include "util.h"
#include "battle_string_ids.h"
#include "constants/species.h"
#include "constants/songs.h"
src/field_fadetransition.c
+2 -3
View File
@@ -13,12 +13,11 @@
#include "metatile_behavior.h"
#include "quest_log.h"
#include "link.h"
#include "event_object_80688E4.h"
#include "event_object_movement.h"
#include "sound.h"
#include "field_door.h"
#include "field_effect.h"
#include "field_screen_effect.h"
#include "event_object_movement.h"
#include "field_specials.h"
#include "event_object_lock.h"
#include "start_menu.h"
@@ -415,7 +414,7 @@ static void task_map_chg_seq_0807E20C(u8 taskId)
if (sub_807E418())
{
sub_807DCB0(TRUE);
ObjectEventSetHeldMovement(&gObjectEvents[GetObjectEventIdByLocalIdAndMap(0xFF, 0, 0)], sub_8063F84(GetPlayerFacingDirection()));
ObjectEventSetHeldMovement(&gObjectEvents[GetObjectEventIdByLocalIdAndMap(0xFF, 0, 0)], GetWalkNormalMovementAction(GetPlayerFacingDirection()));
task->data[0] = 2;
}
break;
src/field_specials.c
+2 -1
View File
@@ -46,6 +46,7 @@
#include "constants/region_map.h"
#include "constants/moves.h"
#include "constants/menu.h"
#include "constants/event_objects.h"
static EWRAM_DATA u8 sElevatorCurrentFloorWindowId = 0;
static EWRAM_DATA u16 sElevatorScroll = 0;
@@ -315,7 +316,7 @@ void Special_AnimatePcTurnOff()
void SpawnCameraObject(void)
{
u8 objectEventId = SpawnSpecialObjectEventParameterized(OBJECT_EVENT_GFX_YOUNGSTER, 8, 127, gSaveBlock1Ptr->pos.x + 7, gSaveBlock1Ptr->pos.y + 7, 3);
u8 objectEventId = SpawnSpecialObjectEventParameterized(OBJECT_EVENT_GFX_YOUNGSTER, 8, OBJ_EVENT_ID_CAMERA, gSaveBlock1Ptr->pos.x + 7, gSaveBlock1Ptr->pos.y + 7, 3);
gObjectEvents[objectEventId].invisible = TRUE;
CameraObjectSetFollowedObjectId(gObjectEvents[objectEventId].spriteId);
}
src/fieldmap.c
-1
View File
@@ -3,7 +3,6 @@
#include "palette.h"
#include "overworld.h"
#include "script.h"
#include "menu.h"
#include "new_menu_helpers.h"
#include "quest_log.h"
#include "fieldmap.h"
src/fldeff_dig.c
-2
View File
@@ -5,8 +5,6 @@
#include "item_use.h"
#include "overworld.h"
#include "party_menu.h"
#include "sprite.h"
#include "constants/object_events.h"
static void FieldCallback_Dig(void);
static void sub_80C9AFC(void);
src/fldeff_rocksmash.c
-4
View File
@@ -3,16 +3,12 @@
#include "field_player_avatar.h"
#include "field_effect.h"
#include "party_menu.h"
#include "malloc.h"
#include "event_data.h"
#include "script.h"
#include "fldeff.h"
#include "event_scripts.h"
#include "field_weather.h"
#include "sound.h"
#include "palette.h"
#include "overworld.h"
#include "wild_encounter.h"
#include "event_object_movement.h"
#include "constants/songs.h"
#include "constants/object_events.h"
src/fldeff_softboiled.c
-1
View File
@@ -5,7 +5,6 @@
#include "menu.h"
#include "new_menu_helpers.h"
#include "constants/songs.h"
#include "fldeff.h"
static void sub_80E57E8(u8 taskId);
static void sub_80E583C(u8 taskId);
src/fldeff_strength.c
-1
View File
@@ -6,7 +6,6 @@
#include "script.h"
#include "fldeff.h"
#include "event_scripts.h"
#include "constants/songs.h"
#include "constants/object_events.h"
static void FldEff_UseStrength(void);
src/fldeff_sweetscent.c
-1
View File
@@ -3,7 +3,6 @@
#include "field_effect.h"
#include "party_menu.h"
#include "malloc.h"
#include "event_data.h"
#include "script.h"
#include "fldeff.h"
#include "event_scripts.h"
src/help_system.c
-2
View File
@@ -10,9 +10,7 @@
#include "strings.h"
#include "text.h"
#include "blit.h"
#include "event_data.h"
#include "constants/songs.h"
#include "constants/flags.h"
extern u8 gGlyphInfo[];
src/hof_pc.c
-1
View File
@@ -5,7 +5,6 @@
#include "script.h"
#include "script_menu.h"
#include "task.h"
#include "hall_of_fame.h"
#include "bg.h"
#include "window.h"
src/ice.c
-2
View File
@@ -1,10 +1,8 @@
#include "global.h"
#include "battle_anim.h"
#include "bg.h"
#include "field_weather.h"
#include "gpu_regs.h"
#include "graphics.h"
#include "main.h"
#include "palette.h"
#include "random.h"
#include "sprite.h"
src/item_menu.c
+1 -1
View File
@@ -5,7 +5,7 @@
#include "berry_pouch.h"
#include "decompress.h"
#include "event_scripts.h"
#include "event_object_80688E4.h"
#include "event_object_movement.h"
#include "field_player_avatar.h"
#include "graphics.h"
#include "help_system.h"
src/item_use.c
-2
View File
@@ -19,7 +19,6 @@
#include "mail.h"
#include "main.h"
#include "malloc.h"
#include "event_object_80688E4.h"
#include "event_object_lock.h"
#include "metatile_behavior.h"
#include "new_menu_helpers.h"
@@ -42,7 +41,6 @@
#include "constants/maps.h"
#include "constants/moves.h"
#include "constants/songs.h"
#include "constants/maps.h"
static EWRAM_DATA void (*sItemUseOnFieldCB)(u8 taskId) = NULL;
src/itemfinder.c
-1
View File
@@ -10,7 +10,6 @@
#include "field_player_avatar.h"
#include "field_specials.h"
#include "fieldmap.h"
#include "itemfinder.h"
#include "constants/songs.h"
static void Task_NoResponse_CleanUp(u8 taskId);
src/list_menu.c
-2
View File
@@ -8,9 +8,7 @@
#include "main.h"
#include "task.h"
#include "graphics.h"
#include "decompress.h"
#include "palette.h"
#include "malloc.h"
#include "strings.h"
#include "sound.h"
#include "pokemon_icon.h"
src/load_save.c
-1
View File
@@ -8,7 +8,6 @@
#include "item.h"
#include "save_location.h"
#include "berry_powder.h"
#include "item.h"
#include "overworld.h"
#include "quest_log.h"
src/main.c
-3
View File
@@ -9,7 +9,6 @@
#include "random.h"
#include "dma3.h"
#include "gba/flash_internal.h"
#include "battle.h"
#include "help_system.h"
#include "sound.h"
#include "new_menu_helpers.h"
@@ -17,12 +16,10 @@
#include "overworld.h"
#include "sprite.h"
#include "play_time.h"
#include "pokemon.h"
#include "intro.h"
#include "battle_controllers.h"
#include "scanline_effect.h"
#include "save_failed_screen.h"
#include "battle.h"
extern u32 intr_main[];
src/menu.c
-4
View File
@@ -1,12 +1,8 @@
#include "global.h"
#include "bg.h"
#include "malloc.h"
#include "menu.h"
#include "menu_helpers.h"
#include "new_menu_helpers.h"
#include "string_util.h"
#include "strings.h"
#include "task.h"
#include "text_window.h"
#include "window.h"
#include "sound.h"
src/menu_indicators.c
-1
View File
@@ -3,7 +3,6 @@
#include "task.h"
#include "decompress.h"
#include "palette.h"
#include "strings.h"
#include "sprite.h"
#include "trig.h"
#include "list_menu.h"
src/mevent_server.c
-4
View File
@@ -1,10 +1,6 @@
#include "global.h"
#include "malloc.h"
#include "decompress.h"
#include "overworld.h"
#include "script.h"
#include "battle_tower.h"
#include "mystery_event_script.h"
#include "mevent.h"
#include "mevent_server.h"
src/mevent_server_helpers.c
-7
View File
@@ -1,14 +1,7 @@
#include "global.h"
#include "malloc.h"
#include "decompress.h"
#include "util.h"
#include "link.h"
#include "link_rfu.h"
#include "overworld.h"
#include "script.h"
#include "battle_tower.h"
#include "mystery_event_script.h"
#include "mevent.h"
#include "mevent_server.h"
static u32 mevent_receive_func(struct mevent_srv_sub *);
src/mevent_show_card.c
-3
View File
@@ -1,7 +1,6 @@
#include "global.h"
#include "constants/species.h"
#include "bg.h"
#include "gpu_regs.h"
#include "palette.h"
#include "decompress.h"
#include "malloc.h"
@@ -9,9 +8,7 @@
#include "new_menu_helpers.h"
#include "pokemon_icon.h"
#include "mystery_gift_menu.h"
#include "menu_indicators.h"
#include "string_util.h"
#include "link_rfu.h"
#include "mevent.h"
#include "battle_anim.h"
src/mystery_event_script.c
-1
View File
@@ -3,7 +3,6 @@
#include "battle_tower.h"
#include "easy_chat.h"
#include "event_data.h"
#include "mail.h"
#include "mail_data.h"
#include "mystery_event_script.h"
#include "pokedex.h"
src/new_game.c
-1
View File
@@ -1,5 +1,4 @@
#include "global.h"
#include "new_game.h"
#include "random.h"
#include "main.h"
#include "overworld.h"
src/new_menu_helpers.c
-2
View File
@@ -3,7 +3,6 @@
#include "dma3.h"
#include "task.h"
#include "bg.h"
#include "gpu_regs.h"
#include "window.h"
#include "menu.h"
#include "menu_helpers.h"
@@ -13,7 +12,6 @@
#include "field_specials.h"
#include "text_window.h"
#include "script.h"
#include "graphics.h"
#include "palette.h"
#define DLG_WINDOW_PALETTE_NUM 15
src/oak_speech.c
-2
View File
@@ -4,7 +4,6 @@
#include "task.h"
#include "malloc.h"
#include "gpu_regs.h"
#include "wild_encounter.h"
#include "palette.h"
#include "blend_palette.h"
#include "text.h"
@@ -25,7 +24,6 @@
#include "overworld.h"
#include "random.h"
#include "data.h"
#include "oak_speech.h"
#include "constants/species.h"
#include "constants/songs.h"
src/party_menu.c
-4
View File
@@ -13,11 +13,9 @@
#include "easy_chat.h"
#include "event_data.h"
#include "evolution_scene.h"
#include "field_control_avatar.h"
#include "field_effect.h"
#include "field_player_avatar.h"
#include "field_screen_effect.h"
#include "field_specials.h"
#include "field_weather.h"
#include "fieldmap.h"
#include "fldeff.h"
@@ -46,7 +44,6 @@
#include "pokemon_icon.h"
#include "pokemon_jump.h"
#include "pokemon_special_anim.h"
#include "pokemon_storage_system.h"
#include "pokemon_summary_screen.h"
#include "quest_log.h"
#include "region_map.h"
@@ -78,7 +75,6 @@
#include "constants/quest_log.h"
#include "constants/songs.h"
#include "constants/species.h"
#include "constants/vars.h"
#define PARTY_PAL_SELECTED (1 << 0)
#define PARTY_PAL_FAINTED (1 << 1)
src/party_menu_specials.c
-1
View File
@@ -2,7 +2,6 @@
#include "data.h"
#include "script.h"
#include "overworld.h"
#include "battle.h"
#include "palette.h"
#include "pokemon.h"
#include "party_menu.h"
src/pokeball.c
-1
View File
@@ -15,7 +15,6 @@
#include "link.h"
#include "battle_gfx_sfx_util.h"
#include "constants/songs.h"
#include "constants/species.h"
#define tFrames data[0]
#define tPan data[1]
src/pokemon_jump_6.c
-1
View File
@@ -1,7 +1,6 @@
#include "global.h"
#include "gflib.h"
#include "menu.h"
#include "pokemon_jump.h"
#include "script.h"
#include "strings.h"
#include "task.h"
src/pokemon_size_record.c
-1
View File
@@ -3,7 +3,6 @@
#include "event_data.h"
#include "pokedex.h"
#include "pokemon.h"
#include "pokemon_size_record.h"
#include "string_util.h"
#include "text.h"
#include "strings.h"
src/quest_log.c
-2
View File
@@ -18,10 +18,8 @@
#include "field_fadetransition.h"
#include "field_weather.h"
#include "event_object_movement.h"
#include "event_object_80688E4.h"
#include "event_object_lock.h"
#include "field_player_avatar.h"
#include "field_control_avatar.h"
#include "battle.h"
#include "item.h"
#include "region_map.h"
src/quest_log_objects.c
+22 -25
View File
@@ -1,11 +1,8 @@
#include "global.h"
#include "event_data.h"
#include "quest_log.h"
#include "fieldmap.h"
#include "field_player_avatar.h"
#include "metatile_behavior.h"
#include "link.h"
#include "link_rfu.h"
void SetQuestLogObjectEventsData(struct QuestLog * questLog)
{
@@ -39,8 +36,8 @@ void SetQuestLogObjectEventsData(struct QuestLog * questLog)
questLog->unk_008[i].localId = gObjectEvents[i].localId;
questLog->unk_008[i].mapNum = gObjectEvents[i].mapNum;
questLog->unk_008[i].mapGroup = gObjectEvents[i].mapGroup;
questLog->unk_008[i].x = gObjectEvents[i].coords2.x;
questLog->unk_008[i].y = gObjectEvents[i].coords2.y;
questLog->unk_008[i].x = gObjectEvents[i].currentCoords.x;
questLog->unk_008[i].y = gObjectEvents[i].currentCoords.y;
questLog->unk_008[i].trainerRange_berryTreeId = gObjectEvents[i].trainerRange_berryTreeId;
questLog->unk_008[i].mapobj_unk_1F = gObjectEvents[i].mapobj_unk_1F;
questLog->unk_008[i].mapobj_unk_21 = gObjectEvents[i].mapobj_unk_21;
@@ -83,8 +80,8 @@ void sub_815A1F8(const struct QuestLog * questLog, const struct ObjectEventTempl
gObjectEvents[i].localId = questLogObjectEvents[i].localId;
gObjectEvents[i].mapNum = questLogObjectEvents[i].mapNum;
gObjectEvents[i].mapGroup = questLogObjectEvents[i].mapGroup;
gObjectEvents[i].coords2.x = questLogObjectEvents[i].x;
gObjectEvents[i].coords2.y = questLogObjectEvents[i].y;
gObjectEvents[i].currentCoords.x = questLogObjectEvents[i].x;
gObjectEvents[i].currentCoords.y = questLogObjectEvents[i].y;
gObjectEvents[i].trainerRange_berryTreeId = questLogObjectEvents[i].trainerRange_berryTreeId;
gObjectEvents[i].mapobj_unk_1F = questLogObjectEvents[i].mapobj_unk_1F;
gObjectEvents[i].mapobj_unk_21 = questLogObjectEvents[i].mapobj_unk_21;
@@ -94,38 +91,38 @@ void sub_815A1F8(const struct QuestLog * questLog, const struct ObjectEventTempl
{
if (gObjectEvents[i].localId == templates[j].localId)
{
gObjectEvents[i].coords1.x = templates[j].x + 7;
gObjectEvents[i].coords1.y = templates[j].y + 7;
gObjectEvents[i].initialCoords.x = templates[j].x + 7;
gObjectEvents[i].initialCoords.y = templates[j].y + 7;
gObjectEvents[i].range.as_nybbles.x = templates[j].movementRangeX;
gObjectEvents[i].range.as_nybbles.y = templates[j].movementRangeY;
}
}
gObjectEvents[i].mapobj_unk_1E = MapGridGetMetatileBehaviorAt(gObjectEvents[i].coords2.x, gObjectEvents[i].coords2.y);
if (gObjectEvents[i].mapobj_unk_1F == MapGridGetMetatileBehaviorAt((s16)(gObjectEvents[i].coords2.x), (s16)(gObjectEvents[i].coords2.y)))
gObjectEvents[i].mapobj_unk_1E = MapGridGetMetatileBehaviorAt(gObjectEvents[i].currentCoords.x, gObjectEvents[i].currentCoords.y);
if (gObjectEvents[i].mapobj_unk_1F == MapGridGetMetatileBehaviorAt((s16)(gObjectEvents[i].currentCoords.x), (s16)(gObjectEvents[i].currentCoords.y)))
{
gObjectEvents[i].coords3.x = gObjectEvents[i].coords2.x;
gObjectEvents[i].coords3.y = gObjectEvents[i].coords2.y;
gObjectEvents[i].previousCoords.x = gObjectEvents[i].currentCoords.x;
gObjectEvents[i].previousCoords.y = gObjectEvents[i].currentCoords.y;
}
else if (gObjectEvents[i].mapobj_unk_1F == MapGridGetMetatileBehaviorAt((s16)(gObjectEvents[i].coords2.x - 1), (s16)(gObjectEvents[i].coords2.y)))
else if (gObjectEvents[i].mapobj_unk_1F == MapGridGetMetatileBehaviorAt((s16)(gObjectEvents[i].currentCoords.x - 1), (s16)(gObjectEvents[i].currentCoords.y)))
{
gObjectEvents[i].coords3.x = gObjectEvents[i].coords2.x - 1;
gObjectEvents[i].coords3.y = gObjectEvents[i].coords2.y;
gObjectEvents[i].previousCoords.x = gObjectEvents[i].currentCoords.x - 1;
gObjectEvents[i].previousCoords.y = gObjectEvents[i].currentCoords.y;
}
else if (gObjectEvents[i].mapobj_unk_1F == MapGridGetMetatileBehaviorAt((s16)(gObjectEvents[i].coords2.x + 1), (s16)(gObjectEvents[i].coords2.y)))
else if (gObjectEvents[i].mapobj_unk_1F == MapGridGetMetatileBehaviorAt((s16)(gObjectEvents[i].currentCoords.x + 1), (s16)(gObjectEvents[i].currentCoords.y)))
{
gObjectEvents[i].coords3.x = gObjectEvents[i].coords2.x + 1;
gObjectEvents[i].coords3.y = gObjectEvents[i].coords2.y;
gObjectEvents[i].previousCoords.x = gObjectEvents[i].currentCoords.x + 1;
gObjectEvents[i].previousCoords.y = gObjectEvents[i].currentCoords.y;
}
else if (gObjectEvents[i].mapobj_unk_1F == MapGridGetMetatileBehaviorAt((s16)(gObjectEvents[i].coords2.x), (s16)(gObjectEvents[i].coords2.y - 1)))
else if (gObjectEvents[i].mapobj_unk_1F == MapGridGetMetatileBehaviorAt((s16)(gObjectEvents[i].currentCoords.x), (s16)(gObjectEvents[i].currentCoords.y - 1)))
{
gObjectEvents[i].coords3.x = gObjectEvents[i].coords2.x;
gObjectEvents[i].coords3.y = gObjectEvents[i].coords2.y - 1;
gObjectEvents[i].previousCoords.x = gObjectEvents[i].currentCoords.x;
gObjectEvents[i].previousCoords.y = gObjectEvents[i].currentCoords.y - 1;
}
else if (gObjectEvents[i].mapobj_unk_1F == MapGridGetMetatileBehaviorAt((s16)(gObjectEvents[i].coords2.x), (s16)(gObjectEvents[i].coords2.y + 1)))
else if (gObjectEvents[i].mapobj_unk_1F == MapGridGetMetatileBehaviorAt((s16)(gObjectEvents[i].currentCoords.x), (s16)(gObjectEvents[i].currentCoords.y + 1)))
{
gObjectEvents[i].coords3.x = gObjectEvents[i].coords2.x;
gObjectEvents[i].coords3.y = gObjectEvents[i].coords2.y + 1;
gObjectEvents[i].previousCoords.x = gObjectEvents[i].currentCoords.x;
gObjectEvents[i].previousCoords.y = gObjectEvents[i].currentCoords.y + 1;
}
}
src/quest_log_player.c
+9 -9
View File
@@ -57,7 +57,7 @@ void sub_8150498(u8 a0)
static void sub_81504A8(void)
{
struct ObjectEvent *objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId];
sub_81507BC(objectEvent, sub_805C808(0));
sub_81507BC(objectEvent, GetPlayerAvatarGraphicsIdByStateId(0));
ObjectEventTurn(objectEvent, objectEvent->placeholder18);
SetPlayerAvatarStateMask(PLAYER_AVATAR_FLAG_ON_FOOT);
}
@@ -65,7 +65,7 @@ static void sub_81504A8(void)
static void sub_81504E8(void)
{
struct ObjectEvent *objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId];
sub_81507BC(objectEvent, sub_805C808(1));
sub_81507BC(objectEvent, GetPlayerAvatarGraphicsIdByStateId(1));
ObjectEventTurn(objectEvent, objectEvent->placeholder18);
SetPlayerAvatarStateMask(PLAYER_AVATAR_FLAG_MACH_BIKE);
sub_80BD620(0, 0);
@@ -86,7 +86,7 @@ static void sub_8150530(void)
}
else
{
sub_81507BC(objectEvent, sub_805C808(4));
sub_81507BC(objectEvent, GetPlayerAvatarGraphicsIdByStateId(4));
StartSpriteAnim(sprite, sub_80634F0(objectEvent->facingDirection));
}
}
@@ -101,7 +101,7 @@ static void sub_81505C4(u8 taskId)
case 0:
ObjectEventClearAnimIfSpecialAnimActive(objectEvent);
objectEvent->enableAnim = TRUE;
sub_81507BC(objectEvent, sub_805C808(4));
sub_81507BC(objectEvent, GetPlayerAvatarGraphicsIdByStateId(4));
StartSpriteAnim(sprite, sub_80634F0(objectEvent->facingDirection));
gTasks[taskId].data[0]++;
gTasks[taskId].data[1] = 0;
@@ -122,9 +122,9 @@ static void sub_81505C4(u8 taskId)
if (sprite->animEnded)
{
if (!(gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_SURFING))
sub_81507BC(objectEvent, sub_805C808(0));
sub_81507BC(objectEvent, GetPlayerAvatarGraphicsIdByStateId(0));
else
sub_81507BC(objectEvent, sub_805C808(2));
sub_81507BC(objectEvent, GetPlayerAvatarGraphicsIdByStateId(2));
ObjectEventTurn(objectEvent, objectEvent->placeholder18);
sprite->pos2.x = 0;
sprite->pos2.y = 0;
@@ -142,11 +142,11 @@ static void sub_8150708(void)
if (!(gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_SURFING))
{
sub_81507BC(objectEvent, sub_805C808(2));
sub_81507BC(objectEvent, GetPlayerAvatarGraphicsIdByStateId(2));
ObjectEventTurn(objectEvent, objectEvent->placeholder18);
SetPlayerAvatarStateMask(PLAYER_AVATAR_FLAG_SURFING);
gFieldEffectArguments[0] = objectEvent->coords2.x;
gFieldEffectArguments[1] = objectEvent->coords2.y;
gFieldEffectArguments[0] = objectEvent->currentCoords.x;
gFieldEffectArguments[1] = objectEvent->currentCoords.y;
gFieldEffectArguments[2] = gPlayerAvatar.objectEventId;
fieldEffectId = FieldEffectStart(FLDEFF_SURF_BLOB);
objectEvent->mapobj_unk_1A = fieldEffectId;
src/random.c
-1
View File
@@ -1,5 +1,4 @@
#include "global.h"
#include "random.h"
// The number 1103515245 comes from the example implementation
// of rand and srand in the ISO C standard.
src/reshow_battle_screen.c
-3
View File
@@ -6,7 +6,6 @@
#include "link.h"
#include "data.h"
#include "sprite.h"
#include "text.h"
#include "gpu_regs.h"
#include "scanline_effect.h"
#include "help_system.h"
@@ -14,8 +13,6 @@
#include "battle_interface.h"
#include "battle_anim.h"
#include "battle_controllers.h"
#include "reshow_battle_screen.h"
#include "constants/species.h"
static void CB2_ReshowBattleScreenAfterMenu(void);
static void sub_8077AAC(void);
src/rfu_union_tool.c
-2
View File
@@ -1,8 +1,6 @@
#include "global.h"
#include "event_data.h"
#include "event_object_movement.h"
#include "event_object_80688E4.h"
#include "event_object_8097404.h"
#include "field_player_avatar.h"
#include "fieldmap.h"
#include "rfu_union_tool.h"
src/roamer.c
-1
View File
@@ -1,5 +1,4 @@
#include "global.h"
#include "roamer.h"
#include "random.h"
#include "overworld.h"
#include "field_specials.h"
src/safari_zone.c
-1
View File
@@ -2,7 +2,6 @@
#include "battle.h"
#include "event_scripts.h"
#include "overworld.h"
#include "battle.h"
#include "script.h"
#include "event_data.h"
#include "field_screen_effect.h"
src/save_failed_screen.c
-1
View File
@@ -6,7 +6,6 @@
#include "help_system.h"
#include "m4a.h"
#include "save.h"
#include "save_failed_screen.h"
#include "strings.h"
#include "text.h"
src/scanline_effect.c
-1
View File
@@ -1,5 +1,4 @@
#include "global.h"
#include "battle.h"
#include "task.h"
#include "trig.h"
#include "scanline_effect.h"
src/scrcmd.c
-2
View File
@@ -21,7 +21,6 @@
#include "field_message_box.h"
#include "new_menu_helpers.h"
#include "window.h"
#include "start_menu.h"
#include "script_menu.h"
#include "string_util.h"
#include "data.h"
@@ -38,7 +37,6 @@
#include "field_effect.h"
#include "fieldmap.h"
#include "field_door.h"
#include "scrcmd.h"
extern u16 (*const gSpecials[])(void);
extern u16 (*const gSpecialsEnd[])(void);
src/script_pokemon_util.c
-2
View File
@@ -1,9 +1,7 @@
#include "global.h"
#include "battle.h"
#include "berry.h"
#include "daycare.h"
#include "event_data.h"
#include "event_object_movement.h"
#include "load_save.h"
#include "malloc.h"
#include "overworld.h"
src/sea_cottage_special_anim.c
-2
View File
@@ -1,10 +1,8 @@
#include "global.h"
#include "event_data.h"
#include "task.h"
#include "menu.h"
#include "field_player_avatar.h"
#include "fieldmap.h"
#include "event_object_movement.h"
#include "field_camera.h"
static EWRAM_DATA u8 gUnknown_2039984 = 0;
src/shop.c
-2
View File
@@ -10,7 +10,6 @@
#include "window.h"
#include "field_specials.h"
#include "field_weather.h"
#include "field_camera.h"
#include "task.h"
#include "text.h"
#include "item.h"
@@ -19,7 +18,6 @@
#include "sound.h"
#include "string_util.h"
#include "overworld.h"
#include "window.h"
#include "palette.h"
#include "field_fadetransition.h"
#include "scanline_effect.h"
src/slot_machine.c
-1
View File
@@ -11,7 +11,6 @@
#include "coins.h"
#include "quest_log.h"
#include "overworld.h"
#include "slot_machine.h"
#include "menu.h"
#include "new_menu_helpers.h"
#include "text_window.h"
src/sound.c
-1
View File
@@ -5,7 +5,6 @@
#include "quest_log.h"
#include "m4a.h"
#include "main.h"
#include "pokemon.h"
#include "constants/songs.h"
#include "task.h"
src/start_menu.c
+1 -1
View File
@@ -23,7 +23,7 @@
#include "field_fadetransition.h"
#include "field_player_avatar.h"
#include "new_menu_helpers.h"
#include "event_object_80688E4.h"
#include "event_object_movement.h"
#include "event_object_lock.h"
#include "script.h"
#include "sound.h"
src/text.c
-4
View File
@@ -1,15 +1,11 @@
#include "global.h"
#include "main.h"
#include "palette.h"
#include "string_util.h"
#include "window.h"
#include "text.h"
#include "sprite.h"
#include "blit.h"
#include "sound.h"
#include "m4a.h"
#include "quest_log.h"
#include "window.h"
#include "graphics.h"
#include "dynamic_placeholder_text_util.h"
#include "constants/songs.h"

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