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

Merge pull request #311 from PikalaxALT/field_player_avatar

Browse Source 
Field player avatar
This commit is contained in:
PikalaxALT
2020-03-26 17:53:18 -04:00
committed by GitHub
parent 7a6d4525c4 9130579f14
commit b9c604b8d2
63 changed files with 2789 additions and 6360 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/bike.s
+20 -20
View File
@@ -5,8 +5,8 @@
.text
thumb_func_start sub_80BD09C
sub_80BD09C: @ 80BD09C
thumb_func_start MovePlayerOnBike
MovePlayerOnBike: @ 80BD09C
push {r4,lr}
sub sp, 0x4
mov r3, sp
@@ -32,7 +32,7 @@ sub_80BD09C: @ 80BD09C
bx r0
.align 2, 0
_080BD0D0: .4byte gUnknown_83E7CFC
thumb_func_end sub_80BD09C
thumb_func_end MovePlayerOnBike
thumb_func_start sub_80BD0D4
sub_80BD0D4: @ 80BD0D4
@@ -342,7 +342,7 @@ _080BD300:
cmp r1, 0x6
bne _080BD322
adds r0, r4, 0
bl sub_805C23C
bl PlayerJumpLedge
b _080BD350
_080BD322:
subs r0, r1, 0x5
@@ -357,16 +357,16 @@ _080BD334:
cmp r1, 0xE
beq _080BD342
adds r0, r4, 0
bl sub_805BAAC
bl PlayerIsMovingOnRockStairs
cmp r0, 0
beq _080BD34A
_080BD342:
adds r0, r4, 0
bl sub_805C11C
bl PlayerGoSpeed2
b _080BD350
_080BD34A:
adds r0, r6, 0
bl sub_805C14C
bl PlayerRideWaterCurrent
_080BD350:
pop {r4-r6}
pop {r0}
@@ -389,7 +389,7 @@ _080BD370:
cmp r0, 0x6
bne _080BD37A
movs r0, 0x1
bl sub_805C23C
bl PlayerJumpLedge
_080BD37A:
pop {r0}
bx r0
@@ -406,7 +406,7 @@ sub_80BD380: @ 80BD380
cmp r0, 0
bne _080BD398
adds r0, r4, 0
bl sub_805C104
bl PlayerGoSpeed1
_080BD398:
pop {r4}
pop {r0}
@@ -481,7 +481,7 @@ sub_80BD40C: @ 80BD40C
lsls r2, 16
asrs r2, 16
str r5, [sp]
bl sub_805BBA8
bl CheckForObjectEventCollision
lsls r0, 24
lsrs r4, r0, 24
cmp r4, 0x4
@@ -537,8 +537,8 @@ _080BD482:
bx r1
thumb_func_end sub_80BD460
thumb_func_start sub_80BD488
sub_80BD488: @ 80BD488
thumb_func_start IsRunningDisallowed
IsRunningDisallowed: @ 80BD488
push {lr}
lsls r0, 24
lsrs r2, r0, 24
@@ -564,7 +564,7 @@ _080BD4B0:
_080BD4B2:
pop {r1}
bx r1
thumb_func_end sub_80BD488
thumb_func_end IsRunningDisallowed
thumb_func_start sub_80BD4B8
sub_80BD4B8: @ 80BD4B8
@@ -611,21 +611,21 @@ sub_80BD4F0: @ 80BD4F0
cmp r0, 0x1
bhi _080BD51A
adds r0, r4, 0
bl MetatileBehavior_ReturnFalse_15
bl MetatileBehavior_IsIsolatedVerticalRail
lsls r0, 24
cmp r0, 0
bne _080BD532
adds r0, r4, 0
bl MetatileBehavior_ReturnFalse_17
bl MetatileBehavior_IsVerticalRail
b _080BD52C
_080BD51A:
adds r0, r5, 0
bl MetatileBehavior_ReturnFalse_16
bl MetatileBehavior_IsIsolatedHorizontalRail
lsls r0, 24
cmp r0, 0
bne _080BD532
adds r0, r5, 0
bl MetatileBehavior_ReturnFalse_18
bl MetatileBehavior_IsHorizontalRail
_080BD52C:
lsls r0, 24
cmp r0, 0
@@ -697,7 +697,7 @@ player_should_look_direction_be_enforced_upon_movement: @ 80BD58C
lsls r0, 2
adds r0, r2
ldrb r0, [r0, 0x1E]
bl MetatileBehavior_ReturnFalse_14
bl MetatileBehavior_IsBumpySlope
lsls r0, 24
cmp r0, 0
beq _080BD5C0
@@ -729,7 +729,7 @@ StartTransitionToFlipBikeState: @ 80BD5C8
beq _080BD5F8
movs r0, 0x1
bl SetPlayerAvatarTransitionFlags
bl sav1_reset_battle_music_maybe
bl Overworld_ClearSavedMusic
bl Overworld_PlaySpecialMapMusic
b _080BD618
.align 2, 0
@@ -875,7 +875,7 @@ Bike_HandleBumpySlopeJump: @ 80BD6C4
bl MapGridGetMetatileBehaviorAt
lsls r0, 24
lsrs r0, 24
bl MetatileBehavior_ReturnFalse_14
bl MetatileBehavior_IsBumpySlope
lsls r0, 24
cmp r0, 0
beq _080BD70C
asm/field_player_avatar.s
-5647
View File
File diff suppressed because it is too large Load Diff
asm/overworld.s
+9 -9
View File
@@ -1715,7 +1715,7 @@ sub_8055864: @ 8055864
bl SetSav1WeatherFromCurrMapHeader
bl sub_805610C
bl sub_8055CB8
bl sav1_reset_battle_music_maybe
bl Overworld_ClearSavedMusic
bl mapheader_run_script_with_tag_x3
bl TryRegenerateRenewableHiddenItems
bl InitMap
@@ -1792,7 +1792,7 @@ sub_8055920: @ 8055920
bl FlagClear
_08055974:
bl sub_8055CB8
bl sav1_reset_battle_music_maybe
bl Overworld_ClearSavedMusic
bl mapheader_run_script_with_tag_x3
bl TryRegenerateRenewableHiddenItems
bl UpdateLocationHistoryForRoamer
@@ -2073,7 +2073,7 @@ _08055B94:
cmp r0, 0x1
beq _08055BD0
adds r0, r5, 0
bl MetatileBehavior_IsCaveDoor
bl MetatileBehavior_IsNonAnimDoor
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -2474,8 +2474,8 @@ Overworld_SetSavedMusic: @ 8055E78
_08055E80: .4byte gSaveBlock1Ptr
thumb_func_end Overworld_SetSavedMusic
thumb_func_start sav1_reset_battle_music_maybe
sav1_reset_battle_music_maybe: @ 8055E84
thumb_func_start Overworld_ClearSavedMusic
Overworld_ClearSavedMusic: @ 8055E84
ldr r0, _08055E90 @ =gSaveBlock1Ptr
ldr r1, [r0]
movs r0, 0
@@ -2483,7 +2483,7 @@ sav1_reset_battle_music_maybe: @ 8055E84
bx lr
.align 2, 0
_08055E90: .4byte gSaveBlock1Ptr
thumb_func_end sav1_reset_battle_music_maybe
thumb_func_end Overworld_ClearSavedMusic
thumb_func_start sub_8055E94
sub_8055E94: @ 8055E94
@@ -3291,7 +3291,7 @@ _080564B0:
ldrb r0, [r6, 0x2]
adds r1, r5, 0
adds r2, r4, 0
bl sub_805B3E0
bl player_step
_080564BA:
bl RunQuestLogCB
add sp, 0x4
@@ -3472,7 +3472,7 @@ _08056618:
.align 2, 0
_08056628: .4byte gFieldCallback
_0805662C:
bl sub_807DF64
bl FieldCB_UnionRoomWarp
_08056630:
ldr r1, _08056640 @ =gFieldCallback
movs r0, 0
@@ -7871,7 +7871,7 @@ sub_8058878: @ 8058878
lsls r1, 30
lsrs r1, 31
movs r0, 0
bl sub_805C7C8
bl GetRivalAvatarGraphicsIdByStateIdAndGender
b _080588C6
.align 2, 0
_080588B4: .4byte gLinkPlayerObjectEvents
berry_fix/payload/include/global.fieldmap.h
+3 -3
View File
@@ -231,9 +231,9 @@ struct ObjectEventGraphicsInfo
#define PLAYER_AVATAR_FLAG_ACRO_BIKE (1 << 2)
#define PLAYER_AVATAR_FLAG_SURFING (1 << 3)
#define PLAYER_AVATAR_FLAG_UNDERWATER (1 << 4)
#define PLAYER_AVATAR_FLAG_5 (1 << 5)
#define PLAYER_AVATAR_FLAG_6 (1 << 6)
#define PLAYER_AVATAR_FLAG_DASH (1 << 7)
#define PLAYER_AVATAR_FLAG_FIELD_MOVE (1 << 5)
#define PLAYER_AVATAR_FLAG_FISHING (1 << 6)
#define PLAYER_AVATAR_FLAG_WATERING (1 << 7)
enum
{
common_syms/quest_log.txt
+2 -2
View File
@@ -1,4 +1,4 @@
gUnknown_3005E88
sNumQuestLogs
sNumEventsInLogEntry
gUnknown_3005E90
gUnknown_3005E94
sCurQuestLogEntry
data/field_player_avatar.s
-153
View File
@@ -1,153 +0,0 @@
#include "constants/event_objects.h"
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnknown_835B764:: @ 835B764
.4byte MetatileBehavior_IsUnknownMovement48, ForcedMovement_Slip
.4byte MetatileBehavior_IsIce_2, ForcedMovement_Slip
.4byte MetatileBehavior_IsWalkSouth, sub_805B750
.4byte MetatileBehavior_IsWalkNorth, sub_805B768
.4byte MetatileBehavior_IsWalkWest, sub_805B780
.4byte MetatileBehavior_IsWalkEast, sub_805B798
.4byte MetatileBehavior_IsSouthwardCurrent, sub_805B82C
.4byte MetatileBehavior_IsNorthwardCurrent, sub_805B844
.4byte MetatileBehavior_IsWestwardCurrent, sub_805B85C
.4byte MetatileBehavior_IsEastwardCurrent, sub_805B874
.4byte MetatileBehavior_UnusedIsSpinRight, sub_805B7B0
.4byte MetatileBehavior_UnusedIsSpinLeft, sub_805B7CC
.4byte MetatileBehavior_UnusedIsSpinUp, sub_805B7E8
.4byte MetatileBehavior_UnusedIsSpinDown, sub_805B804
.4byte MetatileBehavior_IsSlideSouth, ForcedMovement_SlideSouth
.4byte MetatileBehavior_IsSlideNorth, ForcedMovement_SlideNorth
.4byte MetatileBehavior_IsSlideWest, ForcedMovement_SlideWest
.4byte MetatileBehavior_IsSlideEast, ForcedMovement_SlideEast
.4byte MetatileBehavior_IsWaterfall, sub_805B82C
.4byte MetatileBehavior_UnusedReturnFalse_7, sub_805B924
.4byte MetatileBehavior_UnusedReturnFalse_8, sub_805B930
.4byte NULL, ForcedMovement_None
gUnknown_835B814:: @ 835B814
.4byte PlayerNotOnBikeNotMoving
.4byte sub_805B9C4
.4byte sub_805B9D4
gUnknown_835B820:: @ 835B820
.byte 0x04, 0x04, 0x05, 0x06, 0x07
.align 2
gUnknown_835B828:: @ 835B828
.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
.align 2
gUnknown_835B844:: @ 835B844
.4byte sub_805BE60
.4byte sub_805BE74
.4byte sub_805BE74
.4byte sub_805BE90
.4byte nullsub_23
.4byte PlayerAvatarTransition_ReturnToField
.4byte nullsub_22
.4byte nullsub_22
gUnknown_835B864:: @ 835B864
.4byte MetatileBehavior_IsSouthArrowWarp
.4byte MetatileBehavior_IsNorthArrowWarp
.4byte MetatileBehavior_IsWestArrowWarp
.4byte MetatileBehavior_IsEastArrowWarp
gUnknown_835B874:: @ 835B874
.byte OBJ_EVENT_GFX_RED_NORMAL, OBJ_EVENT_GFX_GREEN_NORMAL
.byte OBJ_EVENT_GFX_RED_BIKE, OBJ_EVENT_GFX_GREEN_BIKE
.byte OBJ_EVENT_GFX_RED_SURF, OBJ_EVENT_GFX_GREEN_SURF
.byte OBJ_EVENT_GFX_RED_ITEM, OBJ_EVENT_GFX_GREEN_ITEM
.byte OBJ_EVENT_GFX_RED_FISH, OBJ_EVENT_GFX_GREEN_FISH
.byte OBJ_EVENT_GFX_RED_VS_SEEKER, OBJ_EVENT_GFX_GREEN_VS_SEEKER
gUnknown_835B880:: @ 835B880
.byte OBJ_EVENT_GFX_RS_BRENDAN
.byte OBJ_EVENT_GFX_RS_MAY
gUnknown_835B882:: @ 835B882
@ Male
.byte OBJ_EVENT_GFX_RED_NORMAL, 0x01
.byte OBJ_EVENT_GFX_RED_BIKE, 0x02
.byte OBJ_EVENT_GFX_RED_SURF, 0x08
@ Female
.byte OBJ_EVENT_GFX_GREEN_NORMAL, 0x01
.byte OBJ_EVENT_GFX_GREEN_BIKE, 0x02
.byte OBJ_EVENT_GFX_GREEN_SURF, 0x08
gUnknown_835B88E:: @ 835B88E
.byte OBJ_EVENT_GFX_RED_VS_SEEKER_BIKE
.byte OBJ_EVENT_GFX_GREEN_VS_SEEKER_BIKE
gUnknown_835B890:: @ 835B890
.4byte MetatileBehavior_IsSouthArrowWarp
.4byte MetatileBehavior_IsNorthArrowWarp
.4byte MetatileBehavior_IsWestArrowWarp
.4byte MetatileBehavior_IsEastArrowWarp
gUnknown_835B8A0:: @ 835B8A0
.4byte sub_805CD64
.4byte sub_805CD84
.4byte sub_805CE20
gUnknown_835B8AC:: @ 835B8AC
.4byte PlayerAvatar_DoSecretBaseMatJump
gUnknown_835B8B0:: @ 835B8B0
.4byte sub_805CFC4
.4byte sub_805CFEC
.4byte sub_805D064
.4byte sub_805D0A4
gUnknown_835B8C0:: @ 835B8C0
.byte 0x03, 0x04, 0x02, 0x01
gUnknown_835B8C4:: @ 835B8C4
.byte 0x18, 0x18, 0x19, 0x1a, 0x1b
.align 2
gUnknown_835B8CC:: @ 835B8CC
.4byte sub_805D33C
.4byte fish1
.4byte fish2
.4byte sub_805D430
.4byte sub_805D47C
.4byte sub_805D508
.4byte sub_805D574
.4byte sub_805D580
.4byte sub_805D5EC
.4byte sub_805D66C
.4byte sub_805D6C8
.4byte sub_805D7C0
.4byte sub_805D838
.4byte sub_805D8AC
.4byte sub_805D8D8
.4byte sub_805D980
gUnknown_835B90C:: @ 835B90C
.2byte 0x0001, 0x0001, 0x0001
gUnknown_835B912:: @ 835B912
.2byte 0x0001, 0x0003, 0x0006
gUnknown_835B918:: @ 835B918
.string "·$"
gUnknown_835B91A:: @ 835B91A
.2byte 0x0024, 0x0021, 0x001e
gUnknown_835B920:: @ 835B920
.2byte 0x0000, 0x0000, 0x0028, 0x000a, 0x0046, 0x001e
gUnknown_835B92C:: @ 835B92C
.byte 0x01, 0x03, 0x04, 0x02, 0x01
data/maps/FuchsiaCity_WardensHouse/map.json
+1 -1
View File
@@ -29,7 +29,7 @@
"flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
"graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER",
"x": 11,
"y": 6,
"elevation": 3,
data/maps/MtEmber_Exterior/map.json
+5 -5
View File
@@ -120,7 +120,7 @@
"flag": "FLAG_TEMP_13"
},
{
"graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
"graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER",
"x": 22,
"y": 45,
"elevation": 3,
@@ -133,7 +133,7 @@
"flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
"graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER",
"x": 17,
"y": 46,
"elevation": 3,
@@ -146,7 +146,7 @@
"flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
"graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER",
"x": 36,
"y": 14,
"elevation": 3,
@@ -185,7 +185,7 @@
"flag": "FLAG_TEMP_15"
},
{
"graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
"graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER",
"x": 35,
"y": 14,
"elevation": 3,
@@ -198,7 +198,7 @@
"flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
"graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER",
"x": 35,
"y": 17,
"elevation": 3,
data/maps/MtEmber_RubyPath_B2F/map.json
+3 -3
View File
@@ -16,7 +16,7 @@
"connections": null,
"object_events": [
{
"graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
"graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER",
"x": 9,
"y": 3,
"elevation": 3,
@@ -29,7 +29,7 @@
"flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
"graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER",
"x": 12,
"y": 5,
"elevation": 3,
@@ -42,7 +42,7 @@
"flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
"graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER",
"x": 12,
"y": 2,
"elevation": 3,
data/maps/MtEmber_RubyPath_B3F/map.json
+4 -4
View File
@@ -16,7 +16,7 @@
"connections": null,
"object_events": [
{
"graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
"graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER",
"x": 10,
"y": 4,
"elevation": 3,
@@ -29,7 +29,7 @@
"flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
"graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER",
"x": 26,
"y": 12,
"elevation": 3,
@@ -42,7 +42,7 @@
"flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
"graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER",
"x": 28,
"y": 8,
"elevation": 3,
@@ -133,7 +133,7 @@
"flag": "FLAG_TEMP_17"
},
{
"graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
"graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER",
"x": 15,
"y": 13,
"elevation": 3,
data/maps/MtEmber_Summit/map.json
+4 -4
View File
@@ -29,7 +29,7 @@
"flag": "FLAG_HIDE_MOLTRES"
},
{
"graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
"graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER",
"x": 10,
"y": 12,
"elevation": 3,
@@ -42,7 +42,7 @@
"flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
"graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER",
"x": 9,
"y": 12,
"elevation": 3,
@@ -55,7 +55,7 @@
"flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
"graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER",
"x": 8,
"y": 11,
"elevation": 3,
@@ -68,7 +68,7 @@
"flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
"graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER",
"x": 8,
"y": 10,
"elevation": 3,
data/maps/PewterCity/scripts.inc
+1 -1
View File
@@ -744,7 +744,7 @@ PewterCity_EventScript_AideGiveRunningShoes:: @ 81662DE
msgbox PewterCity_Text_RunningShoesLetterFromMom
closemessage
removeobject LOCALID_AIDE
setflag FLAG_SYS_RUNNING_SHOES
setflag FLAG_SYS_B_DASH
setvar VAR_MAP_SCENE_PEWTER_CITY, 2
return
data/maps/SeafoamIslands_1F/map.json
+2 -2
View File
@@ -16,7 +16,7 @@
"connections": null,
"object_events": [
{
"graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
"graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER",
"x": 22,
"y": 12,
"elevation": 3,
@@ -29,7 +29,7 @@
"flag": "FLAG_HIDE_SEAFOAM_1F_BOULDER_1"
},
{
"graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
"graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER",
"x": 32,
"y": 9,
"elevation": 3,
data/maps/SeafoamIslands_B1F/map.json
+2 -2
View File
@@ -16,7 +16,7 @@
"connections": null,
"object_events": [
{
"graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
"graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER",
"x": 22,
"y": 8,
"elevation": 3,
@@ -29,7 +29,7 @@
"flag": "FLAG_HIDE_SEAFOAM_B1F_BOULDER_1"
},
{
"graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
"graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER",
"x": 30,
"y": 8,
"elevation": 3,
data/maps/SeafoamIslands_B2F/map.json
+2 -2
View File
@@ -16,7 +16,7 @@
"connections": null,
"object_events": [
{
"graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
"graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER",
"x": 22,
"y": 8,
"elevation": 3,
@@ -29,7 +29,7 @@
"flag": "FLAG_HIDE_SEAFOAM_B2F_BOULDER_1"
},
{
"graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
"graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER",
"x": 30,
"y": 8,
"elevation": 3,
data/maps/SeafoamIslands_B3F/map.json
+6 -6
View File
@@ -16,7 +16,7 @@
"connections": null,
"object_events": [
{
"graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
"graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER",
"x": 23,
"y": 8,
"elevation": 1,
@@ -29,7 +29,7 @@
"flag": "FLAG_HIDE_SEAFOAM_B3F_BOULDER_1"
},
{
"graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
"graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER",
"x": 24,
"y": 8,
"elevation": 1,
@@ -42,7 +42,7 @@
"flag": "FLAG_HIDE_SEAFOAM_B3F_BOULDER_2"
},
{
"graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
"graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER",
"x": 12,
"y": 16,
"elevation": 3,
@@ -55,7 +55,7 @@
"flag": "FLAG_HIDE_SEAFOAM_B3F_BOULDER_5"
},
{
"graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
"graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER",
"x": 13,
"y": 16,
"elevation": 3,
@@ -68,7 +68,7 @@
"flag": "FLAG_HIDE_SEAFOAM_B3F_BOULDER_6"
},
{
"graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
"graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER",
"x": 9,
"y": 16,
"elevation": 3,
@@ -81,7 +81,7 @@
"flag": "FLAG_HIDE_SEAFOAM_B3F_BOULDER_4"
},
{
"graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
"graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER",
"x": 6,
"y": 17,
"elevation": 3,
data/maps/SeafoamIslands_B4F/map.json
+2 -2
View File
@@ -16,7 +16,7 @@
"connections": null,
"object_events": [
{
"graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
"graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER",
"x": 8,
"y": 18,
"elevation": 1,
@@ -29,7 +29,7 @@
"flag": "FLAG_HIDE_SEAFOAM_B4F_BOULDER_1"
},
{
"graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
"graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER",
"x": 9,
"y": 18,
"elevation": 1,
data/maps/SevenIsland_SevaultCanyon/map.json
+2 -2
View File
@@ -144,7 +144,7 @@
"flag": "FLAG_TEMP_12"
},
{
"graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
"graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER",
"x": 13,
"y": 47,
"elevation": 3,
@@ -209,7 +209,7 @@
"flag": "FLAG_TEMP_17"
},
{
"graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
"graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER",
"x": 17,
"y": 47,
"elevation": 3,
data/maps/SevenIsland_SevaultCanyon_TanobyKey/map.json
+7 -7
View File
@@ -16,7 +16,7 @@
"connections": null,
"object_events": [
{
"graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
"graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER",
"x": 7,
"y": 6,
"elevation": 3,
@@ -29,7 +29,7 @@
"flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
"graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER",
"x": 8,
"y": 6,
"elevation": 3,
@@ -42,7 +42,7 @@
"flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
"graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER",
"x": 8,
"y": 9,
"elevation": 3,
@@ -55,7 +55,7 @@
"flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
"graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER",
"x": 6,
"y": 10,
"elevation": 3,
@@ -68,7 +68,7 @@
"flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
"graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER",
"x": 8,
"y": 10,
"elevation": 3,
@@ -81,7 +81,7 @@
"flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
"graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER",
"x": 6,
"y": 9,
"elevation": 3,
@@ -94,7 +94,7 @@
"flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
"graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER",
"x": 6,
"y": 6,
"elevation": 3,
data/maps/SixIsland_RuinValley/map.json
+8 -8
View File
@@ -100,7 +100,7 @@
"flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
"graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER",
"x": 17,
"y": 10,
"elevation": 5,
@@ -113,7 +113,7 @@
"flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
"graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER",
"x": 17,
"y": 12,
"elevation": 5,
@@ -126,7 +126,7 @@
"flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
"graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER",
"x": 18,
"y": 11,
"elevation": 5,
@@ -139,7 +139,7 @@
"flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
"graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER",
"x": 6,
"y": 33,
"elevation": 3,
@@ -152,7 +152,7 @@
"flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
"graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER",
"x": 6,
"y": 34,
"elevation": 3,
@@ -165,7 +165,7 @@
"flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
"graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER",
"x": 41,
"y": 32,
"elevation": 3,
@@ -178,7 +178,7 @@
"flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
"graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER",
"x": 41,
"y": 33,
"elevation": 3,
@@ -191,7 +191,7 @@
"flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
"graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER",
"x": 42,
"y": 33,
"elevation": 3,
data/maps/VictoryRoad_1F/map.json
+3 -3
View File
@@ -68,7 +68,7 @@
"flag": "FLAG_HIDE_VICTORY_ROAD_1F_TM02"
},
{
"graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
"graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER",
"x": 7,
"y": 18,
"elevation": 3,
@@ -81,7 +81,7 @@
"flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
"graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER",
"x": 4,
"y": 12,
"elevation": 3,
@@ -94,7 +94,7 @@
"flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
"graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER",
"x": 16,
"y": 3,
"elevation": 3,
data/maps/VictoryRoad_2F/map.json
+3 -3
View File
@@ -133,7 +133,7 @@
"flag": "FLAG_HIDE_VICTORY_ROAD_2F_TM37"
},
{
"graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
"graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER",
"x": 8,
"y": 7,
"elevation": 3,
@@ -146,7 +146,7 @@
"flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
"graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER",
"x": 6,
"y": 17,
"elevation": 3,
@@ -159,7 +159,7 @@
"flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
"graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER",
"x": 33,
"y": 19,
"elevation": 3,
data/maps/VictoryRoad_3F/map.json
+4 -4
View File
@@ -94,7 +94,7 @@
"flag": "FLAG_HIDE_VICTORY_ROAD_3F_TM50"
},
{
"graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
"graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER",
"x": 19,
"y": 15,
"elevation": 3,
@@ -107,7 +107,7 @@
"flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
"graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER",
"x": 33,
"y": 18,
"elevation": 0,
@@ -120,7 +120,7 @@
"flag": "FLAG_HIDE_VICTORY_ROAD_3F_BOULDER"
},
{
"graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
"graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER",
"x": 35,
"y": 13,
"elevation": 3,
@@ -133,7 +133,7 @@
"flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
"graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER",
"x": 32,
"y": 5,
"elevation": 3,
data/scripts/field_moves.inc
+2 -2
View File
@@ -125,7 +125,7 @@ EventScript_StrengthBoulder:: @ 81BE11D
goto_if_questlog EventScript_ReleaseEnd
lockall
goto_if_unset FLAG_BADGE04_GET, EventScript_CantMoveBoulder
goto_if_set FLAG_SYS_STRENGTH_ACTIVE, EventScript_AlreadyUsedStrength
goto_if_set FLAG_SYS_USE_STRENGTH, EventScript_AlreadyUsedStrength
checkpartymove MOVE_STRENGTH
compare VAR_RESULT, PARTY_SIZE
goto_if_eq EventScript_CantMoveBoulder
@@ -147,7 +147,7 @@ EventScript_FldEffStrength:: @ 81BE16E
end
EventScript_UseStrength:: @ 81BE179
setflag FLAG_SYS_STRENGTH_ACTIVE
setflag FLAG_SYS_USE_STRENGTH
msgbox Text_MonUsedStrengthCanMoveBoulders, MSGBOX_SIGN
end
include/bike.h
+6
View File
@@ -6,4 +6,10 @@ bool8 sub_80BD540(void);
void StartTransitionToFlipBikeState(u8 flags);
s16 GetPlayerSpeed(void);
void MovePlayerOnBike(u8 direction, u16 newKeys, u16 heldKeys);
bool32 IsRunningDisallowed(u8 metatileBehavior);
void Bike_HandleBumpySlopeJump(void);
void Bike_UpdateBikeCounterSpeed(u8 counter);
bool8 player_should_look_direction_be_enforced_upon_movement(void);
#endif //GUARD_BIKE_H
include/constants/event_objects.h
+1 -1
View File
@@ -98,7 +98,7 @@
#define OBJ_EVENT_GFX_POKEDEX 94
#define OBJ_EVENT_GFX_CUT_TREE 95
#define OBJ_EVENT_GFX_ROCK_SMASH_ROCK 96
#define OBJ_EVENT_GFX_STRENGTH_BOULDER 97
#define OBJ_EVENT_GFX_PUSHABLE_BOULDER 97
#define OBJ_EVENT_GFX_FOSSIL 98
#define OBJ_EVENT_GFX_RUBY 99
#define OBJ_EVENT_GFX_SAPPHIRE 100
include/constants/flags.h
+2 -2
View File
@@ -1321,7 +1321,7 @@
#define FLAG_SYS_VS_SEEKER_CHARGING (SYS_FLAGS + 0x1)
#define FLAG_SYS_WHITE_FLUTE_ACTIVE (SYS_FLAGS + 0x3)
#define FLAG_SYS_BLACK_FLUTE_ACTIVE (SYS_FLAGS + 0x4)
#define FLAG_SYS_STRENGTH_ACTIVE (SYS_FLAGS + 0x5)
#define FLAG_SYS_USE_STRENGTH (SYS_FLAGS + 0x5)
#define FLAG_SYS_FLASH_ACTIVE (SYS_FLAGS + 0x6)
#define FLAG_SYS_SPECIAL_WILD_BATTLE (SYS_FLAGS + 0x7)
#define FLAG_0x808 (SYS_FLAGS + 0x8)
@@ -1345,7 +1345,7 @@
#define FLAG_SYS_GAME_CLEAR (SYS_FLAGS + 0x2C)
#define FLAG_SYS_SET_TRAINER_CARD_PROFILE (SYS_FLAGS + 0x2D)
#define FLAG_0x82E (SYS_FLAGS + 0x2E)
#define FLAG_SYS_RUNNING_SHOES (SYS_FLAGS + 0x2F)
#define FLAG_SYS_B_DASH (SYS_FLAGS + 0x2F)
#define FLAG_SYS_ON_CYCLING_ROAD (SYS_FLAGS + 0x30)
#define FLAG_0x831 (SYS_FLAGS + 0x31)
#define FLAG_0x832 (SYS_FLAGS + 0x32)
include/constants/vars.h
+4 -5
View File
@@ -221,11 +221,10 @@
#define VAR_0x40A7 0x40A7
#define VAR_0x40A8 0x40A8
#define VAR_0x40A9 0x40A9
#define VAR_0x40AA 0x40AA
#define VAR_0x40AB 0x40AB
#define VAR_0x40AC 0x40AC
#define VAR_0x40AD 0x40AD
#define VAR_0x40AE 0x40AE
#define VAR_QLBAK_TRAINER_REMATCHES 0x40AA // array of 4
#define VAR_QLBAK_MAP_LAYOUT 0x40AE
#define VAR_0x40AF 0x40AF
#define VAR_0x40B0 0x40B0
#define VAR_0x40B1 0x40B1
include/event_object_movement.h
+26 -2
View File
@@ -26,6 +26,8 @@ struct UnkStruct_083A3698
u8 animPos[4];
};
typedef void (*MovementAction)(u8 direction);
#define GROUND_EFFECT_FLAG_TALL_GRASS_ON_SPAWN (1 << 0)
#define GROUND_EFFECT_FLAG_TALL_GRASS_ON_MOVE (1 << 1)
#define GROUND_EFFECT_FLAG_LONG_GRASS_ON_SPAWN (1 << 2)
@@ -117,8 +119,8 @@ bool8 ObjectEventSetHeldMovement(struct ObjectEvent *, u8);
void ShiftStillObjectEventCoords(struct ObjectEvent *);
void OverrideMovementTypeForObjectEvent(const struct ObjectEvent *, u8);
void SetTrainerMovementType(struct ObjectEvent *, u8);
u8 GetFishingNoCatchDirectionAnimNum(u8 direction);
u8 GetFishingBiteDirectionAnimNum(u8 a0);
u8 GetFishingDirectionAnimNum(u8 direction);
u8 GetFishingNoCatchDirectionAnimNum(u8 a0);
void ObjectEventSetGraphicsId(struct ObjectEvent *objectEvent, u8 a1);
u8 sub_805EB44(u8, u8, s16, s16);
void InitObjectEventPalettes(u8 mode);
@@ -130,6 +132,7 @@ u8 GetWalkFastestMovementAction(u32);
u8 sub_8063F2C(u32 direction);
u8 GetTrainerFacingDirectionMovementType(u8 direction);
u8 GetFaceDirectionMovementAction(u32);
u8 GetFaceDirectionFastMovementAction(u32);
void CameraObjectSetFollowedObjectId(u8 objectId);
void UnfreezeObjectEvents(void);
void sub_8069058(u8, u8);
@@ -186,6 +189,7 @@ void sub_8068CA4(struct Sprite *, u8);
bool8 sub_8068CB4(struct Sprite *sprite);
void SetAndStartSpriteAnim(struct Sprite *, u8, u8);
bool8 SpriteAnimEnded(struct Sprite *);
u8 ObjectEventGetHeldMovementActionId(struct ObjectEvent *objectEvent);
u8 GetMoveDirectionAnimNum(u8 direction);
// Exported data declarations
@@ -197,5 +201,25 @@ extern const struct OamData gObjectEventBaseOam_32x32;
extern const u16 gUnknown_8398648[];
extern const u16 gUnknown_8398688[];
extern const u8 gReflectionEffectPaletteMap[];
u8 GetLedgeJumpDirection(s16 x, s16 y, u8 z);
u8 sub_8063F58(u32 direction);
u8 sub_8063FDC(u32 direction);
u8 sub_8064008(u32 direction);
u8 GetPlayerRunMovementAction(u32 direction);
u8 GetPlayerRunSlowMovementAction(u32 direction);
u8 GetWalkSlowMovementAction(u32 direction);
u8 sub_80640E4(u32 direction);
u8 GetAcroWheelieFaceDirectionMovementAction(u32 direction);
u8 GetAcroPopWheelieFaceDirectionMovementAction(u32 direction);
u8 GetAcroEndWheelieFaceDirectionMovementAction(u32 direction);
u8 GetAcroWheelieHopFaceDirectionMovementAction(u32 direction);
u8 GetAcroWheelieHopDirectionMovementAction(u32 direction);
u8 GetAcroWheelieJumpDirectionMovementAction(u32 direction);
u8 GetJumpInPlaceTurnAroundMovementAction(u32 direction);
u8 GetAcroWheelieInPlaceDirectionMovementAction(u32 direction);
u8 GetAcroPopWheelieMoveDirectionMovementAction(u32 direction);
u8 GetAcroWheelieMoveDirectionMovementAction(u32 direction);
u8 sub_80641EC(u32 direction);
u8 GetFishingBiteDirectionAnimNum(u8 direction);
#endif // GUARD_EVENT_OBJECT_MOVEMENT_H
include/field_control_avatar.h
+1
View File
@@ -35,5 +35,6 @@ void FieldClearPlayerInput(struct FieldInput *input);
int ProcessPlayerFieldInput(struct FieldInput *input);
void FieldInput_HandleCancelSignpost(struct FieldInput * input);
void FieldGetPlayerInput(struct FieldInput *input, u16 newKeys, u16 heldKeys);
void sub_806DE70(u16 x, u16 y);
#endif //GUARD_FIELD_CONTROL_AVATAR_H
include/field_effect_helpers.h
+3
View File
@@ -22,6 +22,9 @@ bool8 sub_80DCBE0(struct ObjectEvent *);
void SetUpReflection(struct ObjectEvent*, struct Sprite*, u8);
u32 StartFieldEffectForObjectEvent(u8, struct ObjectEvent*);
u8 FindTallGrassFieldEffectSpriteId(u8 localId, u8 mapNum, u8 mapGroup, s16 x, s16 y);
void ShowWarpArrowSprite(u8 spriteId, u8 direction, s16 x, s16 y);
void SetSpriteInvisible(u8 spriteId);
void sub_80DC4A4(u8 spriteId, u8 value, s16 data1);
void sub_80DCCE0(struct Sprite * sprite);
void UpdateShadowFieldEffect(struct Sprite * sprite);
void UpdateBubblesFieldEffect(struct Sprite * sprite);
include/field_fadetransition.h
+2 -2
View File
@@ -11,7 +11,7 @@ void DoDoorWarp(void);
void DoFallWarp(void);
void DoTeleportWarp(void);
void sub_807E500(void);
void sub_807DF64(void);
void FieldCB_UnionRoomWarp(void);
void WarpFadeOutScreen(void);
void FieldCallback_ReturnToEventScript2(void);
void FadeInFromBlack(void);
@@ -20,7 +20,7 @@ void WarpFadeInScreen(void);
void sub_807DCE4(void);
bool32 sub_807E418(void);
bool32 FieldFadeTransitionBackgroundEffectIsFinished(void);
void palette_bg_faded_fill_black(void);
void sub_807E4A0(u16 metatileBehavior, u16 delay);
void DoEscalatorWarp(u8 a0);
include/field_player_avatar.h
+34 -12
View File
@@ -11,32 +11,54 @@ void PlayerGetDestCoords(s16 *, s16 *);
u8 GetPlayerFacingDirection(void);
u8 GetPlayerMovementDirection(void);
u8 PlayerGetCopyableMovement(void);
void MovePlayerNotOnBike(u8 direction, u16 heldKeys);
void sub_808D074(u8);
void MovementType_Player(struct Sprite * sprite);
void sub_805C270(void);
void sub_805C780(void);
void GetXYCoordsOneStepInFrontOfPlayer(s16 *xPtr, s16 *yPtr);
u8 GetPlayerAvatarGraphicsIdByStateId(u8);
void SetPlayerAvatarStateMask(u8 mask);
void sub_805D9C4(struct Sprite *sprite);
void sub_805D154(u8 direction);
void sub_805DAE4(u8 direction);
void AlignFishingAnimationFrames(struct Sprite *sprite);
void CreateStopSurfingTask_NoMusicChange(u8 direction);
void SavePlayerFacingDirectionForTeleport(u8 direction);
void SetPlayerAvatarTransitionFlags(u16 a);
bool8 IsPlayerFacingSurfableFishableWater(void);
void sub_805D2C0(u8 secondaryId);
void StartFishing(u8 secondaryId);
u8 GetPlayerAvatarObjectId(void);
u8 PlayerGetZCoord(void);
u8 GetPlayerAvatarGraphicsIdByCurrentState(void);
void sub_805CB70(void);
void sub_805CB04(bool8);
void sub_805DC04(void);
void sub_805DAB0(void);
bool32 sub_805DAD0(void);
bool32 sub_805DC24(void);
void SetPlayerInvisibility(bool8);
void StartTeleportInPlayerAnim(void);
void StartTeleportWarpOutPlayerAnim(void);
bool32 WaitTeleportWarpOutPlayerAnim(void);
bool32 WaitTeleportInPlayerAnim(void);
bool8 PartyHasMonWithSurf(void);
bool8 IsPlayerSurfingNorth(void);
void player_get_pos_including_state_based_drift(s16 *x, s16 *y);
u8 player_get_pos_including_state_based_drift(s16 *x, s16 *y);
void sub_805CBE8(void);
u8 sub_805C7C8(u8 state, u8 gender);
u8 GetRivalAvatarGraphicsIdByStateIdAndGender(u8 state, u8 gender);
u8 GetPlayerAvatarGraphicsIdByStateIdAndGender(u8 state, u8 gender);
u8 CheckForObjectEventCollision(struct ObjectEvent *objectEvent, s16 x, s16 y, u8 direction, u8 metatileBehavior);
void sub_805C0D4(u8 direction);
void PlayerGoSlow(u8 direction);
void PlayerGoSpeed1(u8 direction);
void PlayerGoSpeed2(u8 direction);
void sub_805C134(u8 direction);
void PlayerRideWaterCurrent(u8 direction);
void sub_805C164(u8 direction);
void PlayerRun(u8 direction);
void PlayerRunSlow(u8 direction);
void PlayerOnBikeCollide(u8 direction);
void PlayerNotOnBikeCollide(u8 direction);
void PlayerFaceDirection(u8 direction);
void PlayerFaceDirectionFast(u8 direction);
void PlayerTurnInPlace(u8 direction);
void PlayerJumpLedge(u8 direction);
void sub_805C260(void);
void player_step(u8 direction, u16 newKeys, u16 heldKeys);
bool32 PlayerIsMovingOnRockStairs(u8 direction);
void sub_805BEB8(void);
#endif //GUARD_FIELD_PLAYER_AVATAR_H
include/global.fieldmap.h
+29 -17
View File
@@ -278,14 +278,25 @@ struct ObjectEventGraphicsInfo
/*0x20*/ const union AffineAnimCmd *const *affineAnims;
};
#define PLAYER_AVATAR_FLAG_ON_FOOT (1 << 0)
#define PLAYER_AVATAR_FLAG_MACH_BIKE (1 << 1)
#define PLAYER_AVATAR_FLAG_ACRO_BIKE (1 << 2)
#define PLAYER_AVATAR_FLAG_SURFING (1 << 3)
#define PLAYER_AVATAR_FLAG_4 (1 << 4)
#define PLAYER_AVATAR_FLAG_5 (1 << 5)
#define PLAYER_AVATAR_FLAG_6 (1 << 6)
#define PLAYER_AVATAR_FLAG_DASH (1 << 7)
enum {
PLAYER_AVATAR_STATE_NORMAL,
PLAYER_AVATAR_STATE_MACH_BIKE,
PLAYER_AVATAR_STATE_ACRO_BIKE,
PLAYER_AVATAR_STATE_SURFING,
PLAYER_AVATAR_STATE_UNDERWATER,
PLAYER_AVATAR_STATE_FIELD_MOVE,
PLAYER_AVATAR_STATE_FISHING,
PLAYER_AVATAR_STATE_WATERING,
};
#define PLAYER_AVATAR_FLAG_ON_FOOT (1 << PLAYER_AVATAR_STATE_NORMAL)
#define PLAYER_AVATAR_FLAG_MACH_BIKE (1 << PLAYER_AVATAR_STATE_MACH_BIKE)
#define PLAYER_AVATAR_FLAG_ACRO_BIKE (1 << PLAYER_AVATAR_STATE_ACRO_BIKE)
#define PLAYER_AVATAR_FLAG_SURFING (1 << PLAYER_AVATAR_STATE_SURFING)
#define PLAYER_AVATAR_FLAG_UNDERWATER (1 << PLAYER_AVATAR_STATE_UNDERWATER)
#define PLAYER_AVATAR_FLAG_FIELD_MOVE (1 << PLAYER_AVATAR_STATE_FIELD_MOVE)
#define PLAYER_AVATAR_FLAG_FISHING (1 << PLAYER_AVATAR_STATE_FISHING)
#define PLAYER_AVATAR_FLAG_WATERING (1 << PLAYER_AVATAR_STATE_WATERING)
enum
{
@@ -308,7 +319,7 @@ enum
COLLISION_STOP_SURFING,
COLLISION_LEDGE_JUMP,
COLLISION_PUSHED_BOULDER,
COLLISION_ROTATING_GATE,
COLLISION_UNKNOWN_WARP_6C_6D_6E_6F,
COLLISION_WHEELIE_HOP,
COLLISION_ISOLATED_VERTICAL_RAIL,
COLLISION_ISOLATED_HORIZONTAL_RAIL,
@@ -335,22 +346,23 @@ enum
struct PlayerAvatar /* 0x202E858 */
{
/*0x00*/ u8 flags;
/*0x01*/ u8 unk1; // used to be bike, but it's not that in Emerald and probably isn't here either. maybe transition flags?
/*0x01*/ u8 transitionFlags; // used to be bike, but it's not that in Emerald and probably isn't here either. maybe transition flags?
/*0x02*/ u8 runningState; // this is a static running state. 00 is not moving, 01 is turn direction, 02 is moving.
/*0x03*/ u8 tileTransitionState; // this is a transition running state: 00 is not moving, 01 is transition between tiles, 02 means you are on the frame in which you have centered on a tile but are about to keep moving, even if changing directions. 2 is also used for a ledge hop, since you are transitioning.
/*0x04*/ u8 spriteId;
/*0x05*/ u8 objectEventId;
/*0x06*/ bool8 preventStep;
/*0x07*/ u8 gender;
// These are not used in FRLG
u8 acroBikeState;
u8 unk9;
u8 newDirBackup;
u8 bikeFrameCounter;
u8 unkB;
u32 unkC;
u32 unk10;
u8 unk14[8];
u8 unk1C[8];
// TODO: rest of struct
u8 bikeSpeed;
u32 directionHistory;
u32 abStartSelectHistory;
u8 dirTimerHistory[8];
// For the Rocket mazes
u16 lastSpinTile;
};
struct Camera
include/metatile_behavior.h
+10 -10
View File
@@ -23,7 +23,7 @@ bool8 MetatileBehavior_IsUnknownWarp6E(u8 metatileBehavior);
bool8 MetatileBehavior_IsUnknownWarp6F(u8 metatileBehavior);
bool8 MetatileBehavior_IsUnknownWarp6C_to_6F(u8 metatileBehavior);
bool8 MetatileBehavior_IsLadder(u8 metatileBehavior);
bool8 MetatileBehavior_IsCaveDoor(u8 metatileBehavior);
bool8 MetatileBehavior_IsNonAnimDoor(u8 metatileBehavior);
bool8 MetatileBehavior_ReturnFalse_2(u8 metatileBehavior);
bool8 MetatileBehavior_IsSurfable(u8 metatileBehavior);
bool8 MetatileBehavior_IsSemiDeepWater(u8 metatileBehavior);
@@ -98,11 +98,11 @@ bool8 MetatileBehavior_IsFallWarp(u8 metatileBehavior);
bool8 MetatileBehavior_ReturnFalse_13(u8 metatileBehavior);
bool8 MetatileBehavior_IsCyclingRoadPullDownTile(u8 metatileBehavior);
bool8 MetatileBehavior_IsCyclingRoadPullDownTileGrass(u8 metatileBehavior);
bool8 MetatileBehavior_ReturnFalse_14(u8 metatileBehavior);
bool8 MetatileBehavior_ReturnFalse_15(u8 metatileBehavior);
bool8 MetatileBehavior_ReturnFalse_16(u8 metatileBehavior);
bool8 MetatileBehavior_ReturnFalse_17(u8 metatileBehavior);
bool8 MetatileBehavior_ReturnFalse_18(u8 metatileBehavior);
bool8 MetatileBehavior_IsBumpySlope(u8 metatileBehavior);
bool8 MetatileBehavior_IsIsolatedVerticalRail(u8 metatileBehavior);
bool8 MetatileBehavior_IsIsolatedHorizontalRail(u8 metatileBehavior);
bool8 MetatileBehavior_IsVerticalRail(u8 metatileBehavior);
bool8 MetatileBehavior_IsHorizontalRail(u8 metatileBehavior);
bool8 MetatileBehavior_IsSeaweed(u8 metatileBehavior);
bool8 MetatileBehavior_IsMB0A(u8 metatileBehavior);
bool8 MetatileBehavior_UnusedReturnFalse_9(u8 metatileBehavior);
@@ -115,10 +115,10 @@ bool8 MetatileBehavior_UnusedReturnFalse_11(u8 metatileBehavior);
bool8 MetatileBehavior_UnusedReturnFalse_12(u8 metatileBehavior);
bool8 MetatileBehavior_UnusedReturnFalse_13(u8 metatileBehavior);
bool8 TestMetatileAttributeBit(u8 attr, u8 bitmask);
bool8 MetatileBehavior_UnusedIsSpinRight(u8 metatileBehavior);
bool8 MetatileBehavior_UnusedIsSpinLeft(u8 metatileBehavior);
bool8 MetatileBehavior_UnusedIsSpinUp(u8 metatileBehavior);
bool8 MetatileBehavior_UnusedIsSpinDown(u8 metatileBehavior);
bool8 MetatileBehavior_IsSpinRight(u8 metatileBehavior);
bool8 MetatileBehavior_IsSpinLeft(u8 metatileBehavior);
bool8 MetatileBehavior_IsSpinUp(u8 metatileBehavior);
bool8 MetatileBehavior_IsSpinDown(u8 metatileBehavior);
bool8 MetatileBehavior_IsStopSpinning(u8 metatileBehavior);
bool8 MetatileBehavior_IsSpinTile(u8 metatileBehavior);
bool8 MetatileBehavior_IsSignpost(u8 metatileBehavior);
include/overworld.h
+1 -1
View File
@@ -85,7 +85,7 @@ void sub_8084EBC(s16, s16);
void sub_80555E0(void);
void copy_saved_warp3_bank_and_enter_x_to_warp1(void);
u8 IsMapTypeOutdoors(u8 mapType);
void sav1_reset_battle_music_maybe(void);
void Overworld_ClearSavedMusic(void);
bool32 sub_8056124(u16 song);
void player_avatar_init_params_reset(void);
include/quest_log.h
+8 -4
View File
@@ -18,9 +18,9 @@ struct UnkStruct_3005E90
extern u8 gQuestLogState;
extern u8 gUnknown_3005E88;
extern u16 sNumQuestLogs;
extern u16 sNumEventsInLogEntry;
extern struct UnkStruct_3005E90 gUnknown_3005E90;
extern struct UnkStruct_203AE98 * gUnknown_3005E94;
extern struct QuestLogEntry * sCurQuestLogEntry;
extern const u16 gUnknown_84566A8[];
void sub_8112720(u8);
@@ -30,7 +30,7 @@ void QuestLog_RecordEnteredMap(u16);
u8 sub_8112CAC(void);
bool8 QuestLog_SchedulePlaybackCB(void (*func)(void));
void sub_8111F38(u16 offset, u16 idx);
void sub_8111134(void);
void CommitQuestLogWindow1(void);
void DestroyHelpMessageWindow(u8 a0);
u8 CreateHelpMessageWindow(void);
void PrintTextOnHelpMessageWindow(const u8 * text, u8 mode);
@@ -53,7 +53,11 @@ void sub_811246C(struct Sprite *sprite);
void sub_81124EC(u8 a0, u8 a1, u8 a2, u8 a3);
bool8 sub_8111C2C(void);
void sub_81128BC(u8 a0);
void sub_811278C(u8, u8);
void sub_811278C(u8 movementActionId, u8 duration);
void Special_UpdateTrainerFansAfterLinkBattle(void);
void sub_8112628(u8 movementActionId);
void sub_81126AC(u8 movementActionId, u8 duration);
void sub_8112588(u8 localId, u8 mapNum, u8 mapGroup, u8 movementActionId, u8 duration);
void sub_8112C9C(void);
#endif //GUARD_QUEST_LOG_H
include/quest_log_objects.h
+1 -1
View File
@@ -4,6 +4,6 @@
#include "global.h"
void SetQuestLogObjectEventsData(struct QuestLog *);
void sub_815A1F8(struct QuestLog *, struct ObjectEventTemplate *);
void SetSav1ObjectEventsFromQuestLog(struct QuestLog *, struct ObjectEventTemplate *);
#endif //GUARD_QUEST_LOG_OBJECTS_H
include/quest_log_player.h
+2
View File
@@ -4,5 +4,7 @@
#include "global.h"
void sub_8150454(void);
bool32 sub_8150474(u8 a0);
void sub_8150498(u8 a0);
#endif //GUARD_QUEST_LOG_PLAYER_H
include/strings.h
+5
View File
@@ -1463,4 +1463,9 @@ extern const u8 gUnknown_841B2C6[];
extern const u8 gUnknown_841B2E5[];
extern const u8 gUnknown_841B2DC[];
// field_player_avatar
extern const u8 gText_PokemonOnHook[];
extern const u8 gText_NotEvenANibble[];
extern const u8 gText_ItGotAway[];
#endif //GUARD_STRINGS_H
ld_script.txt
+2 -2
View File
@@ -92,7 +92,7 @@ SECTIONS {
src/metatile_behavior.o(.text);
src/field_camera.o(.text);
src/field_door.o(.text);
asm/field_player_avatar.o(.text);
src/field_player_avatar.o(.text);
src/event_object_movement.o(.text);
src/field_message_box.o(.text);
src/event_object_lock.o(.text);
@@ -433,7 +433,7 @@ SECTIONS {
src/fieldmap.o(.rodata);
src/metatile_behavior.o(.rodata);
src/field_door.o(.rodata);
data/field_player_avatar.o(.rodata);
src/field_player_avatar.o(.rodata);
src/event_object_movement.o(.rodata);
src/scrcmd.o(.rodata);
src/coord_event_weather.o(.rodata);
src/data/object_events/object_event_graphics_info_pointers.h
+1 -1
View File
@@ -250,7 +250,7 @@ const struct ObjectEventGraphicsInfo *const gObjectEventGraphicsInfoPointers[NUM
[OBJ_EVENT_GFX_POKEDEX] = &gObjectEventGraphicsInfo_Pokedex,
[OBJ_EVENT_GFX_CUT_TREE] = &gObjectEventGraphicsInfo_CutTree,
[OBJ_EVENT_GFX_ROCK_SMASH_ROCK] = &gObjectEventGraphicsInfo_RockSmashRock,
[OBJ_EVENT_GFX_STRENGTH_BOULDER] = &gObjectEventGraphicsInfo_StrengthBoulder,
[OBJ_EVENT_GFX_PUSHABLE_BOULDER] = &gObjectEventGraphicsInfo_StrengthBoulder,
[OBJ_EVENT_GFX_FOSSIL] = &gObjectEventGraphicsInfo_Fossil,
[OBJ_EVENT_GFX_RUBY] = &gObjectEventGraphicsInfo_Ruby,
[OBJ_EVENT_GFX_SAPPHIRE] = &gObjectEventGraphicsInfo_Sapphire,
src/dynamic_placeholder_text_util.c
+3 -3
View File
@@ -9,9 +9,9 @@ static const u8 sTextColorTable[] =
{
// [LOW_NYBBLE / 2] = 0xXY, // HIGH_NYBBLE
[OBJ_EVENT_GFX_RED_NORMAL / 2] = 0x00, // OBJ_EVENT_GFX_RED_BIKE
[OBJ_EVENT_GFX_RED_SURF / 2] = 0x00, // OBJ_EVENT_GFX_RED_ITEM
[OBJ_EVENT_GFX_RED_SURF / 2] = 0x00, // OBJ_EVENT_GFX_RED_ITEM
[OBJ_EVENT_GFX_RED_FISH / 2] = 0x00, // OBJ_EVENT_GFX_RED_VS_SEEKER
[OBJ_EVENT_GFX_RED_VS_SEEKER_BIKE / 2] = 0x10, // OBJ_EVENT_GFX_GREEN_NORMAL
[OBJ_EVENT_GFX_RED_VS_SEEKER_BIKE / 2] = 0x10, // OBJ_EVENT_GFX_GREEN_NORMAL
[OBJ_EVENT_GFX_GREEN_BIKE / 2] = 0x11, // OBJ_EVENT_GFX_GREEN_SURF
[OBJ_EVENT_GFX_GREEN_ITEM / 2] = 0x11, // OBJ_EVENT_GFX_GREEN_FISH
[OBJ_EVENT_GFX_GREEN_VS_SEEKER / 2] = 0x11, // OBJ_EVENT_GFX_GREEN_VS_SEEKER_BIKE
@@ -56,7 +56,7 @@ static const u8 sTextColorTable[] =
[OBJ_EVENT_GFX_TEACHY_TV_HOST / 2] = 0x00, // OBJ_EVENT_GFX_GYM_GUY
[OBJ_EVENT_GFX_ITEM_BALL / 2] = 0x33, // OBJ_EVENT_GFX_TOWN_MAP
[OBJ_EVENT_GFX_POKEDEX / 2] = 0x33, // OBJ_EVENT_GFX_CUT_TREE
[OBJ_EVENT_GFX_ROCK_SMASH_ROCK / 2] = 0x33, // OBJ_EVENT_GFX_STRENGTH_BOULDER
[OBJ_EVENT_GFX_ROCK_SMASH_ROCK / 2] = 0x33, // OBJ_EVENT_GFX_PUSHABLE_BOULDER
[OBJ_EVENT_GFX_FOSSIL / 2] = 0x33, // OBJ_EVENT_GFX_RUBY
[OBJ_EVENT_GFX_SAPPHIRE / 2] = 0x33, // OBJ_EVENT_GFX_OLD_AMBER
[OBJ_EVENT_GFX_GYM_SIGN / 2] = 0x33, // OBJ_EVENT_GFX_SIGN
src/event_data.c
+1 -1
View File
@@ -44,7 +44,7 @@ void sub_806E110(void)
memset(gSaveBlock1Ptr->vars, 0, 16 * 2);
FlagClear(FLAG_SYS_WHITE_FLUTE_ACTIVE);
FlagClear(FLAG_SYS_BLACK_FLUTE_ACTIVE);
FlagClear(FLAG_SYS_STRENGTH_ACTIVE);
FlagClear(FLAG_SYS_USE_STRENGTH);
FlagClear(FLAG_SYS_SPECIAL_WILD_BATTLE);
FlagClear(FLAG_SYS_INFORMED_OF_LOCAL_WIRELESS_PLAYER);
}
src/event_object_movement.c
+37 -39
View File
@@ -153,8 +153,6 @@ static void sub_80632BC(struct Sprite *);
static void sub_80632E0(struct Sprite *);
static void MovementType_WanderAroundDuplicate(struct Sprite *);
extern void sub_805B3B8(struct Sprite *);
#define movement_type_def(setup, table) \
static u8 setup##_callback(struct ObjectEvent *, struct Sprite *); \
void setup(struct Sprite *sprite) \
@@ -212,7 +210,7 @@ static void (*const sMovementTypeCallbacks[])(struct Sprite *) = {
MovementType_FaceDirection,
MovementType_FaceDirection,
MovementType_FaceDirection,
sub_805B3B8,
MovementType_Player,
NULL,
MovementType_FaceDownAndUp,
MovementType_FaceLeftAndRight,
@@ -806,7 +804,7 @@ const u8 gAcroEndWheelieDirectionAnimNums[] = {
[DIR_NORTHEAST] = 0x1D,
};
const u8 gAcroUnusedActionDirectionAnimNums[] = {
const u8 gUnknown_83A6465[] = {
[DIR_NONE] = 0x18,
[DIR_SOUTH] = 0x18,
[DIR_NORTH] = 0x19,
@@ -818,7 +816,7 @@ const u8 gAcroUnusedActionDirectionAnimNums[] = {
[DIR_NORTHEAST] = 0x1B,
};
const u8 gAcroWheeliePedalDirectionAnimNums[] = {
const u8 gAcroUnusedActionDirectionAnimNums[] = {
[DIR_NONE] = 0x20,
[DIR_SOUTH] = 0x20,
[DIR_NORTH] = 0x21,
@@ -830,7 +828,7 @@ const u8 gAcroWheeliePedalDirectionAnimNums[] = {
[DIR_NORTHEAST] = 0x21,
};
const u8 gFishingDirectionAnimNums[] = {
const u8 gAcroWheeliePedalDirectionAnimNums[] = {
[DIR_NONE] = 0x24,
[DIR_SOUTH] = 0x24,
[DIR_NORTH] = 0x25,
@@ -842,7 +840,7 @@ const u8 gFishingDirectionAnimNums[] = {
[DIR_NORTHEAST] = 0x25,
};
const u8 gFishingNoCatchDirectionAnimNums[] = {
const u8 gFishingDirectionAnimNums[] = {
[DIR_NONE] = 0x0,
[DIR_SOUTH] = 0x0,
[DIR_NORTH] = 0x1,
@@ -854,7 +852,7 @@ const u8 gFishingNoCatchDirectionAnimNums[] = {
[DIR_NORTHEAST] = 0x1,
};
const u8 gFishingBiteDirectionAnimNums[] = {
const u8 gFishingNoCatchDirectionAnimNums[] = {
[DIR_NONE] = 0x4,
[DIR_SOUTH] = 0x4,
[DIR_NORTH] = 0x5,
@@ -866,7 +864,7 @@ const u8 gFishingBiteDirectionAnimNums[] = {
[DIR_NORTHEAST] = 0x5,
};
const u8 gUnknown_83A648A[] = {
const u8 gFishingBiteDirectionAnimNums[] = {
[DIR_NONE] = 0x8,
[DIR_SOUTH] = 0x8,
[DIR_NORTH] = 0x9,
@@ -3040,7 +3038,7 @@ bool8 ObjectEventIsTrainerAndCloseToPlayer(struct ObjectEvent *objectEvent)
s16 minY;
s16 maxY;
if (!TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_DASH))
if (!TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_WATERING))
{
return FALSE;
}
@@ -4962,6 +4960,11 @@ u8 GetAcroEndWheelieDirectionAnimNum(u8 direction)
return gAcroEndWheelieDirectionAnimNums[direction];
}
u8 sub_80634C0(u8 direction)
{
return gUnknown_83A6465[direction];
}
u8 GetAcroUnusedActionDirectionAnimNum(u8 direction)
{
return gAcroUnusedActionDirectionAnimNums[direction];
@@ -4987,11 +4990,6 @@ u8 GetFishingBiteDirectionAnimNum(u8 direction)
return gFishingBiteDirectionAnimNums[direction];
}
u8 sub_8063510(u8 direction)
{
return gUnknown_83A648A[direction];
}
u8 GetRunningDirectionAnimNum(u8 direction)
{
return gRunningDirectionAnimNums[direction];
@@ -5449,19 +5447,19 @@ u8 sub_8063F10(u32 idx)
}
dirn_to_anim(sub_8063F2C, gUnknown_83A64FB);
dirn_to_anim(sub_8063F58, gUnknown_83A6500);
dirn_to_anim(GetWalkSlowMovementAction, gUnknown_83A6500);
dirn_to_anim(GetWalkNormalMovementAction, gUnknown_83A6505);
dirn_to_anim(GetWalkFastMovementAction, gUnknown_83A650A);
dirn_to_anim(sub_8063FDC, gUnknown_83A650F);
dirn_to_anim(sub_8064008, gUnknown_83A6514);
dirn_to_anim(GetWalkFastestMovementAction, gUnknown_83A6519);
dirn_to_anim(GetSlideMovementAction, gUnknown_83A651E);
dirn_to_anim(sub_806408C, gUnknown_83A6523);
dirn_to_anim(sub_80640B8, gUnknown_83A6528);
dirn_to_anim(GetPlayerRunMovementAction, gUnknown_83A6523);
dirn_to_anim(GetPlayerRunSlowMovementAction, gUnknown_83A6528);
dirn_to_anim(sub_80640E4, gUnknown_83A652D);
dirn_to_anim(GetJump2MovementAction, gUnknown_83A6532);
dirn_to_anim(GetJumpInPlaceMovementAction, gUnknown_83A6537);
dirn_to_anim(sub_8064168, gUnknown_83A653C);
dirn_to_anim(GetJumpInPlaceTurnAroundMovementAction, gUnknown_83A653C);
dirn_to_anim(GetJumpMovementAction, gUnknown_83A6541);
dirn_to_anim(sub_80641C0, gUnknown_83A6546);
dirn_to_anim(sub_80641EC, gUnknown_83A654B);
@@ -5475,15 +5473,15 @@ bool8 ObjectEventFaceOppositeDirection(struct ObjectEvent *objectEvent, u8 direc
return ObjectEventSetHeldMovement(objectEvent, GetFaceDirectionMovementAction(GetOppositeDirection(direction)));
}
dirn_to_anim(sub_80642F4, gUnknown_83A6564);
dirn_to_anim(sub_8064320, gUnknown_83A6569);
dirn_to_anim(sub_806434C, gUnknown_83A656E);
dirn_to_anim(sub_8064378, gUnknown_83A6573);
dirn_to_anim(sub_80643A4, gUnknown_83A6578);
dirn_to_anim(sub_80643D0, gUnknown_83A657D);
dirn_to_anim(sub_80643FC, gUnknown_83A6582);
dirn_to_anim(sub_8064428, gUnknown_83A6587);
dirn_to_anim(sub_8064454, gUnknown_83A658C);
dirn_to_anim(GetAcroWheelieFaceDirectionMovementAction, gUnknown_83A6564);
dirn_to_anim(GetAcroPopWheelieFaceDirectionMovementAction, gUnknown_83A6569);
dirn_to_anim(GetAcroEndWheelieFaceDirectionMovementAction, gUnknown_83A656E);
dirn_to_anim(GetAcroWheelieHopFaceDirectionMovementAction, gUnknown_83A6573);
dirn_to_anim(GetAcroWheelieHopDirectionMovementAction, gUnknown_83A6578);
dirn_to_anim(GetAcroWheelieJumpDirectionMovementAction, gUnknown_83A657D);
dirn_to_anim(GetAcroWheelieInPlaceDirectionMovementAction, gUnknown_83A6582);
dirn_to_anim(GetAcroPopWheelieMoveDirectionMovementAction, gUnknown_83A6587);
dirn_to_anim(GetAcroWheelieMoveDirectionMovementAction, gUnknown_83A658C);
u8 GetOppositeDirection(u8 direction)
{
@@ -7537,7 +7535,7 @@ void sub_8066C70(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 dire
{
SetObjectEventDirection(objectEvent, direction);
ShiftStillObjectEventCoords(objectEvent);
obj_npc_animation_step(objectEvent, sprite, GetFishingDirectionAnimNum(direction));
obj_npc_animation_step(objectEvent, sprite, GetAcroWheeliePedalDirectionAnimNum(direction));
sprite->animPaused = TRUE;
sprite->data[2] = 1;
}
@@ -7616,25 +7614,25 @@ static bool8 MovementAction_AcroEndWheelieFaceRight_Step0(struct ObjectEvent *ob
static bool8 MovementAction_UnusedAcroActionDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite)
{
StartSpriteAnimInDirection(objectEvent, sprite, DIR_SOUTH, GetAcroWheeliePedalDirectionAnimNum(DIR_SOUTH));
StartSpriteAnimInDirection(objectEvent, sprite, DIR_SOUTH, GetAcroUnusedActionDirectionAnimNum(DIR_SOUTH));
return FALSE;
}
static bool8 MovementAction_UnusedAcroActionUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite)
{
StartSpriteAnimInDirection(objectEvent, sprite, DIR_NORTH, GetAcroWheeliePedalDirectionAnimNum(DIR_NORTH));
StartSpriteAnimInDirection(objectEvent, sprite, DIR_NORTH, GetAcroUnusedActionDirectionAnimNum(DIR_NORTH));
return FALSE;
}
static bool8 MovementAction_UnusedAcroActionLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite)
{
StartSpriteAnimInDirection(objectEvent, sprite, DIR_WEST, GetAcroWheeliePedalDirectionAnimNum(DIR_WEST));
StartSpriteAnimInDirection(objectEvent, sprite, DIR_WEST, GetAcroUnusedActionDirectionAnimNum(DIR_WEST));
return FALSE;
}
static bool8 MovementAction_UnusedAcroActionRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite)
{
StartSpriteAnimInDirection(objectEvent, sprite, DIR_EAST, GetAcroWheeliePedalDirectionAnimNum(DIR_EAST));
StartSpriteAnimInDirection(objectEvent, sprite, DIR_EAST, GetAcroUnusedActionDirectionAnimNum(DIR_EAST));
return FALSE;
}
@@ -7851,25 +7849,25 @@ static bool8 MovementAction_AcroWheelieJumpRight_Step1(struct ObjectEvent *objec
static bool8 MovementActionFunc_x88_0(struct ObjectEvent *objectEvent, struct Sprite *sprite)
{
sub_80656C4(objectEvent, sprite, DIR_SOUTH, GetFishingDirectionAnimNum(DIR_SOUTH), 8);
sub_80656C4(objectEvent, sprite, DIR_SOUTH, GetAcroWheeliePedalDirectionAnimNum(DIR_SOUTH), 8);
return MovementAction_WalkInPlace_Step1(objectEvent, sprite);
}
static bool8 MovementActionFunc_x89_0(struct ObjectEvent *objectEvent, struct Sprite *sprite)
{
sub_80656C4(objectEvent, sprite, DIR_NORTH, GetFishingDirectionAnimNum(DIR_NORTH), 8);
sub_80656C4(objectEvent, sprite, DIR_NORTH, GetAcroWheeliePedalDirectionAnimNum(DIR_NORTH), 8);
return MovementAction_WalkInPlace_Step1(objectEvent, sprite);
}
static bool8 MovementActionFunc_x8A_0(struct ObjectEvent *objectEvent, struct Sprite *sprite)
{
sub_80656C4(objectEvent, sprite, DIR_WEST, GetFishingDirectionAnimNum(DIR_WEST), 8);
sub_80656C4(objectEvent, sprite, DIR_WEST, GetAcroWheeliePedalDirectionAnimNum(DIR_WEST), 8);
return MovementAction_WalkInPlace_Step1(objectEvent, sprite);
}
static bool8 MovementActionFunc_x8B_0(struct ObjectEvent *objectEvent, struct Sprite *sprite)
{
sub_80656C4(objectEvent, sprite, DIR_EAST, GetFishingDirectionAnimNum(DIR_EAST), 8);
sub_80656C4(objectEvent, sprite, DIR_EAST, GetAcroWheeliePedalDirectionAnimNum(DIR_EAST), 8);
return MovementAction_WalkInPlace_Step1(objectEvent, sprite);
}
@@ -7947,7 +7945,7 @@ static bool8 MovementAction_AcroPopWheelieMoveRight_Step1(struct ObjectEvent *ob
void sub_806751C(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 direction, u8 speed)
{
npc_apply_direction(objectEvent, sprite, direction, speed);
npc_apply_anim_looping(objectEvent, sprite, GetFishingDirectionAnimNum(objectEvent->facingDirection));
npc_apply_anim_looping(objectEvent, sprite, GetAcroWheeliePedalDirectionAnimNum(objectEvent->facingDirection));
}
static bool8 MovementAction_AcroWheelieMoveDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite)
@@ -8017,7 +8015,7 @@ static bool8 MovementAction_AcroWheelieMoveRight_Step1(struct ObjectEvent *objec
void sub_806764C(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 direction, u8 speed)
{
npc_apply_direction(objectEvent, sprite, direction, speed);
npc_apply_anim_looping(objectEvent, sprite, GetAcroUnusedActionDirectionAnimNum(objectEvent->facingDirection));
npc_apply_anim_looping(objectEvent, sprite, sub_80634C0(objectEvent->facingDirection));
SeekSpriteAnim(sprite, 0);
}
src/field_control_avatar.c
+6 -6
View File
@@ -105,11 +105,11 @@ void FieldGetPlayerInput(struct FieldInput *input, u16 newKeys, u16 heldKeys)
{
if (GetPlayerSpeed() != 4)
{
if ((newKeys & START_BUTTON) && !(gPlayerAvatar.flags & 0x40))
if ((newKeys & START_BUTTON) && !(gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_FISHING))
input->pressedStartButton = TRUE;
if (gQuestLogState != QL_STATE_2 && gQuestLogState != QL_STATE_3)
{
if (!(gPlayerAvatar.flags & 0x40))
if (!(gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_FISHING))
{
if (newKeys & SELECT_BUTTON)
input->pressedSelectButton = TRUE;
@@ -625,7 +625,7 @@ static bool8 TryStartStepBasedScript(struct MapPosition *position, u16 metatileB
return TRUE;
if (TryStartStepCountScript(metatileBehavior) == TRUE)
return TRUE;
if (!(gPlayerAvatar.flags & 0x40) && !MetatileBehavior_IsForcedMovementTile(metatileBehavior) && UpdateRepelCounter() == TRUE)
if (!(gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_FISHING) && !MetatileBehavior_IsForcedMovementTile(metatileBehavior) && UpdateRepelCounter() == TRUE)
return TRUE;
return FALSE;
}
@@ -655,7 +655,7 @@ static bool8 TryStartStepCountScript(u16 metatileBehavior)
UpdateHappinessStepCounter();
if (!(gPlayerAvatar.flags & 0x40) && !MetatileBehavior_IsForcedMovementTile(metatileBehavior))
if (!(gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_FISHING) && !MetatileBehavior_IsForcedMovementTile(metatileBehavior))
{
if (sub_810C4EC() == TRUE)
{
@@ -839,7 +839,7 @@ static bool8 TryArrowWarp(struct MapPosition *position, u16 metatileBehavior, u8
else if (sub_806DB84(metatileBehavior, direction) == TRUE)
{
delay = 0;
if (gPlayerAvatar.flags & 6)
if (gPlayerAvatar.flags & (PLAYER_AVATAR_FLAG_MACH_BIKE | PLAYER_AVATAR_FLAG_ACRO_BIKE))
{
SetPlayerAvatarTransitionFlags(1);
delay = 12;
@@ -906,7 +906,7 @@ static bool8 IsWarpMetatileBehavior(u16 metatileBehavior)
return TRUE;
if (MetatileBehavior_IsEscalator(metatileBehavior) == TRUE)
return TRUE;
if (MetatileBehavior_IsCaveDoor(metatileBehavior) == TRUE)
if (MetatileBehavior_IsNonAnimDoor(metatileBehavior) == TRUE)
return TRUE;
if (MetatileBehavior_IsLavaridgeB1FWarp(metatileBehavior) == TRUE)
return TRUE;
src/field_effect.c
+1 -1
View File
@@ -2888,7 +2888,7 @@ u8 FldEff_UseSurf(void)
{
u8 taskId = CreateTask(Task_FldEffUseSurf, 0xff);
gTasks[taskId].data[15] = gFieldEffectArguments[0];
sav1_reset_battle_music_maybe();
Overworld_ClearSavedMusic();
if (sub_8056124(MUS_NAMINORI))
Overworld_ChangeMusicTo(MUS_NAMINORI);
return FALSE;
src/field_fadetransition.c
+40 -40
View File
@@ -29,9 +29,9 @@ static void sub_807DF4C(u8 a0);
static void sub_807DFBC(u8 taskId);
static void task_map_chg_seq_0807E20C(u8 taskId);
static void task_map_chg_seq_0807E2CC(u8 taskId);
static void sub_807E31C(u8 taskId);
static void Task_TeleportWarpIn(u8 taskId);
static void sub_807E718(u8 taskId);
static void sub_807E784(u8 taskId);
static void Task_TeleportWarp(u8 taskId);
static void sub_807E80C(u8 taskId);
static void sub_807E980(u8 taskId);
static void sub_807EB64(u16, s16*, s16*);
@@ -126,12 +126,12 @@ static void sub_807DC70(void)
static void sub_807DCB0(bool8 arg)
{
sub_805CB04(!arg);
SetPlayerInvisibility(!arg);
}
static void task0A_nop_for_a_while(u8 taskId)
{
if (sub_807E418() == TRUE)
if (FieldFadeTransitionBackgroundEffectIsFinished() == TRUE)
DestroyTask(taskId);
}
@@ -145,7 +145,7 @@ void sub_807DCE4(void)
static void task0A_asap_script_env_2_enable_and_set_ctx_running(u8 taskId)
{
if (sub_807E418() == TRUE)
if (FieldFadeTransitionBackgroundEffectIsFinished() == TRUE)
{
DestroyTask(taskId);
EnableBothScriptContexts();
@@ -184,7 +184,7 @@ static void task_mpl_807DD60(u8 taskId)
}
break;
case 2:
if (sub_807E418() == TRUE)
if (FieldFadeTransitionBackgroundEffectIsFinished() == TRUE)
{
ScriptContext2_Disable();
DestroyTask(taskId);
@@ -218,7 +218,7 @@ static void sub_807DDF0(u8 taskId)
}
break;
case 2:
if (sub_807E418() == TRUE)
if (FieldFadeTransitionBackgroundEffectIsFinished() == TRUE)
{
sub_8009FE8();
ScriptContext2_Disable();
@@ -260,7 +260,7 @@ static void sub_807DE78(bool8 a0)
else
{
sub_807DF4C(a0);
if (MetatileBehavior_IsCaveDoor(behavior) == TRUE)
if (MetatileBehavior_IsNonAnimDoor(behavior) == TRUE)
func = task_map_chg_seq_0807E20C;
else if (MetatileBehavior_IsUnknownWarp6C_to_6F(behavior) == TRUE)
{
@@ -284,7 +284,7 @@ static void sub_807DF4C(bool8 a0)
FadeInFromBlack();
}
void sub_807DF64(void)
void FieldCB_UnionRoomWarp(void)
{
Overworld_PlaySpecialMapMusic();
sub_8111CF0();
@@ -300,13 +300,13 @@ void sub_807DF7C(void)
ScriptContext2_Enable();
}
static void sub_807DF94(void)
static void FieldCB_TeleportWarpIn(void)
{
Overworld_PlaySpecialMapMusic();
WarpFadeInScreen();
sub_8111CF0();
PlaySE(SE_TK_WARPOUT);
CreateTask(sub_807E31C, 10);
CreateTask(Task_TeleportWarpIn, 10);
ScriptContext2_Enable();
}
@@ -363,7 +363,7 @@ static void sub_807DFBC(u8 taskId)
}
break;
case 9:
if (sub_807E418() && walkrun_is_standing_still() && !FieldIsDoorAnimationRunning() && !FuncIsActiveTask(Task_BarnDoorWipe))
if (FieldFadeTransitionBackgroundEffectIsFinished() && walkrun_is_standing_still() && !FieldIsDoorAnimationRunning() && !FuncIsActiveTask(Task_BarnDoorWipe))
{
ObjectEventClearHeldMovementIfFinished(&gObjectEvents[GetObjectEventIdByLocalIdAndMap(0xFF, 0, 0)]);
task->data[0] = 4;
@@ -371,7 +371,7 @@ static void sub_807DFBC(u8 taskId)
break;
// Legacy RS
case 1:
if (sub_807E418())
if (FieldFadeTransitionBackgroundEffectIsFinished())
{
sub_807DCB0(TRUE);
ObjectEventSetHeldMovement(&gObjectEvents[GetObjectEventIdByLocalIdAndMap(0xFF, 0, 0)], MOVEMENT_ACTION_WALK_NORMAL_DOWN);
@@ -413,7 +413,7 @@ static void task_map_chg_seq_0807E20C(u8 taskId)
task->data[0] = 1;
break;
case 1:
if (sub_807E418())
if (FieldFadeTransitionBackgroundEffectIsFinished())
{
sub_807DCB0(TRUE);
ObjectEventSetHeldMovement(&gObjectEvents[GetObjectEventIdByLocalIdAndMap(0xFF, 0, 0)], GetWalkNormalMovementAction(GetPlayerFacingDirection()));
@@ -444,7 +444,7 @@ static void task_map_chg_seq_0807E2CC(u8 taskId)
gTasks[taskId].data[0]++;
break;
case 1:
if (sub_807E418())
if (FieldFadeTransitionBackgroundEffectIsFinished())
{
UnfreezeObjectEvents();
ScriptContext2_Disable();
@@ -454,18 +454,18 @@ static void task_map_chg_seq_0807E2CC(u8 taskId)
}
}
static void sub_807E31C(u8 taskId)
static void Task_TeleportWarpIn(u8 taskId)
{
switch (gTasks[taskId].data[0])
{
case 0:
FreezeObjectEvents();
ScriptContext2_Enable();
sub_805DC04();
StartTeleportInPlayerAnim();
gTasks[taskId].data[0]++;
break;
case 1:
if (sub_807E418() && sub_805DC24() != TRUE)
if (FieldFadeTransitionBackgroundEffectIsFinished() && WaitTeleportInPlayerAnim() != TRUE)
{
UnfreezeObjectEvents();
ScriptContext2_Disable();
@@ -477,7 +477,7 @@ static void sub_807E31C(u8 taskId)
static void Task_WaitFadeAndCreateStartMenuTask(u8 taskId)
{
if (sub_807E418() == TRUE)
if (FieldFadeTransitionBackgroundEffectIsFinished() == TRUE)
{
DestroyTask(taskId);
CreateTask(Task_StartMenuHandleInput, 80);
@@ -499,7 +499,7 @@ bool8 FieldCB2_ReturnToStartMenuInit(void)
static void task_mpl_807E3C8(u8 taskId)
{
if (sub_807E418() == TRUE)
if (FieldFadeTransitionBackgroundEffectIsFinished() == TRUE)
{
ScriptContext2_Disable();
DestroyTask(taskId);
@@ -515,12 +515,12 @@ void sub_807E3EC(void)
CreateTask(task_mpl_807E3C8, 10);
}
static bool32 sub_807E40C(void)
static bool32 WaitWarpFadeOutScreen(void)
{
return gPaletteFade.active;
}
bool32 sub_807E418(void)
bool32 FieldFadeTransitionBackgroundEffectIsFinished(void)
{
if (IsWeatherNotFadingIn() == TRUE && ForestMapPreviewScreenIsRunning())
return TRUE;
@@ -535,7 +535,7 @@ void DoWarp(void)
WarpFadeOutScreen();
PlayRainStoppingSoundEffect();
PlaySE(SE_KAIDAN);
gFieldCallback = sub_807DF64;
gFieldCallback = FieldCB_UnionRoomWarp;
CreateTask(sub_807E718, 10);
}
@@ -545,7 +545,7 @@ void DoDiveWarp(void)
TryFadeOutOldMapMusic();
WarpFadeOutScreen();
PlayRainStoppingSoundEffect();
gFieldCallback = sub_807DF64;
gFieldCallback = FieldCB_UnionRoomWarp;
CreateTask(sub_807E718, 10);
}
@@ -560,7 +560,7 @@ void sub_807E4A0(u16 metatileBehavior, u16 delay)
void DoDoorWarp(void)
{
ScriptContext2_Enable();
gFieldCallback = sub_807DF64;
gFieldCallback = FieldCB_UnionRoomWarp;
CreateTask(sub_807E80C, 10);
}
@@ -568,14 +568,14 @@ void sub_807E500(void)
{
ScriptContext2_Enable();
CreateTask(sub_807E718, 10);
gFieldCallback = sub_807DF94;
gFieldCallback = FieldCB_TeleportWarpIn;
}
void DoUnionRoomWarp(void)
{
ScriptContext2_Enable();
gFieldCallback = sub_807DF64;
CreateTask(sub_807E784, 10);
gFieldCallback = FieldCB_UnionRoomWarp;
CreateTask(Task_TeleportWarp, 10);
}
void DoFallWarp(void)
@@ -606,8 +606,8 @@ void DoTeleportWarp(void)
{
ScriptContext2_Enable();
TryFadeOutOldMapMusic();
CreateTask(sub_807E784, 10);
gFieldCallback = sub_807DF94;
CreateTask(Task_TeleportWarp, 10);
gFieldCallback = FieldCB_TeleportWarpIn;
}
void sub_807E5C4(void)
@@ -628,7 +628,7 @@ static void sub_807E5EC(u8 taskId)
task->data[0]++;
break;
case 1:
if (!sub_807E40C() && BGMusicStopped())
if (!WaitWarpFadeOutScreen() && BGMusicStopped())
task->data[0]++;
break;
case 2:
@@ -661,7 +661,7 @@ static void sub_807E678(u8 taskId)
data[0]++;
break;
case 1:
if (!sub_807E40C() && BGMusicStopped())
if (!WaitWarpFadeOutScreen() && BGMusicStopped())
{
Link_TryStartSend5FFF();
data[0]++;
@@ -694,7 +694,7 @@ static void sub_807E718(u8 taskId)
task->data[0]++;
break;
case 1:
if (!sub_807E40C() && BGMusicStopped())
if (!WaitWarpFadeOutScreen() && BGMusicStopped())
task->data[0]++;
break;
case 2:
@@ -705,7 +705,7 @@ static void sub_807E718(u8 taskId)
}
}
static void sub_807E784(u8 taskId)
static void Task_TeleportWarp(u8 taskId)
{
struct Task *task = &gTasks[taskId];
switch (task->data[0])
@@ -714,18 +714,18 @@ static void sub_807E784(u8 taskId)
FreezeObjectEvents();
ScriptContext2_Enable();
PlaySE(SE_TK_WARPIN);
sub_805DAB0();
StartTeleportWarpOutPlayerAnim();
task->data[0]++;
break;
case 1:
if (!sub_805DAD0())
if (!WaitTeleportWarpOutPlayerAnim())
{
WarpFadeOutScreen();
task->data[0]++;
}
break;
case 2:
if (!sub_807E40C() && BGMusicStopped())
if (!WaitWarpFadeOutScreen() && BGMusicStopped())
task->data[0]++;
break;
case 3:
@@ -829,11 +829,11 @@ static void sub_807E980(u8 taskId)
break;
case 3:
sub_807EAC4(data[2], data[3], &data[4], &data[5], &data[6]);
if (!sub_807E40C() && BGMusicStopped())
if (!WaitWarpFadeOutScreen() && BGMusicStopped())
data[0]++;
break;
default:
gFieldCallback = sub_807DF64;
gFieldCallback = FieldCB_UnionRoomWarp;
WarpIntoMap();
SetMainCallback2(CB2_LoadMap);
DestroyTask(taskId);
@@ -898,7 +898,7 @@ static void sub_807EC34(u8 taskId)
switch (data[0])
{
default:
if (sub_807E418() == TRUE)
if (FieldFadeTransitionBackgroundEffectIsFinished() == TRUE)
{
CameraObjectReset1();
ScriptContext2_Disable();
src/field_player_avatar.c
+2165
View File
File diff suppressed because it is too large Load Diff
src/field_screen_effect.c
+2 -2
View File
@@ -434,14 +434,14 @@ static void sub_807F45C(u8 taskId)
++gTasks[taskId].data[0];
break;
case 3:
if (sub_807E418() == TRUE)
if (FieldFadeTransitionBackgroundEffectIsFinished() == TRUE)
{
DestroyTask(taskId);
ScriptContext1_SetupScript(EventScript_AfterWhiteOutHeal);
}
break;
case 6:
if (sub_807E418() == TRUE)
if (FieldFadeTransitionBackgroundEffectIsFinished() == TRUE)
{
DestroyTask(taskId);
ScriptContext1_SetupScript(EventScript_AfterWhiteOutMomHeal);
src/fldeff_strength.c
+1 -1
View File
@@ -13,7 +13,7 @@ static void ShowMonCB_UseStrength(void);
bool8 SetUpFieldMove_Strength(void)
{
if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_SURFING) || CheckObjectGraphicsInFrontOfPlayer(OBJ_EVENT_GFX_STRENGTH_BOULDER) != TRUE)
if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_SURFING) || CheckObjectGraphicsInFrontOfPlayer(OBJ_EVENT_GFX_PUSHABLE_BOULDER) != TRUE)
{
return FALSE;
}
src/item_use.c
+6 -6
View File
@@ -263,10 +263,10 @@ void FieldUseFunc_MachBike(u8 taskId)
behavior = MapGridGetMetatileBehaviorAt(x, y);
if (FlagGet(FLAG_SYS_ON_CYCLING_ROAD) == TRUE
|| MetatileBehavior_ReturnFalse_17(behavior) == TRUE
|| MetatileBehavior_ReturnFalse_18(behavior) == TRUE
|| MetatileBehavior_ReturnFalse_15(behavior) == TRUE
|| MetatileBehavior_ReturnFalse_16(behavior) == TRUE)
|| MetatileBehavior_IsVerticalRail(behavior) == TRUE
|| MetatileBehavior_IsHorizontalRail(behavior) == TRUE
|| MetatileBehavior_IsIsolatedVerticalRail(behavior) == TRUE
|| MetatileBehavior_IsIsolatedHorizontalRail(behavior) == TRUE)
sub_80A10C4(taskId, gTasks[taskId].data[3], 2, gUnknown_8416451);
else if (sub_8055C9C() == TRUE && !sub_80BD540())
{
@@ -308,7 +308,7 @@ static bool8 ItemUseCheckFunc_Rod(void)
if (MetatileBehavior_IsWaterfall(behavior))
return FALSE;
if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_4))
if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_UNDERWATER))
return FALSE;
if (!TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_SURFING))
{
@@ -327,7 +327,7 @@ static bool8 ItemUseCheckFunc_Rod(void)
static void ItemUseOnFieldCB_Rod(u8 taskId)
{
sub_805D2C0(ItemId_GetSecondaryId(gSpecialVar_ItemId));
StartFishing(ItemId_GetSecondaryId(gSpecialVar_ItemId));
DestroyTask(taskId);
}
src/metatile_behavior.c
+10 -10
View File
@@ -191,7 +191,7 @@ bool8 MetatileBehavior_IsLadder(u8 metatileBehavior)
return FALSE;
}
bool8 MetatileBehavior_IsCaveDoor(u8 metatileBehavior)
bool8 MetatileBehavior_IsNonAnimDoor(u8 metatileBehavior)
{
if(metatileBehavior == MB_CAVE_DOOR)
return TRUE;
@@ -677,11 +677,11 @@ bool8 MetatileBehavior_IsCyclingRoadPullDownTileGrass(u8 metatileBehavior)
return metatileBehavior == MB_CYCLING_ROAD_PULL_DOWN_GRASS;
}
bool8 MetatileBehavior_ReturnFalse_14(u8 metatileBehavior) { return FALSE; }
bool8 MetatileBehavior_ReturnFalse_15(u8 metatileBehavior) { return FALSE; }
bool8 MetatileBehavior_ReturnFalse_16(u8 metatileBehavior) { return FALSE; }
bool8 MetatileBehavior_ReturnFalse_17(u8 metatileBehavior) { return FALSE; }
bool8 MetatileBehavior_ReturnFalse_18(u8 metatileBehavior) { return FALSE; }
bool8 MetatileBehavior_IsBumpySlope(u8 metatileBehavior) { return FALSE; }
bool8 MetatileBehavior_IsIsolatedVerticalRail(u8 metatileBehavior) { return FALSE; }
bool8 MetatileBehavior_IsIsolatedHorizontalRail(u8 metatileBehavior) { return FALSE; }
bool8 MetatileBehavior_IsVerticalRail(u8 metatileBehavior) { return FALSE; }
bool8 MetatileBehavior_IsHorizontalRail(u8 metatileBehavior) { return FALSE; }
bool8 MetatileBehavior_IsSeaweed(u8 metatileBehavior)
{
@@ -750,7 +750,7 @@ bool8 TestMetatileAttributeBit(u8 arg1, u8 arg2)
return FALSE;
}
bool8 MetatileBehavior_UnusedIsSpinRight(u8 metatileBehavior)
bool8 MetatileBehavior_IsSpinRight(u8 metatileBehavior)
{
if(metatileBehavior == MB_SPIN_RIGHT)
return TRUE;
@@ -758,7 +758,7 @@ bool8 MetatileBehavior_UnusedIsSpinRight(u8 metatileBehavior)
return FALSE;
}
bool8 MetatileBehavior_UnusedIsSpinLeft(u8 metatileBehavior)
bool8 MetatileBehavior_IsSpinLeft(u8 metatileBehavior)
{
if(metatileBehavior == MB_SPIN_LEFT)
return TRUE;
@@ -766,7 +766,7 @@ bool8 MetatileBehavior_UnusedIsSpinLeft(u8 metatileBehavior)
return FALSE;
}
bool8 MetatileBehavior_UnusedIsSpinUp(u8 metatileBehavior)
bool8 MetatileBehavior_IsSpinUp(u8 metatileBehavior)
{
if(metatileBehavior == MB_SPIN_UP)
return TRUE;
@@ -774,7 +774,7 @@ bool8 MetatileBehavior_UnusedIsSpinUp(u8 metatileBehavior)
return FALSE;
}
bool8 MetatileBehavior_UnusedIsSpinDown(u8 metatileBehavior)
bool8 MetatileBehavior_IsSpinDown(u8 metatileBehavior)
{
if(metatileBehavior == MB_SPIN_DOWN)
return TRUE;
src/naming_screen.c
+1 -1
View File
@@ -1300,7 +1300,7 @@ static void NamingScreen_CreatePlayerIcon(void)
u8 rivalGfxId;
u8 spriteId;
rivalGfxId = sub_805C7C8(0, sNamingScreenData->monSpecies);
rivalGfxId = GetRivalAvatarGraphicsIdByStateIdAndGender(0, sNamingScreenData->monSpecies);
spriteId = AddPseudoObjectEvent(rivalGfxId, SpriteCallbackDummy, 0x38, 0x25, 0);
gSprites[spriteId].oam.priority = 3;
StartSpriteAnim(&gSprites[spriteId], 4);
src/new_menu_helpers.c
+5 -5
View File
@@ -457,7 +457,7 @@ void AddTextPrinterWithCustomSpeedForMessage(bool8 allowSkippingDelayWithButtonP
void LoadStdWindowFrameGfx(void)
{
if (gQuestLogState == 2)
if (gQuestLogState == QL_STATE_2)
{
gTextFlags.autoScroll = 1;
TextWindow_LoadTilesStdFrame1(0, DLG_WINDOW_BASE_TILE_NUM);
@@ -495,8 +495,8 @@ void ClearDialogWindowAndFrame(u8 windowId, bool8 copyToVram)
ClearWindowTilemap(windowId);
if (copyToVram == TRUE)
CopyWindowToVram(windowId, 3);
if (gQuestLogState == 2)
sub_8111134();
if (gQuestLogState == QL_STATE_2)
CommitQuestLogWindow1();
}
void ClearStdWindowAndFrame(u8 windowId, bool8 copyToVram)
@@ -527,7 +527,7 @@ static void WindowFunc_DrawStandardFrame(u8 bg, u8 tilemapLeft, u8 tilemapTop, u
static void WindowFunc_DrawDialogueFrame(u8 bg, u8 tilemapLeft, u8 tilemapTop, u8 width, u8 height, u8 paletteNum)
{
if (!IsMsgSignPost() || gQuestLogState == 2)
if (!IsMsgSignPost() || gQuestLogState == QL_STATE_2)
{
FillBgTilemapBufferRect(bg, DLG_WINDOW_BASE_TILE_NUM + 0, tilemapLeft - 2, tilemapTop - 1, 1, 1, DLG_WINDOW_PALETTE_NUM);
FillBgTilemapBufferRect(bg, DLG_WINDOW_BASE_TILE_NUM + 1, tilemapLeft - 1, tilemapTop - 1, 1, 1, DLG_WINDOW_PALETTE_NUM);
@@ -611,7 +611,7 @@ void SetStdWindowBorderStyle(u8 windowId, bool8 copyToVram)
void sub_80F7768(u8 windowId, bool8 copyToVram)
{
if (gQuestLogState == 2)
if (gQuestLogState == QL_STATE_2)
{
gTextFlags.autoScroll = 1;
TextWindow_LoadTilesStdFrame1(0, DLG_WINDOW_BASE_TILE_NUM);
src/option_menu.c
+1 -1
View File
@@ -509,7 +509,7 @@ static void BufferOptionMenuString(u8 selection)
static void CloseAndSaveOptionMenu(u8 taskId)
{
gFieldCallback = sub_807DF64;
gFieldCallback = FieldCB_UnionRoomWarp;
SetMainCallback2(gMain.savedCallback);
FreeAllWindowBuffers();
gSaveBlock2Ptr->optionsTextSpeed = sOptionMenuPtr->option[MENUITEM_TEXTSPEED];
src/quest_log.c
+259 -258
View File
File diff suppressed because it is too large Load Diff
src/quest_log_objects.c
+2 -2
View File
@@ -45,7 +45,7 @@ void SetQuestLogObjectEventsData(struct QuestLog * questLog)
}
}
void sub_815A1F8(const struct QuestLog * questLog, const struct ObjectEventTemplate * templates)
void SetSav1ObjectEventsFromQuestLog(const struct QuestLog * questLog, const struct ObjectEventTemplate * templates)
{
u32 i, j;
const struct QuestLogObjectEvent * questLogObjectEvents = questLog->unk_008;
@@ -131,7 +131,7 @@ void sub_815A1F8(const struct QuestLog * questLog, const struct ObjectEventTempl
void sub_815A540(void)
{
if (gQuestLogState == 2)
if (gQuestLogState == QL_STATE_2)
{
s16 x, y;
src/quest_log_player.c
+10 -10
View File
@@ -39,7 +39,7 @@ void sub_8150454(u8 a0)
gUnknown_8471EDC[a0]();
}
bool8 sub_8150474(u8 a0)
bool32 sub_8150474(u8 a0)
{
if (gUnknown_3005E88 == 2)
{
@@ -87,7 +87,7 @@ static void sub_8150530(void)
else
{
sub_81507BC(objectEvent, GetPlayerAvatarGraphicsIdByStateId(4));
StartSpriteAnim(sprite, GetFishingNoCatchDirectionAnimNum(objectEvent->facingDirection));
StartSpriteAnim(sprite, GetFishingDirectionAnimNum(objectEvent->facingDirection));
}
}
@@ -102,23 +102,23 @@ static void sub_81505C4(u8 taskId)
ObjectEventClearHeldMovementIfActive(objectEvent);
objectEvent->enableAnim = TRUE;
sub_81507BC(objectEvent, GetPlayerAvatarGraphicsIdByStateId(4));
StartSpriteAnim(sprite, GetFishingNoCatchDirectionAnimNum(objectEvent->facingDirection));
StartSpriteAnim(sprite, GetFishingDirectionAnimNum(objectEvent->facingDirection));
gTasks[taskId].data[0]++;
gTasks[taskId].data[1] = 0;
break;
case 1:
sub_805D9C4(sprite);
AlignFishingAnimationFrames(sprite);
if (gTasks[taskId].data[1] < 60)
gTasks[taskId].data[1]++;
else
gTasks[taskId].data[0]++;
break;
case 2:
StartSpriteAnim(sprite, GetFishingBiteDirectionAnimNum(GetPlayerFacingDirection()));
StartSpriteAnim(sprite, GetFishingNoCatchDirectionAnimNum(GetPlayerFacingDirection()));
gTasks[taskId].data[0]++;
break;
case 3:
sub_805D9C4(sprite);
AlignFishingAnimationFrames(sprite);
if (sprite->animEnded)
{
if (!(gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_SURFING))
@@ -177,20 +177,20 @@ static void sub_81507BC(struct ObjectEvent * a0, u8 a1)
static void sub_81507CC(void)
{
sub_805D154(1);
CreateStopSurfingTask_NoMusicChange(1);
}
static void sub_81507D8(void)
{
sub_805D154(2);
CreateStopSurfingTask_NoMusicChange(2);
}
static void sub_81507E4(void)
{
sub_805D154(3);
CreateStopSurfingTask_NoMusicChange(3);
}
static void sub_81507F0(void)
{
sub_805D154(4);
CreateStopSurfingTask_NoMusicChange(4);
}
src/scrcmd.c
+1 -1
View File
@@ -802,7 +802,7 @@ bool8 ScrCmd_warpteleport2(struct ScriptContext * ctx)
u16 y = VarGet(ScriptReadHalfword(ctx));
SetWarpDestination(mapGroup, mapNum, warpId, x, y);
sub_805DAE4(GetPlayerFacingDirection());
SavePlayerFacingDirectionForTeleport(GetPlayerFacingDirection());
sub_807E500();
ResetInitialPlayerAvatarState();
return TRUE;
src/seagallop.c
+1 -1
View File
@@ -322,7 +322,7 @@ static void Task_Seagallop_3(void)
SetWarpDestination(warpInfo[0], warpInfo[1], -1, warpInfo[2], warpInfo[3]);
PlayRainStoppingSoundEffect();
PlaySE(SE_KAIDAN);
gFieldCallback = sub_807DF64;
gFieldCallback = FieldCB_UnionRoomWarp;
WarpIntoMap();
SetMainCallback2(CB2_LoadMap);
ResetInitialPlayerAvatarState();
src/strings.c
+3 -3
View File
@@ -1056,9 +1056,9 @@ const u8 gText_BerryCrush2[] = _("BERRY CRUSH");
const u8 gText_PressingSpeedRankings[] = _("Pressing-Speed Rankings");
const u8 gText_Var1Players[] = _("{STR_VAR_1} PLAYERS");
ALIGNED(4) const u8 gText_Ghost[] = _("GHOST");
const u8 gUnknown_841D14E[] = _("A POKéMON's on the hook!{PAUSE_UNTIL_PRESS}");
const u8 gUnknown_841D169[] = _("Not even a nibble‥{PAUSE_UNTIL_PRESS}");
const u8 gUnknown_841D17E[] = _("It got away‥{PAUSE_UNTIL_PRESS}");
const u8 gText_PokemonOnHook[] = _("A POKéMON's on the hook!{PAUSE_UNTIL_PRESS}");
const u8 gText_NotEvenANibble[] = _("Not even a nibble‥{PAUSE_UNTIL_PRESS}");
const u8 gText_ItGotAway[] = _("It got away‥{PAUSE_UNTIL_PRESS}");
const u8 gUnknown_841D18D[] = _("ROOFTOP");
ALIGNED(4) const u8 gString_PokemonFireRed_Staff[] = _("Pokémon FireRed Version\nStaff");
ALIGNED(4) const u8 gString_PokemonLeafGreen_Staff[] = _("Pokémon LeafGreen Version\nStaff");
sym_ewram.txt
+1 -14
View File
@@ -78,21 +78,8 @@ gLinkPlayerObjectEvents: @ 2031DEC
.include "src/fieldmap.o"
.align 2
.include "src/field_camera.o"
.align 2
@ .include "src/field_player_avatar.o"
gUnknown_2036E30: @ 2036E30
.space 0x4
gUnknown_2036E34: @ 2036E34
.space 0x4
gObjectEvents: @ 2036E38
.space 0x240
gPlayerAvatar: @ 2037078
.space 0x20
.include "src/field_player_avatar.o"
.align 2
.include "src/event_object_movement.o"
.align 2