diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-01-24 17:04:11 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-24 17:04:11 -0500 |
| commit | a09e66b53f61027d8805e5d6bb4df3d679693485 (patch) | |
| tree | 04a4449bf2f57e6e41cec00c7faeaaa4bffe9c2e /src | |
| parent | 85e5c57e8c86cca00e8bfc7d54e21d08c9e62e69 (diff) | |
| parent | b47094bd122b2a4dcc5ebcb86a5215d7a8cce9f7 (diff) | |
Merge pull request #238 from GriffinRichards/doc-vermilion
Document Vermilion City and SS Anne scripts
Diffstat (limited to 'src')
| -rw-r--r-- | src/fame_checker.c | 2 | ||||
| -rw-r--r-- | src/seagallop.c | 28 |
2 files changed, 22 insertions, 8 deletions
diff --git a/src/fame_checker.c b/src/fame_checker.c index b8f2c0055..6f60b4a44 100644 --- a/src/fame_checker.c +++ b/src/fame_checker.c @@ -33,7 +33,7 @@ #define SPRITETAG_QUESTION_MARK 1001 #define SPRITETAG_SPINNING_POKEBALL 1002 #define SPRITETAG_SCROLL_INDICATORS 1004 -#define SPRITETAG_DAISY 1006 +#define SPRITETAG_DAISY 1006 // TODO: Investigate, seems to be used for other NPCs (e.g. Fan Club Chairman) #define SPRITETAG_FUJI 1007 #define SPRITETAG_OAK 1008 #define SPRITETAG_BILL 1009 diff --git a/src/seagallop.c b/src/seagallop.c index 10ea97fec..aa0c48da1 100644 --- a/src/seagallop.c +++ b/src/seagallop.c @@ -176,7 +176,7 @@ static const struct SpriteTemplate sWakeSpriteTemplate = { SpriteCB_Wake }; -void ScrSpecial_SeagallopFerry(void) +void DoSeagallopFerryScene(void) { SetVBlankCallback(NULL); HelpSystem_Disable(); @@ -459,7 +459,8 @@ static bool8 GetDirectionOfTravel(void) return (sTravelDirectionMatrix[gSpecialVar_0x8004] >> gSpecialVar_0x8006) & 1; } -u8 sub_8147500(void) +// For "All aboard SEAGALLOP HI-SPEED ##" text +u8 GetSeagallopNumber(void) { u16 originId, destId; @@ -478,21 +479,34 @@ u8 sub_8147500(void) if (originId == SEAGALLOP_BIRTH_ISLAND || destId == SEAGALLOP_BIRTH_ISLAND) return 12; - if ((originId == SEAGALLOP_ONE_ISLAND || originId == SEAGALLOP_TWO_ISLAND || originId == SEAGALLOP_THREE_ISLAND) && (destId == SEAGALLOP_ONE_ISLAND || destId == SEAGALLOP_TWO_ISLAND || destId == SEAGALLOP_THREE_ISLAND)) + if ((originId == SEAGALLOP_ONE_ISLAND + || originId == SEAGALLOP_TWO_ISLAND + || originId == SEAGALLOP_THREE_ISLAND) + && (destId == SEAGALLOP_ONE_ISLAND + || destId == SEAGALLOP_TWO_ISLAND + || destId == SEAGALLOP_THREE_ISLAND)) return 2; - if ((originId == SEAGALLOP_FOUR_ISLAND || originId == SEAGALLOP_FIVE_ISLAND) && (destId == SEAGALLOP_FOUR_ISLAND || destId == SEAGALLOP_FIVE_ISLAND)) + if ((originId == SEAGALLOP_FOUR_ISLAND + || originId == SEAGALLOP_FIVE_ISLAND) + && (destId == SEAGALLOP_FOUR_ISLAND + || destId == SEAGALLOP_FIVE_ISLAND)) return 3; - if ((originId == SEAGALLOP_SIX_ISLAND || originId == SEAGALLOP_SEVEN_ISLAND) && (destId == SEAGALLOP_SIX_ISLAND || destId == SEAGALLOP_SEVEN_ISLAND)) + if ((originId == SEAGALLOP_SIX_ISLAND + || originId == SEAGALLOP_SEVEN_ISLAND) + && (destId == SEAGALLOP_SIX_ISLAND + || destId == SEAGALLOP_SEVEN_ISLAND)) return 5; return 6; } -bool8 sub_8147594(void) +bool8 IsPlayerLeftOfVermilionSailor(void) { - if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(VERMILION_CITY) && gSaveBlock1Ptr->location.mapNum == MAP_NUM(VERMILION_CITY) && gSaveBlock1Ptr->pos.x < 24) + if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(VERMILION_CITY) + && gSaveBlock1Ptr->location.mapNum == MAP_NUM(VERMILION_CITY) + && gSaveBlock1Ptr->pos.x < 24) return TRUE; return FALSE; |