diff options
133 files changed, 3968 insertions, 4107 deletions
diff --git a/asm/field_control_avatar.s b/asm/field_control_avatar.s index b74e60d1f..d036f25e2 100644 --- a/asm/field_control_avatar.s +++ b/asm/field_control_avatar.s @@ -332,7 +332,7 @@ sub_806CAC8: @ 806CAC8 movs r2, 0x2 ldrsh r1, [r4, r2] movs r2, 0xFF - bl sub_8058F48 + bl MapGridGetMetatileAttributeAt mov r8, r0 mov r0, sp movs r1, 0 @@ -798,7 +798,7 @@ sub_806CEA0: @ 806CEA0 movs r0, 0 b _0806CED2 _0806CEB8: - ldr r0, _0806CED8 @ =gUnknown_8168CE4 + ldr r0, _0806CED8 @ =PalletTown_PlayersHouse_2F_EventScript_PC cmp r4, r0 beq _0806CECA ldr r0, _0806CEDC @ =EventScript_PC @@ -815,7 +815,7 @@ _0806CED2: pop {r1} bx r1 .align 2, 0 -_0806CED8: .4byte gUnknown_8168CE4 +_0806CED8: .4byte PalletTown_PlayersHouse_2F_EventScript_PC _0806CEDC: .4byte EventScript_PC thumb_func_end sub_806CEA0 diff --git a/asm/field_effect.s b/asm/field_effect.s index 64ef0ae18..91ea68461 100644 --- a/asm/field_effect.s +++ b/asm/field_effect.s @@ -2629,7 +2629,7 @@ sub_80847F8: @ 80847F8 bl FreezeObjectEvents bl CameraObjectReset2 ldrb r0, [r4, 0xA] - bl sub_809C448 + bl StartEscalator movs r0, 0x1 bl sub_81128BC ldrh r0, [r4, 0x8] @@ -2859,7 +2859,7 @@ sub_80849A0: @ 80849A0 lsrs r0, 24 cmp r0, 0x1 bne _080849DC - bl sub_809C460 + bl StopEscalator bl WarpIntoMap ldr r1, _080849E4 @ =gFieldCallback ldr r0, _080849E8 @ =sub_80849F4 @@ -2984,7 +2984,7 @@ _08084AC4: movs r1, 0 _08084AC6: adds r0, r1, 0 - bl sub_809C448 + bl StartEscalator movs r0, 0x1 add sp, 0x4 pop {r4,r5} @@ -3163,11 +3163,11 @@ _08084C14: .4byte gSprites sub_8084C18: @ 8084C18 push {r4,lr} adds r4, r0, 0 - bl sub_809C474 + bl IsEscalatorMoving lsls r0, 24 cmp r0, 0 bne _08084C34 - bl sub_809C460 + bl StopEscalator ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] diff --git a/asm/field_player_avatar.s b/asm/field_player_avatar.s index 5510caceb..6e425d2c7 100644 --- a/asm/field_player_avatar.s +++ b/asm/field_player_avatar.s @@ -2921,7 +2921,7 @@ IsPlayerFacingSurfableFishableWater: @ 805C8B0 ldrsh r0, [r0, r1] movs r2, 0 ldrsh r1, [r5, r2] - bl sub_805C938 + bl MetatileAtCoordsIsWaterTile lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -2940,24 +2940,24 @@ _0805C92E: bx r1 thumb_func_end IsPlayerFacingSurfableFishableWater - thumb_func_start sub_805C938 -sub_805C938: @ 805C938 + thumb_func_start MetatileAtCoordsIsWaterTile +MetatileAtCoordsIsWaterTile: @ 805C938 push {lr} lsls r0, 16 asrs r0, 16 lsls r1, 16 asrs r1, 16 movs r2, 0x1 - bl sub_8058F48 + bl MapGridGetMetatileAttributeAt lsls r0, 24 lsrs r0, 24 movs r1, 0x2 - bl sub_805A2BC + bl TestMetatileAttributeBit lsls r0, 24 lsrs r0, 24 pop {r1} bx r1 - thumb_func_end sub_805C938 + thumb_func_end MetatileAtCoordsIsWaterTile thumb_func_start ClearPlayerAvatarInfo ClearPlayerAvatarInfo: @ 805C95C diff --git a/asm/fldeff_cut.s b/asm/fldeff_cut.s deleted file mode 100644 index c0266194e..000000000 --- a/asm/fldeff_cut.s +++ /dev/null @@ -1,535 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .syntax unified - - .text - - thumb_func_start sub_8097874 -sub_8097874: @ 8097874 - push {lr} - lsls r0, 16 - asrs r0, 16 - lsls r1, 16 - asrs r1, 16 - movs r2, 0x1 - bl sub_8058F48 - lsls r0, 24 - lsrs r0, 24 - movs r1, 0x1 - bl sub_805A2BC - lsls r0, 24 - lsrs r0, 24 - pop {r1} - bx r1 - thumb_func_end sub_8097874 - - thumb_func_start SetUpFieldMove_Cut -SetUpFieldMove_Cut: @ 8097898 - push {r4-r7,lr} - mov r7, r8 - push {r7} - sub sp, 0x4 - ldr r4, _080978CC @ =gUnknown_2039874 - movs r0, 0 - strb r0, [r4] - bl CutMoveRuinValleyCheck - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - beq _080978E0 - movs r0, 0x5F - bl CheckObjectGraphicsInFrontOfPlayer - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - bne _08097904 - ldr r1, _080978D0 @ =gFieldCallback2 - ldr r0, _080978D4 @ =FieldCallback_PrepareFadeInFromMenu - str r0, [r1] - ldr r1, _080978D8 @ =gPostMenuFieldCallback - ldr r0, _080978DC @ =sub_80979D0 - b _080978EC - .align 2, 0 -_080978CC: .4byte gUnknown_2039874 -_080978D0: .4byte gFieldCallback2 -_080978D4: .4byte FieldCallback_PrepareFadeInFromMenu -_080978D8: .4byte gPostMenuFieldCallback -_080978DC: .4byte sub_80979D0 -_080978E0: - strb r0, [r4] -_080978E2: - ldr r1, _080978F4 @ =gFieldCallback2 - ldr r0, _080978F8 @ =FieldCallback_PrepareFadeInFromMenu - str r0, [r1] - ldr r1, _080978FC @ =gPostMenuFieldCallback - ldr r0, _08097900 @ =sub_8097984 -_080978EC: - str r0, [r1] - movs r0, 0x1 - b _08097970 - .align 2, 0 -_080978F4: .4byte gFieldCallback2 -_080978F8: .4byte FieldCallback_PrepareFadeInFromMenu -_080978FC: .4byte gPostMenuFieldCallback -_08097900: .4byte sub_8097984 -_08097904: - ldr r4, _0809797C @ =gPlayerFacingPosition - adds r1, r4, 0x2 - adds r0, r4, 0 - bl PlayerGetDestCoords - movs r7, 0 - adds r2, r4, 0 - ldr r0, _08097980 @ =0x0000ffff - mov r8, r0 -_08097916: - mov r1, r8 - adds r0, r1, r7 - ldrh r1, [r2, 0x2] - adds r0, r1 - movs r6, 0 - lsls r0, 16 - asrs r5, r0, 16 -_08097924: - mov r1, r8 - adds r0, r1, r6 - ldrh r1, [r2] - adds r0, r1 - lsls r0, 16 - asrs r4, r0, 16 - adds r0, r4, 0 - adds r1, r5, 0 - str r2, [sp] - bl MapGridGetZCoordAt - lsls r0, 24 - lsrs r0, 24 - ldr r2, [sp] - movs r1, 0x4 - ldrsb r1, [r2, r1] - cmp r0, r1 - bne _0809795A - adds r0, r4, 0 - adds r1, r5, 0 - bl sub_8097874 - lsls r0, 24 - lsrs r0, 24 - ldr r2, [sp] - cmp r0, 0x1 - beq _080978E2 -_0809795A: - adds r0, r6, 0x1 - lsls r0, 24 - lsrs r6, r0, 24 - cmp r6, 0x2 - bls _08097924 - adds r0, r7, 0x1 - lsls r0, 24 - lsrs r7, r0, 24 - cmp r7, 0x2 - bls _08097916 - movs r0, 0 -_08097970: - add sp, 0x4 - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r1} - bx r1 - .align 2, 0 -_0809797C: .4byte gPlayerFacingPosition -_08097980: .4byte 0x0000ffff - thumb_func_end SetUpFieldMove_Cut - - thumb_func_start sub_8097984 -sub_8097984: @ 8097984 - push {lr} - movs r0, 0x1 - bl FieldEffectStart - bl GetCursorSelectionMonId - ldr r1, _0809799C @ =gFieldEffectArguments - lsls r0, 24 - lsrs r0, 24 - str r0, [r1] - pop {r0} - bx r0 - .align 2, 0 -_0809799C: .4byte gFieldEffectArguments - thumb_func_end sub_8097984 - - thumb_func_start sub_80979A0 -sub_80979A0: @ 80979A0 - push {lr} - bl oei_task_add - lsls r0, 24 - lsrs r0, 24 - ldr r2, _080979C8 @ =gTasks - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - adds r1, r2 - ldr r2, _080979CC @ =sub_8097A20 - lsrs r0, r2, 16 - strh r0, [r1, 0x18] - strh r2, [r1, 0x1A] - movs r0, 0x12 - bl IncrementGameStat - movs r0, 0 - pop {r1} - bx r1 - .align 2, 0 -_080979C8: .4byte gTasks -_080979CC: .4byte sub_8097A20 - thumb_func_end sub_80979A0 - - thumb_func_start sub_80979D0 -sub_80979D0: @ 80979D0 - push {lr} - bl GetCursorSelectionMonId - ldr r1, _080979E8 @ =gFieldEffectArguments - lsls r0, 24 - lsrs r0, 24 - str r0, [r1] - ldr r0, _080979EC @ =EventScript_FldEffCut - bl ScriptContext1_SetupScript - pop {r0} - bx r0 - .align 2, 0 -_080979E8: .4byte gFieldEffectArguments -_080979EC: .4byte EventScript_FldEffCut - thumb_func_end sub_80979D0 - - thumb_func_start sub_80979F0 -sub_80979F0: @ 80979F0 - push {lr} - bl oei_task_add - lsls r0, 24 - lsrs r0, 24 - ldr r2, _08097A18 @ =gTasks - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - adds r1, r2 - ldr r2, _08097A1C @ =sub_8097C6C - lsrs r0, r2, 16 - strh r0, [r1, 0x18] - strh r2, [r1, 0x1A] - movs r0, 0x12 - bl IncrementGameStat - movs r0, 0 - pop {r1} - bx r1 - .align 2, 0 -_08097A18: .4byte gTasks -_08097A1C: .4byte sub_8097C6C - thumb_func_end sub_80979F0 - - thumb_func_start sub_8097A20 -sub_8097A20: @ 8097A20 - push {lr} - movs r0, 0x1 - bl FieldEffectActiveListRemove - ldr r0, _08097A38 @ =gUnknown_2039874 - ldrb r0, [r0] - cmp r0, 0x1 - bne _08097A3C - bl CutMoveOpenDottedHoleDoor - b _08097A42 - .align 2, 0 -_08097A38: .4byte gUnknown_2039874 -_08097A3C: - movs r0, 0x3A - bl FieldEffectStart -_08097A42: - pop {r0} - bx r0 - thumb_func_end sub_8097A20 - - thumb_func_start sub_8097A48 -sub_8097A48: @ 8097A48 - push {r4-r7,lr} - mov r7, r9 - mov r6, r8 - push {r6,r7} - movs r7, 0 - movs r0, 0x79 - bl PlaySE - ldr r4, _08097B38 @ =gPlayerFacingPosition - adds r1, r4, 0x2 - adds r0, r4, 0 - bl PlayerGetDestCoords - mov r8, r4 - ldr r0, _08097B3C @ =0x0000ffff - mov r9, r0 -_08097A68: - mov r1, r9 - adds r0, r1, r7 - mov r2, r8 - ldrh r2, [r2, 0x2] - adds r0, r2 - movs r6, 0 - lsls r0, 16 - asrs r5, r0, 16 -_08097A78: - mov r1, r9 - adds r0, r1, r6 - mov r2, r8 - ldrh r2, [r2] - adds r0, r2 - lsls r0, 16 - asrs r4, r0, 16 - adds r0, r4, 0 - adds r1, r5, 0 - bl MapGridGetZCoordAt - lsls r0, 24 - lsrs r0, 24 - mov r2, r8 - movs r1, 0x4 - ldrsb r1, [r2, r1] - cmp r0, r1 - bne _08097ABC - adds r0, r4, 0 - adds r1, r5, 0 - bl sub_8097874 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - bne _08097ABC - adds r0, r4, 0 - adds r1, r5, 0 - bl sub_8097B50 - adds r0, r4, 0 - adds r1, r5, 0 - bl sub_805F378 -_08097ABC: - adds r0, r6, 0x1 - lsls r0, 24 - lsrs r6, r0, 24 - cmp r6, 0x2 - bls _08097A78 - adds r0, r7, 0x1 - lsls r0, 24 - lsrs r7, r0, 24 - cmp r7, 0x2 - bls _08097A68 - bl DrawWholeMapView - ldr r4, _08097B40 @ =gUnknown_2039870 - movs r0, 0x8 - bl Alloc - str r0, [r4] - movs r7, 0 - ldr r5, _08097B44 @ =gSprites -_08097AE2: - ldr r0, _08097B48 @ =gPlayerAvatar - ldrb r1, [r0, 0x4] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r5 - ldrh r1, [r0, 0x2] - lsls r1, 23 - lsrs r1, 7 - movs r2, 0x80 - lsls r2, 12 - adds r1, r2 - asrs r1, 16 - ldrb r2, [r0] - adds r2, 0x14 - ldr r0, _08097B4C @ =gUnknown_83D414C - movs r3, 0 - bl CreateSprite - ldr r1, [r4] - adds r1, r7 - strb r0, [r1] - ldr r0, [r4] - adds r0, r7 - ldrb r1, [r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r5 - lsls r1, r7, 5 - strh r1, [r0, 0x32] - adds r0, r7, 0x1 - lsls r0, 24 - lsrs r7, r0, 24 - cmp r7, 0x7 - bls _08097AE2 - movs r0, 0 - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r7} - pop {r1} - bx r1 - .align 2, 0 -_08097B38: .4byte gPlayerFacingPosition -_08097B3C: .4byte 0x0000ffff -_08097B40: .4byte gUnknown_2039870 -_08097B44: .4byte gSprites -_08097B48: .4byte gPlayerAvatar -_08097B4C: .4byte gUnknown_83D414C - thumb_func_end sub_8097A48 - - thumb_func_start sub_8097B50 -sub_8097B50: @ 8097B50 - push {r4-r7,lr} - lsls r0, 16 - lsls r1, 16 - movs r4, 0 - lsrs r6, r0, 16 - asrs r0, 16 - lsrs r7, r1, 16 - asrs r1, 16 - bl MapGridGetMetatileIdAt - lsls r0, 16 - lsrs r2, r0, 16 - ldr r1, _08097B84 @ =gUnknown_83D4100 - ldr r5, _08097B88 @ =0x0000ffff - mov r12, r1 -_08097B6E: - lsls r3, r4, 2 - adds r0, r3, r1 - ldrh r0, [r0] - cmp r0, r5 - beq _08097BA0 - cmp r0, r2 - beq _08097B8C - adds r0, r4, 0x1 - lsls r0, 16 - lsrs r4, r0, 16 - b _08097B6E - .align 2, 0 -_08097B84: .4byte gUnknown_83D4100 -_08097B88: .4byte 0x0000ffff -_08097B8C: - lsls r0, r6, 16 - asrs r0, 16 - lsls r1, r7, 16 - asrs r1, 16 - mov r2, r12 - adds r2, 0x2 - adds r2, r3, r2 - ldrh r2, [r2] - bl MapGridSetMetatileIdAt -_08097BA0: - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end sub_8097B50 - - thumb_func_start objc_8097BA8 -objc_8097BA8: @ 8097BA8 - movs r2, 0 - movs r1, 0x8 - strh r1, [r0, 0x2E] - strh r2, [r0, 0x30] - strh r2, [r0, 0x34] - ldr r1, _08097BB8 @ =objc_8097BBC - str r1, [r0, 0x1C] - bx lr - .align 2, 0 -_08097BB8: .4byte objc_8097BBC - thumb_func_end objc_8097BA8 - - thumb_func_start objc_8097BBC -objc_8097BBC: @ 8097BBC - push {r4,lr} - adds r4, r0, 0 - movs r1, 0x32 - ldrsh r0, [r4, r1] - movs r2, 0x2E - ldrsh r1, [r4, r2] - bl Sin - strh r0, [r4, 0x24] - movs r1, 0x32 - ldrsh r0, [r4, r1] - movs r2, 0x2E - ldrsh r1, [r4, r2] - bl Cos - strh r0, [r4, 0x26] - ldrh r0, [r4, 0x32] - adds r0, 0x8 - movs r1, 0xFF - ands r0, r1 - strh r0, [r4, 0x32] - ldrh r1, [r4, 0x2E] - adds r1, 0x1 - ldrh r2, [r4, 0x34] - lsls r0, r2, 16 - asrs r0, 18 - adds r1, r0 - strh r1, [r4, 0x2E] - adds r2, 0x1 - strh r2, [r4, 0x34] - ldrh r1, [r4, 0x30] - movs r2, 0x30 - ldrsh r0, [r4, r2] - cmp r0, 0x1C - beq _08097C08 - adds r0, r1, 0x1 - strh r0, [r4, 0x30] - b _08097C0C -_08097C08: - ldr r0, _08097C14 @ =sub_8097C18 - str r0, [r4, 0x1C] -_08097C0C: - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_08097C14: .4byte sub_8097C18 - thumb_func_end objc_8097BBC - - thumb_func_start sub_8097C18 -sub_8097C18: @ 8097C18 - push {r4-r6,lr} - movs r4, 0x1 -_08097C1C: - ldr r6, _08097C64 @ =gUnknown_2039870 - ldr r0, [r6] - adds r0, r4 - ldrb r1, [r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - ldr r5, _08097C68 @ =gSprites - adds r0, r5 - bl DestroySprite - adds r0, r4, 0x1 - lsls r0, 24 - lsrs r4, r0, 24 - cmp r4, 0x7 - bls _08097C1C - ldr r0, [r6] - ldrb r1, [r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r5 - movs r1, 0x3A - bl FieldEffectStop - ldr r0, [r6] - bl Free - bl sub_80696C0 - bl ScriptContext2_Disable - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_08097C64: .4byte gUnknown_2039870 -_08097C68: .4byte gSprites - thumb_func_end sub_8097C18 - - thumb_func_start sub_8097C6C -sub_8097C6C: @ 8097C6C - push {lr} - movs r0, 0x79 - bl PlaySE - movs r0, 0x2 - bl FieldEffectActiveListRemove - bl EnableBothScriptContexts - pop {r0} - bx r0 - thumb_func_end sub_8097C6C - - .align 2, 0 @ Don't pad with nop. diff --git a/asm/fldeff_flash.s b/asm/fldeff_flash.s index f550d2291..c6cc17f82 100644 --- a/asm/fldeff_flash.s +++ b/asm/fldeff_flash.s @@ -42,7 +42,7 @@ _080C9B6E: thumb_func_start sub_80C9B74 sub_80C9B74: @ 80C9B74 push {r4,lr} - bl oei_task_add + bl CreateFieldEffectShowMon adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 diff --git a/data/event_scripts.s b/data/event_scripts.s index f66b4da77..c088f893d 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1330,16 +1330,14 @@ EventScript_SetResultFalse:: @ 81A77B0 setvar VAR_RESULT, FALSE return -Route16_NorthEntrance_1F_EventScript_1A77B6:: @ 81A77B6 -Route18_EastEntrance_1F_EventScript_1A77B6:: @ 81A77B6 +EventScript_SetExitingCyclingRoad:: @ 81A77B6 lockall clearflag FLAG_SYS_ON_CYCLING_ROAD setvar VAR_MAP_SCENE_ROUTE16, 0 releaseall end -Route16_NorthEntrance_1F_EventScript_1A77C1:: @ 81A77C1 -Route18_EastEntrance_1F_EventScript_1A77C1:: @ 81A77C1 +EventScript_SetEnteringCyclingRoad:: @ 81A77C1 lockall setvar VAR_MAP_SCENE_ROUTE16, 1 releaseall @@ -1619,34 +1617,7 @@ Text_1ACD45:: @ 81ACD45 .include "data/scripts/fame_checker.inc" .include "data/text/fame_checker.inc" - -gUnknown_81B1C8B:: @ 81B1C8B - .string "Hmm…\n" - .string "Is that right…$" - -gUnknown_81B1C9F:: @ 81B1C9F - .string "Oh!\n" - .string "Look, look!$" - -gUnknown_81B1CAF:: @ 81B1CAF - .string "Read it, read it!$" - -gUnknown_81B1CC1:: @ 81B1CC1 - .string "TRAINER TIPS\p" - .string "Press START to open the MENU!$" - -gUnknown_81B1CEC:: @ 81B1CEC - .string "Signs are useful, aren't they?$" - -gUnknown_81B1D0B:: @ 81B1D0B - .string "Look, look!\p" - .string "I copied what it said on one of\n" - .string "those TRAINER TIPS signs!$" - -gUnknown_81B1D51:: @ 81B1D51 - .string "TRAINER TIPS!\p" - .string "Press START to open the MENU!$" - + .include "data/text/sign_lady.inc" .include "data/text/trainer_card.inc" .include "data/scripts/trainer_card.inc" .include "data/text/help_system.inc" diff --git a/data/field_effect_scripts.s b/data/field_effect_scripts.s index de50ed39d..cac76bea9 100644 --- a/data/field_effect_scripts.s +++ b/data/field_effect_scripts.s @@ -78,11 +78,11 @@ gFldEffScript_ExclamationMarkIcon:: @ 81D97C4 end gFldEffScript_UseCutOnGrass:: @ 81D97CA - callnative sub_80979A0 + callnative FldEff_UseCutOnGrass end gFldEffScript_UseCutOnTree:: @ 81D97D0 - callnative sub_80979F0 + callnative FldEff_UseCutOnTree end gFldEffScript_Shadow:: @ 81D97D6 @@ -299,7 +299,7 @@ gFldEffScript_SecretPowerShrub:: @ 81D9964 end gFldEffScript_CutGrass:: @ 81D9965 - loadfadedpal_callnative gUnknown_83D4144, sub_8097A48 + loadfadedpal_callnative gFldEffPalette_CutGrass, FldEff_CutGrass end gFldEffScript_FieldMoveShowMonInit:: @ 81D996F diff --git a/data/fldeff_cut.s b/data/fldeff_cut.s deleted file mode 100644 index ca25b396a..000000000 --- a/data/fldeff_cut.s +++ /dev/null @@ -1,40 +0,0 @@ -#include "constants/maps.h" -#include "constants/species.h" - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - .align 2 - -gUnknown_83D4100:: @ 83D4100 - .2byte 0x000d, 0x0001 - .2byte 0x000a, 0x0013 - .2byte 0x000b, 0x000e - .2byte 0x000c, 0x000f - .2byte 0x0352, 0x033e - .2byte 0x0300, 0x0310 - .2byte 0x0301, 0x0311 - .2byte 0x0302, 0x0312 - .2byte 0x0284, 0x0281 - .2byte 0xffff, 0xffff - - .align 2 -gOamData_83D4128:: - .4byte 0x00000000, 0x00001401 - -gAnimCmd_83D4130:: - obj_image_anim_frame 0, 30 - obj_image_anim_jump 0 - -gSpriteAnimTable_83D4138:: - .4byte gAnimCmd_83D4130 - -gUnknown_83D413C:: - obj_frame_tiles gUnknown_8398648, 0x20 - -gUnknown_83D4144:: - obj_pal gUnknown_8398688, 4096 - -gUnknown_83D414C:: @ 83D414C - spr_template 0xFFFF, 4096, gOamData_83D4128, gSpriteAnimTable_83D4138, gUnknown_83D413C, gDummySpriteAffineAnimTable, objc_8097BA8 - diff --git a/data/maps/OneIsland/map.json b/data/maps/OneIsland/map.json index 0fa530aa2..cc27f84cb 100644 --- a/data/maps/OneIsland/map.json +++ b/data/maps/OneIsland/map.json @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "OneIsland_EventScript_167517", + "script": "OneIsland_EventScript_OldMan", "flag": "0" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "OneIsland_EventScript_167549", + "script": "OneIsland_EventScript_BaldingMan", "flag": "0" } ], @@ -103,14 +103,14 @@ "x": 14, "y": 13, "elevation": 0, - "script": "OneIsland_EventScript_167552" + "script": "OneIsland_EventScript_IslandSign" }, { "type": "bg_event_type_0", "x": 15, "y": 6, "elevation": 0, - "script": "OneIsland_EventScript_16755B" + "script": "OneIsland_EventScript_PokemonNetCenterSign" } ] } diff --git a/data/maps/OneIsland/scripts.inc b/data/maps/OneIsland/scripts.inc index 545a3d333..a474b19a8 100644 --- a/data/maps/OneIsland/scripts.inc +++ b/data/maps/OneIsland/scripts.inc @@ -1,3 +1,5 @@ +.equ LOCALID_BILL, 1 + OneIsland_MapScripts:: @ 8167484 map_script MAP_SCRIPT_ON_TRANSITION, OneIsland_OnTransition map_script MAP_SCRIPT_ON_FRAME_TABLE, OneIsland_OnFrame @@ -8,35 +10,34 @@ OneIsland_OnTransition:: @ 816748F end OneIsland_OnFrame:: @ 8167493 - map_script_2 VAR_MAP_SCENE_ONE_ISLAND_HARBOR, 2, EventScript_16749D + map_script_2 VAR_MAP_SCENE_ONE_ISLAND_HARBOR, 2, OneIsland_EventScript_EnterOneIslandFirstTime .2byte 0 -EventScript_16749D:: @ 816749D +OneIsland_EventScript_EnterOneIslandFirstTime:: @ 816749D lockall textcolor 0 - applymovement OBJ_EVENT_ID_PLAYER, Movement_167505 + applymovement OBJ_EVENT_ID_PLAYER, OneIsland_Movement_PlayerExitHarbor waitmovement 0 - msgbox gUnknown_818161B + msgbox OneIsland_Text_BillLetsGoSeeCelio closemessage - applymovement 1, Movement_167507 - applymovement OBJ_EVENT_ID_PLAYER, Movement_1674F4 + applymovement LOCALID_BILL, OneIsland_Movement_BillWalkToPokeCenter + applymovement OBJ_EVENT_ID_PLAYER, OneIsland_Movement_PlayerWalkToPokeCenter waitmovement 0 opendoor 14, 5 waitdooranim - applymovement 1, Movement_167514 - applymovement OBJ_EVENT_ID_PLAYER, Movement_167501 + applymovement LOCALID_BILL, OneIsland_Movement_BillEnterPokeCenter + applymovement OBJ_EVENT_ID_PLAYER, OneIsland_Movement_PlayerEnterPokeCenter waitmovement 0 closedoor 14, 5 waitdooranim - removeobject 1 + removeobject LOCALID_BILL setvar VAR_MAP_SCENE_ONE_ISLAND_HARBOR, 3 warp MAP_ONE_ISLAND_POKEMON_CENTER_1F, 255, 9, 9 waitstate releaseall end -Movement_1674F4:: @ 81674F4 - walk_up + .macro walk_to_pokecenter walk_up walk_up walk_up @@ -48,65 +49,60 @@ Movement_1674F4:: @ 81674F4 walk_up walk_up walk_up + .endm + +OneIsland_Movement_PlayerWalkToPokeCenter:: @ 81674F4 + walk_up + walk_to_pokecenter step_end -Movement_167501:: @ 8167501 +OneIsland_Movement_PlayerEnterPokeCenter:: @ 8167501 walk_up walk_up set_invisible step_end -Movement_167505:: @ 8167505 +OneIsland_Movement_PlayerExitHarbor:: @ 8167505 walk_up step_end -Movement_167507:: @ 8167507 - walk_up - walk_up - walk_up - walk_up - walk_right - walk_right - walk_up - walk_up - walk_up - walk_up - walk_up +OneIsland_Movement_BillWalkToPokeCenter:: @ 8167507 + walk_to_pokecenter walk_up step_end -Movement_167514:: @ 8167514 +OneIsland_Movement_BillEnterPokeCenter:: @ 8167514 walk_up set_invisible step_end -OneIsland_EventScript_167517:: @ 8167517 +OneIsland_EventScript_OldMan:: @ 8167517 lock faceplayer - goto_if_set FLAG_SYS_CAN_LINK_WITH_RS, EventScript_16753F - goto_if_set FLAG_SEVII_DETOUR_FINISHED, EventScript_167535 - msgbox gUnknown_818174E + goto_if_set FLAG_SYS_CAN_LINK_WITH_RS, OneIsland_EventScript_OldManLinkHoenn + goto_if_set FLAG_SEVII_DETOUR_FINISHED, OneIsland_EventScript_OldManLinkKanto + msgbox OneIsland_Text_LuckyToHaveCelioHere release end -EventScript_167535:: @ 8167535 - msgbox gUnknown_8181858 +OneIsland_EventScript_OldManLinkKanto:: @ 8167535 + msgbox OneIsland_Text_HavePCLinkageWithKanto release end -EventScript_16753F:: @ 816753F - msgbox gUnknown_8181901 +OneIsland_EventScript_OldManLinkHoenn:: @ 816753F + msgbox OneIsland_Text_HavePCLinkageWithHoenn release end -OneIsland_EventScript_167549:: @ 8167549 - msgbox gUnknown_8181A4A, MSGBOX_NPC +OneIsland_EventScript_BaldingMan:: @ 8167549 + msgbox OneIsland_Text_IsntWarmClimateHereGreat, MSGBOX_NPC end -OneIsland_EventScript_167552:: @ 8167552 - msgbox gUnknown_81819E1, MSGBOX_SIGN +OneIsland_EventScript_IslandSign:: @ 8167552 + msgbox OneIsland_Text_IslandSign, MSGBOX_SIGN end -OneIsland_EventScript_16755B:: @ 816755B - msgbox gUnknown_8181A0A, MSGBOX_SIGN +OneIsland_EventScript_PokemonNetCenterSign:: @ 816755B + msgbox OneIsland_Text_PokemonNetCenterSign, MSGBOX_SIGN end diff --git a/data/maps/OneIsland/text.inc b/data/maps/OneIsland/text.inc index d9a6e376a..5f49a4a5c 100644 --- a/data/maps/OneIsland/text.inc +++ b/data/maps/OneIsland/text.inc @@ -1,4 +1,4 @@ -gUnknown_818161B:: @ 818161B +OneIsland_Text_BillLetsGoSeeCelio:: @ 818161B .string "BILL: Here we are!\n" .string "This is ONE ISLAND.\p" .string "There are several islands around\n" @@ -14,7 +14,7 @@ Text_WhereDoYouWantToSail:: @ 8181726 .string "Ahoy, there!\n" .string "Where do you want to sail?$" -gUnknown_818174E:: @ 818174E +OneIsland_Text_LuckyToHaveCelioHere:: @ 818174E .string "Here we are on an island smack in\n" .string "the middle of nowhere.\p" .string "We're lucky to have an upstanding\n" @@ -26,7 +26,7 @@ gUnknown_818174E:: @ 818174E .string "I'm not sure what that means, but\n" .string "CELIO is quite the man!$" -gUnknown_8181858:: @ 8181858 +OneIsland_Text_HavePCLinkageWithKanto:: @ 8181858 .string "My granddaughter was in a tizzy\n" .string "over a new breakthrough.\p" .string "She said we now have PC linkage\n" @@ -34,7 +34,7 @@ gUnknown_8181858:: @ 8181858 .string "I'm not sure what that means, but\n" .string "CELIO is quite the man!$" -gUnknown_8181901:: @ 8181901 +OneIsland_Text_HavePCLinkageWithHoenn:: @ 8181901 .string "My granddaughter was in a tizzy\n" .string "over a new breakthrough.\p" .string "She said we finally have PC linkage\n" @@ -44,18 +44,19 @@ gUnknown_8181901:: @ 8181901 .string "He would make a fine husband for\n" .string "my granddaughter!$" -gUnknown_81819E1:: @ 81819E1 +OneIsland_Text_IslandSign:: @ 81819E1 .string "ONE ISLAND\n" .string "Friends Gather at Knot Island$" -gUnknown_8181A0A:: @ 8181A0A +OneIsland_Text_PokemonNetCenterSign:: @ 8181A0A .string "Expanding the POKéMON World!\n" .string "POKéMON NET CENTER$" -Text_181A3A:: @ 8181A3A +@ Unused +OneIsland_Text_ReturnToCinnabar:: @ 8181A3A .string "グレンタウンに もどりますか？$" -gUnknown_8181A4A:: @ 8181A4A +OneIsland_Text_IsntWarmClimateHereGreat:: @ 8181A4A .string "Hi, sight-seeing, are you?\n" .string "Isn't the warm climate here great?$" diff --git a/data/maps/OneIsland_Harbor/map.json b/data/maps/OneIsland_Harbor/map.json index fd3210c7e..a6ae42fa8 100644 --- a/data/maps/OneIsland_Harbor/map.json +++ b/data/maps/OneIsland_Harbor/map.json @@ -38,7 +38,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "OneIsland_Harbor_EventScript_1713BD", + "script": "OneIsland_Harbor_EventScript_Sailor", "flag": "0" } ], diff --git a/data/maps/OneIsland_Harbor/scripts.inc b/data/maps/OneIsland_Harbor/scripts.inc index bbbe36fb9..af6fe7ca5 100644 --- a/data/maps/OneIsland_Harbor/scripts.inc +++ b/data/maps/OneIsland_Harbor/scripts.inc @@ -4,21 +4,21 @@ OneIsland_Harbor_MapScripts:: @ 8171378 .byte 0 OneIsland_Harbor_OnWarp:: @ 8171383 - map_script_2 VAR_MAP_SCENE_ONE_ISLAND_HARBOR, 1, EventScript_17138D + map_script_2 VAR_MAP_SCENE_ONE_ISLAND_HARBOR, 1, OneIsland_Harbor_EventScript_TurnPlayerNorth .2byte 0 -EventScript_17138D:: @ 817138D +OneIsland_Harbor_EventScript_TurnPlayerNorth:: @ 817138D turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH end OneIsland_Harbor_OnFrame:: @ 8171392 - map_script_2 VAR_MAP_SCENE_ONE_ISLAND_HARBOR, 1, EventScript_17139C + map_script_2 VAR_MAP_SCENE_ONE_ISLAND_HARBOR, 1, OneIsland_Harbor_EventScript_PlayerEnterHarborFirstTime .2byte 0 -EventScript_17139C:: @ 817139C +OneIsland_Harbor_EventScript_PlayerEnterHarborFirstTime:: @ 817139C lockall textcolor 0 - applymovement OBJ_EVENT_ID_PLAYER, Movement_1713B9 + applymovement OBJ_EVENT_ID_PLAYER, OneIsland_Harbor_Movement_PlayerExitHarbor waitmovement 0 setvar VAR_MAP_SCENE_ONE_ISLAND_HARBOR, 2 warp MAP_ONE_ISLAND, 255, 12, 18 @@ -26,13 +26,13 @@ EventScript_17139C:: @ 817139C releaseall end -Movement_1713B9:: @ 81713B9 +OneIsland_Harbor_Movement_PlayerExitHarbor:: @ 81713B9 walk_up walk_up walk_up step_end -OneIsland_Harbor_EventScript_1713BD:: @ 81713BD +OneIsland_Harbor_EventScript_Sailor:: @ 81713BD lock faceplayer message Text_WhereDoYouWantToSail diff --git a/data/maps/OneIsland_House1/map.json b/data/maps/OneIsland_House1/map.json index 6a8f21cfc..ced35430e 100644 --- a/data/maps/OneIsland_House1/map.json +++ b/data/maps/OneIsland_House1/map.json @@ -25,7 +25,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "OneIsland_House1_EventScript_17135C", + "script": "OneIsland_House1_EventScript_OldMan", "flag": "0" }, { @@ -38,7 +38,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "OneIsland_House1_EventScript_171365", + "script": "OneIsland_House1_EventScript_OldWoman", "flag": "0" } ], diff --git a/data/maps/OneIsland_House1/scripts.inc b/data/maps/OneIsland_House1/scripts.inc index 172f5f4a9..7a11eaa72 100644 --- a/data/maps/OneIsland_House1/scripts.inc +++ b/data/maps/OneIsland_House1/scripts.inc @@ -1,10 +1,10 @@ OneIsland_House1_MapScripts:: @ 817135B .byte 0 -OneIsland_House1_EventScript_17135C:: @ 817135C - msgbox gUnknown_81A2332, MSGBOX_NPC +OneIsland_House1_EventScript_OldMan:: @ 817135C + msgbox OneIsland_House1_Text_GazeUponVolcanoOnSunnyDays, MSGBOX_NPC end -OneIsland_House1_EventScript_171365:: @ 8171365 - msgbox gUnknown_81A2380, MSGBOX_NPC +OneIsland_House1_EventScript_OldWoman:: @ 8171365 + msgbox OneIsland_House1_Text_LastTimeMtEmberErupted, MSGBOX_NPC end diff --git a/data/maps/OneIsland_House1/text.inc b/data/maps/OneIsland_House1/text.inc index a050b31b0..09734127c 100644 --- a/data/maps/OneIsland_House1/text.inc +++ b/data/maps/OneIsland_House1/text.inc @@ -1,9 +1,9 @@ -gUnknown_81A2332:: @ 81A2332 +OneIsland_House1_Text_GazeUponVolcanoOnSunnyDays:: @ 81A2332 .string "On sunny days, I step out and gaze\n" .string "upon the volcano.\p" .string "That's my daily routine.$" -gUnknown_81A2380:: @ 81A2380 +OneIsland_House1_Text_LastTimeMtEmberErupted:: @ 81A2380 .string "Let me think… When was the last\n" .string "time MT. EMBER erupted?$" diff --git a/data/maps/OneIsland_House2/map.json b/data/maps/OneIsland_House2/map.json index c9ce2a7b0..a715328ef 100644 --- a/data/maps/OneIsland_House2/map.json +++ b/data/maps/OneIsland_House2/map.json @@ -25,7 +25,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "OneIsland_House2_EventScript_17136F", + "script": "OneIsland_House2_EventScript_Lass", "flag": "0" } ], diff --git a/data/maps/OneIsland_House2/scripts.inc b/data/maps/OneIsland_House2/scripts.inc index 0b1761475..e69c5b41e 100644 --- a/data/maps/OneIsland_House2/scripts.inc +++ b/data/maps/OneIsland_House2/scripts.inc @@ -1,6 +1,6 @@ OneIsland_House2_MapScripts:: @ 817136E .byte 0 -OneIsland_House2_EventScript_17136F:: @ 817136F - msgbox gUnknown_81A23B8, MSGBOX_NPC +OneIsland_House2_EventScript_Lass:: @ 817136F + msgbox OneIsland_House2_Text_IWantToStayHereForever, MSGBOX_NPC end diff --git a/data/maps/OneIsland_House2/text.inc b/data/maps/OneIsland_House2/text.inc index c147325c1..fe1a6ba91 100644 --- a/data/maps/OneIsland_House2/text.inc +++ b/data/maps/OneIsland_House2/text.inc @@ -1,4 +1,4 @@ -gUnknown_81A23B8:: @ 81A23B8 +OneIsland_House2_Text_IWantToStayHereForever:: @ 81A23B8 .string "Young people all want to go off to\n" .string "big cities.\p" .string "But I want to stay here forever!$" diff --git a/data/maps/OneIsland_KindleRoad/map.json b/data/maps/OneIsland_KindleRoad/map.json index 83aa1eadc..99dc16ac3 100644 --- a/data/maps/OneIsland_KindleRoad/map.json +++ b/data/maps/OneIsland_KindleRoad/map.json @@ -31,7 +31,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 4, - "script": "OneIsland_KindleRoad_EventScript_1ABBF1", + "script": "OneIsland_KindleRoad_EventScript_Maria", "flag": "0" }, { @@ -44,7 +44,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, - "script": "OneIsland_KindleRoad_EventScript_1ABC2F", + "script": "OneIsland_KindleRoad_EventScript_Abigail", "flag": "0" }, { @@ -57,7 +57,7 @@ "movement_range_y": 3, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "OneIsland_KindleRoad_EventScript_1ABC6D", + "script": "OneIsland_KindleRoad_EventScript_Finn", "flag": "0" }, { @@ -70,7 +70,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "OneIsland_KindleRoad_EventScript_1ABCAB", + "script": "OneIsland_KindleRoad_EventScript_Garrett", "flag": "0" }, { @@ -83,7 +83,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 0, - "script": "OneIsland_KindleRoad_EventScript_1ABCE9", + "script": "OneIsland_KindleRoad_EventScript_Tommy", "flag": "0" }, { @@ -96,7 +96,7 @@ "movement_range_y": 7, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "OneIsland_KindleRoad_EventScript_1ABD27", + "script": "OneIsland_KindleRoad_EventScript_Sharon", "flag": "0" }, { @@ -109,7 +109,7 @@ "movement_range_y": 4, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "OneIsland_KindleRoad_EventScript_1ABD65", + "script": "OneIsland_KindleRoad_EventScript_Tanya", "flag": "0" }, { @@ -122,7 +122,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "OneIsland_KindleRoad_EventScript_1ABDA3", + "script": "OneIsland_KindleRoad_EventScript_Shea", "flag": "0" }, { @@ -135,7 +135,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "OneIsland_KindleRoad_EventScript_1ABDE1", + "script": "OneIsland_KindleRoad_EventScript_Hugh", "flag": "0" }, { @@ -148,7 +148,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "OneIsland_KindleRoad_EventScript_1ABE1F", + "script": "OneIsland_KindleRoad_EventScript_Bryce", "flag": "0" }, { @@ -161,7 +161,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "OneIsland_KindleRoad_EventScript_1ABE5D", + "script": "OneIsland_KindleRoad_EventScript_Claire", "flag": "0" }, { @@ -174,7 +174,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "OneIsland_KindleRoad_EventScript_1ABEE1", + "script": "OneIsland_KindleRoad_EventScript_Mik", "flag": "0" }, { @@ -187,7 +187,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "OneIsland_KindleRoad_EventScript_1ABE9B", + "script": "OneIsland_KindleRoad_EventScript_Kia", "flag": "0" }, { @@ -429,14 +429,14 @@ "x": 13, "y": 59, "elevation": 0, - "script": "OneIsland_KindleRoad_EventScript_168762" + "script": "OneIsland_KindleRoad_EventScript_EmberSpaSign" }, { "type": "bg_event_type_0", "x": 8, "y": 115, "elevation": 0, - "script": "OneIsland_KindleRoad_EventScript_168759" + "script": "OneIsland_KindleRoad_EventScript_RouteSign" } ] } diff --git a/data/maps/OneIsland_KindleRoad/scripts.inc b/data/maps/OneIsland_KindleRoad/scripts.inc index 00c5106a7..bcc33708a 100644 --- a/data/maps/OneIsland_KindleRoad/scripts.inc +++ b/data/maps/OneIsland_KindleRoad/scripts.inc @@ -1,10 +1,10 @@ OneIsland_KindleRoad_MapScripts:: @ 8168758 .byte 0 -OneIsland_KindleRoad_EventScript_168759:: @ 8168759 - msgbox gUnknown_8189D02, MSGBOX_SIGN +OneIsland_KindleRoad_EventScript_RouteSign:: @ 8168759 + msgbox OneIsland_KindleRoad_Text_RouteSign, MSGBOX_SIGN end -OneIsland_KindleRoad_EventScript_168762:: @ 8168762 - msgbox gUnknown_8189D32, MSGBOX_SIGN +OneIsland_KindleRoad_EventScript_EmberSpaSign:: @ 8168762 + msgbox OneIsland_KindleRoad_Text_EmberSpaSign, MSGBOX_SIGN end diff --git a/data/maps/OneIsland_KindleRoad/text.inc b/data/maps/OneIsland_KindleRoad/text.inc index 93537a5f3..8a65dd3ac 100644 --- a/data/maps/OneIsland_KindleRoad/text.inc +++ b/data/maps/OneIsland_KindleRoad/text.inc @@ -1,164 +1,164 @@ -Text_18961F:: @ 818961F +OneIsland_KindleRoad_Text_MariaIntro:: @ 818961F .string "The weather's gorgeous!\n" .string "Perfect for a battle!$" -Text_18964D:: @ 818964D +OneIsland_KindleRoad_Text_MariaDefeat:: @ 818964D .string "Aiyeeeeh!$" -Text_189657:: @ 8189657 +OneIsland_KindleRoad_Text_MariaPostBattle:: @ 8189657 .string "Please don't splash my face!\n" .string "You'll ruin the makeup.$" -Text_18968C:: @ 818968C +OneIsland_KindleRoad_Text_AbigailIntro:: @ 818968C .string "I'm beginning to get a sunburn…$" -Text_1896AC:: @ 81896AC +OneIsland_KindleRoad_Text_AbigailDefeat:: @ 81896AC .string "Oh, you're so awful.$" -Text_1896C1:: @ 81896C1 +OneIsland_KindleRoad_Text_AbigailPostBattle:: @ 81896C1 .string "I like that cap you have.\n" .string "Maybe I should wear one, too…$" -Text_1896F9:: @ 81896F9 +OneIsland_KindleRoad_Text_FinnIntro:: @ 81896F9 .string "Seen from here, MT. EMBER towers\n" .string "into the sky.$" -Text_189728:: @ 8189728 +OneIsland_KindleRoad_Text_FinnDefeat:: @ 8189728 .string "Well, aren't you tough?$" -Text_189740:: @ 8189740 +OneIsland_KindleRoad_Text_FinnPostBattle:: @ 8189740 .string "The sky is immense around these\n" .string "parts.$" -Text_189767:: @ 8189767 +OneIsland_KindleRoad_Text_GarrettIntro:: @ 8189767 .string "I took a break from swimming,\n" .string "only to have you challenge me?$" -Text_1897A4:: @ 81897A4 +OneIsland_KindleRoad_Text_GarrettDefeat:: @ 81897A4 .string "Hey, what the…\n" .string "You're good, you!$" -Text_1897C5:: @ 81897C5 +OneIsland_KindleRoad_Text_GarrettPostBattle:: @ 81897C5 .string "Instead of using SURF all the time,\n" .string "you should swim some.$" -Text_1897FF:: @ 81897FF +OneIsland_KindleRoad_Text_TommyIntro:: @ 81897FF .string "Wait! Wait a second!\n" .string "I think I've hooked a big one!$" -Text_189833:: @ 8189833 +OneIsland_KindleRoad_Text_TommyDefeat:: @ 8189833 .string "I've lost it all again…$" -Text_18984B:: @ 818984B +OneIsland_KindleRoad_Text_TommyPostBattle:: @ 818984B .string "Not only did I lose, the big one\n" .string "got away from me, too!$" -Text_189883:: @ 8189883 +OneIsland_KindleRoad_Text_SharonIntro:: @ 8189883 .string "Could you help me out with my\n" .string "training?$" -Text_1898AB:: @ 81898AB +OneIsland_KindleRoad_Text_SharonDefeat:: @ 81898AB .string "You were a cut above me.$" -Text_1898C4:: @ 81898C4 +OneIsland_KindleRoad_Text_SharonPostBattle:: @ 81898C4 .string "It's clear that you're skilled.\n" .string "I like you!$" -Text_1898F0:: @ 81898F0 +OneIsland_KindleRoad_Text_TanyaIntro:: @ 81898F0 .string "There isn't a day in which we don't\n" .string "train!$" -Text_18991B:: @ 818991B +OneIsland_KindleRoad_Text_TanyaDefeat:: @ 818991B .string "I'm such a fool!$" -Text_18992C:: @ 818992C +OneIsland_KindleRoad_Text_TanyaPostBattle:: @ 818992C .string "I'll train even harder from now on!$" -Text_189950:: @ 8189950 +OneIsland_KindleRoad_Text_SheaIntro:: @ 8189950 .string "Every morning, before breakfast,\n" .string "I swim around this island.$" -Text_18998C:: @ 818998C +OneIsland_KindleRoad_Text_SheaDefeat:: @ 818998C .string "Gasp…\n" .string "Gasp…$" -Text_189998:: @ 8189998 +OneIsland_KindleRoad_Text_SheaPostBattle:: @ 8189998 .string "I lost because I'm pooped from all\n" .string "the running I did…$" -Text_1899CE:: @ 81899CE +OneIsland_KindleRoad_Text_HughIntro:: @ 81899CE .string "Dress appropriately for battle!\n" .string "Lose that frivolous outfit!$" -Text_189A0A:: @ 8189A0A +OneIsland_KindleRoad_Text_HughDefeat:: @ 8189A0A .string "Why me?!$" -Text_189A13:: @ 8189A13 +OneIsland_KindleRoad_Text_HughPostBattle:: @ 8189A13 .string "Even martial artists are becoming\n" .string "fashion conscious these days…$" -Text_189A53:: @ 8189A53 +OneIsland_KindleRoad_Text_BryceIntro:: @ 8189A53 .string "You know, everything tastes great\n" .string "when you're out in the wild.$" -Text_189A92:: @ 8189A92 +OneIsland_KindleRoad_Text_BryceDefeat:: @ 8189A92 .string "Awww, blown!$" -Text_189A9F:: @ 8189A9F +OneIsland_KindleRoad_Text_BrycePostBattle:: @ 8189A9F .string "The water in volcanic regions is\n" .string "delicious.$" -Text_189ACB:: @ 8189ACB +OneIsland_KindleRoad_Text_ClaireIntro:: @ 8189ACB .string "My lunch filled us up, so will you\n" .string "battle us for some exercise?$" -Text_189B0B:: @ 8189B0B +OneIsland_KindleRoad_Text_ClaireDefeat:: @ 8189B0B .string "That made me all sweaty.$" -Text_189B24:: @ 8189B24 +OneIsland_KindleRoad_Text_ClairePostBattle:: @ 8189B24 .string "What should I do?\n" .string "I feel famished again.$" -Text_189B4D:: @ 8189B4D +OneIsland_KindleRoad_Text_KiaIntro:: @ 8189B4D .string "KIA: My big brother and I make\n" .string "an awesome combination!$" -Text_189B84:: @ 8189B84 +OneIsland_KindleRoad_Text_KiaDefeat:: @ 8189B84 .string "KIA: Huh?!\n" .string "I can't believe it!$" -Text_189BA3:: @ 8189BA3 +OneIsland_KindleRoad_Text_KiaPostBattle:: @ 8189BA3 .string "KIA: How could there be anyone\n" .string "better than my big brother?$" -Text_189BDE:: @ 8189BDE +OneIsland_KindleRoad_Text_KiaNotEnoughMons:: @ 8189BDE .string "KIA: If you want to battle with\n" .string "us, you have to bring at least two\l" .string "POKéMON with you.$" -Text_189C33:: @ 8189C33 +OneIsland_KindleRoad_Text_MikIntro:: @ 8189C33 .string "MIK: Together with KIA, I'm afraid\n" .string "of nothing!$" -Text_189C62:: @ 8189C62 +OneIsland_KindleRoad_Text_MikDefeat:: @ 8189C62 .string "MIK: Whoa!\n" .string "That's too much!$" -Text_189C7E:: @ 8189C7E +OneIsland_KindleRoad_Text_MikPostBattle:: @ 8189C7E .string "MIK: How could my combination\n" .string "with KIA fail?$" -Text_189CAB:: @ 8189CAB +OneIsland_KindleRoad_Text_MikNotEnoughMons:: @ 8189CAB .string "MIK: Hey, do you want to battle\n" .string "with us two?\p" .string "Bring two or more POKéMON with\n" .string "you, then.$" -gUnknown_8189D02:: @ 8189D02 +OneIsland_KindleRoad_Text_RouteSign:: @ 8189D02 .string "This is KINDLE ROAD.\p" .string "Go straight for MT. EMBER.$" -gUnknown_8189D32:: @ 8189D32 +OneIsland_KindleRoad_Text_EmberSpaSign:: @ 8189D32 .string "Light the Fire in Your Heart!\n" .string "EMBER SPA$" diff --git a/data/maps/OneIsland_KindleRoad_EmberSpa/map.json b/data/maps/OneIsland_KindleRoad_EmberSpa/map.json index 3472ab348..112a729cd 100644 --- a/data/maps/OneIsland_KindleRoad_EmberSpa/map.json +++ b/data/maps/OneIsland_KindleRoad_EmberSpa/map.json @@ -25,7 +25,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "OneIsland_KindleRoad_EmberSpa_EventScript_16535C", + "script": "OneIsland_KindleRoad_EmberSpa_EventScript_OldMan", "flag": "0" }, { @@ -38,7 +38,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "OneIsland_KindleRoad_EmberSpa_EventScript_165365", + "script": "OneIsland_KindleRoad_EmberSpa_EventScript_BaldingMan1", "flag": "0" }, { @@ -51,7 +51,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "OneIsland_KindleRoad_EmberSpa_EventScript_165380", + "script": "OneIsland_KindleRoad_EmberSpa_EventScript_BlackBelt", "flag": "FLAG_HIDE_POSTGAME_GOSSIPERS" }, { @@ -64,7 +64,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "OneIsland_KindleRoad_EmberSpa_EventScript_165377", + "script": "OneIsland_KindleRoad_EmberSpa_EventScript_OldWoman", "flag": "0" }, { @@ -77,7 +77,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "OneIsland_KindleRoad_EmberSpa_EventScript_165399", + "script": "OneIsland_KindleRoad_EmberSpa_EventScript_RockSmashMan", "flag": "0" }, { @@ -90,7 +90,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "OneIsland_KindleRoad_EmberSpa_EventScript_16536E", + "script": "OneIsland_KindleRoad_EmberSpa_EventScript_BaldingMan2", "flag": "0" } ], @@ -111,7 +111,7 @@ "elevation": 3, "var": "VAR_TEMP_1", "var_value": 0, - "script": "OneIsland_KindleRoad_EmberSpa_EventScript_1653CF" + "script": "OneIsland_KindleRoad_EmberSpa_EventScript_SpaHeal" } ], "bg_events": [] diff --git a/data/maps/OneIsland_KindleRoad_EmberSpa/scripts.inc b/data/maps/OneIsland_KindleRoad_EmberSpa/scripts.inc index d32ab0d4a..becd846c8 100644 --- a/data/maps/OneIsland_KindleRoad_EmberSpa/scripts.inc +++ b/data/maps/OneIsland_KindleRoad_EmberSpa/scripts.inc @@ -1,52 +1,52 @@ OneIsland_KindleRoad_EmberSpa_MapScripts:: @ 816535B .byte 0 -OneIsland_KindleRoad_EmberSpa_EventScript_16535C:: @ 816535C - msgbox gUnknown_817D34A, MSGBOX_NPC +OneIsland_KindleRoad_EmberSpa_EventScript_OldMan:: @ 816535C + msgbox OneIsland_KindleRoad_EmberSpa_Text_WaterWarmsMeToCore, MSGBOX_NPC end -OneIsland_KindleRoad_EmberSpa_EventScript_165365:: @ 8165365 - msgbox gUnknown_817D3DE, MSGBOX_NPC +OneIsland_KindleRoad_EmberSpa_EventScript_BaldingMan1:: @ 8165365 + msgbox OneIsland_KindleRoad_EmberSpa_Text_EnjoyBowlOfChowder, MSGBOX_NPC end -OneIsland_KindleRoad_EmberSpa_EventScript_16536E:: @ 816536E - msgbox gUnknown_817D4AA, MSGBOX_NPC +OneIsland_KindleRoad_EmberSpa_EventScript_BaldingMan2:: @ 816536E + msgbox OneIsland_KindleRoad_EmberSpa_Text_HotSpringIsTherapeutic, MSGBOX_NPC end -OneIsland_KindleRoad_EmberSpa_EventScript_165377:: @ 8165377 - msgbox gUnknown_817D4E3, MSGBOX_NPC +OneIsland_KindleRoad_EmberSpa_EventScript_OldWoman:: @ 8165377 + msgbox OneIsland_KindleRoad_EmberSpa_Text_SeeHowSmoothMySkinIs, MSGBOX_NPC end -OneIsland_KindleRoad_EmberSpa_EventScript_165380:: @ 8165380 +OneIsland_KindleRoad_EmberSpa_EventScript_BlackBelt:: @ 8165380 lock faceplayer famechecker FAMECHECKER_BRUNO, 3 - msgbox gUnknown_817D550 + msgbox OneIsland_KindleRoad_EmberSpa_Text_BrunoVisitsSpaOnOccasion release end -OneIsland_KindleRoad_EmberSpa_EventScript_165399:: @ 8165399 +OneIsland_KindleRoad_EmberSpa_EventScript_RockSmashMan:: @ 8165399 lock faceplayer - goto_if_set FLAG_GOT_HM06, EventScript_1653C5 - msgbox gUnknown_817D622 + goto_if_set FLAG_GOT_HM06, OneIsland_KindleRoad_EmberSpa_EventScript_AlreadyGotHM06 + msgbox OneIsland_KindleRoad_EmberSpa_Text_UsedThisToMakeEmberSpa giveitem ITEM_HM06 setflag FLAG_GOT_HM06 - msgbox gUnknown_817D6F3 + msgbox OneIsland_KindleRoad_EmberSpa_Text_ExplainHM06 release end -EventScript_1653C5:: @ 81653C5 - msgbox gUnknown_817D6F3 +OneIsland_KindleRoad_EmberSpa_EventScript_AlreadyGotHM06:: @ 81653C5 + msgbox OneIsland_KindleRoad_EmberSpa_Text_ExplainHM06 release end -OneIsland_KindleRoad_EmberSpa_EventScript_1653CF:: @ 81653CF +OneIsland_KindleRoad_EmberSpa_EventScript_SpaHeal:: @ 81653CF lockall fadescreen FADE_TO_WHITE special HealPlayerParty fadescreen FADE_FROM_WHITE - msgbox gUnknown_817D450 + msgbox OneIsland_KindleRoad_EmberSpa_Text_WaterExquisiteFullyRefreshed setvar VAR_TEMP_1, 1 releaseall end diff --git a/data/maps/OneIsland_KindleRoad_EmberSpa/text.inc b/data/maps/OneIsland_KindleRoad_EmberSpa/text.inc index ffc4fea83..64c2ee64c 100644 --- a/data/maps/OneIsland_KindleRoad_EmberSpa/text.inc +++ b/data/maps/OneIsland_KindleRoad_EmberSpa/text.inc @@ -1,4 +1,4 @@ -gUnknown_817D34A:: @ 817D34A +OneIsland_KindleRoad_EmberSpa_Text_WaterWarmsMeToCore:: @ 817D34A .string "Hm!\n" .string "Haaaaaaaaaaah!\p" .string "Aaaah! This is heavenly!\n" @@ -7,29 +7,29 @@ gUnknown_817D34A:: @ 817D34A .string "Go to the middle, relax, and get\n" .string "good and warm!$" -gUnknown_817D3DE:: @ 817D3DE +OneIsland_KindleRoad_EmberSpa_Text_EnjoyBowlOfChowder:: @ 817D3DE .string "My favorite part of bathing comes\n" .string "up right after this.\p" .string "I enjoy a bowl of chowder to\n" .string "warm me from the inside, too!$" -gUnknown_817D450:: @ 817D450 +OneIsland_KindleRoad_EmberSpa_Text_WaterExquisiteFullyRefreshed:: @ 817D450 .string "The water is perfectly warm.\n" .string "It feels exquisite…\p" .string "{PLAYER} and the POKéMON were\n" .string "fully refreshed!$" -gUnknown_817D4AA:: @ 817D4AA +OneIsland_KindleRoad_EmberSpa_Text_HotSpringIsTherapeutic:: @ 817D4AA .string "Soaking in a hot spring pool is\n" .string "therapeutic, people say.$" -gUnknown_817D4E3:: @ 817D4E3 +OneIsland_KindleRoad_EmberSpa_Text_SeeHowSmoothMySkinIs:: @ 817D4E3 .string "Have a look at my face.\n" .string "See how smooth my skin is?\p" .string "The hot spring's water keeps my\n" .string "skin younger than my age.$" -gUnknown_817D550:: @ 817D550 +OneIsland_KindleRoad_EmberSpa_Text_BrunoVisitsSpaOnOccasion:: @ 817D550 .string "After an honest day of training,\n" .string "nothing beats a relaxing soak in\l" .string "the hot spring pool.\p" @@ -38,7 +38,7 @@ gUnknown_817D550:: @ 817D550 .string "He comes to rehab injuries, both\n" .string "his own and his POKéMON's.$" -gUnknown_817D622:: @ 817D622 +OneIsland_KindleRoad_EmberSpa_Text_UsedThisToMakeEmberSpa:: @ 817D622 .string "Hot springs go hand-in-hand with\n" .string "volcanoes.\p" .string "The EMBER SPA here, well,\n" @@ -48,7 +48,7 @@ gUnknown_817D622:: @ 817D622 .string "I was using this at the time.\n" .string "I suppose I can part with it.$" -gUnknown_817D6F3:: @ 817D6F3 +OneIsland_KindleRoad_EmberSpa_Text_ExplainHM06:: @ 817D6F3 .string "That shatters boulders as if they\n" .string "were made of crackers.$" diff --git a/data/maps/OneIsland_PokemonCenter_1F/map.json b/data/maps/OneIsland_PokemonCenter_1F/map.json index 08df3284c..8ffa34c57 100644 --- a/data/maps/OneIsland_PokemonCenter_1F/map.json +++ b/data/maps/OneIsland_PokemonCenter_1F/map.json @@ -25,7 +25,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "OneIsland_PokemonCenter_1F_EventScript_170E94", + "script": "OneIsland_PokemonCenter_1F_EventScript_Nurse", "flag": "0" }, { @@ -38,7 +38,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "OneIsland_PokemonCenter_1F_EventScript_170E9D", + "script": "OneIsland_PokemonCenter_1F_EventScript_Bill", "flag": "FLAG_HIDE_ONE_ISLAND_POKECENTER_BILL" }, { @@ -51,7 +51,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "OneIsland_PokemonCenter_1F_EventScript_170EC5", + "script": "OneIsland_PokemonCenter_1F_EventScript_Celio", "flag": "FLAG_HIDE_ONE_ISLAND_POKECENTER_CELIO" }, { @@ -64,7 +64,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "OneIsland_PokemonCenter_1F_EventScript_171148", + "script": "OneIsland_PokemonCenter_1F_EventScript_LittleBoy", "flag": "0" }, { @@ -77,7 +77,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "OneIsland_PokemonCenter_1F_EventScript_171151", + "script": "OneIsland_PokemonCenter_1F_EventScript_Hiker", "flag": "0" }, { @@ -90,7 +90,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "OneIsland_PokemonCenter_1F_EventScript_17115A", + "script": "OneIsland_PokemonCenter_1F_EventScript_BattleGirl", "flag": "0" } ], @@ -118,7 +118,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F", "var_value": 2, - "script": "OneIsland_PokemonCenter_1F_EventScript_1711AA" + "script": "OneIsland_PokemonCenter_1F_EventScript_LeaveOneIslandTriggerTop" }, { "type": "trigger", @@ -127,7 +127,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F", "var_value": 2, - "script": "OneIsland_PokemonCenter_1F_EventScript_1711B6" + "script": "OneIsland_PokemonCenter_1F_EventScript_LeaveOneIslandTriggerMidTop" }, { "type": "trigger", @@ -136,7 +136,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F", "var_value": 2, - "script": "OneIsland_PokemonCenter_1F_EventScript_1711C2" + "script": "OneIsland_PokemonCenter_1F_EventScript_LeaveOneIslandTriggerMidBottom" }, { "type": "trigger", @@ -145,7 +145,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F", "var_value": 2, - "script": "OneIsland_PokemonCenter_1F_EventScript_1711CE" + "script": "OneIsland_PokemonCenter_1F_EventScript_LeaveOneIslandTriggerBottom" } ], "bg_events": [ @@ -154,63 +154,63 @@ "x": 12, "y": 2, "elevation": 0, - "script": "OneIsland_PokemonCenter_1F_EventScript_171179" + "script": "OneIsland_PokemonCenter_1F_EventScript_NetworkMachine" }, { "type": "bg_event_type_0", "x": 12, "y": 3, "elevation": 0, - "script": "OneIsland_PokemonCenter_1F_EventScript_171179" + "script": "OneIsland_PokemonCenter_1F_EventScript_NetworkMachine" }, { "type": "bg_event_type_0", "x": 12, "y": 4, "elevation": 0, - "script": "OneIsland_PokemonCenter_1F_EventScript_171179" + "script": "OneIsland_PokemonCenter_1F_EventScript_NetworkMachine" }, { "type": "bg_event_type_0", "x": 12, "y": 5, "elevation": 0, - "script": "OneIsland_PokemonCenter_1F_EventScript_171179" + "script": "OneIsland_PokemonCenter_1F_EventScript_NetworkMachine" }, { "type": "bg_event_type_0", "x": 13, "y": 5, "elevation": 0, - "script": "OneIsland_PokemonCenter_1F_EventScript_171179" + "script": "OneIsland_PokemonCenter_1F_EventScript_NetworkMachine" }, { "type": "bg_event_type_0", "x": 15, "y": 5, "elevation": 0, - "script": "OneIsland_PokemonCenter_1F_EventScript_171179" + "script": "OneIsland_PokemonCenter_1F_EventScript_NetworkMachine" }, { "type": "bg_event_type_0", "x": 14, "y": 5, "elevation": 0, - "script": "OneIsland_PokemonCenter_1F_EventScript_171179" + "script": "OneIsland_PokemonCenter_1F_EventScript_NetworkMachine" }, { "type": "bg_event_type_0", "x": 16, "y": 5, "elevation": 0, - "script": "OneIsland_PokemonCenter_1F_EventScript_171179" + "script": "OneIsland_PokemonCenter_1F_EventScript_NetworkMachine" }, { "type": "bg_event_type_0", "x": 17, "y": 5, "elevation": 0, - "script": "OneIsland_PokemonCenter_1F_EventScript_171179" + "script": "OneIsland_PokemonCenter_1F_EventScript_NetworkMachine" } ] } diff --git a/data/maps/OneIsland_PokemonCenter_1F/scripts.inc b/data/maps/OneIsland_PokemonCenter_1F/scripts.inc index 05f00c76b..53d0aebcd 100644 --- a/data/maps/OneIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/OneIsland_PokemonCenter_1F/scripts.inc @@ -1,3 +1,6 @@ +.equ LOCALID_BILL, 2 +.equ LOCALID_CELIO, 3 + OneIsland_PokemonCenter_1F_MapScripts:: @ 8170BF8 map_script MAP_SCRIPT_ON_TRANSITION, OneIsland_PokemonCenter_1F_OnTransition map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume @@ -7,147 +10,147 @@ OneIsland_PokemonCenter_1F_MapScripts:: @ 8170BF8 OneIsland_PokemonCenter_1F_OnLoad:: @ 8170C0D compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5 - call_if_ge EventScript_170C22 - call_if_set FLAG_SYS_CAN_LINK_WITH_RS, EventScript_170C36 + call_if_ge OneIsland_PokemonCenter_1F_EventScript_SetRubyMetatile + call_if_set FLAG_SYS_CAN_LINK_WITH_RS, OneIsland_PokemonCenter_1F_EventScript_SetNetworkMachineOn end -EventScript_170C22:: @ 8170C22 - setmetatile 13, 4, 861, 1 +OneIsland_PokemonCenter_1F_EventScript_SetRubyMetatile:: @ 8170C22 + setmetatile 13, 4, METATILE_PokemonCenter_NetworkMachine_Ruby, 1 return -EventScript_170C2C:: @ 8170C2C - setmetatile 16, 4, 863, 1 +OneIsland_PokemonCenter_1F_EventScript_SetSapphireMetatile:: @ 8170C2C + setmetatile 16, 4, METATILE_PokemonCenter_NetworkMachine_Sapphire, 1 return -EventScript_170C36:: @ 8170C36 - call EventScript_170C2C - setmetatile 14, 4, 858, 1 - setmetatile 15, 4, 859, 1 +OneIsland_PokemonCenter_1F_EventScript_SetNetworkMachineOn:: @ 8170C36 + call OneIsland_PokemonCenter_1F_EventScript_SetSapphireMetatile + setmetatile 14, 4, METATILE_PokemonCenter_NetworkMachine_ScreenLeft_On, 1 + setmetatile 15, 4, METATILE_PokemonCenter_NetworkMachine_ScreenRight_On, 1 return OneIsland_PokemonCenter_1F_OnTransition:: @ 8170C4E setrespawn SPAWN_ONE_ISLAND compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 6 - call_if_eq EventScript_170C73 + call_if_eq OneIsland_PokemonCenter_1F_EventScript_SetCelioQuestDone compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 0 - call_if_eq EventScript_170C79 + call_if_eq OneIsland_PokemonCenter_1F_EventScript_SetBillCelioFirstMeetingPos compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 2 - call_if_eq EventScript_170C90 + call_if_eq OneIsland_PokemonCenter_1F_EventScript_SetBillCelioReadyToLeavePos end -EventScript_170C73:: @ 8170C73 +OneIsland_PokemonCenter_1F_EventScript_SetCelioQuestDone:: @ 8170C73 setvar VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 7 return -EventScript_170C79:: @ 8170C79 - setobjectxyperm 2, 9, 8 - setobjectmovementtype 2, 7 - setobjectxyperm 3, 15, 6 - setobjectmovementtype 3, 7 +OneIsland_PokemonCenter_1F_EventScript_SetBillCelioFirstMeetingPos:: @ 8170C79 + setobjectxyperm LOCALID_BILL, 9, 8 + setobjectmovementtype LOCALID_BILL, MOVEMENT_TYPE_FACE_UP + setobjectxyperm LOCALID_CELIO, 15, 6 + setobjectmovementtype LOCALID_CELIO, MOVEMENT_TYPE_FACE_UP return -EventScript_170C90:: @ 8170C90 - setobjectxyperm 2, 14, 7 - setobjectmovementtype 2, 9 - setobjectxyperm 3, 14, 8 - setobjectmovementtype 3, 9 +OneIsland_PokemonCenter_1F_EventScript_SetBillCelioReadyToLeavePos:: @ 8170C90 + setobjectxyperm LOCALID_BILL, 14, 7 + setobjectmovementtype LOCALID_BILL, MOVEMENT_TYPE_FACE_LEFT + setobjectxyperm LOCALID_CELIO, 14, 8 + setobjectmovementtype LOCALID_CELIO, MOVEMENT_TYPE_FACE_LEFT return OneIsland_PokemonCenter_1F_OnFrame:: @ 8170CA7 - map_script_2 VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 0, EventScript_170CB1 + map_script_2 VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 0, OneIsland_PokemonCenter_1F_EventScript_MeetCelioScene .2byte 0 -EventScript_170CB1:: @ 8170CB1 +OneIsland_PokemonCenter_1F_EventScript_MeetCelioScene:: @ 8170CB1 lockall textcolor 0 - applymovement OBJ_EVENT_ID_PLAYER, Movement_170E7D - applymovement 2, Movement_170E86 + applymovement OBJ_EVENT_ID_PLAYER, OneIsland_PokemonCenter_1F_Movement_PlayerWalkToCelio + applymovement LOCALID_BILL, OneIsland_PokemonCenter_1F_Movement_BillWalkToCelio waitmovement 0 - msgbox gUnknown_81A0CDE + msgbox OneIsland_PokemonCenter_1F_Text_BillHeyThereCelio applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight waitmovement 0 playse SE_PIN - applymovement 3, Movement_ExclamationMark + applymovement LOCALID_CELIO, Movement_ExclamationMark waitmovement 0 - applymovement 3, Movement_WalkInPlaceFastestLeft + applymovement LOCALID_CELIO, Movement_WalkInPlaceFastestLeft waitmovement 0 - applymovement 3, Movement_Delay48 + applymovement LOCALID_CELIO, Movement_Delay48 waitmovement 0 - msgbox gUnknown_81A0CF7 - msgbox gUnknown_81A0D27 - applymovement 2, Movement_WalkInPlaceFastestDown + msgbox OneIsland_PokemonCenter_1F_Text_CelioCantBelieveYouCameOut + msgbox OneIsland_PokemonCenter_1F_Text_BillHowsYourResearchComing + applymovement LOCALID_BILL, Movement_WalkInPlaceFastestDown applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp waitmovement 0 - msgbox gUnknown_81A0D72 - applymovement 2, Movement_WalkInPlaceFastestRight + msgbox OneIsland_PokemonCenter_1F_Text_ThisIsMyBuddyCelio + applymovement LOCALID_BILL, Movement_WalkInPlaceFastestRight waitmovement 0 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight waitmovement 0 - call_if_set FLAG_SYS_GAME_CLEAR, EventScript_170E34 - call_if_unset FLAG_SYS_GAME_CLEAR, EventScript_170E3D - applymovement 3, Movement_WalkInPlaceFastestDown + call_if_set FLAG_SYS_GAME_CLEAR, OneIsland_PokemonCenter_1F_EventScript_IntroducePlayerChamp + call_if_unset FLAG_SYS_GAME_CLEAR, OneIsland_PokemonCenter_1F_EventScript_IntroducePlayerNotChamp + applymovement LOCALID_CELIO, Movement_WalkInPlaceFastestDown waitmovement 0 - msgbox gUnknown_81A0E17 - msgbox gUnknown_81A0E90 - applymovement 3, Movement_WalkInPlaceFastestLeft + msgbox OneIsland_PokemonCenter_1F_Text_CelioThatsReallyImpressive + msgbox OneIsland_PokemonCenter_1F_Text_BillBringMeUpToSpeed + applymovement LOCALID_CELIO, Movement_WalkInPlaceFastestLeft waitmovement 0 - msgbox gUnknown_81A0ECC + msgbox OneIsland_PokemonCenter_1F_Text_CelioPCsCantLinkWithYours closemessage - applymovement 2, Movement_WalkInPlaceFastestUp + applymovement LOCALID_BILL, Movement_WalkInPlaceFastestUp waitmovement 0 - msgbox gUnknown_81A0F40 - applymovement 2, Movement_WalkInPlaceFastestDown + msgbox OneIsland_PokemonCenter_1F_Text_BillLetMeHelpYou + applymovement LOCALID_BILL, Movement_WalkInPlaceFastestDown waitmovement 0 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp waitmovement 0 - msgbox gUnknown_81A0FB1 - msgreceiveditem gUnknown_81A10EE, ITEM_METEORITE, 1, MUS_FAN5 + msgbox OneIsland_PokemonCenter_1F_Text_CanYouDeliverThisMeteoritePlayer + msgreceiveditem OneIsland_PokemonCenter_1F_Text_AcceptedMeteoriteFromBill, ITEM_METEORITE, 1, MUS_FAN5 additem ITEM_METEORITE - applymovement 3, Movement_WalkInPlaceFastestDown + applymovement LOCALID_CELIO, Movement_WalkInPlaceFastestDown waitmovement 0 - msgbox gUnknown_81A1113 - giveitem_msg gUnknown_81A231B, ITEM_TRI_PASS, 1, MUS_FAN5 - msgbox gUnknown_81A1150 + msgbox OneIsland_PokemonCenter_1F_Text_CelioPleaseTakeThis + giveitem_msg OneIsland_PokemonCenter_1F_Text_ObtainedTriPass, ITEM_TRI_PASS, 1, MUS_FAN5 + msgbox OneIsland_PokemonCenter_1F_Text_PassLetsYouTravelBetweenIslands compare VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 2 - call_if_ge EventScript_170E46 + call_if_ge OneIsland_PokemonCenter_1F_EventScript_ReceiveTownMapPage compare VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 2 - call_if_lt EventScript_170E58 + call_if_lt OneIsland_PokemonCenter_1F_EventScript_ReceiveTownMap setflag FLAG_SYS_SEVII_MAP_123 - msgbox gUnknown_81A1230 + msgbox OneIsland_PokemonCenter_1F_Text_BillCatchYouLater closemessage - applymovement 2, Movement_WalkInPlaceFastestUp + applymovement LOCALID_BILL, Movement_WalkInPlaceFastestUp waitmovement 0 - applymovement 3, Movement_WalkInPlaceFastestUp + applymovement LOCALID_CELIO, Movement_WalkInPlaceFastestUp waitmovement 0 setflag FLAG_SYS_PC_STORAGE_DISABLED setvar VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 1 releaseall end -EventScript_170E34:: @ 8170E34 - msgbox gUnknown_81A0DE8 +OneIsland_PokemonCenter_1F_EventScript_IntroducePlayerChamp:: @ 8170E34 + msgbox OneIsland_PokemonCenter_1F_Text_PlayerIsReigningPokemonChamp return -EventScript_170E3D:: @ 8170E3D - msgbox gUnknown_81A0DAC +OneIsland_PokemonCenter_1F_EventScript_IntroducePlayerNotChamp:: @ 8170E3D + msgbox OneIsland_PokemonCenter_1F_Text_PlayerIsRisingPokemonChamp return -EventScript_170E46:: @ 8170E46 +OneIsland_PokemonCenter_1F_EventScript_ReceiveTownMapPage:: @ 8170E46 textcolor 3 playfanfare MUS_FAN5 - message Text_1A11EC + message OneIsland_PokemonCenter_1F_Text_ReceivedExtraPageForTownMap waitmessage waitfanfare call EventScript_1A6675 return -EventScript_170E58:: @ 8170E58 +OneIsland_PokemonCenter_1F_EventScript_ReceiveTownMap:: @ 8170E58 setflag FLAG_HIDE_TOWN_MAP setvar VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 2 - giveitem_msg gUnknown_81A1218, ITEM_TOWN_MAP, 1, MUS_FAN5 + giveitem_msg OneIsland_PokemonCenter_1F_Text_ReceivedTownMap, ITEM_TOWN_MAP, 1, MUS_FAN5 return -Movement_170E7D:: @ 8170E7D +OneIsland_PokemonCenter_1F_Movement_PlayerWalkToCelio:: @ 8170E7D walk_up walk_up walk_right @@ -158,7 +161,7 @@ Movement_170E7D:: @ 8170E7D walk_in_place_fastest_up step_end -Movement_170E86:: @ 8170E86 +OneIsland_PokemonCenter_1F_Movement_BillWalkToCelio:: @ 8170E86 walk_up walk_right walk_right @@ -169,121 +172,123 @@ Movement_170E86:: @ 8170E86 walk_in_place_fastest_right step_end +@ Unused Movement_170E8F:: @ 8170E8F walk_up step_end +@ Unused Movement_170E91:: @ 8170E91 walk_left walk_in_place_fastest_right step_end -OneIsland_PokemonCenter_1F_EventScript_170E94:: @ 8170E94 +OneIsland_PokemonCenter_1F_EventScript_Nurse:: @ 8170E94 lock faceplayer call EventScript_PkmnCenterNurse release end -OneIsland_PokemonCenter_1F_EventScript_170E9D:: @ 8170E9D +OneIsland_PokemonCenter_1F_EventScript_Bill:: @ 8170E9D lock - goto_if_set FLAG_SEVII_DETOUR_FINISHED, EventScript_170EB1 - msgbox gUnknown_81A1266 + goto_if_set FLAG_SEVII_DETOUR_FINISHED, OneIsland_PokemonCenter_1F_EventScript_BillGoTakeStroll + msgbox OneIsland_PokemonCenter_1F_Text_HmmHowAboutLikeThis release end -EventScript_170EB1:: @ 8170EB1 - applymovement 2, Movement_FacePlayer +OneIsland_PokemonCenter_1F_EventScript_BillGoTakeStroll:: @ 8170EB1 + applymovement LOCALID_BILL, Movement_FacePlayer waitmovement 0 - msgbox gUnknown_81A128C + msgbox OneIsland_PokemonCenter_1F_Text_GotPCWorkingStrollAWhileMore release end -OneIsland_PokemonCenter_1F_EventScript_170EC5:: @ 8170EC5 +OneIsland_PokemonCenter_1F_EventScript_Celio:: @ 8170EC5 lock faceplayer compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 7 - goto_if_eq EventScript_170F35 + goto_if_eq OneIsland_PokemonCenter_1F_EventScript_CelioGiveBillFact compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 6 - goto_if_eq EventScript_170F9B - goto_if_set FLAG_RECOVERED_SAPPHIRE, EventScript_170FA5 + goto_if_eq OneIsland_PokemonCenter_1F_EventScript_CelioJustGivenSapphire + goto_if_set FLAG_RECOVERED_SAPPHIRE, OneIsland_PokemonCenter_1F_EventScript_GiveCelioSapphire compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5 - goto_if_eq EventScript_17103A - goto_if_set FLAG_GOT_RUBY, EventScript_171044 + goto_if_eq OneIsland_PokemonCenter_1F_EventScript_ExplainRainbowPass + goto_if_set FLAG_GOT_RUBY, OneIsland_PokemonCenter_1F_EventScript_GiveCelioRuby compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 4 - goto_if_eq EventScript_1710F2 + goto_if_eq OneIsland_PokemonCenter_1F_EventScript_CelioWaitingForRuby specialvar VAR_RESULT, IsNationalPokedexEnabled compare VAR_RESULT, TRUE - goto_if_eq EventScript_1710FC + goto_if_eq OneIsland_PokemonCenter_1F_EventScript_CelioRequestRuby compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 3 - goto_if_eq EventScript_171134 - msgbox gUnknown_81A1321 + goto_if_eq OneIsland_PokemonCenter_1F_EventScript_CelioPlayerMissingNationalDex + msgbox OneIsland_PokemonCenter_1F_Text_SorryForBeingPoorHost closemessage - applymovement 3, Movement_FaceOriginalDirection + applymovement LOCALID_CELIO, Movement_FaceOriginalDirection waitmovement 0 release end -EventScript_170F35:: @ 8170F35 - msgbox gUnknown_81A1EBD +OneIsland_PokemonCenter_1F_EventScript_CelioGiveBillFact:: @ 8170F35 + msgbox OneIsland_PokemonCenter_1F_Text_CelioHearingRumorsAboutYou random 3 compare VAR_RESULT, 0 - goto_if_eq EventScript_170F6D + goto_if_eq OneIsland_PokemonCenter_1F_EventScript_BillFact1 compare VAR_RESULT, 1 - goto_if_eq EventScript_170F84 + goto_if_eq OneIsland_PokemonCenter_1F_EventScript_BillFact2 famechecker FAMECHECKER_BILL, 5 - msgbox gUnknown_81A2076 + msgbox OneIsland_PokemonCenter_1F_Text_BillCantStomachMilk release end -EventScript_170F6D:: @ 8170F6D +OneIsland_PokemonCenter_1F_EventScript_BillFact1:: @ 8170F6D famechecker FAMECHECKER_BILL, 3 - msgbox gUnknown_81A1EF3 + msgbox OneIsland_PokemonCenter_1F_Text_BillsFirstMonWasAbra release end -EventScript_170F84:: @ 8170F84 +OneIsland_PokemonCenter_1F_EventScript_BillFact2:: @ 8170F84 famechecker FAMECHECKER_BILL, 4 - msgbox gUnknown_81A1F7C + msgbox OneIsland_PokemonCenter_1F_Text_BillsHometownInGoldenrod release end -EventScript_170F9B:: @ 8170F9B - msgbox gUnknown_81A1E39 +OneIsland_PokemonCenter_1F_EventScript_CelioJustGivenSapphire:: @ 8170F9B + msgbox OneIsland_PokemonCenter_1F_Text_WishYouBestOfLuck release end -EventScript_170FA5:: @ 8170FA5 +OneIsland_PokemonCenter_1F_EventScript_GiveCelioSapphire:: @ 8170FA5 textcolor 3 playfanfare MUS_ME_WAZA - message Text_1A1C2D + message OneIsland_PokemonCenter_1F_Text_HandedSapphireToCelio waitmessage waitfanfare call EventScript_1A6675 removeitem ITEM_SAPPHIRE, 1 - msgbox gUnknown_81A1C4E + msgbox OneIsland_PokemonCenter_1F_Text_ThankYouGiveMeTime closemessage - applymovement 3, Movement_171142 + applymovement LOCALID_CELIO, OneIsland_PokemonCenter_1F_Movement_CelioPutGemInMachine waitmovement 0 playse SE_TK_KASYA - call EventScript_170C2C + call OneIsland_PokemonCenter_1F_EventScript_SetSapphireMetatile special DrawWholeMapView - msgbox gUnknown_81A1D45 + msgbox OneIsland_PokemonCenter_1F_Text_OkayThisIsGood closemessage delay 60 - applymovement 3, Movement_17113E + applymovement LOCALID_CELIO, OneIsland_PokemonCenter_1F_Movement_CelioCheckMachine waitmovement 0 delay 30 - applymovement 3, Movement_17113E + applymovement LOCALID_CELIO, OneIsland_PokemonCenter_1F_Movement_CelioCheckMachine waitmovement 0 delay 40 playse SE_PC_ON - call EventScript_170C36 + call OneIsland_PokemonCenter_1F_EventScript_SetNetworkMachineOn special DrawWholeMapView - msgbox gUnknown_81A1D59 - applymovement 3, Movement_FacePlayer + msgbox OneIsland_PokemonCenter_1F_Text_LinkedUpWithLanette + applymovement LOCALID_CELIO, Movement_FacePlayer waitmovement 0 - msgbox gUnknown_81A1D7D + msgbox OneIsland_PokemonCenter_1F_Text_ManagedToLinkWithHoennThankYou special sub_810B82C setflag FLAG_SYS_CAN_LINK_WITH_RS setflag FLAG_HIDE_CERULEAN_CAVE_GUARD @@ -293,43 +298,43 @@ EventScript_170FA5:: @ 8170FA5 release end -EventScript_17103A:: @ 817103A - msgbox gUnknown_81A1BB7 +OneIsland_PokemonCenter_1F_EventScript_ExplainRainbowPass:: @ 817103A + msgbox OneIsland_PokemonCenter_1F_Text_PassLetYouGetToAllIslands release end -EventScript_171044:: @ 8171044 - msgbox gUnknown_81A197E +OneIsland_PokemonCenter_1F_EventScript_GiveCelioRuby:: @ 8171044 + msgbox OneIsland_PokemonCenter_1F_Text_OhThats textcolor 3 playfanfare MUS_ME_WAZA - message Text_1A198D + message OneIsland_PokemonCenter_1F_Text_HandedRubyToCelio waitmessage waitfanfare call EventScript_1A6675 closemessage - applymovement 3, Movement_171142 + applymovement LOCALID_CELIO, OneIsland_PokemonCenter_1F_Movement_CelioPutGemInMachine waitmovement 0 playse SE_TK_KASYA - call EventScript_170C22 + call OneIsland_PokemonCenter_1F_EventScript_SetRubyMetatile special DrawWholeMapView delay 30 - applymovement 3, Movement_FacePlayer + applymovement LOCALID_CELIO, Movement_FacePlayer waitmovement 0 - msgbox gUnknown_81A19AA, MSGBOX_YESNO + msgbox OneIsland_PokemonCenter_1F_Text_MayIAskOneMoreFavor, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq EventScript_171099 - goto EventScript_1710B2 + goto_if_eq OneIsland_PokemonCenter_1F_EventScript_DeclineHelpCelio + goto OneIsland_PokemonCenter_1F_EventScript_GiveRainbowPass end -EventScript_171099:: @ 8171099 - msgbox gUnknown_81A1A08, MSGBOX_YESNO +OneIsland_PokemonCenter_1F_EventScript_DeclineHelpCelio:: @ 8171099 + msgbox OneIsland_PokemonCenter_1F_Text_PleaseINeedYourHelp, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq EventScript_171099 - goto EventScript_1710B2 + goto_if_eq OneIsland_PokemonCenter_1F_EventScript_DeclineHelpCelio + goto OneIsland_PokemonCenter_1F_EventScript_GiveRainbowPass end -EventScript_1710B2:: @ 81710B2 - msgbox gUnknown_81A1A3F +OneIsland_PokemonCenter_1F_EventScript_GiveRainbowPass:: @ 81710B2 + msgbox OneIsland_PokemonCenter_1F_Text_AnotherGemstoneInSeviiIslands removeitem ITEM_RUBY, 1 removeitem ITEM_TRI_PASS, 1 setvar VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5 @@ -337,47 +342,47 @@ EventScript_1710B2:: @ 81710B2 setflag FLAG_SYS_SEVII_MAP_4567 textcolor 3 playfanfare MUS_FAN5 - message Text_1A1B56 + message OneIsland_PokemonCenter_1F_Text_ReturnedTriPassForRainbowPass waitmessage waitfanfare playfanfare MUS_FAN5 - message Text_1A1B8E + message OneIsland_PokemonCenter_1F_Text_ObtainedExtraMapPage waitmessage waitfanfare call EventScript_1A6675 - goto EventScript_17103A + goto OneIsland_PokemonCenter_1F_EventScript_ExplainRainbowPass end -EventScript_1710F2:: @ 81710F2 - msgbox gUnknown_81A1896 +OneIsland_PokemonCenter_1F_EventScript_CelioWaitingForRuby:: @ 81710F2 + msgbox OneIsland_PokemonCenter_1F_Text_TryingToFindGem release end -EventScript_1710FC:: @ 81710FC - msgbox gUnknown_81A169B - applymovement 3, Movement_WalkInPlaceFastestUp +OneIsland_PokemonCenter_1F_EventScript_CelioRequestRuby:: @ 81710FC + msgbox OneIsland_PokemonCenter_1F_Text_CelioCaughtMoreMonMaybeICanBeUseful + applymovement LOCALID_CELIO, Movement_WalkInPlaceFastestUp waitmovement 0 - msgbox gUnknown_81A1723 - applymovement 3, Movement_FacePlayer + msgbox OneIsland_PokemonCenter_1F_Text_YoullBeTradingFromTrainersFarAway + applymovement LOCALID_CELIO, Movement_FacePlayer waitmovement 0 - msgbox gUnknown_81A17DF + msgbox OneIsland_PokemonCenter_1F_Text_NeedsSpecialGemstone setvar VAR_MAP_SCENE_MT_EMBER_EXTERIOR, 1 setvar VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 4 release end -EventScript_171134:: @ 8171134 - msgbox gUnknown_81A15EC +OneIsland_PokemonCenter_1F_EventScript_CelioPlayerMissingNationalDex:: @ 8171134 + msgbox OneIsland_PokemonCenter_1F_Text_CelioImModifyingMyNetworkMachine release end -Movement_17113E:: @ 817113E +OneIsland_PokemonCenter_1F_Movement_CelioCheckMachine:: @ 817113E walk_in_place_up delay_8 walk_in_place_up step_end -Movement_171142:: @ 8171142 +OneIsland_PokemonCenter_1F_Movement_CelioPutGemInMachine:: @ 8171142 walk_in_place_fastest_up walk_in_place_up delay_16 @@ -385,116 +390,116 @@ Movement_171142:: @ 8171142 walk_in_place_up step_end -OneIsland_PokemonCenter_1F_EventScript_171148:: @ 8171148 - msgbox gUnknown_81A20D5, MSGBOX_NPC +OneIsland_PokemonCenter_1F_EventScript_LittleBoy:: @ 8171148 + msgbox OneIsland_PokemonCenter_1F_Text_CameFromPalletDontKnowIt, MSGBOX_NPC end -OneIsland_PokemonCenter_1F_EventScript_171151:: @ 8171151 - msgbox gUnknown_81A212D, MSGBOX_NPC +OneIsland_PokemonCenter_1F_EventScript_Hiker:: @ 8171151 + msgbox OneIsland_PokemonCenter_1F_Text_EnormousVolcanoOnIsland, MSGBOX_NPC end -OneIsland_PokemonCenter_1F_EventScript_17115A:: @ 817115A +OneIsland_PokemonCenter_1F_EventScript_BattleGirl:: @ 817115A lock faceplayer - goto_if_set FLAG_SYS_CAN_LINK_WITH_RS, EventScript_17116F - msgbox gUnknown_81A218D + goto_if_set FLAG_SYS_CAN_LINK_WITH_RS, OneIsland_PokemonCenter_1F_EventScript_BattleGirlHoennLinked + msgbox OneIsland_PokemonCenter_1F_Text_WishICouldTradeWithBoyfriend release end -EventScript_17116F:: @ 817116F - msgbox gUnknown_81A21D0 +OneIsland_PokemonCenter_1F_EventScript_BattleGirlHoennLinked:: @ 817116F + msgbox OneIsland_PokemonCenter_1F_Text_TradedWithFarAwayBoyfriend release end -OneIsland_PokemonCenter_1F_EventScript_171179:: @ 8171179 +OneIsland_PokemonCenter_1F_EventScript_NetworkMachine:: @ 8171179 lockall - goto_if_set FLAG_SYS_CAN_LINK_WITH_RS, EventScript_1711A0 - goto_if_set FLAG_SEVII_DETOUR_FINISHED, EventScript_171196 - msgbox gUnknown_81A223F + goto_if_set FLAG_SYS_CAN_LINK_WITH_RS, OneIsland_PokemonCenter_1F_EventScript_NetworkMachineLinkedWithHoenn + goto_if_set FLAG_SEVII_DETOUR_FINISHED, OneIsland_PokemonCenter_1F_EventScript_NetworkMachineLinkedWithKanto + msgbox OneIsland_PokemonCenter_1F_Text_MachineUnderAdjustment releaseall end -EventScript_171196:: @ 8171196 - msgbox gUnknown_81A2286 +OneIsland_PokemonCenter_1F_EventScript_NetworkMachineLinkedWithKanto:: @ 8171196 + msgbox OneIsland_PokemonCenter_1F_Text_MachineLinkedWithKanto releaseall end -EventScript_1711A0:: @ 81711A0 - msgbox gUnknown_81A22CB +OneIsland_PokemonCenter_1F_EventScript_NetworkMachineLinkedWithHoenn:: @ 81711A0 + msgbox OneIsland_PokemonCenter_1F_Text_MachineLinkedWithKantoAndHoenn releaseall end -OneIsland_PokemonCenter_1F_EventScript_1711AA:: @ 81711AA +OneIsland_PokemonCenter_1F_EventScript_LeaveOneIslandTriggerTop:: @ 81711AA lockall setvar VAR_TEMP_1, 1 - goto EventScript_1711DA + goto OneIsland_PokemonCenter_1F_EventScript_LeaveOneIslandScene end -OneIsland_PokemonCenter_1F_EventScript_1711B6:: @ 81711B6 +OneIsland_PokemonCenter_1F_EventScript_LeaveOneIslandTriggerMidTop:: @ 81711B6 lockall setvar VAR_TEMP_1, 2 - goto EventScript_1711DA + goto OneIsland_PokemonCenter_1F_EventScript_LeaveOneIslandScene end -OneIsland_PokemonCenter_1F_EventScript_1711C2:: @ 81711C2 +OneIsland_PokemonCenter_1F_EventScript_LeaveOneIslandTriggerMidBottom:: @ 81711C2 lockall setvar VAR_TEMP_1, 3 - goto EventScript_1711DA + goto OneIsland_PokemonCenter_1F_EventScript_LeaveOneIslandScene end -OneIsland_PokemonCenter_1F_EventScript_1711CE:: @ 81711CE +OneIsland_PokemonCenter_1F_EventScript_LeaveOneIslandTriggerBottom:: @ 81711CE lockall setvar VAR_TEMP_1, 4 - goto EventScript_1711DA + goto OneIsland_PokemonCenter_1F_EventScript_LeaveOneIslandScene end -EventScript_1711DA:: @ 81711DA +OneIsland_PokemonCenter_1F_EventScript_LeaveOneIslandScene:: @ 81711DA textcolor 0 playse SE_PIN - applymovement 2, Movement_ExclamationMark + applymovement LOCALID_BILL, Movement_ExclamationMark waitmovement 0 - msgbox gUnknown_81A13B8 + msgbox OneIsland_PokemonCenter_1F_Text_BillOhHeyPlayer closemessage compare VAR_TEMP_1, 1 - call_if_eq EventScript_1712E4 + call_if_eq OneIsland_PokemonCenter_1F_EventScript_PlayerWalkToBillTop compare VAR_TEMP_1, 2 - call_if_eq EventScript_1712EF + call_if_eq OneIsland_PokemonCenter_1F_EventScript_PlayerWalkToBillMidTop compare VAR_TEMP_1, 3 - call_if_eq EventScript_1712FA + call_if_eq OneIsland_PokemonCenter_1F_EventScript_PlayerWalkToBillMidBottom compare VAR_TEMP_1, 4 - call_if_eq EventScript_171305 + call_if_eq OneIsland_PokemonCenter_1F_EventScript_PlayerWalkToBillBottom delay 10 - msgbox gUnknown_81A13CB + msgbox OneIsland_PokemonCenter_1F_Text_BillWeGotItDone applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestDown waitmovement 0 - msgbox gUnknown_81A1431 - applymovement 2, Movement_WalkInPlaceFastestDown + msgbox OneIsland_PokemonCenter_1F_Text_CelioJobWentQuick + applymovement LOCALID_BILL, Movement_WalkInPlaceFastestDown waitmovement 0 - applymovement 3, Movement_WalkInPlaceFastestUp + applymovement LOCALID_CELIO, Movement_WalkInPlaceFastestUp waitmovement 0 - msgbox gUnknown_81A1470 - msgbox gUnknown_81A14E1 + msgbox OneIsland_PokemonCenter_1F_Text_BillYouveLearnedALot + msgbox OneIsland_PokemonCenter_1F_Text_CelioOhReallyEhehe closemessage - applymovement 2, Movement_WalkInPlaceFastestLeft + applymovement LOCALID_BILL, Movement_WalkInPlaceFastestLeft waitmovement 0 delay 10 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight waitmovement 0 delay 15 - msgbox gUnknown_81A14FB + msgbox OneIsland_PokemonCenter_1F_Text_BillWeShouldHeadBackToKanto closemessage - applymovement 2, Movement_WalkInPlaceFastestDown + applymovement LOCALID_BILL, Movement_WalkInPlaceFastestDown waitmovement 0 delay 15 - applymovement 3, Movement_WalkInPlaceFastestLeft + applymovement LOCALID_CELIO, Movement_WalkInPlaceFastestLeft waitmovement 0 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestDown waitmovement 0 - msgbox gUnknown_81A1574 + msgbox OneIsland_PokemonCenter_1F_Text_CelioPromiseIllShowYouAroundSometime closemessage delay 25 - applymovement OBJ_EVENT_ID_PLAYER, Movement_171326 - applymovement 2, Movement_17132D + applymovement OBJ_EVENT_ID_PLAYER, OneIsland_PokemonCenter_1F_Movement_PlayerExit + applymovement LOCALID_BILL, OneIsland_PokemonCenter_1F_Movement_BillExit waitmovement 0 playse SE_KAIDAN setflag FLAG_HIDE_ONE_ISLAND_POKECENTER_BILL @@ -506,49 +511,50 @@ EventScript_1711DA:: @ 81711DA goto EventScript_SetSail end -EventScript_1712E4:: @ 81712E4 - applymovement OBJ_EVENT_ID_PLAYER, Movement_171310 +OneIsland_PokemonCenter_1F_EventScript_PlayerWalkToBillTop:: @ 81712E4 + applymovement OBJ_EVENT_ID_PLAYER, OneIsland_PokemonCenter_1F_Movement_PlayerWalkToBillTop waitmovement 0 return -EventScript_1712EF:: @ 81712EF - applymovement OBJ_EVENT_ID_PLAYER, Movement_171314 +OneIsland_PokemonCenter_1F_EventScript_PlayerWalkToBillMidTop:: @ 81712EF + applymovement OBJ_EVENT_ID_PLAYER, OneIsland_PokemonCenter_1F_Movement_PlayerWalkToBillMidTop waitmovement 0 return -EventScript_1712FA:: @ 81712FA - applymovement OBJ_EVENT_ID_PLAYER, Movement_171316 +OneIsland_PokemonCenter_1F_EventScript_PlayerWalkToBillMidBottom:: @ 81712FA + applymovement OBJ_EVENT_ID_PLAYER, OneIsland_PokemonCenter_1F_Movement_PlayerWalkToBillMidBottom waitmovement 0 return -EventScript_171305:: @ 8171305 - applymovement OBJ_EVENT_ID_PLAYER, Movement_17131A +OneIsland_PokemonCenter_1F_EventScript_PlayerWalkToBillBottom:: @ 8171305 + applymovement OBJ_EVENT_ID_PLAYER, OneIsland_PokemonCenter_1F_Movement_PlayerWalkToBillBottom waitmovement 0 return -Movement_171310:: @ 8171310 +OneIsland_PokemonCenter_1F_Movement_PlayerWalkToBillTop:: @ 8171310 walk_right walk_down walk_in_place_fastest_right step_end -Movement_171314:: @ 8171314 +OneIsland_PokemonCenter_1F_Movement_PlayerWalkToBillMidTop:: @ 8171314 walk_right step_end -Movement_171316:: @ 8171316 +OneIsland_PokemonCenter_1F_Movement_PlayerWalkToBillMidBottom:: @ 8171316 walk_right walk_up walk_in_place_fastest_right step_end -Movement_17131A:: @ 817131A +OneIsland_PokemonCenter_1F_Movement_PlayerWalkToBillBottom:: @ 817131A walk_right walk_up walk_up walk_in_place_fastest_right step_end +@ Unused Movement_17131F:: @ 817131F delay_16 delay_16 @@ -556,11 +562,12 @@ Movement_17131F:: @ 817131F walk_in_place_fastest_left step_end +@ Unused Movement_171324:: @ 8171324 walk_in_place_fast_down step_end -Movement_171326:: @ 8171326 +OneIsland_PokemonCenter_1F_Movement_PlayerExit:: @ 8171326 walk_left walk_left walk_left @@ -569,7 +576,7 @@ Movement_171326:: @ 8171326 walk_down step_end -Movement_17132D:: @ 817132D +OneIsland_PokemonCenter_1F_Movement_BillExit:: @ 817132D walk_left walk_left walk_left diff --git a/data/maps/OneIsland_PokemonCenter_1F/text.inc b/data/maps/OneIsland_PokemonCenter_1F/text.inc index e2d6c7fed..278a1cc44 100644 --- a/data/maps/OneIsland_PokemonCenter_1F/text.inc +++ b/data/maps/OneIsland_PokemonCenter_1F/text.inc @@ -1,52 +1,52 @@ -gUnknown_81A0CDE:: @ 81A0CDE +OneIsland_PokemonCenter_1F_Text_BillHeyThereCelio:: @ 81A0CDE .string "BILL: Hey, there!\n" .string "CELIO!$" -gUnknown_81A0CF7:: @ 81A0CF7 +OneIsland_PokemonCenter_1F_Text_CelioCantBelieveYouCameOut:: @ 81A0CF7 .string "CELIO: BILL!\n" .string "I can't believe you came out here.$" -gUnknown_81A0D27:: @ 81A0D27 +OneIsland_PokemonCenter_1F_Text_BillHowsYourResearchComing:: @ 81A0D27 .string "BILL: Well, absolutely!\n" .string "How's your research coming along?\p" .string "…Oh, wait a sec.$" -gUnknown_81A0D72:: @ 81A0D72 +OneIsland_PokemonCenter_1F_Text_ThisIsMyBuddyCelio:: @ 81A0D72 .string "{PLAYER}, this is my buddy CELIO.\n" .string "He's one dedicated PC MANIAC!$" -gUnknown_81A0DAC:: @ 81A0DAC +OneIsland_PokemonCenter_1F_Text_PlayerIsRisingPokemonChamp:: @ 81A0DAC .string "CELIO, this is {PLAYER}, a rising\n" .string "contender as the POKéMON CHAMP!$" -gUnknown_81A0DE8:: @ 81A0DE8 +OneIsland_PokemonCenter_1F_Text_PlayerIsReigningPokemonChamp:: @ 81A0DE8 .string "CELIO, this is {PLAYER}, the\n" .string "reigning POKéMON CHAMP!$" -gUnknown_81A0E17:: @ 81A0E17 +OneIsland_PokemonCenter_1F_Text_CelioThatsReallyImpressive:: @ 81A0E17 .string "CELIO: That's really impressive.\p" .string "I hate to say it, but I have zero\n" .string "aptitude for battling.\p" .string "Anyways, I'm glad to meet you.$" -gUnknown_81A0E90:: @ 81A0E90 +OneIsland_PokemonCenter_1F_Text_BillBringMeUpToSpeed:: @ 81A0E90 .string "BILL: So, bring me up to speed.\n" .string "How's your machine running?$" -gUnknown_81A0ECC:: @ 81A0ECC +OneIsland_PokemonCenter_1F_Text_CelioPCsCantLinkWithYours:: @ 81A0ECC .string "CELIO: It's running fine, but we're\n" .string "too remote out here.\p" .string "The PCs on this island just can't\n" .string "link with your PC, BILL.$" -gUnknown_81A0F40:: @ 81A0F40 +OneIsland_PokemonCenter_1F_Text_BillLetMeHelpYou:: @ 81A0F40 .string "BILL: Oh, yeah?\n" .string "Okay, let me take a look-see.\p" .string "…Hang on here…\n" .string "I think we can make it work.\l" .string "Let me help you, okay?$" -gUnknown_81A0FB1:: @ 81A0FB1 +OneIsland_PokemonCenter_1F_Text_CanYouDeliverThisMeteoritePlayer:: @ 81A0FB1 .string "{PLAYER}, can I get you to wait for\n" .string "me just a bit?\p" .string "…Actually, can I get you to do\n" @@ -62,38 +62,38 @@ gUnknown_81A0FB1:: @ 81A0FB1 .string "So, can I get you to deliver this\n" .string "METEORITE to him?$" -gUnknown_81A10EE:: @ 81A10EE +OneIsland_PokemonCenter_1F_Text_AcceptedMeteoriteFromBill:: @ 81A10EE .string "{PLAYER} accepted the METEORITE\n" .string "from BILL.$" -gUnknown_81A1113:: @ 81A1113 +OneIsland_PokemonCenter_1F_Text_CelioPleaseTakeThis:: @ 81A1113 .string "CELIO: {PLAYER}, if you are going\n" .string "to TWO ISLAND, please take this.$" -gUnknown_81A1150:: @ 81A1150 +OneIsland_PokemonCenter_1F_Text_PassLetsYouTravelBetweenIslands:: @ 81A1150 .string "It's a PASS for the ferry service\n" .string "serving the local islands.\p" .string "It will let you travel between the\n" .string "ISLANDS ONE, TWO, and THREE.\p" .string "Oh, you should have this, too.$" -Text_1A11EC:: @ 81A11EC +OneIsland_PokemonCenter_1F_Text_ReceivedExtraPageForTownMap:: @ 81A11EC .string "{PLAYER} received an extra page\n" .string "for the TOWN MAP!$" -gUnknown_81A1218:: @ 81A1218 +OneIsland_PokemonCenter_1F_Text_ReceivedTownMap:: @ 81A1218 .string "{PLAYER} received\n" .string "a TOWN MAP!$" -gUnknown_81A1230:: @ 81A1230 +OneIsland_PokemonCenter_1F_Text_BillCatchYouLater:: @ 81A1230 .string "BILL: I'll catch you later!\n" .string "Say hi to the guy for me!$" -gUnknown_81A1266:: @ 81A1266 +OneIsland_PokemonCenter_1F_Text_HmmHowAboutLikeThis:: @ 81A1266 .string "Hmm…\p" .string "How about we try this like this…$" -gUnknown_81A128C:: @ 81A128C +OneIsland_PokemonCenter_1F_Text_GotPCWorkingStrollAWhileMore:: @ 81A128C .string "Oh, hey, {PLAYER}!\p" .string "Did you see?\n" .string "We got the PC working!\p" @@ -102,54 +102,54 @@ gUnknown_81A128C:: @ 81A128C .string "Can you go out on a stroll or\n" .string "something for a while more?$" -gUnknown_81A1321:: @ 81A1321 +OneIsland_PokemonCenter_1F_Text_SorryForBeingPoorHost:: @ 81A1321 .string "I'm sorry for taking up so much of\n" .string "BILL's time.\p" .string "I'm also sorry for being such a \n" .string "poor host on your visit here.$" -Text_UsualPCServicesUnavailable:: @ 81A1390 +OneIsland_PokemonCenter_1F_Text_UsualPCServicesUnavailable:: @ 81A1390 .string "The usual PC services aren't\n" .string "available…$" -gUnknown_81A13B8:: @ 81A13B8 +OneIsland_PokemonCenter_1F_Text_BillOhHeyPlayer:: @ 81A13B8 .string "BILL: Oh, hey!\n" .string "{PLAYER}!$" -gUnknown_81A13CB:: @ 81A13CB +OneIsland_PokemonCenter_1F_Text_BillWeGotItDone:: @ 81A13CB .string "BILL: What kept you so long?\n" .string "Been out having a good time?\p" .string "We got it done.\n" .string "The PCs are up and running!$" -gUnknown_81A1431:: @ 81A1431 +OneIsland_PokemonCenter_1F_Text_CelioJobWentQuick:: @ 81A1431 .string "CELIO: The job went incredibly\n" .string "quick.\p" .string "BILL is one amazing guy…$" -gUnknown_81A1470:: @ 81A1470 +OneIsland_PokemonCenter_1F_Text_BillYouveLearnedALot:: @ 81A1470 .string "BILL: No, no! There was almost\n" .string "nothing left for me to do.\p" .string "CELIO, I have to hand it to you.\n" .string "You've learned a lot.$" -gUnknown_81A14E1:: @ 81A14E1 +OneIsland_PokemonCenter_1F_Text_CelioOhReallyEhehe:: @ 81A14E1 .string "CELIO: Oh, really?\n" .string "Ehehe…$" -gUnknown_81A14FB:: @ 81A14FB +OneIsland_PokemonCenter_1F_Text_BillWeShouldHeadBackToKanto:: @ 81A14FB .string "BILL: Well, there you have it.\n" .string "I'm finished with the job.\l" .string "We should head back to KANTO.\p" .string "CELIO, I'll be seeing you again.$" -gUnknown_81A1574:: @ 81A1574 +OneIsland_PokemonCenter_1F_Text_CelioPromiseIllShowYouAroundSometime:: @ 81A1574 .string "CELIO: {PLAYER}, I'm really sorry\n" .string "that we sent you off alone today.\p" .string "I promise, I will show you around\n" .string "these islands sometime.$" -gUnknown_81A15EC:: @ 81A15EC +OneIsland_PokemonCenter_1F_Text_CelioImModifyingMyNetworkMachine:: @ 81A15EC .string "CELIO: Hello!\n" .string "You look awfully busy as always.\p" .string "How am I doing?\p" @@ -159,7 +159,7 @@ gUnknown_81A15EC:: @ 81A15EC .string "I hope you'll be first to use it,\l" .string "{PLAYER}.$" -gUnknown_81A169B:: @ 81A169B +OneIsland_PokemonCenter_1F_Text_CelioCaughtMoreMonMaybeICanBeUseful:: @ 81A169B .string "CELIO: {PLAYER}, how have things\n" .string "been for you?\p" .string "Oh, is that right?\n" @@ -167,7 +167,7 @@ gUnknown_81A169B:: @ 81A169B .string "Do you know what?\n" .string "Maybe I can be useful to you.$" -gUnknown_81A1723:: @ 81A1723 +OneIsland_PokemonCenter_1F_Text_YoullBeTradingFromTrainersFarAway:: @ 81A1723 .string "I'm modifying the Network Machine\n" .string "right now.\p" .string "I'm changing it so it can handle\n" @@ -176,7 +176,7 @@ gUnknown_81A1723:: @ 81A1723 .string "trading for exotic POKéMON from\l" .string "TRAINERS far away.$" -gUnknown_81A17DF:: @ 81A17DF +OneIsland_PokemonCenter_1F_Text_NeedsSpecialGemstone:: @ 81A17DF .string "But, there is a slight catch.\p" .string "For the link to work, the Machine\n" .string "needs a special gemstone.\p" @@ -184,7 +184,7 @@ gUnknown_81A17DF:: @ 81A17DF .string "but I haven't found one yet.\p" .string "Who knows where it could be.$" -gUnknown_81A1896:: @ 81A1896 +OneIsland_PokemonCenter_1F_Text_TryingToFindGem:: @ 81A1896 .string "I was trying to find the gem\n" .string "even while I was studying.\p" .string "As a result, I've made no headway\n" @@ -194,26 +194,26 @@ gUnknown_81A1896:: @ 81A1896 .string "But this time, I want to try to do\n" .string "things by myself.$" -gUnknown_81A197E:: @ 81A197E +OneIsland_PokemonCenter_1F_Text_OhThats:: @ 81A197E .string "Oh!\n" .string "Th-that's…$" -Text_1A198D:: @ 81A198D +OneIsland_PokemonCenter_1F_Text_HandedRubyToCelio:: @ 81A198D .string "{PLAYER} handed the RUBY\n" .string "to CELIO.$" -gUnknown_81A19AA:: @ 81A19AA +OneIsland_PokemonCenter_1F_Text_MayIAskOneMoreFavor:: @ 81A19AA .string "Thank you!\n" .string "{PLAYER}, you're simply amazing.\p" .string "… … … … … …\p" .string "Um… May I ask one more giant favor\n" .string "of you?$" -gUnknown_81A1A08:: @ 81A1A08 +OneIsland_PokemonCenter_1F_Text_PleaseINeedYourHelp:: @ 81A1A08 .string "It… It's not anything weird.\n" .string "Please, I need your help.$" -gUnknown_81A1A3F:: @ 81A1A3F +OneIsland_PokemonCenter_1F_Text_AnotherGemstoneInSeviiIslands:: @ 81A1A3F .string "While I was studying gemstones,\n" .string "I discovered something important.\p" .string "There is another gem that forms\n" @@ -225,26 +225,26 @@ gUnknown_81A1A3F:: @ 81A1A3F .string "{PLAYER}, may I have your ferry\n" .string "PASS and the TOWN MAP?$" -Text_1A1B56:: @ 81A1B56 +OneIsland_PokemonCenter_1F_Text_ReturnedTriPassForRainbowPass:: @ 81A1B56 .string "{PLAYER} returned the TRI-PASS and\n" .string "received the RAINBOW PASS.$" -Text_1A1B8E:: @ 81A1B8E +OneIsland_PokemonCenter_1F_Text_ObtainedExtraMapPage:: @ 81A1B8E .string "Obtained an extra page for the\n" .string "TOWN MAP!$" -gUnknown_81A1BB7:: @ 81A1BB7 +OneIsland_PokemonCenter_1F_Text_PassLetYouGetToAllIslands:: @ 81A1BB7 .string "This is my own ferry PASS.\p" .string "It will let you get to all the\n" .string "SEVII ISLANDS.\p" .string "{PLAYER}, please, I can't do\n" .string "it without your help.$" -Text_1A1C2D:: @ 81A1C2D +OneIsland_PokemonCenter_1F_Text_HandedSapphireToCelio:: @ 81A1C2D .string "{PLAYER} handed the SAPPHIRE\n" .string "to CELIO.$" -gUnknown_81A1C4E:: @ 81A1C4E +OneIsland_PokemonCenter_1F_Text_ThankYouGiveMeTime:: @ 81A1C4E .string "CELIO: So this is the gem that\n" .string "forms a pair with the RUBY…\p" .string "{PLAYER}, you've gone through a lot\n" @@ -255,14 +255,14 @@ gUnknown_81A1C4E:: @ 81A1C4E .string "Now it's my turn to work for you!\n" .string "Please give me a little time.$" -gUnknown_81A1D45:: @ 81A1D45 +OneIsland_PokemonCenter_1F_Text_OkayThisIsGood:: @ 81A1D45 .string "Okay, this is good…$" -gUnknown_81A1D59:: @ 81A1D59 +OneIsland_PokemonCenter_1F_Text_LinkedUpWithLanette:: @ 81A1D59 .string "I did it!\n" .string "I linked up with LANETTE!$" -gUnknown_81A1D7D:: @ 81A1D7D +OneIsland_PokemonCenter_1F_Text_ManagedToLinkWithHoennThankYou:: @ 81A1D7D .string "{PLAYER}…\n" .string "{PLAYER}, I did it!\p" .string "I've managed to link up with\n" @@ -273,7 +273,7 @@ gUnknown_81A1D7D:: @ 81A1D7D .string "Thanks to you, my dream came\n" .string "true…$" -gUnknown_81A1E39:: @ 81A1E39 +OneIsland_PokemonCenter_1F_Text_WishYouBestOfLuck:: @ 81A1E39 .string "I…\n" .string "I'm not crying.\p" .string "That's enough about me!\p" @@ -281,12 +281,12 @@ gUnknown_81A1E39:: @ 81A1E39 .string "looking for exotic POKéMON, right?\p" .string "I wish you the best of luck!$" -gUnknown_81A1EBD:: @ 81A1EBD +OneIsland_PokemonCenter_1F_Text_CelioHearingRumorsAboutYou:: @ 81A1EBD .string "CELIO: Hello!\p" .string "{PLAYER}, I've been hearing rumors\n" .string "about you.$" -gUnknown_81A1EF3:: @ 81A1EF3 +OneIsland_PokemonCenter_1F_Text_BillsFirstMonWasAbra:: @ 81A1EF3 .string "{PLAYER}, what's your favorite kind\n" .string "of POKéMON?\p" .string "BILL is a POKéMANIAC, so he loves\n" @@ -294,7 +294,7 @@ gUnknown_81A1EF3:: @ 81A1EF3 .string "Apparently, the first one he caught\n" .string "was an ABRA.$" -gUnknown_81A1F7C:: @ 81A1F7C +OneIsland_PokemonCenter_1F_Text_BillsHometownInGoldenrod:: @ 81A1F7C .string "By the way, {PLAYER}, you're from\n" .string "PALLET TOWN, aren't you?\p" .string "I've heard that it's a quiet and\n" @@ -305,53 +305,53 @@ gUnknown_81A1F7C:: @ 81A1F7C .string "festive, bustling city.\p" .string "I'd like to go there one day.$" -gUnknown_81A2076:: @ 81A2076 +OneIsland_PokemonCenter_1F_Text_BillCantStomachMilk:: @ 81A2076 .string "{PLAYER}, is there anything that\n" .string "you can't stand?\p" .string "Apparently, BILL simply can't\n" .string "stomach milk at all.$" -gUnknown_81A20D5:: @ 81A20D5 +OneIsland_PokemonCenter_1F_Text_CameFromPalletDontKnowIt:: @ 81A20D5 .string "Oh, you're a stranger here!\n" .string "Hi! Where did you come from?\p" .string "…PALLET TOWN?\n" .string "I don't know it!$" -gUnknown_81A212D:: @ 81A212D +OneIsland_PokemonCenter_1F_Text_EnormousVolcanoOnIsland:: @ 81A212D .string "On this island, there's an enormous\n" .string "volcano.\p" .string "It hasn't erupted lately, so why\n" .string "not enjoy a hike?$" -gUnknown_81A218D:: @ 81A218D +OneIsland_PokemonCenter_1F_Text_WishICouldTradeWithBoyfriend:: @ 81A218D .string "I wish I could trade POKéMON with\n" .string "my boyfriend who lives far away…$" -gUnknown_81A21D0:: @ 81A21D0 +OneIsland_PokemonCenter_1F_Text_TradedWithFarAwayBoyfriend:: @ 81A21D0 .string "I traded POKéMON with my boyfriend\n" .string "far away!\p" .string "Everyone's saying that we can\n" .string "thank you and CELIO.\p" .string "So, thank you!$" -gUnknown_81A223F:: @ 81A223F +OneIsland_PokemonCenter_1F_Text_MachineUnderAdjustment:: @ 81A223F .string "Network Machine\n" .string "Link Level 0\p" .string "…POKéMON Storage System under\n" .string "adjustment…$" -gUnknown_81A2286:: @ 81A2286 +OneIsland_PokemonCenter_1F_Text_MachineLinkedWithKanto:: @ 81A2286 .string "Network Machine\n" .string "Link Level 1\p" .string "Link established with the KANTO\n" .string "region.$" -gUnknown_81A22CB:: @ 81A22CB +OneIsland_PokemonCenter_1F_Text_MachineLinkedWithKantoAndHoenn:: @ 81A22CB .string "Network Machine\n" .string "Link Level 2\p" .string "Link established with the KANTO\n" .string "and HOENN regions.$" -gUnknown_81A231B:: @ 81A231B +OneIsland_PokemonCenter_1F_Text_ObtainedTriPass:: @ 81A231B .string "Obtained the TRI-PASS!$" diff --git a/data/maps/OneIsland_TreasureBeach/map.json b/data/maps/OneIsland_TreasureBeach/map.json index 33eaf4781..b95513e7a 100644 --- a/data/maps/OneIsland_TreasureBeach/map.json +++ b/data/maps/OneIsland_TreasureBeach/map.json @@ -31,7 +31,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "OneIsland_TreasureBeach_EventScript_1ABF27", + "script": "OneIsland_TreasureBeach_EventScript_Amara", "flag": "0" }, { @@ -44,7 +44,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "OneIsland_TreasureBeach_EventScript_16876C", + "script": "OneIsland_TreasureBeach_EventScript_Boy", "flag": "0" } ], diff --git a/data/maps/OneIsland_TreasureBeach/scripts.inc b/data/maps/OneIsland_TreasureBeach/scripts.inc index a49a763a1..137c8103e 100644 --- a/data/maps/OneIsland_TreasureBeach/scripts.inc +++ b/data/maps/OneIsland_TreasureBeach/scripts.inc @@ -1,6 +1,6 @@ OneIsland_TreasureBeach_MapScripts:: @ 816876B .byte 0 -OneIsland_TreasureBeach_EventScript_16876C:: @ 816876C - msgbox gUnknown_8189DCE, MSGBOX_NPC +OneIsland_TreasureBeach_EventScript_Boy:: @ 816876C + msgbox OneIsland_TreasureBeach_Text_GoodThingsWashUpOnBeach, MSGBOX_NPC end diff --git a/data/maps/OneIsland_TreasureBeach/text.inc b/data/maps/OneIsland_TreasureBeach/text.inc index 344ed5203..30ed2b0bb 100644 --- a/data/maps/OneIsland_TreasureBeach/text.inc +++ b/data/maps/OneIsland_TreasureBeach/text.inc @@ -1,16 +1,16 @@ -Text_189D5A:: @ 8189D5A +OneIsland_TreasureBeach_Text_AmaraIntro:: @ 8189D5A .string "Lying back, rocked by the waves…\n" .string "It's exquisite.$" -Text_189D8B:: @ 8189D8B +OneIsland_TreasureBeach_Text_AmaraDefeat:: @ 8189D8B .string "I lost…\n" .string "It feels awful.$" -Text_189DA3:: @ 8189DA3 +OneIsland_TreasureBeach_Text_AmaraPostBattle:: @ 8189DA3 .string "The sea is pleasantly warm in these\n" .string "parts.$" -gUnknown_8189DCE:: @ 8189DCE +OneIsland_TreasureBeach_Text_GoodThingsWashUpOnBeach:: @ 8189DCE .string "Good things get washed up by the\n" .string "ocean current onto this beach.\p" .string "That's why I often come here for\n" diff --git a/data/maps/PalletTown/map.json b/data/maps/PalletTown/map.json index 6ebe51cc2..32d501c67 100644 --- a/data/maps/PalletTown/map.json +++ b/data/maps/PalletTown/map.json @@ -36,7 +36,7 @@ "movement_range_y": 4, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PalletTown_EventScript_16575C", + "script": "PalletTown_EventScript_SignLady", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 2, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PalletTown_EventScript_16582F", + "script": "PalletTown_EventScript_FatMan", "flag": "0" }, { @@ -97,7 +97,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_PALLET_TOWN_OAK", "var_value": 0, - "script": "PalletTown_EventScript_1655ED" + "script": "PalletTown_EventScript_OakTriggerLeft" }, { "type": "trigger", @@ -106,7 +106,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_PALLET_TOWN_OAK", "var_value": 0, - "script": "PalletTown_EventScript_1655F9" + "script": "PalletTown_EventScript_OakTriggerRight" }, { "type": "trigger", @@ -115,7 +115,7 @@ "elevation": 3, "var": "VAR_TEMP_2", "var_value": 1, - "script": "PalletTown_EventScript_16587B" + "script": "PalletTown_EventScript_SignLadyTrigger" } ], "bg_events": [ @@ -124,35 +124,35 @@ "x": 16, "y": 16, "elevation": 0, - "script": "PalletTown_EventScript_165838" + "script": "PalletTown_EventScript_OaksLabSign" }, { "type": "bg_event_type_0", "x": 4, "y": 7, "elevation": 0, - "script": "PalletTown_EventScript_165850" + "script": "PalletTown_EventScript_PlayersHouseSign" }, { "type": "bg_event_type_0", "x": 13, "y": 7, "elevation": 0, - "script": "PalletTown_EventScript_165859" + "script": "PalletTown_EventScript_RivalsHouseSign" }, { "type": "bg_event_type_0", "x": 9, "y": 11, "elevation": 0, - "script": "PalletTown_EventScript_165862" + "script": "PalletTown_EventScript_TownSign" }, { "type": "bg_event_type_0", "x": 5, "y": 14, "elevation": 0, - "script": "PalletTown_EventScript_16586B" + "script": "PalletTown_EventScript_TrainerTips" } ] } diff --git a/data/maps/PalletTown/scripts.inc b/data/maps/PalletTown/scripts.inc index 9fd73f882..77fb4cb8c 100644 --- a/data/maps/PalletTown/scripts.inc +++ b/data/maps/PalletTown/scripts.inc @@ -1,3 +1,8 @@ +.equ LOCALID_SIGN_LADY, 1 +.equ LOCALID_PROF_OAK, 3 + +.equ SIGN_LADY_READY, VAR_TEMP_2 + PalletTown_MapScripts:: @ 816545A map_script MAP_SCRIPT_ON_TRANSITION, PalletTown_OnTransition map_script MAP_SCRIPT_ON_FRAME_TABLE, PalletTown_OnFrame @@ -5,50 +10,51 @@ PalletTown_MapScripts:: @ 816545A PalletTown_OnTransition:: @ 8165465 setworldmapflag FLAG_WORLD_MAP_PALLET_TOWN - call_if_set FLAG_PALLET_LADY_NOT_BLOCKING_SIGN, EventScript_165488 + call_if_set FLAG_PALLET_LADY_NOT_BLOCKING_SIGN, PalletTown_EventScript_TryReadySignLady compare VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 0 - call_if_eq EventScript_1654A8 + call_if_eq PalletTown_EventScript_SetSignLadyPos compare VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 1 - call_if_eq EventScript_1654A2 + call_if_eq PalletTown_EventScript_SetSignLadyDone end -EventScript_165488:: @ 8165488 +PalletTown_EventScript_TryReadySignLady:: @ 8165488 goto_if_unset FLAG_PALLET_TOWN_LADY_MOVED_FROM_SIGN, EventScript_Return compare VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 1 goto_if_ge EventScript_Return setvar VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 1 return -EventScript_1654A2:: @ 81654A2 +PalletTown_EventScript_SetSignLadyDone:: @ 81654A2 setvar VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 2 return -EventScript_1654A8:: @ 81654A8 - goto_if_set FLAG_PALLET_LADY_NOT_BLOCKING_SIGN, EventScript_1654BD - setobjectxyperm 1, 5, 15 - setobjectmovementtype 1, 7 +PalletTown_EventScript_SetSignLadyPos:: @ 81654A8 + goto_if_set FLAG_PALLET_LADY_NOT_BLOCKING_SIGN, PalletTown_EventScript_MoveSignLadyToRouteEntrance + setobjectxyperm LOCALID_SIGN_LADY, 5, 15 + setobjectmovementtype LOCALID_SIGN_LADY, MOVEMENT_TYPE_FACE_UP return -EventScript_1654BD:: @ 81654BD - setobjectxyperm 1, 12, 2 - setobjectmovementtype 1, 8 - setvar VAR_TEMP_2, 1 +PalletTown_EventScript_MoveSignLadyToRouteEntrance:: @ 81654BD + setobjectxyperm LOCALID_SIGN_LADY, 12, 2 + setobjectmovementtype LOCALID_SIGN_LADY, MOVEMENT_TYPE_FACE_DOWN + setvar SIGN_LADY_READY, TRUE return PalletTown_OnFrame:: @ 81654CE - map_script_2 VAR_MAP_SCENE_PALLET_TOWN_OAK, 2, EventScript_1654D8 + map_script_2 VAR_MAP_SCENE_PALLET_TOWN_OAK, 2, PalletTown_EventScript_OakRatingScene .2byte 0 -EventScript_1654D8:: @ 81654D8 +@ Oak approaches player after exiting their house post Elite Four to check if they should receieve the National Dex +PalletTown_EventScript_OakRatingScene:: @ 81654D8 lockall textcolor 0 - setobjectxyperm 3, 14, 14 - setobjectmovementtype 3, 9 - addobject 3 - applymovement 3, Movement_1655AF + setobjectxyperm LOCALID_PROF_OAK, 14, 14 + setobjectmovementtype LOCALID_PROF_OAK, MOVEMENT_TYPE_FACE_LEFT + addobject LOCALID_PROF_OAK + applymovement LOCALID_PROF_OAK, PalletTown_Movement_OakWalkToPlayersDoor waitmovement 0 - goto_if_unset FLAG_WORLD_MAP_ONE_ISLAND, EventScript_1655A1 - msgbox gUnknown_817D8BF + goto_if_unset FLAG_WORLD_MAP_ONE_ISLAND, PalletTown_EventScript_NotBeenToOneIslandYet + msgbox PalletTown_Text_OakLetMeSeePokedex setvar VAR_0x8004, 0 specialvar VAR_RESULT, Special_GetPokedexCount copyvar VAR_0x8008, VAR_0x8005 @@ -56,17 +62,17 @@ EventScript_1654D8:: @ 81654D8 getnumberstring 0, VAR_0x8008 getnumberstring 1, VAR_0x8009 compare VAR_0x8009, 60 - goto_if_lt EventScript_165593 - msgbox gUnknown_817D9AA + goto_if_lt PalletTown_EventScript_NotEnoughMonsForNationalDex + msgbox PalletTown_Text_CaughtXImpressiveFollowMe closemessage playbgm MUS_ANNAI, 0 - applymovement OBJ_EVENT_ID_PLAYER, Movement_1655DD - applymovement 3, Movement_1655CC + applymovement OBJ_EVENT_ID_PLAYER, PalletTown_Movement_PlayerWalkToLabFromHouse + applymovement LOCALID_PROF_OAK, PalletTown_Movement_OakWalkToLabFromHouse waitmovement 0 opendoor 16, 13 waitdooranim - applymovement 3, Movement_16572E - applymovement OBJ_EVENT_ID_PLAYER, Movement_165758 + applymovement LOCALID_PROF_OAK, PalletTown_Movement_OakEnterLab + applymovement OBJ_EVENT_ID_PLAYER, PalletTown_Movement_PlayerEnterLab waitmovement 0 closedoor 16, 13 waitdooranim @@ -78,26 +84,26 @@ EventScript_1654D8:: @ 81654D8 releaseall end -EventScript_16557E:: @ 816557E +PalletTown_EventScript_EndOakRatingScene:: @ 816557E closemessage - applymovement 3, Movement_1655BE + applymovement LOCALID_PROF_OAK, PalletTown_Movement_OakExit waitmovement 0 - removeobject 3 + removeobject LOCALID_PROF_OAK setvar VAR_MAP_SCENE_PALLET_TOWN_OAK, 3 releaseall end -EventScript_165593:: @ 8165593 - msgbox gUnknown_817D925 - goto EventScript_16557E +PalletTown_EventScript_NotEnoughMonsForNationalDex:: @ 8165593 + msgbox PalletTown_Text_CaughtXPuttingInHonestEffort + goto PalletTown_EventScript_EndOakRatingScene end -EventScript_1655A1:: @ 81655A1 - msgbox gUnknown_817DA16 - goto EventScript_16557E +PalletTown_EventScript_NotBeenToOneIslandYet:: @ 81655A1 + msgbox PalletTown_Text_OakYouEnjoyingTraveling + goto PalletTown_EventScript_EndOakRatingScene end -Movement_1655AF:: @ 81655AF +PalletTown_Movement_OakWalkToPlayersDoor:: @ 81655AF walk_left walk_left walk_left @@ -114,7 +120,7 @@ Movement_1655AF:: @ 81655AF walk_in_place_fastest_up step_end -Movement_1655BE:: @ 81655BE +PalletTown_Movement_OakExit:: @ 81655BE walk_right walk_right walk_right @@ -130,7 +136,7 @@ Movement_1655BE:: @ 81655BE walk_right step_end -Movement_1655CC:: @ 81655CC +PalletTown_Movement_OakWalkToLabFromHouse:: @ 81655CC walk_right walk_right walk_right @@ -149,7 +155,7 @@ Movement_1655CC:: @ 81655CC walk_in_place_fastest_up step_end -Movement_1655DD:: @ 81655DD +PalletTown_Movement_PlayerWalkToLabFromHouse:: @ 81655DD walk_down walk_right walk_right @@ -167,24 +173,24 @@ Movement_1655DD:: @ 81655DD walk_right step_end -PalletTown_EventScript_1655ED:: @ 81655ED +PalletTown_EventScript_OakTriggerLeft:: @ 81655ED lockall setvar VAR_TEMP_1, 0 - goto EventScript_165605 + goto PalletTown_EventScript_OakTrigger end -PalletTown_EventScript_1655F9:: @ 81655F9 +PalletTown_EventScript_OakTriggerRight:: @ 81655F9 lockall setvar VAR_TEMP_1, 1 - goto EventScript_165605 + goto PalletTown_EventScript_OakTrigger end -EventScript_165605:: @ 8165605 +PalletTown_EventScript_OakTrigger:: @ 8165605 famechecker FAMECHECKER_OAK, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005 textcolor 0 delay 30 playbgm MUS_OHKIDO, 0 - message Text_17D72C + message PalletTown_Text_OakDontGoOut waitmessage delay 85 closemessage @@ -194,23 +200,23 @@ EventScript_165605:: @ 8165605 applymovement OBJ_EVENT_ID_PLAYER, Movement_ExclamationMark waitmovement 0 delay 30 - addobject 3 + addobject LOCALID_PROF_OAK compare VAR_TEMP_1, 0 - call_if_eq EventScript_1656B8 + call_if_eq PalletTown_EventScript_OakEnterLeft compare VAR_TEMP_1, 1 - call_if_eq EventScript_1656C3 + call_if_eq PalletTown_EventScript_OakEnterRight delay 30 - msgbox gUnknown_817D74A + msgbox PalletTown_Text_OakGrassUnsafeNeedMon closemessage delay 30 compare VAR_TEMP_1, 0 - call_if_eq EventScript_1656CE + call_if_eq PalletTown_EventScript_OakLeadPlayerToLabLeft compare VAR_TEMP_1, 1 - call_if_eq EventScript_1656E0 + call_if_eq PalletTown_EventScript_OakLeadPlayerToLabRight opendoor 16, 13 waitdooranim - applymovement 3, Movement_16572E - applymovement OBJ_EVENT_ID_PLAYER, Movement_165758 + applymovement LOCALID_PROF_OAK, PalletTown_Movement_OakEnterLab + applymovement OBJ_EVENT_ID_PLAYER, PalletTown_Movement_PlayerEnterLab waitmovement 0 closedoor 16, 13 waitdooranim @@ -224,29 +230,29 @@ EventScript_165605:: @ 8165605 releaseall end -EventScript_1656B8:: @ 81656B8 - applymovement 3, Movement_1656F2 +PalletTown_EventScript_OakEnterLeft:: @ 81656B8 + applymovement LOCALID_PROF_OAK, PalletTown_Movement_OakEnterLeft waitmovement 0 return -EventScript_1656C3:: @ 81656C3 - applymovement 3, Movement_1656FB +PalletTown_EventScript_OakEnterRight:: @ 81656C3 + applymovement LOCALID_PROF_OAK, PalletTown_Movement_OakEnterRight waitmovement 0 return -EventScript_1656CE:: @ 81656CE - applymovement 3, Movement_165705 - applymovement OBJ_EVENT_ID_PLAYER, Movement_165731 +PalletTown_EventScript_OakLeadPlayerToLabLeft:: @ 81656CE + applymovement LOCALID_PROF_OAK, PalletTown_Movement_OakWalkToLabLeft + applymovement OBJ_EVENT_ID_PLAYER, PalletTown_Movement_PlayerWalkToLabLeft waitmovement 0 return -EventScript_1656E0:: @ 81656E0 - applymovement 3, Movement_165719 - applymovement OBJ_EVENT_ID_PLAYER, Movement_165744 +PalletTown_EventScript_OakLeadPlayerToLabRight:: @ 81656E0 + applymovement LOCALID_PROF_OAK, PalletTown_Movement_OakWalkToLabRight + applymovement OBJ_EVENT_ID_PLAYER, PalletTown_Movement_PlayerWalkToLabRight waitmovement 0 return -Movement_1656F2:: @ 81656F2 +PalletTown_Movement_OakEnterLeft:: @ 81656F2 walk_up walk_up walk_right @@ -257,7 +263,7 @@ Movement_1656F2:: @ 81656F2 walk_up step_end -Movement_1656FB:: @ 81656FB +PalletTown_Movement_OakEnterRight:: @ 81656FB walk_right walk_up walk_up @@ -269,8 +275,7 @@ Movement_1656FB:: @ 81656FB walk_up step_end -Movement_165705:: @ 8165705 - walk_down + .macro walk_to_lab walk_left walk_down walk_down @@ -287,214 +292,174 @@ Movement_165705:: @ 8165705 walk_right walk_right walk_right + .endm + +PalletTown_Movement_OakWalkToLabLeft:: @ 8165705 + walk_down + walk_to_lab walk_right walk_in_place_fastest_up step_end -Movement_165719:: @ 8165719 +PalletTown_Movement_OakWalkToLabRight:: @ 8165719 walk_down walk_left - walk_left - walk_down - walk_down - walk_down - walk_down - walk_down - walk_down - walk_down - walk_down - walk_down - walk_down - walk_down - walk_right - walk_right - walk_right - walk_right + walk_to_lab walk_right walk_in_place_fastest_up step_end -Movement_16572E:: @ 816572E +PalletTown_Movement_OakEnterLab:: @ 816572E walk_up set_invisible step_end -Movement_165731:: @ 8165731 - walk_down - walk_down - walk_left - walk_down - walk_down - walk_down +PalletTown_Movement_PlayerWalkToLabLeft:: @ 8165731 walk_down walk_down - walk_down - walk_down - walk_down - walk_down - walk_down - walk_down - walk_right - walk_right - walk_right - walk_right + walk_to_lab step_end -Movement_165744:: @ 8165744 +PalletTown_Movement_PlayerWalkToLabRight:: @ 8165744 walk_down walk_down walk_left - walk_left - walk_down - walk_down - walk_down - walk_down - walk_down - walk_down - walk_down - walk_down - walk_down - walk_down - walk_down - walk_right - walk_right - walk_right - walk_right + walk_to_lab step_end -Movement_165758:: @ 8165758 +PalletTown_Movement_PlayerEnterLab:: @ 8165758 walk_right walk_up set_invisible step_end -PalletTown_EventScript_16575C:: @ 816575C +PalletTown_EventScript_SignLady:: @ 816575C lock compare VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 2 - goto_if_eq EventScript_1657ED + goto_if_eq PalletTown_EventScript_SignLadyDone compare VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 1 - goto_if_eq EventScript_165815 - compare VAR_TEMP_2, 1 - goto_if_eq EventScript_1658C2 - goto_if_set FLAG_TEMP_2, EventScript_165801 - msgbox gUnknown_81B1C8B - applymovement 1, Movement_FacePlayer + goto_if_eq PalletTown_EventScript_SignLadyJustShowedSign + compare SIGN_LADY_READY, TRUE + goto_if_eq PalletTown_EventScript_SignLadyStartShowSign + goto_if_set FLAG_TEMP_2, PalletTown_EventScript_SignLadyGoReadSign + msgbox PalletTown_Text_HmmIsThatRight + applymovement LOCALID_SIGN_LADY, Movement_FacePlayer waitmovement 0 playse SE_PIN - applymovement 1, Movement_ExclamationMark + applymovement LOCALID_SIGN_LADY, Movement_ExclamationMark waitmovement 0 - applymovement 1, Movement_Delay48 + applymovement LOCALID_SIGN_LADY, Movement_Delay48 waitmovement 0 - msgbox gUnknown_81B1C9F + msgbox PalletTown_Text_OhLookLook closemessage compare VAR_FACING, DIR_EAST - call_if_eq EventScript_1657D7 + call_if_eq PalletTown_EventScript_SignLadyMoveOutOfWayRight compare VAR_FACING, DIR_EAST - call_if_ne EventScript_1657E2 + call_if_ne PalletTown_EventScript_SignLadyMoveOutOfWayLeft moveobjectoffscreen 1 setflag FLAG_TEMP_2 release end -EventScript_1657D7:: @ 81657D7 - applymovement 1, Movement_165829 +PalletTown_EventScript_SignLadyMoveOutOfWayRight:: @ 81657D7 + applymovement LOCALID_SIGN_LADY, PalletTown_Movement_SignLadyMoveOutOfWayRight waitmovement 0 return -EventScript_1657E2:: @ 81657E2 - applymovement 1, Movement_16582C +PalletTown_EventScript_SignLadyMoveOutOfWayLeft:: @ 81657E2 + applymovement LOCALID_SIGN_LADY, PalletTown_Movement_SignLadyMoveOutOfWayLeft waitmovement 0 return -EventScript_1657ED:: @ 81657ED - applymovement 1, Movement_FacePlayer +PalletTown_EventScript_SignLadyDone:: @ 81657ED + applymovement LOCALID_SIGN_LADY, Movement_FacePlayer waitmovement 0 - msgbox gUnknown_817D7C8 + msgbox PalletTown_Text_RaisingMonsToo release end -EventScript_165801:: @ 8165801 - applymovement 1, Movement_FacePlayer +PalletTown_EventScript_SignLadyGoReadSign:: @ 8165801 + applymovement LOCALID_SIGN_LADY, Movement_FacePlayer waitmovement 0 - msgbox gUnknown_81B1CAF + msgbox PalletTown_Text_ReadItReadIt release end -EventScript_165815:: @ 8165815 - applymovement 1, Movement_FacePlayer +PalletTown_EventScript_SignLadyJustShowedSign:: @ 8165815 + applymovement LOCALID_SIGN_LADY, Movement_FacePlayer waitmovement 0 - msgbox gUnknown_81B1CEC + msgbox PalletTown_Text_SignsAreUsefulArentThey release end -Movement_165829:: @ 8165829 +PalletTown_Movement_SignLadyMoveOutOfWayRight:: @ 8165829 walk_right walk_in_place_fastest_left step_end -Movement_16582C:: @ 816582C +PalletTown_Movement_SignLadyMoveOutOfWayLeft:: @ 816582C walk_left walk_in_place_fastest_right step_end -PalletTown_EventScript_16582F:: @ 816582F - msgbox gUnknown_817D80D, MSGBOX_NPC +PalletTown_EventScript_FatMan:: @ 816582F + msgbox PalletTown_Text_CanStoreItemsAndMonsInPC, MSGBOX_NPC end -PalletTown_EventScript_165838:: @ 8165838 +PalletTown_EventScript_OaksLabSign:: @ 8165838 lockall famechecker FAMECHECKER_OAK, 0 - msgbox gUnknown_817D866 + msgbox PalletTown_Text_OakPokemonResearchLab releaseall end -PalletTown_EventScript_165850:: @ 8165850 - msgbox gUnknown_817D87F, MSGBOX_SIGN +PalletTown_EventScript_PlayersHouseSign:: @ 8165850 + msgbox PalletTown_Text_PlayersHouse, MSGBOX_SIGN end -PalletTown_EventScript_165859:: @ 8165859 - msgbox gUnknown_817D88A, MSGBOX_SIGN +PalletTown_EventScript_RivalsHouseSign:: @ 8165859 + msgbox PalletTown_Text_RivalsHouse, MSGBOX_SIGN end -PalletTown_EventScript_165862:: @ 8165862 - msgbox gUnknown_817D895, MSGBOX_SIGN +PalletTown_EventScript_TownSign:: @ 8165862 + msgbox PalletTown_Text_TownSign, MSGBOX_SIGN end -PalletTown_EventScript_16586B:: @ 816586B +PalletTown_EventScript_TrainerTips:: @ 816586B lockall - msgbox gUnknown_81B1CC1 + msgbox PalletTown_Text_PressStartToOpenMenu setvar VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 1 releaseall end -PalletTown_EventScript_16587B:: @ 816587B +PalletTown_EventScript_SignLadyTrigger:: @ 816587B lockall - applymovement 1, Movement_WalkInPlaceFastestRight + applymovement LOCALID_SIGN_LADY, Movement_WalkInPlaceFastestRight applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft waitmovement 0 - call EventScript_165894 + call PalletTown_EventScript_SignLadyShowSign releaseall end -EventScript_165894:: @ 8165894 +PalletTown_EventScript_SignLadyShowSign:: @ 8165894 textcolor 1 - msgbox gUnknown_81B1D0B + msgbox PalletTown_Text_LookCopiedTrainerTipsSign closemessage delay 20 textcolor 3 setflag FLAG_PALLET_TOWN_LADY_MOVED_FROM_SIGN setvar VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 1 - setvar VAR_TEMP_2, 0 + setvar SIGN_LADY_READY, FALSE special sub_80699E0 special sub_80699BC signmsg - msgbox gUnknown_81B1D51 + msgbox PalletTown_Text_PressStartToOpenMenuCopy normalmsg return -EventScript_1658C2:: @ 81658C2 - applymovement 1, Movement_FacePlayer +PalletTown_EventScript_SignLadyStartShowSign:: @ 81658C2 + applymovement LOCALID_SIGN_LADY, Movement_FacePlayer waitmovement 0 - call EventScript_165894 + call PalletTown_EventScript_SignLadyShowSign release end diff --git a/data/maps/PalletTown/text.inc b/data/maps/PalletTown/text.inc index ad476a541..5ed553ce2 100644 --- a/data/maps/PalletTown/text.inc +++ b/data/maps/PalletTown/text.inc @@ -1,8 +1,8 @@ -Text_17D72C:: @ 817D72C +PalletTown_Text_OakDontGoOut:: @ 817D72C .string "OAK: Hey! Wait!\n" .string "Don't go out!$" -gUnknown_817D74A:: @ 817D74A +PalletTown_Text_OakGrassUnsafeNeedMon:: @ 817D74A .string "OAK: It's unsafe!\n" .string "Wild POKéMON live in tall grass!\p" .string "You need your own POKéMON for\n" @@ -10,30 +10,30 @@ gUnknown_817D74A:: @ 817D74A .string "I know!\n" .string "Here, come with me!$" -gUnknown_817D7C8:: @ 817D7C8 +PalletTown_Text_RaisingMonsToo:: @ 817D7C8 .string "I'm raising POKéMON, too.\p" .string "When they get strong, they can\n" .string "protect me.$" -gUnknown_817D80D:: @ 817D80D +PalletTown_Text_CanStoreItemsAndMonsInPC:: @ 817D80D .string "Technology is incredible!\p" .string "You can now store and recall items\n" .string "and POKéMON as data via PC.$" -gUnknown_817D866:: @ 817D866 +PalletTown_Text_OakPokemonResearchLab:: @ 817D866 .string "OAK POKéMON RESEARCH LAB$" -gUnknown_817D87F:: @ 817D87F +PalletTown_Text_PlayersHouse:: @ 817D87F .string "{PLAYER}'s house$" -gUnknown_817D88A:: @ 817D88A +PalletTown_Text_RivalsHouse:: @ 817D88A .string "{RIVAL}'s house$" -gUnknown_817D895:: @ 817D895 +PalletTown_Text_TownSign:: @ 817D895 .string "PALLET TOWN\n" .string "Shades of your journey await!$" -gUnknown_817D8BF:: @ 817D8BF +PalletTown_Text_OakLetMeSeePokedex:: @ 817D8BF .string "OAK: Ah, {PLAYER}!\n" .string "You're back, are you?\p" .string "How much have you filled in your\n" @@ -41,14 +41,14 @@ gUnknown_817D8BF:: @ 817D8BF .string "May I see it?\p" .string "Let's see…$" -gUnknown_817D925:: @ 817D925 +PalletTown_Text_CaughtXPuttingInHonestEffort:: @ 817D925 .string "You've caught {STR_VAR_2}…\p" .string "Hm, it looks as if you're putting\n" .string "in an honest effort.\p" .string "When you manage to fill it some\n" .string "more, come show me, please.$" -gUnknown_817D9AA:: @ 817D9AA +PalletTown_Text_CaughtXImpressiveFollowMe:: @ 817D9AA .string "You've caught… {STR_VAR_2}!?\n" .string "Now, this is impressive!\p" .string "There's something I wanted to ask\n" @@ -56,7 +56,7 @@ gUnknown_817D9AA:: @ 817D9AA .string "Come.\n" .string "Follow me.$" -gUnknown_817DA16:: @ 817DA16 +PalletTown_Text_OakYouEnjoyingTraveling:: @ 817DA16 .string "OAK: Ah, {PLAYER}!\n" .string "You seem to be enjoying traveling.\p" .string "Knowing you, {PLAYER}, I can easily\n" diff --git a/data/maps/PalletTown_GarysHouse/map.json b/data/maps/PalletTown_GarysHouse/map.json index a1fb5c9c8..48822f5bb 100644 --- a/data/maps/PalletTown_GarysHouse/map.json +++ b/data/maps/PalletTown_GarysHouse/map.json @@ -25,7 +25,7 @@ "movement_range_y": 3, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PalletTown_GarysHouse_EventScript_168D56", + "script": "PalletTown_GarysHouse_EventScript_Daisy", "flag": "0" }, { @@ -38,7 +38,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PalletTown_GarysHouse_EventScript_168F63", + "script": "PalletTown_GarysHouse_EventScript_TownMap", "flag": "FLAG_HIDE_TOWN_MAP" } ], @@ -72,21 +72,21 @@ "x": 12, "y": 1, "elevation": 0, - "script": "PalletTown_GarysHouse_EventScript_168F6C" + "script": "PalletTown_GarysHouse_EventScript_Bookshelf" }, { "type": "bg_event_type_0", "x": 11, "y": 1, "elevation": 0, - "script": "PalletTown_GarysHouse_EventScript_168F6C" + "script": "PalletTown_GarysHouse_EventScript_Bookshelf" }, { "type": "bg_event_type_0", "x": 9, "y": 1, "elevation": 0, - "script": "PalletTown_GarysHouse_EventScript_168F75" + "script": "PalletTown_GarysHouse_EventScript_Picture" } ] } diff --git a/data/maps/PalletTown_GarysHouse/scripts.inc b/data/maps/PalletTown_GarysHouse/scripts.inc index 2059a2f58..a64dff1a9 100644 --- a/data/maps/PalletTown_GarysHouse/scripts.inc +++ b/data/maps/PalletTown_GarysHouse/scripts.inc @@ -1,67 +1,72 @@ +.equ LOCALID_DAISY, 1 +.equ LOCALID_TOWN_MAP, 2 + +.equ RECEIVED_TOWN_MAP, VAR_TEMP_1 + PalletTown_GarysHouse_MapScripts:: @ 8168D27 map_script MAP_SCRIPT_ON_TRANSITION, PalletTown_GarysHouse_OnTransition .byte 0 PalletTown_GarysHouse_OnTransition:: @ 8168D2D compare VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 2 - call_if_lt EventScript_168D44 + call_if_lt PalletTown_GarysHouse_EventScript_MoveDaisyToTable compare VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 2 - call_if_ge EventScript_168D50 + call_if_ge PalletTown_GarysHouse_EventScript_AlreadyReceivedTownMap end -EventScript_168D44:: @ 8168D44 - setobjectmovementtype 1, 10 - setobjectxyperm 1, 5, 4 +PalletTown_GarysHouse_EventScript_MoveDaisyToTable:: @ 8168D44 + setobjectmovementtype LOCALID_DAISY, MOVEMENT_TYPE_FACE_RIGHT + setobjectxyperm LOCALID_DAISY, 5, 4 return -EventScript_168D50:: @ 8168D50 - setvar VAR_TEMP_1, 1 +PalletTown_GarysHouse_EventScript_AlreadyReceivedTownMap:: @ 8168D50 + setvar RECEIVED_TOWN_MAP, TRUE return -PalletTown_GarysHouse_EventScript_168D56:: @ 8168D56 +PalletTown_GarysHouse_EventScript_Daisy:: @ 8168D56 lock faceplayer famechecker FAMECHECKER_DAISY, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005 - goto_if_set FLAG_SYS_GAME_CLEAR, EventScript_168DB9 - compare VAR_TEMP_1, 1 - goto_if_eq EventScript_168EEC + goto_if_set FLAG_SYS_GAME_CLEAR, PalletTown_GarysHouse_EventScript_GroomMon + compare RECEIVED_TOWN_MAP, TRUE + goto_if_eq PalletTown_GarysHouse_EventScript_PleaseGiveMonsRest compare VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 2 - goto_if_eq EventScript_168F59 + goto_if_eq PalletTown_GarysHouse_EventScript_ExplainTownMap compare VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 1 - goto_if_eq EventScript_168EF6 + goto_if_eq PalletTown_GarysHouse_EventScript_GiveTownMap compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 1 - goto_if_ge EventScript_168DAF - msgbox gUnknown_818D58C + goto_if_ge PalletTown_GarysHouse_EventScript_HeardBattledRival + msgbox PalletTown_GarysHouse_Text_HiBrothersAtLab closemessage - applymovement 1, Movement_FaceOriginalDirection + applymovement LOCALID_DAISY, Movement_FaceOriginalDirection waitmovement 0 release end -EventScript_168DAF:: @ 8168DAF - msgbox gUnknown_818D5C4 +PalletTown_GarysHouse_EventScript_HeardBattledRival:: @ 8168DAF + msgbox PalletTown_GarysHouse_Text_HeardYouBattledRival release end -EventScript_168DB9:: @ 8168DB9 +PalletTown_GarysHouse_EventScript_GroomMon:: @ 8168DB9 goto_if_questlog EventScript_ReleaseEnd special sub_8112364 compare VAR_MASSAGE_COOLDOWN_STEP_COUNTER, 500 - goto_if_lt EventScript_168E46 - msgbox gUnknown_818D7D3, MSGBOX_YESNO + goto_if_lt PalletTown_GarysHouse_EventScript_RateMonFriendship + msgbox PalletTown_GarysHouse_Text_LikeMeToGroomMon, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq EventScript_168E3C - msgbox gUnknown_818D8B2 + goto_if_eq PalletTown_GarysHouse_EventScript_DeclineGrooming + msgbox PalletTown_GarysHouse_Text_GroomWhichOne special Special_ChooseMonFromParty waitstate lock faceplayer - compare VAR_0x8004, 6 - goto_if_ge EventScript_168E3C + compare VAR_0x8004, PARTY_SIZE + goto_if_ge PalletTown_GarysHouse_EventScript_DeclineGrooming specialvar VAR_RESULT, Special_GetSpeciesOfPartySlot_x8004 compare VAR_RESULT, SPECIES_EGG - goto_if_eq EventScript_168E32 - msgbox gUnknown_818D8CC + goto_if_eq PalletTown_GarysHouse_EventScript_CantGroomEgg + msgbox PalletTown_GarysHouse_Text_LookingNiceInNoTime closemessage fadescreen FADE_TO_BLACK playfanfare MUS_ME_ASA @@ -69,109 +74,109 @@ EventScript_168DB9:: @ 8168DB9 special Special_DaisyMassageServices fadescreen FADE_FROM_BLACK special Special_GetMonNickname - msgbox gUnknown_818D8FE + msgbox PalletTown_GarysHouse_Text_ThereYouGoAllDone release end -EventScript_168E32:: @ 8168E32 - msgbox gUnknown_818D97B +PalletTown_GarysHouse_EventScript_CantGroomEgg:: @ 8168E32 + msgbox PalletTown_GarysHouse_Text_CantGroomAnEgg release end -EventScript_168E3C:: @ 8168E3C - msgbox gUnknown_818D875 +PalletTown_GarysHouse_EventScript_DeclineGrooming:: @ 8168E3C + msgbox PalletTown_GarysHouse_Text_DontNeedAnyGrooming release end -EventScript_168E46:: @ 8168E46 - msgbox gUnknown_818D9A5 +PalletTown_GarysHouse_EventScript_RateMonFriendship:: @ 8168E46 + msgbox PalletTown_GarysHouse_Text_MayISeeFirstMon specialvar VAR_RESULT, Special_GetLeadMonFriendship switch VAR_RESULT - case 0, EventScript_168EA6 - case 1, EventScript_168EB0 - case 2, EventScript_168EBA - case 3, EventScript_168EC4 - case 4, EventScript_168ECE - case 5, EventScript_168ED8 - case 6, EventScript_168EE2 + case 0, PalletTown_GarysHouse_EventScript_MonFriendshipLowest + case 1, PalletTown_GarysHouse_EventScript_MonFriendshipLower + case 2, PalletTown_GarysHouse_EventScript_MonFriendshipLow + case 3, PalletTown_GarysHouse_EventScript_MonFriendshipMid + case 4, PalletTown_GarysHouse_EventScript_MonFriendshipHigh + case 5, PalletTown_GarysHouse_EventScript_MonFriendshipHigher + case 6, PalletTown_GarysHouse_EventScript_MonFriendshipHighest end -EventScript_168EA6:: @ 8168EA6 - msgbox gUnknown_818DBDD +PalletTown_GarysHouse_EventScript_MonFriendshipLowest:: @ 8168EA6 + msgbox PalletTown_GarysHouse_Text_WhyWouldMonHateYouSoMuch release end -EventScript_168EB0:: @ 8168EB0 - msgbox gUnknown_818DB88 +PalletTown_GarysHouse_EventScript_MonFriendshipLower:: @ 8168EB0 + msgbox PalletTown_GarysHouse_Text_DontLikeWayItGlaresAtYou release end -EventScript_168EBA:: @ 8168EBA - msgbox gUnknown_818DB2E +PalletTown_GarysHouse_EventScript_MonFriendshipLow:: @ 8168EBA + msgbox PalletTown_GarysHouse_Text_NotFamiliarWithYouYet release end -EventScript_168EC4:: @ 8168EC4 - msgbox gUnknown_818DAF3 +PalletTown_GarysHouse_EventScript_MonFriendshipMid:: @ 8168EC4 + msgbox PalletTown_GarysHouse_Text_ItsWarmingUpToYou release end -EventScript_168ECE:: @ 8168ECE - msgbox gUnknown_818DABE +PalletTown_GarysHouse_EventScript_MonFriendshipHigh:: @ 8168ECE + msgbox PalletTown_GarysHouse_Text_ItsQuiteFriendly release end -EventScript_168ED8:: @ 8168ED8 - msgbox gUnknown_818DA73 +PalletTown_GarysHouse_EventScript_MonFriendshipHigher:: @ 8168ED8 + msgbox PalletTown_GarysHouse_Text_ItLooksVeryHappy release end -EventScript_168EE2:: @ 8168EE2 - msgbox gUnknown_818DA16 +PalletTown_GarysHouse_EventScript_MonFriendshipHighest:: @ 8168EE2 + msgbox PalletTown_GarysHouse_Text_CouldntLoveYouMore release end -EventScript_168EEC:: @ 8168EEC - msgbox gUnknown_818D701 +PalletTown_GarysHouse_EventScript_PleaseGiveMonsRest:: @ 8168EEC + msgbox PalletTown_GarysHouse_Text_PleaseGiveMonsRest release end -EventScript_168EF6:: @ 8168EF6 - msgbox gUnknown_818D60A +PalletTown_GarysHouse_EventScript_GiveTownMap:: @ 8168EF6 + msgbox PalletTown_GarysHouse_Text_ErrandForGrandpaThisWillHelp closemessage checkitemspace ITEM_TOWN_MAP, 1 compare VAR_RESULT, FALSE - goto_if_eq EventScript_168F4F - applymovement 1, Movement_WalkInPlaceFastestRight + goto_if_eq PalletTown_GarysHouse_EventScript_NoRoomForTownMap + applymovement LOCALID_DAISY, Movement_WalkInPlaceFastestRight waitmovement 0 - removeobject 2 + removeobject LOCALID_TOWN_MAP setvar VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 2 delay 15 - applymovement 1, Movement_FacePlayer + applymovement LOCALID_DAISY, Movement_FacePlayer waitmovement 0 delay 12 - giveitem_msg gUnknown_818D661, ITEM_TOWN_MAP, 1, MUS_FAN5 + giveitem_msg PalletTown_GarysHouse_Text_ReceivedTownMapFromDaisy, ITEM_TOWN_MAP, 1, MUS_FAN5 release end -EventScript_168F4F:: @ 8168F4F - msgbox gUnknown_818D684 +PalletTown_GarysHouse_EventScript_NoRoomForTownMap:: @ 8168F4F + msgbox PalletTown_GarysHouse_Text_DontHaveSpaceForThis release end -EventScript_168F59:: @ 8168F59 - msgbox gUnknown_818D6AF +PalletTown_GarysHouse_EventScript_ExplainTownMap:: @ 8168F59 + msgbox PalletTown_GarysHouse_Text_ExplainTownMap release end -PalletTown_GarysHouse_EventScript_168F63:: @ 8168F63 - msgbox gUnknown_818D763, MSGBOX_NPC +PalletTown_GarysHouse_EventScript_TownMap:: @ 8168F63 + msgbox PalletTown_GarysHouse_Text_ItsBigMapOfKanto, MSGBOX_NPC end -PalletTown_GarysHouse_EventScript_168F6C:: @ 8168F6C - msgbox gUnknown_818D7A1, MSGBOX_SIGN +PalletTown_GarysHouse_EventScript_Bookshelf:: @ 8168F6C + msgbox PalletTown_GarysHouse_Text_ShelvesCrammedFullOfBooks, MSGBOX_SIGN end -PalletTown_GarysHouse_EventScript_168F75:: @ 8168F75 - msgbox gUnknown_818DC47, MSGBOX_SIGN +PalletTown_GarysHouse_EventScript_Picture:: @ 8168F75 + msgbox PalletTown_GarysHouse_Text_LovelyAndSweetClefairy, MSGBOX_SIGN end diff --git a/data/maps/PalletTown_GarysHouse/text.inc b/data/maps/PalletTown_GarysHouse/text.inc index 92d05fbef..38e3adbdc 100644 --- a/data/maps/PalletTown_GarysHouse/text.inc +++ b/data/maps/PalletTown_GarysHouse/text.inc @@ -1,47 +1,47 @@ -gUnknown_818D58C:: @ 818D58C +PalletTown_GarysHouse_Text_HiBrothersAtLab:: @ 818D58C .string "DAISY: Hi, {PLAYER}!\p" .string "My brother, {RIVAL}, is out at\n" .string "Grandpa's LAB.$" -gUnknown_818D5C4:: @ 818D5C4 +PalletTown_GarysHouse_Text_HeardYouBattledRival:: @ 818D5C4 .string "DAISY: {PLAYER}, I heard you had\n" .string "a battle against {RIVAL}.\p" .string "I wish I'd seen that!$" -gUnknown_818D60A:: @ 818D60A +PalletTown_GarysHouse_Text_ErrandForGrandpaThisWillHelp:: @ 818D60A .string "Grandpa asked you to run an\n" .string "errand?\p" .string "Gee, that's lazy of him.\n" .string "Here, this will help you.$" -gUnknown_818D661:: @ 818D661 +PalletTown_GarysHouse_Text_ReceivedTownMapFromDaisy:: @ 818D661 .string "{PLAYER} received a TOWN MAP\n" .string "from DAISY.$" -gUnknown_818D684:: @ 818D684 +PalletTown_GarysHouse_Text_DontHaveSpaceForThis:: @ 818D684 .string "You don't have space for this in\n" .string "your BAG.$" -gUnknown_818D6AF:: @ 818D6AF +PalletTown_GarysHouse_Text_ExplainTownMap:: @ 818D6AF .string "You can use the TOWN MAP to find\n" .string "out where you are, or check the\l" .string "names of places.$" -gUnknown_818D701:: @ 818D701 +PalletTown_GarysHouse_Text_PleaseGiveMonsRest:: @ 818D701 .string "DAISY: Just like people, POKéMON\n" .string "are living things.\p" .string "When they get tired, please give\n" .string "them a rest.$" -gUnknown_818D763:: @ 818D763 +PalletTown_GarysHouse_Text_ItsBigMapOfKanto:: @ 818D763 .string "It's a big map of the KANTO region.\n" .string "Now this would be useful!$" -gUnknown_818D7A1:: @ 818D7A1 +PalletTown_GarysHouse_Text_ShelvesCrammedFullOfBooks:: @ 818D7A1 .string "The shelves are crammed full of\n" .string "books on POKéMON.$" -gUnknown_818D7D3:: @ 818D7D3 +PalletTown_GarysHouse_Text_LikeMeToGroomMon:: @ 818D7D3 .string "DAISY: Hi, {PLAYER}!\n" .string "Good timing.\p" .string "I'm about to have some tea.\n" @@ -50,72 +50,72 @@ gUnknown_818D7D3:: @ 818D7D3 .string "Your POKéMON are a little dirty.\p" .string "Would you like me to groom one?$" -gUnknown_818D875:: @ 818D875 +PalletTown_GarysHouse_Text_DontNeedAnyGrooming:: @ 818D875 .string "You don't need any grooming done?\n" .string "Okay, we'll just have tea.$" -gUnknown_818D8B2:: @ 818D8B2 +PalletTown_GarysHouse_Text_GroomWhichOne:: @ 818D8B2 .string "Which one should I groom?$" -gUnknown_818D8CC:: @ 818D8CC +PalletTown_GarysHouse_Text_LookingNiceInNoTime:: @ 818D8CC .string "DAISY: Okay, I'll get it looking\n" .string "nice in no time.$" -gUnknown_818D8FE:: @ 818D8FE +PalletTown_GarysHouse_Text_ThereYouGoAllDone:: @ 818D8FE .string "{SIZE}Á{STR_VAR_1} looks dreamily content…\p" .string "{SIZE}ÈDAISY: There you go! All done.\n" .string "See? Doesn't it look nice?\p" .string "Giggle…\n" .string "It's such a cute POKéMON.$" -gUnknown_818D97B:: @ 818D97B +PalletTown_GarysHouse_Text_CantGroomAnEgg:: @ 818D97B .string "Oh, sorry. I honestly can't\n" .string "groom an EGG.$" -gUnknown_818D9A5:: @ 818D9A5 +PalletTown_GarysHouse_Text_MayISeeFirstMon:: @ 818D9A5 .string "DAISY: Your POKéMON grow to love\n" .string "you if you raise them with love.\p" .string "For example, {PLAYER}, may I see\n" .string "your first POKéMON?$" -gUnknown_818DA16:: @ 818DA16 +PalletTown_GarysHouse_Text_CouldntLoveYouMore:: @ 818DA16 .string "It couldn't possibly love you\n" .string "any more than it does now.\p" .string "Your POKéMON is happy beyond\n" .string "words.$" -gUnknown_818DA73:: @ 818DA73 +PalletTown_GarysHouse_Text_ItLooksVeryHappy:: @ 818DA73 .string "It looks very happy.\p" .string "I wish {RIVAL} could see this and\n" .string "learn something from it.$" -gUnknown_818DABE:: @ 818DABE +PalletTown_GarysHouse_Text_ItsQuiteFriendly:: @ 818DABE .string "It's quite friendly with you.\n" .string "Keep being good to it!$" -gUnknown_818DAF3:: @ 818DAF3 +PalletTown_GarysHouse_Text_ItsWarmingUpToYou:: @ 818DAF3 .string "It's warming up to you.\n" .string "Trust must be growing between you.$" -gUnknown_818DB2E:: @ 818DB2E +PalletTown_GarysHouse_Text_NotFamiliarWithYouYet:: @ 818DB2E .string "It's not quite familiar with you\n" .string "yet.\p" .string "POKéMON are all quite wary when\n" .string "you first get them.$" -gUnknown_818DB88:: @ 818DB88 +PalletTown_GarysHouse_Text_DontLikeWayItGlaresAtYou:: @ 818DB88 .string "{PLAYER}, I don't like the way it\n" .string "glares at you.\p" .string "Could you try being a little nicer\n" .string "to it?$" -gUnknown_818DBDD:: @ 818DBDD +PalletTown_GarysHouse_Text_WhyWouldMonHateYouSoMuch:: @ 818DBDD .string "…Um, it's not easy for me to say\n" .string "this, but…\p" .string "Is there some reason why your\n" .string "POKéMON would hate you so much?$" -gUnknown_818DC47:: @ 818DC47 +PalletTown_GarysHouse_Text_LovelyAndSweetClefairy:: @ 818DC47 .string "“The lovely and sweet\n" .string "CLEFAIRY”$" diff --git a/data/maps/PalletTown_PlayersHouse_1F/map.json b/data/maps/PalletTown_PlayersHouse_1F/map.json index ab8dabcf9..b6d8afc36 100644 --- a/data/maps/PalletTown_PlayersHouse_1F/map.json +++ b/data/maps/PalletTown_PlayersHouse_1F/map.json @@ -25,7 +25,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PalletTown_PlayersHouse_1F_EventScript_168C09", + "script": "PalletTown_PlayersHouse_1F_EventScript_Mom", "flag": "0" } ], @@ -66,7 +66,7 @@ "x": 6, "y": 1, "elevation": 0, - "script": "PalletTown_PlayersHouse_1F_EventScript_168C62" + "script": "PalletTown_PlayersHouse_1F_EventScript_TV" } ] } diff --git a/data/maps/PalletTown_PlayersHouse_1F/scripts.inc b/data/maps/PalletTown_PlayersHouse_1F/scripts.inc index 6dc0a1a47..0fa5219aa 100644 --- a/data/maps/PalletTown_PlayersHouse_1F/scripts.inc +++ b/data/maps/PalletTown_PlayersHouse_1F/scripts.inc @@ -1,58 +1,59 @@ PalletTown_PlayersHouse_1F_MapScripts:: @ 8168C08 .byte 0 -PalletTown_PlayersHouse_1F_EventScript_168C09:: @ 8168C09 +PalletTown_PlayersHouse_1F_EventScript_Mom:: @ 8168C09 lock faceplayer - goto_if_set FLAG_BEAT_RIVAL_IN_OAKS_LAB, EventScript_168C4A + goto_if_set FLAG_BEAT_RIVAL_IN_OAKS_LAB, PalletTown_PlayersHouse_1F_EventScript_MomHeal checkplayergender compare VAR_RESULT, MALE - call_if_eq EventScript_168C38 + call_if_eq PalletTown_PlayersHouse_1F_EventScript_MomOakLookingForYouMale compare VAR_RESULT, FEMALE - call_if_eq EventScript_168C41 + call_if_eq PalletTown_PlayersHouse_1F_EventScript_MomOakLookingForYouFemale closemessage applymovement 1, Movement_FaceOriginalDirection waitmovement 0 release end -EventScript_168C38:: @ 8168C38 - msgbox gUnknown_818D2F0 +PalletTown_PlayersHouse_1F_EventScript_MomOakLookingForYouMale:: @ 8168C38 + msgbox PalletTown_PlayersHouse_1F_Text_AllBoysLeaveOakLookingForYou return -EventScript_168C41:: @ 8168C41 - msgbox gUnknown_818D360 +PalletTown_PlayersHouse_1F_EventScript_MomOakLookingForYouFemale:: @ 8168C41 + msgbox PalletTown_PlayersHouse_1F_Text_AllGirlsLeaveOakLookingForYou return -EventScript_168C4A:: @ 8168C4A - msgbox gUnknown_818D3D1 +PalletTown_PlayersHouse_1F_EventScript_MomHeal:: @ 8168C4A + msgbox PalletTown_PlayersHouse_1F_Text_YouShouldTakeQuickRest closemessage call EventScript_OutOfCenterPartyHeal - msgbox gUnknown_818D3F8 + msgbox PalletTown_PlayersHouse_1F_Text_LookingGreatTakeCare release end -PalletTown_PlayersHouse_1F_EventScript_168C62:: @ 8168C62 +@ Displays special text if interacted with from side or back (which are normally inaccessible) +PalletTown_PlayersHouse_1F_EventScript_TV:: @ 8168C62 lockall compare VAR_FACING, DIR_NORTH - goto_if_eq EventScript_168C78 - msgbox gUnknown_818D4F9 + goto_if_eq PalletTown_PlayersHouse_1F_EventScript_TVScreen + msgbox PalletTown_PlayersHouse_1F_Text_OopsWrongSide releaseall end -EventScript_168C78:: @ 8168C78 +PalletTown_PlayersHouse_1F_EventScript_TVScreen:: @ 8168C78 checkplayergender compare VAR_RESULT, MALE - call_if_eq EventScript_168C91 + call_if_eq PalletTown_PlayersHouse_1F_EventScript_TVScreenMale compare VAR_RESULT, FEMALE - call_if_eq EventScript_168C9A + call_if_eq PalletTown_PlayersHouse_1F_EventScript_TVScreenFemale releaseall end -EventScript_168C91:: @ 8168C91 - msgbox gUnknown_818D43E +PalletTown_PlayersHouse_1F_EventScript_TVScreenMale:: @ 8168C91 + msgbox PalletTown_PlayersHouse_1F_Text_MovieOnTVFourBoysOnRailroad return -EventScript_168C9A:: @ 8168C9A - msgbox gUnknown_818D492 +PalletTown_PlayersHouse_1F_EventScript_TVScreenFemale:: @ 8168C9A + msgbox PalletTown_PlayersHouse_1F_Text_MovieOnTVGirlOnBrickRoad return diff --git a/data/maps/PalletTown_PlayersHouse_1F/text.inc b/data/maps/PalletTown_PlayersHouse_1F/text.inc index ba40d1729..baa31b38d 100644 --- a/data/maps/PalletTown_PlayersHouse_1F/text.inc +++ b/data/maps/PalletTown_PlayersHouse_1F/text.inc @@ -1,38 +1,38 @@ -gUnknown_818D2F0:: @ 818D2F0 +PalletTown_PlayersHouse_1F_Text_AllBoysLeaveOakLookingForYou:: @ 818D2F0 .string "MOM: …Right.\n" .string "All boys leave home someday.\l" .string "It said so on TV.\p" .string "Oh, yes. PROF. OAK, next door, was\n" .string "looking for you.$" -gUnknown_818D360:: @ 818D360 +PalletTown_PlayersHouse_1F_Text_AllGirlsLeaveOakLookingForYou:: @ 818D360 .string "MOM: …Right.\n" .string "All girls dream of traveling.\l" .string "It said so on TV.\p" .string "Oh, yes. PROF. OAK, next door, was\n" .string "looking for you.$" -gUnknown_818D3D1:: @ 818D3D1 +PalletTown_PlayersHouse_1F_Text_YouShouldTakeQuickRest:: @ 818D3D1 .string "MOM: {PLAYER}!\n" .string "You should take a quick rest.$" -gUnknown_818D3F8:: @ 818D3F8 +PalletTown_PlayersHouse_1F_Text_LookingGreatTakeCare:: @ 818D3F8 .string "MOM: Oh, good! You and your\n" .string "POKéMON are looking great.\l" .string "Take care now!$" -gUnknown_818D43E:: @ 818D43E +PalletTown_PlayersHouse_1F_Text_MovieOnTVFourBoysOnRailroad:: @ 818D43E .string "There's a movie on TV.\n" .string "Four boys are walking on railroad\l" .string "tracks.\p" .string "…I better go, too.$" -gUnknown_818D492:: @ 818D492 +PalletTown_PlayersHouse_1F_Text_MovieOnTVGirlOnBrickRoad:: @ 818D492 .string "There's a movie on TV.\n" .string "A girl with her hair in pigtails is\l" .string "walking up a brick road.\p" .string "…I better go, too.$" -gUnknown_818D4F9:: @ 818D4F9 +PalletTown_PlayersHouse_1F_Text_OopsWrongSide:: @ 818D4F9 .string "Oops, wrong side…$" diff --git a/data/maps/PalletTown_PlayersHouse_2F/map.json b/data/maps/PalletTown_PlayersHouse_2F/map.json index 67befec6c..8d6f9fa57 100644 --- a/data/maps/PalletTown_PlayersHouse_2F/map.json +++ b/data/maps/PalletTown_PlayersHouse_2F/map.json @@ -31,21 +31,21 @@ "x": 6, "y": 5, "elevation": 3, - "script": "PalletTown_PlayersHouse_2F_EventScript_168CD2" + "script": "PalletTown_PlayersHouse_2F_EventScript_NES" }, { "type": "bg_event_type_0", "x": 1, "y": 1, "elevation": 0, - "script": "PalletTown_PlayersHouse_2F_EventScript_168CE4" + "script": "PalletTown_PlayersHouse_2F_EventScript_PC" }, { "type": "bg_event_type_0", "x": 11, "y": 1, "elevation": 0, - "script": "PalletTown_PlayersHouse_2F_EventScript_168CDB" + "script": "PalletTown_PlayersHouse_2F_EventScript_Sign" } ] } diff --git a/data/maps/PalletTown_PlayersHouse_2F/scripts.inc b/data/maps/PalletTown_PlayersHouse_2F/scripts.inc index 7e8c8ee73..de44c733a 100644 --- a/data/maps/PalletTown_PlayersHouse_2F/scripts.inc +++ b/data/maps/PalletTown_PlayersHouse_2F/scripts.inc @@ -5,32 +5,31 @@ PalletTown_PlayersHouse_2F_MapScripts:: @ 8168CA3 PalletTown_PlayersHouse_2F_OnTransition:: @ 8168CAE compare VAR_MAP_SCENE_PALLET_TOWN_PLAYERS_HOUSE_2F, 0 - call_if_eq EventScript_168CBA + call_if_eq PalletTown_PlayersHouse_2F_EventScript_SetRespawn end -EventScript_168CBA:: @ 8168CBA +PalletTown_PlayersHouse_2F_EventScript_SetRespawn:: @ 8168CBA setrespawn SPAWN_PALLET_TOWN return PalletTown_PlayersHouse_2F_OnWarp:: @ 8168CBE - map_script_2 VAR_MAP_SCENE_PALLET_TOWN_PLAYERS_HOUSE_2F, 0, EventScript_168CC8 + map_script_2 VAR_MAP_SCENE_PALLET_TOWN_PLAYERS_HOUSE_2F, 0, PalletTown_PlayersHouse_2F_FirstWarpIn .2byte 0 -EventScript_168CC8:: @ 8168CC8 +PalletTown_PlayersHouse_2F_FirstWarpIn:: @ 8168CC8 turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH setvar VAR_MAP_SCENE_PALLET_TOWN_PLAYERS_HOUSE_2F, 1 end -PalletTown_PlayersHouse_2F_EventScript_168CD2:: @ 8168CD2 - msgbox gUnknown_818D50B, MSGBOX_SIGN +PalletTown_PlayersHouse_2F_EventScript_NES:: @ 8168CD2 + msgbox PalletTown_PlayersHouse_2F_Text_PlayedWithNES, MSGBOX_SIGN end -PalletTown_PlayersHouse_2F_EventScript_168CDB:: @ 8168CDB - msgbox gUnknown_818D53B, MSGBOX_SIGN +PalletTown_PlayersHouse_2F_EventScript_Sign:: @ 8168CDB + msgbox PalletTown_PlayersHouse_2F_Text_PressLRForHelp, MSGBOX_SIGN end -gUnknown_8168CE4:: @ 8168CE4 -PalletTown_PlayersHouse_2F_EventScript_168CE4:: @ 8168CE4 +PalletTown_PlayersHouse_2F_EventScript_PC:: @ 8168CE4 goto_if_questlog EventScript_ReleaseEnd lockall setvar VAR_0x8004, 32 diff --git a/data/maps/PalletTown_PlayersHouse_2F/text.inc b/data/maps/PalletTown_PlayersHouse_2F/text.inc index e6c794231..cb7a68dce 100644 --- a/data/maps/PalletTown_PlayersHouse_2F/text.inc +++ b/data/maps/PalletTown_PlayersHouse_2F/text.inc @@ -1,9 +1,9 @@ -gUnknown_818D50B:: @ 818D50B +PalletTown_PlayersHouse_2F_Text_PlayedWithNES:: @ 818D50B .string "{PLAYER} played with the NES.\p" .string "…Okay!\n" .string "It's time to go!$" -gUnknown_818D53B:: @ 818D53B +PalletTown_PlayersHouse_2F_Text_PressLRForHelp:: @ 818D53B .string "It's a posted notice…\p" .string "If you're confused, ask for HELP!\n" .string "Press the L or R Button!$" diff --git a/data/maps/PalletTown_ProfessorOaksLab/map.json b/data/maps/PalletTown_ProfessorOaksLab/map.json index fe8980b44..ce27f53a8 100644 --- a/data/maps/PalletTown_ProfessorOaksLab/map.json +++ b/data/maps/PalletTown_ProfessorOaksLab/map.json @@ -25,7 +25,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PalletTown_ProfessorOaksLab_EventScript_169DEE", + "script": "PalletTown_ProfessorOaksLab_EventScript_Aide1", "flag": "0" }, { @@ -38,7 +38,7 @@ "movement_range_y": 4, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PalletTown_ProfessorOaksLab_EventScript_169E46", + "script": "PalletTown_ProfessorOaksLab_EventScript_Aide3", "flag": "0" }, { @@ -51,7 +51,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PalletTown_ProfessorOaksLab_EventScript_169E1A", + "script": "PalletTown_ProfessorOaksLab_EventScript_Aide2", "flag": "0" }, { @@ -64,7 +64,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PalletTown_ProfessorOaksLab_EventScript_169595", + "script": "PalletTown_ProfessorOaksLab_EventScript_ProfOak", "flag": "FLAG_HIDE_OAK_IN_HIS_LAB" }, { @@ -77,7 +77,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PalletTown_ProfessorOaksLab_EventScript_169BAB", + "script": "PalletTown_ProfessorOaksLab_EventScript_BulbasaurBall", "flag": "FLAG_HIDE_BULBASAUR_BALL" }, { @@ -90,7 +90,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PalletTown_ProfessorOaksLab_EventScript_169D78", + "script": "PalletTown_ProfessorOaksLab_EventScript_SquirtleBall", "flag": "FLAG_HIDE_SQUIRTLE_BALL" }, { @@ -103,7 +103,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PalletTown_ProfessorOaksLab_EventScript_169DAE", + "script": "PalletTown_ProfessorOaksLab_EventScript_CharmanderBall", "flag": "FLAG_HIDE_CHARMANDER_BALL" }, { @@ -116,7 +116,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PalletTown_ProfessorOaksLab_EventScript_16955F", + "script": "PalletTown_ProfessorOaksLab_EventScript_Rival", "flag": "FLAG_HIDE_RIVAL_IN_LAB" }, { @@ -129,7 +129,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PalletTown_ProfessorOaksLab_EventScript_169E5F", + "script": "PalletTown_ProfessorOaksLab_EventScript_Pokedex", "flag": "FLAG_HIDE_POKEDEX" }, { @@ -142,7 +142,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PalletTown_ProfessorOaksLab_EventScript_169E5F", + "script": "PalletTown_ProfessorOaksLab_EventScript_Pokedex", "flag": "FLAG_HIDE_POKEDEX" } ], @@ -177,7 +177,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB", "var_value": 2, - "script": "PalletTown_ProfessorOaksLab_EventScript_1692C3" + "script": "PalletTown_ProfessorOaksLab_EventScript_LeaveStarterSceneTrigger" }, { "type": "trigger", @@ -186,7 +186,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB", "var_value": 2, - "script": "PalletTown_ProfessorOaksLab_EventScript_1692C3" + "script": "PalletTown_ProfessorOaksLab_EventScript_LeaveStarterSceneTrigger" }, { "type": "trigger", @@ -195,7 +195,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB", "var_value": 2, - "script": "PalletTown_ProfessorOaksLab_EventScript_1692C3" + "script": "PalletTown_ProfessorOaksLab_EventScript_LeaveStarterSceneTrigger" }, { "type": "trigger", @@ -204,7 +204,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB", "var_value": 3, - "script": "PalletTown_ProfessorOaksLab_EventScript_1692E7" + "script": "PalletTown_ProfessorOaksLab_EventScript_RivalBattleTriggerLeft" }, { "type": "trigger", @@ -213,7 +213,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB", "var_value": 3, - "script": "PalletTown_ProfessorOaksLab_EventScript_1692F3" + "script": "PalletTown_ProfessorOaksLab_EventScript_RivalBattleTriggerMid" }, { "type": "trigger", @@ -222,7 +222,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB", "var_value": 3, - "script": "PalletTown_ProfessorOaksLab_EventScript_1692FF" + "script": "PalletTown_ProfessorOaksLab_EventScript_RivalBattleTriggerRight" } ], "bg_events": [ @@ -231,28 +231,28 @@ "x": 2, "y": 1, "elevation": 0, - "script": "PalletTown_ProfessorOaksLab_EventScript_169E68" + "script": "PalletTown_ProfessorOaksLab_EventScript_Computer" }, { "type": "bg_event_type_0", "x": 3, "y": 1, "elevation": 0, - "script": "PalletTown_ProfessorOaksLab_EventScript_169E68" + "script": "PalletTown_ProfessorOaksLab_EventScript_Computer" }, { "type": "bg_event_type_0", "x": 6, "y": 1, "elevation": 0, - "script": "PalletTown_ProfessorOaksLab_EventScript_169E71" + "script": "PalletTown_ProfessorOaksLab_EventScript_LeftSign" }, { "type": "bg_event_type_0", "x": 7, "y": 1, "elevation": 0, - "script": "PalletTown_ProfessorOaksLab_EventScript_169E7A" + "script": "PalletTown_ProfessorOaksLab_EventScript_RightSign" } ] } diff --git a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc index 0e466abd3..19518f6e7 100644 --- a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc +++ b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc @@ -1,3 +1,18 @@ +.equ LOCALID_PROF_OAK, 4 +.equ LOCALID_BULBASAUR_BALL, 5 +.equ LOCALID_SQUIRTLE_BALL, 6 +.equ LOCALID_CHARMANDER_BALL, 7 +.equ LOCALID_RIVAL, 8 +.equ LOCALID_POKEDEX_1, 9 +.equ LOCALID_POKEDEX_2, 10 + +.equ PLAYER_STARTER_NUM, VAR_TEMP_1 +.equ PLAYER_STARTER_SPECIES, VAR_TEMP_2 +.equ RIVAL_STARTER_SPECIES, VAR_TEMP_3 +.equ RIVAL_STARTER_ID, VAR_TEMP_4 + +.equ SHOWED_OAK_COMPLETE_DEX, FLAG_TEMP_2 + PalletTown_ProfessorOaksLab_MapScripts:: @ 8168F7E map_script MAP_SCRIPT_ON_TRANSITION, PalletTown_ProfessorOaksLab_OnTransition map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, PalletTown_ProfessorOaksLab_OnWarp @@ -7,194 +22,194 @@ PalletTown_ProfessorOaksLab_MapScripts:: @ 8168F7E PalletTown_ProfessorOaksLab_OnTransition:: @ 8168F8E setflag FLAG_VISITED_OAKS_LAB compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 1 - call_if_eq EventScript_168FC6 + call_if_eq PalletTown_ProfessorOaksLab_EventScript_ReadyOakForStarterScene compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 7 - call_if_eq EventScript_168FD5 + call_if_eq PalletTown_ProfessorOaksLab_EventScript_ReadyOakForNationalDexScene compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 8 - call_if_eq EventScript_168FC0 - call_if_set FLAG_GOT_POKEBALLS_FROM_OAK_AFTER_22_RIVAL, EventScript_168FBC + call_if_eq PalletTown_ProfessorOaksLab_EventScript_SetNationalDexSceneFinished + call_if_set FLAG_GOT_POKEBALLS_FROM_OAK_AFTER_22_RIVAL, PalletTown_ProfessorOaksLab_EventScript_SetSkipPokeBallCheck end -EventScript_168FBC:: @ 8168FBC +PalletTown_ProfessorOaksLab_EventScript_SetSkipPokeBallCheck:: @ 8168FBC setflag FLAG_OAK_SKIP_22_RIVAL_CHECK return -EventScript_168FC0:: @ 8168FC0 +PalletTown_ProfessorOaksLab_EventScript_SetNationalDexSceneFinished:: @ 8168FC0 setvar VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 9 return -EventScript_168FC6:: @ 8168FC6 - setobjectxyperm 4, 6, 11 - setobjectmovementtype 4, 7 +PalletTown_ProfessorOaksLab_EventScript_ReadyOakForStarterScene:: @ 8168FC6 + setobjectxyperm LOCALID_PROF_OAK, 6, 11 + setobjectmovementtype LOCALID_PROF_OAK, MOVEMENT_TYPE_FACE_UP savebgm MUS_OHKIDO return -EventScript_168FD5:: @ 8168FD5 - setobjectxyperm 4, 6, 11 - setobjectmovementtype 4, 7 +PalletTown_ProfessorOaksLab_EventScript_ReadyOakForNationalDexScene:: @ 8168FD5 + setobjectxyperm LOCALID_PROF_OAK, 6, 11 + setobjectmovementtype LOCALID_PROF_OAK, MOVEMENT_TYPE_FACE_UP return PalletTown_ProfessorOaksLab_OnWarp:: @ 8168FE1 - map_script_2 VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 1, EventScript_168FEB + map_script_2 VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 1, PalletTown_ProfessorOaksLab_EventScript_ReadyPlayerForStarterScene .2byte 0 -EventScript_168FEB:: @ 8168FEB +PalletTown_ProfessorOaksLab_EventScript_ReadyPlayerForStarterScene:: @ 8168FEB turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH end PalletTown_ProfessorOaksLab_OnFrame:: @ 8168FF0 - map_script_2 VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 1, EventScript_16923E - map_script_2 VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 7, EventScript_169002 + map_script_2 VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 1, PalletTown_ProfessorOaksLab_ChooseStarterScene + map_script_2 VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 7, PalletTown_ProfessorOaksLab_EventScript_EnterForNationalDexScene .2byte 0 -EventScript_169002:: @ 8169002 +PalletTown_ProfessorOaksLab_EventScript_EnterForNationalDexScene:: @ 8169002 lockall setvar VAR_FACING, DIR_NORTH textcolor 0 - applymovement 4, Movement_1692B0 + applymovement LOCALID_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakEnter waitmovement 0 - removeobject 4 - setobjectxyperm 4, 6, 3 - setobjectmovementtype 4, 8 + removeobject LOCALID_PROF_OAK + setobjectxyperm LOCALID_PROF_OAK, 6, 3 + setobjectmovementtype LOCALID_PROF_OAK, MOVEMENT_TYPE_FACE_DOWN clearflag FLAG_HIDE_OAK_IN_HIS_LAB - applymovement OBJ_EVENT_ID_PLAYER, Movement_1692B7 + applymovement OBJ_EVENT_ID_PLAYER, PalletTown_ProfessorOaksLab_Movement_PlayerEnter waitmovement 0 - goto EventScript_169035 + goto PalletTown_ProfessorOaksLab_EventScript_NationalDexScene end -EventScript_169035:: @ 8169035 - msgbox gUnknown_818EE60 +PalletTown_ProfessorOaksLab_EventScript_NationalDexScene:: @ 8169035 + msgbox PalletTown_ProfessorOaksLab_Text_OakSightingsOfRareMons closemessage compare VAR_FACING, DIR_NORTH - call_if_eq EventScript_169174 + call_if_eq PalletTown_ProfessorOaksLab_EventScript_NationalDexSceneRivalEnterNorth compare VAR_FACING, DIR_SOUTH - call_if_eq EventScript_1691BB + call_if_eq PalletTown_ProfessorOaksLab_EventScript_NationalDexSceneRivalEnterSouth compare VAR_FACING, DIR_EAST - call_if_eq EventScript_169194 + call_if_eq PalletTown_ProfessorOaksLab_EventScript_NationalDexSceneRivalEnterEastWest compare VAR_FACING, DIR_WEST - call_if_eq EventScript_169194 - msgbox gUnknown_818EF59 + call_if_eq PalletTown_ProfessorOaksLab_EventScript_NationalDexSceneRivalEnterEastWest + msgbox PalletTown_ProfessorOaksLab_Text_RivalJustLetMeHandleEverything fadedefaultbgm - msgbox gUnknown_818F004 + msgbox PalletTown_ProfessorOaksLab_Text_OakNeedYourHelpTooNeedToSeePokedexes compare VAR_FACING, DIR_NORTH - call_if_eq EventScript_1691DB + call_if_eq PalletTown_ProfessorOaksLab_EventScript_PlayerFaceOakNorth compare VAR_FACING, DIR_WEST - call_if_eq EventScript_1691E6 + call_if_eq PalletTown_ProfessorOaksLab_EventScript_PlayerFaceOakWest textcolor 3 - msgbox gUnknown_818F062 + msgbox PalletTown_ProfessorOaksLab_Text_OakTookBothPokedexUnits closemessage call EventScript_1A6675 compare VAR_FACING, DIR_NORTH - call_if_eq EventScript_1691F1 + call_if_eq PalletTown_ProfessorOaksLab_EventScript_OakBringDexesToDeskNorth compare VAR_FACING, DIR_SOUTH - call_if_eq EventScript_1691FC + call_if_eq PalletTown_ProfessorOaksLab_EventScript_OakBringDexesToDeskSouth compare VAR_FACING, DIR_EAST - call_if_eq EventScript_169215 + call_if_eq PalletTown_ProfessorOaksLab_EventScript_OakBringDexesToDeskEast compare VAR_FACING, DIR_WEST - call_if_eq EventScript_169227 - addobject 9 - addobject 10 + call_if_eq PalletTown_ProfessorOaksLab_EventScript_OakBringDexesToDeskWest + addobject LOCALID_POKEDEX_1 + addobject LOCALID_POKEDEX_2 delay 30 - msgbox gUnknown_818F085 + msgbox PalletTown_ProfessorOaksLab_Text_OakNowTheseUnitsCanRecordMoreData closemessage - removeobject 9 - removeobject 10 + removeobject LOCALID_POKEDEX_1 + removeobject LOCALID_POKEDEX_2 delay 30 compare VAR_FACING, DIR_NORTH - call_if_eq EventScript_169845 + call_if_eq PalletTown_ProfessorOaksLab_EventScript_OakBringDexesOverNorth compare VAR_FACING, DIR_SOUTH - call_if_eq EventScript_169850 + call_if_eq PalletTown_ProfessorOaksLab_EventScript_OakBringDexesOverSouth compare VAR_FACING, DIR_EAST - call_if_eq EventScript_16985B + call_if_eq PalletTown_ProfessorOaksLab_EventScript_OakBringDexesOverEast compare VAR_FACING, DIR_WEST - call_if_eq EventScript_16986D + call_if_eq PalletTown_ProfessorOaksLab_EventScript_OakBringDexesOverWest textcolor 3 playfanfare MUS_FAN5 - message Text_18F0E8 + message PalletTown_ProfessorOaksLab_Text_PlayersPokedexWasUpgraded waitmessage waitfanfare call EventScript_1A6675 special EnableNationalPokedex - msgbox gUnknown_818F103 - msgbox gUnknown_818F1DB + msgbox PalletTown_ProfessorOaksLab_Text_OakMustReallyWorkToFillPokedex + msgbox PalletTown_ProfessorOaksLab_Text_RivalIllCompleteThePokedex closemessage playbgm MUS_RIVAL2, 0 compare VAR_FACING, DIR_NORTH - call_if_eq EventScript_169B69 + call_if_eq PalletTown_ProfessorOaksLab_EventScript_RivalExitNorth compare VAR_FACING, DIR_SOUTH - call_if_eq EventScript_169B7B + call_if_eq PalletTown_ProfessorOaksLab_EventScript_RivalExit compare VAR_FACING, DIR_EAST - call_if_eq EventScript_169B7B + call_if_eq PalletTown_ProfessorOaksLab_EventScript_RivalExit compare VAR_FACING, DIR_WEST - call_if_eq EventScript_169B7B - removeobject 8 + call_if_eq PalletTown_ProfessorOaksLab_EventScript_RivalExit + removeobject LOCALID_RIVAL fadedefaultbgm setvar VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 8 releaseall end -EventScript_169174:: @ 8169174 - setobjectxyperm 8, 5, 10 - addobject 8 +PalletTown_ProfessorOaksLab_EventScript_NationalDexSceneRivalEnterNorth:: @ 8169174 + setobjectxyperm LOCALID_RIVAL, 5, 10 + addobject LOCALID_RIVAL playbgm MUS_RIVAL1, 0 - applymovement OBJ_EVENT_ID_PLAYER, Movement_169B94 - applymovement 8, Movement_169B9D + applymovement OBJ_EVENT_ID_PLAYER, PalletTown_ProfessorOaksLab_Movement_WatchRivalEnterNorth + applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalEnter waitmovement 0 return -EventScript_169194:: @ 8169194 - setobjectxyperm 8, 6, 10 - addobject 8 +PalletTown_ProfessorOaksLab_EventScript_NationalDexSceneRivalEnterEastWest:: @ 8169194 + setobjectxyperm LOCALID_RIVAL, 6, 10 + addobject LOCALID_RIVAL playbgm MUS_RIVAL1, 0 - applymovement 4, Movement_WalkInPlaceFastestDown - applymovement OBJ_EVENT_ID_PLAYER, Movement_169B91 - applymovement 8, Movement_169B9D + applymovement LOCALID_PROF_OAK, Movement_WalkInPlaceFastestDown + applymovement OBJ_EVENT_ID_PLAYER, PalletTown_ProfessorOaksLab_Movement_WatchRivalEnterEastWest + applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalEnter waitmovement 0 return -EventScript_1691BB:: @ 81691BB - setobjectxyperm 8, 6, 10 - addobject 8 +PalletTown_ProfessorOaksLab_EventScript_NationalDexSceneRivalEnterSouth:: @ 81691BB + setobjectxyperm LOCALID_RIVAL, 6, 10 + addobject LOCALID_RIVAL playbgm MUS_RIVAL1, 0 - applymovement 4, Movement_WalkInPlaceFastestDown - applymovement 8, Movement_169B9D + applymovement LOCALID_PROF_OAK, Movement_WalkInPlaceFastestDown + applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalEnter waitmovement 0 return -EventScript_1691DB:: @ 81691DB +PalletTown_ProfessorOaksLab_EventScript_PlayerFaceOakNorth:: @ 81691DB applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp waitmovement 0 return -EventScript_1691E6:: @ 81691E6 +PalletTown_ProfessorOaksLab_EventScript_PlayerFaceOakWest:: @ 81691E6 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft waitmovement 0 return -EventScript_1691F1:: @ 81691F1 - applymovement 4, Movement_169232 +PalletTown_ProfessorOaksLab_EventScript_OakBringDexesToDeskNorth:: @ 81691F1 + applymovement LOCALID_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakBringDexesToDesk waitmovement 0 return -EventScript_1691FC:: @ 81691FC - applymovement 4, Movement_169238 - applymovement OBJ_EVENT_ID_PLAYER, Movement_1698C7 - applymovement 8, Movement_1698C7 - waitmovement 4 +PalletTown_ProfessorOaksLab_EventScript_OakBringDexesToDeskSouth:: @ 81691FC + applymovement LOCALID_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakBringDexesToDeskSouth + applymovement OBJ_EVENT_ID_PLAYER, PalletTown_ProfessorOaksLab_Movement_WatchOakWalkToDesk + applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_WatchOakWalkToDesk + waitmovement LOCALID_PROF_OAK return -EventScript_169215:: @ 8169215 - applymovement 4, Movement_169232 - applymovement OBJ_EVENT_ID_PLAYER, Movement_1698C3 - waitmovement 4 +PalletTown_ProfessorOaksLab_EventScript_OakBringDexesToDeskEast:: @ 8169215 + applymovement LOCALID_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakBringDexesToDesk + applymovement OBJ_EVENT_ID_PLAYER, PalletTown_ProfessorOaksLab_Movement_WatchOakWalkToDeskEast + waitmovement LOCALID_PROF_OAK return -EventScript_169227:: @ 8169227 - applymovement 4, Movement_169232 +PalletTown_ProfessorOaksLab_EventScript_OakBringDexesToDeskWest:: @ 8169227 + applymovement LOCALID_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakBringDexesToDesk waitmovement 0 return -Movement_169232:: @ 8169232 +PalletTown_ProfessorOaksLab_Movement_OakBringDexesToDesk:: @ 8169232 walk_up walk_left walk_in_place_fastest_up @@ -202,7 +217,7 @@ Movement_169232:: @ 8169232 delay_4 step_end -Movement_169238:: @ 8169238 +PalletTown_ProfessorOaksLab_Movement_OakBringDexesToDeskSouth:: @ 8169238 walk_left walk_left walk_up @@ -210,37 +225,37 @@ Movement_169238:: @ 8169238 delay_4 step_end -EventScript_16923E:: @ 816923E +PalletTown_ProfessorOaksLab_ChooseStarterScene:: @ 816923E lockall textcolor 0 - applymovement 4, Movement_1692B0 + applymovement LOCALID_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakEnter waitmovement 0 - removeobject 4 - setobjectxyperm 4, 6, 3 - setobjectmovementtype 4, 8 + removeobject LOCALID_PROF_OAK + setobjectxyperm LOCALID_PROF_OAK, 6, 3 + setobjectmovementtype LOCALID_PROF_OAK, MOVEMENT_TYPE_FACE_DOWN clearflag FLAG_HIDE_OAK_IN_HIS_LAB - applymovement OBJ_EVENT_ID_PLAYER, Movement_1692B7 + applymovement OBJ_EVENT_ID_PLAYER, PalletTown_ProfessorOaksLab_Movement_PlayerEnter waitmovement 0 - applymovement 8, Movement_WalkInPlaceFastestUp + applymovement LOCALID_RIVAL, Movement_WalkInPlaceFastestUp waitmovement 0 clearflag FLAG_SPECIAL_FLAG_0x4001 savebgm SE_STOP fadedefaultbgm - msgbox gUnknown_818DC94 + msgbox PalletTown_ProfessorOaksLab_Text_RivalFedUpWithWaiting closemessage delay 60 - msgbox gUnknown_818DFBC + msgbox PalletTown_ProfessorOaksLab_Text_OakThreeMonsChooseOne closemessage delay 30 - applymovement 8, Movement_1692C0 + applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalReact waitmovement 0 - msgbox gUnknown_818DCB9 - msgbox gUnknown_818E0EA + msgbox PalletTown_ProfessorOaksLab_Text_RivalNoFairWhatAboutMe + msgbox PalletTown_ProfessorOaksLab_Text_OakBePatientRival setvar VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 2 releaseall end -Movement_1692B0:: @ 81692B0 +PalletTown_ProfessorOaksLab_Movement_OakEnter:: @ 81692B0 walk_up walk_up walk_up @@ -249,7 +264,7 @@ Movement_1692B0:: @ 81692B0 walk_up step_end -Movement_1692B7:: @ 81692B7 +PalletTown_ProfessorOaksLab_Movement_PlayerEnter:: @ 81692B7 walk_up walk_up walk_up @@ -260,97 +275,101 @@ Movement_1692B7:: @ 81692B7 walk_up step_end -Movement_1692C0:: @ 81692C0 +PalletTown_ProfessorOaksLab_Movement_RivalReact:: @ 81692C0 walk_in_place_up walk_in_place_up step_end -PalletTown_ProfessorOaksLab_EventScript_1692C3:: @ 81692C3 +PalletTown_ProfessorOaksLab_EventScript_LeaveStarterSceneTrigger:: @ 81692C3 lockall textcolor 0 - applymovement 4, Movement_FaceDown + applymovement LOCALID_PROF_OAK, Movement_FaceDown waitmovement 0 - msgbox gUnknown_818E177 + msgbox PalletTown_ProfessorOaksLab_Text_OakHeyDontGoAwayYet closemessage - applymovement OBJ_EVENT_ID_PLAYER, Movement_1692E5 + applymovement OBJ_EVENT_ID_PLAYER, PalletTown_ProfessorOaksLab_Movement_PlayerWalkUp waitmovement 0 releaseall end -Movement_1692E5:: @ 81692E5 +PalletTown_ProfessorOaksLab_Movement_PlayerWalkUp:: @ 81692E5 walk_up step_end -PalletTown_ProfessorOaksLab_EventScript_1692E7:: @ 81692E7 +PalletTown_ProfessorOaksLab_EventScript_RivalBattleTriggerLeft:: @ 81692E7 lockall setvar VAR_TEMP_2, 1 - goto EventScript_16930B + goto PalletTown_ProfessorOaksLab_EventScript_RivalBattle end -PalletTown_ProfessorOaksLab_EventScript_1692F3:: @ 81692F3 +PalletTown_ProfessorOaksLab_EventScript_RivalBattleTriggerMid:: @ 81692F3 lockall setvar VAR_TEMP_2, 2 - goto EventScript_16930B + goto PalletTown_ProfessorOaksLab_EventScript_RivalBattle end -PalletTown_ProfessorOaksLab_EventScript_1692FF:: @ 81692FF +PalletTown_ProfessorOaksLab_EventScript_RivalBattleTriggerRight:: @ 81692FF lockall setvar VAR_TEMP_2, 3 - goto EventScript_16930B + goto PalletTown_ProfessorOaksLab_EventScript_RivalBattle end -EventScript_16930B:: @ 816930B +PalletTown_ProfessorOaksLab_EventScript_RivalBattle:: @ 816930B textcolor 0 playbgm MUS_RIVAL1, 0 - applymovement 8, Movement_WalkInPlaceFastestDown + applymovement LOCALID_RIVAL, Movement_WalkInPlaceFastestDown waitmovement 0 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp waitmovement 0 - msgbox gUnknown_818DDA4 + msgbox PalletTown_ProfessorOaksLab_Text_RivalLetsCheckOutMons closemessage - applymovement 4, Movement_FaceDown + applymovement LOCALID_PROF_OAK, Movement_FaceDown waitmovement 0 compare VAR_STARTER_MON, 0 - goto_if_eq EventScript_1693D2 + goto_if_eq PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleCharmander compare VAR_STARTER_MON, 1 - goto_if_eq EventScript_16944D + goto_if_eq PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleBulbasaur compare VAR_STARTER_MON, 2 - goto_if_eq EventScript_16935A + goto_if_eq PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleSquirtle end -EventScript_16935A:: @ 816935A +@ The scripts for the rival approaching the player for battle are a bit bloated because +@ both the player and rival can be in 3 different positions, so theres 9 different approaches +@ NOTE: Names below refer to the Rival's mon (e.g. for RivalBattleSquirtle, player has Charmander) + +PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleSquirtle:: @ 816935A compare VAR_TEMP_2, 1 - goto_if_eq EventScript_16937C + goto_if_eq PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleSquirtleLeft compare VAR_TEMP_2, 2 - goto_if_eq EventScript_16938C + goto_if_eq PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleSquirtleMid compare VAR_TEMP_2, 3 - goto_if_eq EventScript_16939C + goto_if_eq PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleSquirtleRight end -EventScript_16937C:: @ 816937C - applymovement 8, Movement_1693C0 +PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleSquirtleLeft:: @ 816937C + applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalApproachForBattleSquirtleLeft waitmovement 0 - goto EventScript_1693AC + goto PalletTown_ProfessorOaksLab_EventScript_RivalBattleSquirtle end -EventScript_16938C:: @ 816938C - applymovement 8, Movement_1693C7 +PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleSquirtleMid:: @ 816938C + applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalApproachForBattleSquirtleMid waitmovement 0 - goto EventScript_1693AC + goto PalletTown_ProfessorOaksLab_EventScript_RivalBattleSquirtle end -EventScript_16939C:: @ 816939C - applymovement 8, Movement_1693CD +PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleSquirtleRight:: @ 816939C + applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalApproachForBattleSquirtleRight waitmovement 0 - goto EventScript_1693AC + goto PalletTown_ProfessorOaksLab_EventScript_RivalBattleSquirtle end -EventScript_1693AC:: @ 81693AC - trainerbattle_earlyrival TRAINER_RIVAL_OAKS_LAB_SQUIRTLE, RIVAL_BATTLE_TUTORIAL, Text_18DDEA, Text_RivalVictory - goto EventScript_1694C2 +PalletTown_ProfessorOaksLab_EventScript_RivalBattleSquirtle:: @ 81693AC + trainerbattle_earlyrival TRAINER_RIVAL_OAKS_LAB_SQUIRTLE, RIVAL_BATTLE_TUTORIAL, PalletTown_ProfessorOaksLab_Text_RivalDefeat, Text_RivalVictory + goto PalletTown_ProfessorOaksLab_EventScript_EndRivalBattle end -Movement_1693C0:: @ 81693C0 +PalletTown_ProfessorOaksLab_Movement_RivalApproachForBattleSquirtleLeft:: @ 81693C0 walk_left walk_left walk_left @@ -359,7 +378,7 @@ Movement_1693C0:: @ 81693C0 walk_down step_end -Movement_1693C7:: @ 81693C7 +PalletTown_ProfessorOaksLab_Movement_RivalApproachForBattleSquirtleMid:: @ 81693C7 walk_left walk_left walk_left @@ -367,46 +386,46 @@ Movement_1693C7:: @ 81693C7 walk_down step_end -Movement_1693CD:: @ 81693CD +PalletTown_ProfessorOaksLab_Movement_RivalApproachForBattleSquirtleRight:: @ 81693CD walk_left walk_left walk_down walk_down step_end -EventScript_1693D2:: @ 81693D2 +PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleCharmander:: @ 81693D2 compare VAR_TEMP_2, 1 - goto_if_eq EventScript_1693F4 + goto_if_eq PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleCharmanderLeft compare VAR_TEMP_2, 2 - goto_if_eq EventScript_169404 + goto_if_eq PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleCharmanderMid compare VAR_TEMP_2, 3 - goto_if_eq EventScript_169414 + goto_if_eq PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleCharmanderRight end -EventScript_1693F4:: @ 81693F4 - applymovement 8, Movement_169438 +PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleCharmanderLeft:: @ 81693F4 + applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_ApproachForBattleCharmanderLeft waitmovement 0 - goto EventScript_169424 + goto PalletTown_ProfessorOaksLab_EventScript_RivalBattleCharmander end -EventScript_169404:: @ 8169404 - applymovement 8, Movement_169440 +PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleCharmanderMid:: @ 8169404 + applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_ApproachForBattleCharmanderMid waitmovement 0 - goto EventScript_169424 + goto PalletTown_ProfessorOaksLab_EventScript_RivalBattleCharmander end -EventScript_169414:: @ 8169414 - applymovement 8, Movement_169447 +PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleCharmanderRight:: @ 8169414 + applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_ApproachForBattleCharmanderRight waitmovement 0 - goto EventScript_169424 + goto PalletTown_ProfessorOaksLab_EventScript_RivalBattleCharmander end -EventScript_169424:: @ 8169424 - trainerbattle_earlyrival TRAINER_RIVAL_OAKS_LAB_CHARMANDER, RIVAL_BATTLE_TUTORIAL, Text_18DDEA, Text_RivalVictory - goto EventScript_1694C2 +PalletTown_ProfessorOaksLab_EventScript_RivalBattleCharmander:: @ 8169424 + trainerbattle_earlyrival TRAINER_RIVAL_OAKS_LAB_CHARMANDER, RIVAL_BATTLE_TUTORIAL, PalletTown_ProfessorOaksLab_Text_RivalDefeat, Text_RivalVictory + goto PalletTown_ProfessorOaksLab_EventScript_EndRivalBattle end -Movement_169438:: @ 8169438 +PalletTown_ProfessorOaksLab_Movement_ApproachForBattleCharmanderLeft:: @ 8169438 walk_left walk_left walk_left @@ -416,7 +435,7 @@ Movement_169438:: @ 8169438 walk_down step_end -Movement_169440:: @ 8169440 +PalletTown_ProfessorOaksLab_Movement_ApproachForBattleCharmanderMid:: @ 8169440 walk_left walk_left walk_left @@ -425,7 +444,7 @@ Movement_169440:: @ 8169440 walk_down step_end -Movement_169447:: @ 8169447 +PalletTown_ProfessorOaksLab_Movement_ApproachForBattleCharmanderRight:: @ 8169447 walk_left walk_left walk_left @@ -433,39 +452,39 @@ Movement_169447:: @ 8169447 walk_down step_end -EventScript_16944D:: @ 816944D +PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleBulbasaur:: @ 816944D compare VAR_TEMP_2, 1 - goto_if_eq EventScript_16946F + goto_if_eq PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleBulbasaurLeft compare VAR_TEMP_2, 2 - goto_if_eq EventScript_16947F + goto_if_eq PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleBulbasaurMid compare VAR_TEMP_2, 3 - goto_if_eq EventScript_16948F + goto_if_eq PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleBulbasaurRight end -EventScript_16946F:: @ 816946F - applymovement 8, Movement_1694B3 +PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleBulbasaurLeft:: @ 816946F + applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalApproachForBattleBulbasaurLeft waitmovement 0 - goto EventScript_16949F + goto PalletTown_ProfessorOaksLab_EventScript_RivalBattleBulbasaur end -EventScript_16947F:: @ 816947F - applymovement 8, Movement_1694B9 +PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleBulbasaurMid:: @ 816947F + applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalApproachForBattleBulbasaurMid waitmovement 0 - goto EventScript_16949F + goto PalletTown_ProfessorOaksLab_EventScript_RivalBattleBulbasaur end -EventScript_16948F:: @ 816948F - applymovement 8, Movement_1694BE +PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleBulbasaurRight:: @ 816948F + applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalApproachForBattleBulbasaurRight waitmovement 0 - goto EventScript_16949F + goto PalletTown_ProfessorOaksLab_EventScript_RivalBattleBulbasaur end -EventScript_16949F:: @ 816949F - trainerbattle_earlyrival TRAINER_RIVAL_OAKS_LAB_BULBASAUR, RIVAL_BATTLE_TUTORIAL, Text_18DDEA, Text_RivalVictory - goto EventScript_1694C2 +PalletTown_ProfessorOaksLab_EventScript_RivalBattleBulbasaur:: @ 816949F + trainerbattle_earlyrival TRAINER_RIVAL_OAKS_LAB_BULBASAUR, RIVAL_BATTLE_TUTORIAL, PalletTown_ProfessorOaksLab_Text_RivalDefeat, Text_RivalVictory + goto PalletTown_ProfessorOaksLab_EventScript_EndRivalBattle end -Movement_1694B3:: @ 81694B3 +PalletTown_ProfessorOaksLab_Movement_RivalApproachForBattleBulbasaurLeft:: @ 81694B3 walk_left walk_left walk_left @@ -473,31 +492,31 @@ Movement_1694B3:: @ 81694B3 walk_down step_end -Movement_1694B9:: @ 81694B9 +PalletTown_ProfessorOaksLab_Movement_RivalApproachForBattleBulbasaurMid:: @ 81694B9 walk_left walk_left walk_down walk_down step_end -Movement_1694BE:: @ 81694BE +PalletTown_ProfessorOaksLab_Movement_RivalApproachForBattleBulbasaurRight:: @ 81694BE walk_left walk_down walk_down step_end -EventScript_1694C2:: @ 81694C2 +PalletTown_ProfessorOaksLab_EventScript_EndRivalBattle:: @ 81694C2 special HealPlayerParty - msgbox gUnknown_818DE38 + msgbox PalletTown_ProfessorOaksLab_Text_RivalGoToughenMyMon closemessage playbgm MUS_RIVAL2, 0 compare VAR_TEMP_2, 1 - call_if_eq EventScript_169504 + call_if_eq PalletTown_ProfessorOaksLab_EventScript_RivalExitAfterBattleLeft compare VAR_TEMP_2, 2 - call_if_eq EventScript_169516 + call_if_eq PalletTown_ProfessorOaksLab_EventScript_RivalExitAfterBattleMid compare VAR_TEMP_2, 3 - call_if_eq EventScript_169528 - removeobject 8 + call_if_eq PalletTown_ProfessorOaksLab_EventScript_RivalExitAfterBattleRight + removeobject LOCALID_RIVAL playse SE_KAIDAN fadedefaultbgm setvar VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 4 @@ -505,25 +524,25 @@ EventScript_1694C2:: @ 81694C2 releaseall end -EventScript_169504:: @ 8169504 - applymovement 8, Movement_16953A - applymovement OBJ_EVENT_ID_PLAYER, Movement_169553 - waitmovement 8 +PalletTown_ProfessorOaksLab_EventScript_RivalExitAfterBattleLeft:: @ 8169504 + applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalExitAfterBattleLeft + applymovement OBJ_EVENT_ID_PLAYER, PalletTown_ProfessorOaksLab_Movement_PlayerWatchRivalExitAfterBattle + waitmovement LOCALID_RIVAL return -EventScript_169516:: @ 8169516 - applymovement 8, Movement_16954A - applymovement OBJ_EVENT_ID_PLAYER, Movement_169553 - waitmovement 8 +PalletTown_ProfessorOaksLab_EventScript_RivalExitAfterBattleMid:: @ 8169516 + applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalExitAfterBattleMid + applymovement OBJ_EVENT_ID_PLAYER, PalletTown_ProfessorOaksLab_Movement_PlayerWatchRivalExitAfterBattle + waitmovement LOCALID_RIVAL return -EventScript_169528:: @ 8169528 - applymovement 8, Movement_169542 - applymovement OBJ_EVENT_ID_PLAYER, Movement_169559 - waitmovement 8 +PalletTown_ProfessorOaksLab_EventScript_RivalExitAfterBattleRight:: @ 8169528 + applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalExitAfterBattleRight + applymovement OBJ_EVENT_ID_PLAYER, PalletTown_ProfessorOaksLab_Movement_PlayerWatchRivalExitAfterBattleRight + waitmovement LOCALID_RIVAL return -Movement_16953A:: @ 816953A +PalletTown_ProfessorOaksLab_Movement_RivalExitAfterBattleLeft:: @ 816953A walk_right walk_down walk_down @@ -533,7 +552,7 @@ Movement_16953A:: @ 816953A delay_8 step_end -Movement_169542:: @ 8169542 +PalletTown_ProfessorOaksLab_Movement_RivalExitAfterBattleRight:: @ 8169542 walk_left walk_down walk_down @@ -543,7 +562,7 @@ Movement_169542:: @ 8169542 delay_8 step_end -Movement_16954A:: @ 816954A +PalletTown_ProfessorOaksLab_Movement_RivalExitAfterBattleMid:: @ 816954A walk_right walk_down walk_down @@ -554,7 +573,7 @@ Movement_16954A:: @ 816954A delay_8 step_end -Movement_169553:: @ 8169553 +PalletTown_ProfessorOaksLab_Movement_PlayerWatchRivalExitAfterBattle:: @ 8169553 delay_16 delay_8 walk_in_place_fastest_right @@ -562,7 +581,7 @@ Movement_169553:: @ 8169553 walk_in_place_fastest_down step_end -Movement_169559:: @ 8169559 +PalletTown_ProfessorOaksLab_Movement_PlayerWatchRivalExitAfterBattleRight:: @ 8169559 delay_16 delay_8 walk_in_place_fastest_left @@ -570,168 +589,168 @@ Movement_169559:: @ 8169559 walk_in_place_fastest_down step_end -PalletTown_ProfessorOaksLab_EventScript_16955F:: @ 816955F +PalletTown_ProfessorOaksLab_EventScript_Rival:: @ 816955F lock faceplayer compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3 - goto_if_eq EventScript_16958B + goto_if_eq PalletTown_ProfessorOaksLab_EventScript_RivalChoseStarter compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 2 - goto_if_eq EventScript_169581 - msgbox gUnknown_818DC67 + goto_if_eq PalletTown_ProfessorOaksLab_EventScript_RivalWaitingForStarter + msgbox PalletTown_ProfessorOaksLab_Text_RivalGrampsIsntAround release end -EventScript_169581:: @ 8169581 - msgbox gUnknown_818DCE2 +PalletTown_ProfessorOaksLab_EventScript_RivalWaitingForStarter:: @ 8169581 + msgbox PalletTown_ProfessorOaksLab_Text_RivalGoChoosePlayer release end -EventScript_16958B:: @ 816958B - msgbox gUnknown_818DD75 +PalletTown_ProfessorOaksLab_EventScript_RivalChoseStarter:: @ 816958B + msgbox PalletTown_ProfessorOaksLab_Text_RivalMyMonLooksTougher release end -PalletTown_ProfessorOaksLab_EventScript_169595:: @ 8169595 +PalletTown_ProfessorOaksLab_EventScript_ProfOak:: @ 8169595 lock faceplayer - goto_if_set FLAG_TEMP_2, EventScript_169600 + goto_if_set SHOWED_OAK_COMPLETE_DEX, PalletTown_ProfessorOaksLab_EventScript_OakJustShownCompleteDex compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 9 - goto_if_eq EventScript_169903 + goto_if_eq PalletTown_ProfessorOaksLab_EventScript_RatePokedex compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 8 - goto_if_eq EventScript_169A6E - goto_if_set FLAG_SYS_GAME_CLEAR, EventScript_1699CE + goto_if_eq PalletTown_ProfessorOaksLab_EventScript_MonsAroundWorldWait + goto_if_set FLAG_SYS_GAME_CLEAR, PalletTown_ProfessorOaksLab_EventScript_TryStartNationalDexScene compare VAR_MAP_SCENE_CERULEAN_CITY_RIVAL, 1 - goto_if_eq EventScript_169903 + goto_if_eq PalletTown_ProfessorOaksLab_EventScript_RatePokedex compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 6 - goto_if_eq EventScript_1698D6 + goto_if_eq PalletTown_ProfessorOaksLab_EventScript_RatePokedexOrTryGiveBalls compare VAR_MAP_SCENE_VIRIDIAN_CITY_MART, 1 - goto_if_ge EventScript_16961E + goto_if_ge PalletTown_ProfessorOaksLab_EventScript_ReceiveDexScene compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 4 - goto_if_eq EventScript_169614 + goto_if_eq PalletTown_ProfessorOaksLab_EventScript_OakBattleMonForItToGrow compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3 - goto_if_eq EventScript_16960A - msgbox gUnknown_818E116 + goto_if_eq PalletTown_ProfessorOaksLab_EventScript_OakCanReachNextTownWithMon + msgbox PalletTown_ProfessorOaksLab_Text_OakWhichOneWillYouChoose release end -EventScript_169600:: @ 8169600 - msgbox gUnknown_81A72AD +PalletTown_ProfessorOaksLab_EventScript_OakJustShownCompleteDex:: @ 8169600 + msgbox PokedexRating_Text_ThankYouMadeDreamReality release end -EventScript_16960A:: @ 816960A - msgbox gUnknown_818E330 +PalletTown_ProfessorOaksLab_EventScript_OakCanReachNextTownWithMon:: @ 816960A + msgbox PalletTown_ProfessorOaksLab_Text_OakCanReachNextTownWithMon release end -EventScript_169614:: @ 8169614 - msgbox gUnknown_818E3AD +PalletTown_ProfessorOaksLab_EventScript_OakBattleMonForItToGrow:: @ 8169614 + msgbox PalletTown_ProfessorOaksLab_Text_OakBattleMonForItToGrow release end -EventScript_16961E:: @ 816961E - msgbox gUnknown_818E405 +PalletTown_ProfessorOaksLab_EventScript_ReceiveDexScene:: @ 816961E + msgbox PalletTown_ProfessorOaksLab_Text_OakHaveSomethingForMe textcolor 3 playfanfare MUS_ME_WAZA - message Text_18E4AF + message PalletTown_ProfessorOaksLab_Text_DeliveredOaksParcel waitmessage waitfanfare call EventScript_1A6675 removeitem ITEM_OAKS_PARCEL, 1 - msgbox gUnknown_818E4CA + msgbox PalletTown_ProfessorOaksLab_Text_OakCustomBallIOrdered playbgm MUS_RIVAL1, 0 - msgbox gUnknown_818DE8D + msgbox PalletTown_ProfessorOaksLab_Text_RivalGramps closemessage compare VAR_FACING, DIR_NORTH - call_if_eq EventScript_169A82 + call_if_eq PalletTown_ProfessorOaksLab_EventScript_DexSceneRivalEnterNorth compare VAR_FACING, DIR_SOUTH - call_if_eq EventScript_169AC1 + call_if_eq PalletTown_ProfessorOaksLab_EventScript_DexSceneRivalEnterSouth compare VAR_FACING, DIR_EAST - call_if_eq EventScript_169A9E + call_if_eq PalletTown_ProfessorOaksLab_EventScript_DexSceneRivalEnterEastWest compare VAR_FACING, DIR_WEST - call_if_eq EventScript_169A9E + call_if_eq PalletTown_ProfessorOaksLab_EventScript_DexSceneRivalEnterEastWest fadedefaultbgm - msgbox gUnknown_818DE99 + msgbox PalletTown_ProfessorOaksLab_Text_RivalWhatDidYouCallMeFor closemessage delay 30 playse SE_PIN - applymovement 4, Movement_ExclamationMark + applymovement LOCALID_PROF_OAK, Movement_ExclamationMark waitmovement 0 - applymovement 4, Movement_Delay48 + applymovement LOCALID_PROF_OAK, Movement_Delay48 waitmovement 0 compare VAR_FACING, DIR_SOUTH - call_if_eq EventScript_169ADD + call_if_eq PalletTown_ProfessorOaksLab_EventScript_DexSceneOakFacePlayerAndRivalSouth compare VAR_FACING, DIR_EAST - call_if_eq EventScript_169B14 + call_if_eq PalletTown_ProfessorOaksLab_EventScript_DexSceneOakFacePlayerAndRivalEast compare VAR_FACING, DIR_WEST - call_if_eq EventScript_169AF5 + call_if_eq PalletTown_ProfessorOaksLab_EventScript_DexSceneOakFacePlayerAndRivalWest compare VAR_FACING, DIR_NORTH - call_if_eq EventScript_169B86 - msgbox gUnknown_818E508 + call_if_eq PalletTown_ProfessorOaksLab_EventScript_DexSceneOakFacePlayerAndRivalNorth + msgbox PalletTown_ProfessorOaksLab_Text_OakHaveRequestForYouTwo closemessage compare VAR_FACING, DIR_NORTH - call_if_eq EventScript_169882 + call_if_eq PalletTown_ProfessorOaksLab_EventScript_DexSceneOakWalkToDeskNorth compare VAR_FACING, DIR_SOUTH - call_if_eq EventScript_16988D + call_if_eq PalletTown_ProfessorOaksLab_EventScript_DexSceneOakWalkToDeskSouth compare VAR_FACING, DIR_EAST - call_if_eq EventScript_1698A6 + call_if_eq PalletTown_ProfessorOaksLab_EventScript_DexSceneOakWalkToDeskEast compare VAR_FACING, DIR_WEST - call_if_eq EventScript_1698B8 - msgbox gUnknown_818E536 + call_if_eq PalletTown_ProfessorOaksLab_EventScript_DexSceneOakWalkToDeskWest + msgbox PalletTown_ProfessorOaksLab_Text_OakPokedexOnDesk closemessage delay 40 - msgbox gUnknown_818E5C5 + msgbox PalletTown_ProfessorOaksLab_Text_OakTakeTheseWithYou closemessage - applymovement 4, Movement_WalkInPlaceFastestUp + applymovement LOCALID_PROF_OAK, Movement_WalkInPlaceFastestUp waitmovement 0 - removeobject 9 + removeobject LOCALID_POKEDEX_1 delay 10 - removeobject 10 + removeobject LOCALID_POKEDEX_2 delay 25 compare VAR_FACING, DIR_NORTH - call_if_eq EventScript_169845 + call_if_eq PalletTown_ProfessorOaksLab_EventScript_OakBringDexesOverNorth compare VAR_FACING, DIR_SOUTH - call_if_eq EventScript_169850 + call_if_eq PalletTown_ProfessorOaksLab_EventScript_OakBringDexesOverSouth compare VAR_FACING, DIR_EAST - call_if_eq EventScript_16985B + call_if_eq PalletTown_ProfessorOaksLab_EventScript_OakBringDexesOverEast compare VAR_FACING, DIR_WEST - call_if_eq EventScript_16986D + call_if_eq PalletTown_ProfessorOaksLab_EventScript_OakBringDexesOverWest delay 10 textcolor 3 playfanfare MUS_FAN5 - message Text_18E5EA + message PalletTown_ProfessorOaksLab_Text_ReceivedPokedexFromOak waitmessage waitfanfare call EventScript_1A6675 setflag FLAG_SYS_POKEDEX_GET special sub_810B810 setvar VAR_MAP_SCENE_POKEMON_CENTER_TEALA, 1 - msgbox gUnknown_818E612 - giveitem_msg gUnknown_818E6B3, ITEM_POKE_BALL, 5 - msgbox gUnknown_818E6D0 + msgbox PalletTown_ProfessorOaksLab_Text_OakCatchMonsForDataTakeThese + giveitem_msg PalletTown_ProfessorOaksLab_Text_ReceivedFivePokeBalls, ITEM_POKE_BALL, 5 + msgbox PalletTown_ProfessorOaksLab_Text_OakExplainCatching famechecker FAMECHECKER_OAK, 1 - msgbox gUnknown_818E784 - msgbox gUnknown_818DEC8 + msgbox PalletTown_ProfessorOaksLab_Text_OakCompleteMonGuideWasMyDream + msgbox PalletTown_ProfessorOaksLab_Text_RivalLeaveItToMeGramps compare VAR_FACING, DIR_NORTH - call_if_eq EventScript_169B33 + call_if_eq PalletTown_ProfessorOaksLab_EventScript_DexSceneRivalFacePlayerNorth compare VAR_FACING, DIR_SOUTH - call_if_eq EventScript_169B45 + call_if_eq PalletTown_ProfessorOaksLab_EventScript_DexSceneRivalFacePlayerSouth compare VAR_FACING, DIR_EAST - call_if_eq EventScript_169B57 + call_if_eq PalletTown_ProfessorOaksLab_EventScript_DexSceneRivalFacePlayerEastWest compare VAR_FACING, DIR_WEST - call_if_eq EventScript_169B57 - msgbox gUnknown_818DEF3 + call_if_eq PalletTown_ProfessorOaksLab_EventScript_DexSceneRivalFacePlayerEastWest + msgbox PalletTown_ProfessorOaksLab_Text_RivalTellSisNotToGiveYouMap closemessage playbgm MUS_RIVAL2, 0 compare VAR_FACING, DIR_NORTH - call_if_eq EventScript_169B69 + call_if_eq PalletTown_ProfessorOaksLab_EventScript_RivalExitNorth compare VAR_FACING, DIR_SOUTH - call_if_eq EventScript_169B7B + call_if_eq PalletTown_ProfessorOaksLab_EventScript_RivalExit compare VAR_FACING, DIR_EAST - call_if_eq EventScript_169B7B + call_if_eq PalletTown_ProfessorOaksLab_EventScript_RivalExit compare VAR_FACING, DIR_WEST - call_if_eq EventScript_169B7B - removeobject 8 + call_if_eq PalletTown_ProfessorOaksLab_EventScript_RivalExit + removeobject LOCALID_RIVAL fadedefaultbgm setvar VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 6 setvar VAR_MAP_SCENE_VIRIDIAN_CITY_MART, 2 @@ -741,86 +760,86 @@ EventScript_16961E:: @ 816961E release end -EventScript_169845:: @ 8169845 - applymovement 4, Movement_16987C +PalletTown_ProfessorOaksLab_EventScript_OakBringDexesOverNorth:: @ 8169845 + applymovement LOCALID_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakBringDexesOver waitmovement 0 return -EventScript_169850:: @ 8169850 - applymovement 4, Movement_16987F +PalletTown_ProfessorOaksLab_EventScript_OakBringDexesOverSouth:: @ 8169850 + applymovement LOCALID_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakBringDexesOverSouth waitmovement 0 return -EventScript_16985B:: @ 816985B - applymovement 4, Movement_16987C - applymovement OBJ_EVENT_ID_PLAYER, Movement_169878 +PalletTown_ProfessorOaksLab_EventScript_OakBringDexesOverEast:: @ 816985B + applymovement LOCALID_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakBringDexesOver + applymovement OBJ_EVENT_ID_PLAYER, PalletTown_ProfessorOaksLab_Movement_PlayerFaceOakForDexEast waitmovement 0 return -EventScript_16986D:: @ 816986D - applymovement 4, Movement_16987C +PalletTown_ProfessorOaksLab_EventScript_OakBringDexesOverWest:: @ 816986D + applymovement LOCALID_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakBringDexesOver waitmovement 0 return -Movement_169878:: @ 8169878 +PalletTown_ProfessorOaksLab_Movement_PlayerFaceOakForDexEast:: @ 8169878 delay_16 delay_8 walk_in_place_fastest_right step_end -Movement_16987C:: @ 816987C +PalletTown_ProfessorOaksLab_Movement_OakBringDexesOver:: @ 816987C walk_right walk_down step_end -Movement_16987F:: @ 816987F +PalletTown_ProfessorOaksLab_Movement_OakBringDexesOverSouth:: @ 816987F walk_down walk_right step_end -EventScript_169882:: @ 8169882 - applymovement 4, Movement_1698CB +PalletTown_ProfessorOaksLab_EventScript_DexSceneOakWalkToDeskNorth:: @ 8169882 + applymovement LOCALID_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakWalkToDesk waitmovement 0 return -EventScript_16988D:: @ 816988D - applymovement 4, Movement_1698D0 - applymovement OBJ_EVENT_ID_PLAYER, Movement_1698C7 - applymovement 8, Movement_1698C7 - waitmovement 4 +PalletTown_ProfessorOaksLab_EventScript_DexSceneOakWalkToDeskSouth:: @ 816988D + applymovement LOCALID_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakWalkToDeskSouth + applymovement OBJ_EVENT_ID_PLAYER, PalletTown_ProfessorOaksLab_Movement_WatchOakWalkToDesk + applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_WatchOakWalkToDesk + waitmovement LOCALID_PROF_OAK return -EventScript_1698A6:: @ 81698A6 - applymovement 4, Movement_1698CB - applymovement OBJ_EVENT_ID_PLAYER, Movement_1698C3 - waitmovement 4 +PalletTown_ProfessorOaksLab_EventScript_DexSceneOakWalkToDeskEast:: @ 81698A6 + applymovement LOCALID_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakWalkToDesk + applymovement OBJ_EVENT_ID_PLAYER, PalletTown_ProfessorOaksLab_Movement_WatchOakWalkToDeskEast + waitmovement LOCALID_PROF_OAK return -EventScript_1698B8:: @ 81698B8 - applymovement 4, Movement_1698CB +PalletTown_ProfessorOaksLab_EventScript_DexSceneOakWalkToDeskWest:: @ 81698B8 + applymovement LOCALID_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakWalkToDesk waitmovement 0 return -Movement_1698C3:: @ 81698C3 +PalletTown_ProfessorOaksLab_Movement_WatchOakWalkToDeskEast:: @ 81698C3 delay_16 delay_8 walk_in_place_fastest_up step_end -Movement_1698C7:: @ 81698C7 +PalletTown_ProfessorOaksLab_Movement_WatchOakWalkToDesk:: @ 81698C7 delay_16 delay_8 walk_in_place_fastest_left step_end -Movement_1698CB:: @ 81698CB +PalletTown_ProfessorOaksLab_Movement_OakWalkToDesk:: @ 81698CB walk_up walk_left delay_16 walk_in_place_fastest_down step_end -Movement_1698D0:: @ 81698D0 +PalletTown_ProfessorOaksLab_Movement_OakWalkToDeskSouth:: @ 81698D0 walk_left walk_left walk_up @@ -828,67 +847,67 @@ Movement_1698D0:: @ 81698D0 walk_in_place_fastest_right step_end -EventScript_1698D6:: @ 81698D6 +PalletTown_ProfessorOaksLab_EventScript_RatePokedexOrTryGiveBalls:: @ 81698D6 setvar VAR_0x8004, 0 specialvar VAR_RESULT, Special_GetPokedexCount copyvar VAR_0x8008, VAR_0x8005 copyvar VAR_0x8009, VAR_0x8006 getnumberstring 0, VAR_0x8008 getnumberstring 1, VAR_0x8009 - compare VAR_0x8009, 1 - goto_if_eq EventScript_1699FB - goto EventScript_169903 + compare VAR_0x8009, 1 @ Player only has starter + goto_if_eq PalletTown_ProfessorOaksLab_EventScript_CheckIfPlayerNeedsBalls + goto PalletTown_ProfessorOaksLab_EventScript_RatePokedex end -EventScript_169903:: @ 8169903 - call ProfOak_EventScript_RatePokedexInPerson - goto_if_set FLAG_OAK_SAW_DEX_COMPLETION, EventScript_169913 +PalletTown_ProfessorOaksLab_EventScript_RatePokedex:: @ 8169903 + call PokedexRating_EventScript_RateInPerson + goto_if_set FLAG_OAK_SAW_DEX_COMPLETION, PalletTown_ProfessorOaksLab_EventScript_DexCompleted release end -EventScript_169913:: @ 8169913 +PalletTown_ProfessorOaksLab_EventScript_DexCompleted:: @ 8169913 closemessage delay 40 - message Text_1A7291 + message PokedexRating_Text_Wroooaaarrr waitmessage compare VAR_FACING, DIR_NORTH - call_if_eq EventScript_169964 + call_if_eq PalletTown_ProfessorOaksLab_EventScript_OakExcitedNorth compare VAR_FACING, DIR_SOUTH - call_if_eq EventScript_16996F + call_if_eq PalletTown_ProfessorOaksLab_EventScript_OakExcitedSouth compare VAR_FACING, DIR_EAST - call_if_eq EventScript_16997A + call_if_eq PalletTown_ProfessorOaksLab_EventScript_OakExcitedEast compare VAR_FACING, DIR_WEST - call_if_eq EventScript_169985 - applymovement 4, Movement_FacePlayer + call_if_eq PalletTown_ProfessorOaksLab_EventScript_OakExcitedWest + applymovement LOCALID_PROF_OAK, Movement_FacePlayer waitmovement 0 closemessage delay 70 - msgbox gUnknown_81A72AD - setflag FLAG_TEMP_2 + msgbox PokedexRating_Text_ThankYouMadeDreamReality + setflag SHOWED_OAK_COMPLETE_DEX release end -EventScript_169964:: @ 8169964 - applymovement 4, Movement_169990 +PalletTown_ProfessorOaksLab_EventScript_OakExcitedNorth:: @ 8169964 + applymovement LOCALID_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakExcitedNorth waitmovement 0 return -EventScript_16996F:: @ 816996F - applymovement 4, Movement_169997 +PalletTown_ProfessorOaksLab_EventScript_OakExcitedSouth:: @ 816996F + applymovement LOCALID_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakExcitedSouth waitmovement 0 return -EventScript_16997A:: @ 816997A - applymovement 4, Movement_16999E +PalletTown_ProfessorOaksLab_EventScript_OakExcitedEast:: @ 816997A + applymovement LOCALID_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakExcitedEast waitmovement 0 return -EventScript_169985:: @ 8169985 - applymovement 4, Movement_1699A5 +PalletTown_ProfessorOaksLab_EventScript_OakExcitedWest:: @ 8169985 + applymovement LOCALID_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakExcitedWest waitmovement 0 return -Movement_169990:: @ 8169990 +PalletTown_ProfessorOaksLab_Movement_OakExcitedNorth:: @ 8169990 walk_in_place_down walk_in_place_fast_down walk_in_place_down @@ -897,7 +916,7 @@ Movement_169990:: @ 8169990 walk_in_place_down step_end -Movement_169997:: @ 8169997 +PalletTown_ProfessorOaksLab_Movement_OakExcitedSouth:: @ 8169997 walk_in_place_up walk_in_place_fast_up walk_in_place_up @@ -906,7 +925,7 @@ Movement_169997:: @ 8169997 walk_in_place_up step_end -Movement_16999E:: @ 816999E +PalletTown_ProfessorOaksLab_Movement_OakExcitedEast:: @ 816999E walk_in_place_left walk_in_place_fast_left walk_in_place_left @@ -915,7 +934,7 @@ Movement_16999E:: @ 816999E walk_in_place_left step_end -Movement_1699A5:: @ 81699A5 +PalletTown_ProfessorOaksLab_Movement_OakExcitedWest:: @ 81699A5 walk_in_place_right walk_in_place_fast_right walk_in_place_right @@ -924,6 +943,7 @@ Movement_1699A5:: @ 81699A5 walk_in_place_right step_end +@ Unused Movement_1699AC:: @ 81699AC walk_left walk_in_place_fastest_down @@ -951,6 +971,7 @@ Movement_1699AC:: @ 81699AC walk_left step_end +@ Unused Movement_1699C5: walk_up walk_down @@ -962,146 +983,146 @@ Movement_1699C5: delay_16 step_end -EventScript_1699CE:: @ 81699CE - call ProfOak_EventScript_RatePokedexInPerson +PalletTown_ProfessorOaksLab_EventScript_TryStartNationalDexScene:: @ 81699CE + call PokedexRating_EventScript_RateInPerson closemessage compare VAR_0x8009, 60 - goto_if_lt EventScript_1699F9 - goto_if_unset FLAG_WORLD_MAP_ONE_ISLAND, EventScript_1699F9 + goto_if_lt PalletTown_ProfessorOaksLab_EventScript_DontStartNationalDexScene + goto_if_unset FLAG_WORLD_MAP_ONE_ISLAND, PalletTown_ProfessorOaksLab_EventScript_DontStartNationalDexScene delay 30 - msgbox gUnknown_818EDF5 - goto EventScript_169035 + msgbox PalletTown_ProfessorOaksLab_Text_OakFavorToAskYouPlayer + goto PalletTown_ProfessorOaksLab_EventScript_NationalDexScene end -EventScript_1699F9:: @ 81699F9 +PalletTown_ProfessorOaksLab_EventScript_DontStartNationalDexScene:: @ 81699F9 release end -EventScript_1699FB:: @ 81699FB +PalletTown_ProfessorOaksLab_EventScript_CheckIfPlayerNeedsBalls:: @ 81699FB goto_if_questlog EventScript_ReleaseEnd special sub_8112364 - goto_if_set FLAG_OAK_SKIP_22_RIVAL_CHECK, EventScript_169A6E - goto_if_set FLAG_GOT_POKEBALLS_FROM_OAK_AFTER_22_RIVAL, EventScript_169A78 + goto_if_set FLAG_OAK_SKIP_22_RIVAL_CHECK, PalletTown_ProfessorOaksLab_EventScript_MonsAroundWorldWait + goto_if_set FLAG_GOT_POKEBALLS_FROM_OAK_AFTER_22_RIVAL, PalletTown_ProfessorOaksLab_EventScript_PlayerAlreadyGotBalls checkitem ITEM_POKE_BALL, 1 compare VAR_RESULT, FALSE - goto_if_eq EventScript_169A34 - goto EventScript_169A6E + goto_if_eq PalletTown_ProfessorOaksLab_EventScript_PlayerOutOfBalls + goto PalletTown_ProfessorOaksLab_EventScript_MonsAroundWorldWait end -EventScript_169A34:: @ 8169A34 +PalletTown_ProfessorOaksLab_EventScript_PlayerOutOfBalls:: @ 8169A34 compare VAR_MAP_SCENE_ROUTE22, 2 - goto_if_ge EventScript_169A45 - goto EventScript_169A6E + goto_if_ge PalletTown_ProfessorOaksLab_EventScript_GivePlayerMoreBalls + goto PalletTown_ProfessorOaksLab_EventScript_MonsAroundWorldWait end -EventScript_169A45:: @ 8169A45 - msgbox gUnknown_818E89C - giveitem_msg gUnknown_818E6B3, ITEM_POKE_BALL, 5 +PalletTown_ProfessorOaksLab_EventScript_GivePlayerMoreBalls:: @ 8169A45 + msgbox PalletTown_ProfessorOaksLab_Text_OakAddedNothingToPokedex + giveitem_msg PalletTown_ProfessorOaksLab_Text_ReceivedFivePokeBalls, ITEM_POKE_BALL, 5 setflag FLAG_GOT_POKEBALLS_FROM_OAK_AFTER_22_RIVAL release end -EventScript_169A6E:: @ 8169A6E - msgbox gUnknown_818E871 +PalletTown_ProfessorOaksLab_EventScript_MonsAroundWorldWait:: @ 8169A6E + msgbox PalletTown_ProfessorOaksLab_Text_OakMonsAroundWorldWait release end -EventScript_169A78:: @ 8169A78 - msgbox gUnknown_818E98E +PalletTown_ProfessorOaksLab_EventScript_PlayerAlreadyGotBalls:: @ 8169A78 + msgbox PalletTown_ProfessorOaksLab_Text_OakComeSeeMeSometime release end -EventScript_169A82:: @ 8169A82 - setobjectxyperm 8, 5, 10 - addobject 8 - applymovement OBJ_EVENT_ID_PLAYER, Movement_169B94 - applymovement 8, Movement_169B9D +PalletTown_ProfessorOaksLab_EventScript_DexSceneRivalEnterNorth:: @ 8169A82 + setobjectxyperm LOCALID_RIVAL, 5, 10 + addobject LOCALID_RIVAL + applymovement OBJ_EVENT_ID_PLAYER, PalletTown_ProfessorOaksLab_Movement_WatchRivalEnterNorth + applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalEnter waitmovement 0 return -EventScript_169A9E:: @ 8169A9E - setobjectxyperm 8, 6, 10 - addobject 8 - applymovement 4, Movement_WalkInPlaceFastestDown - applymovement OBJ_EVENT_ID_PLAYER, Movement_169B91 - applymovement 8, Movement_169B9D +PalletTown_ProfessorOaksLab_EventScript_DexSceneRivalEnterEastWest:: @ 8169A9E + setobjectxyperm LOCALID_RIVAL, 6, 10 + addobject LOCALID_RIVAL + applymovement LOCALID_PROF_OAK, Movement_WalkInPlaceFastestDown + applymovement OBJ_EVENT_ID_PLAYER, PalletTown_ProfessorOaksLab_Movement_WatchRivalEnterEastWest + applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalEnter waitmovement 0 return -EventScript_169AC1:: @ 8169AC1 - setobjectxyperm 8, 6, 10 - addobject 8 - applymovement 4, Movement_WalkInPlaceFastestDown - applymovement 8, Movement_169B9D +PalletTown_ProfessorOaksLab_EventScript_DexSceneRivalEnterSouth:: @ 8169AC1 + setobjectxyperm LOCALID_RIVAL, 6, 10 + addobject LOCALID_RIVAL + applymovement LOCALID_PROF_OAK, Movement_WalkInPlaceFastestDown + applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalEnter waitmovement 0 return -EventScript_169ADD:: @ 8169ADD - applymovement 4, Movement_FacePlayer +PalletTown_ProfessorOaksLab_EventScript_DexSceneOakFacePlayerAndRivalSouth:: @ 8169ADD + applymovement LOCALID_PROF_OAK, Movement_FacePlayer waitmovement 0 delay 15 - applymovement 4, Movement_WalkInPlaceFastestDown + applymovement LOCALID_PROF_OAK, Movement_WalkInPlaceFastestDown waitmovement 0 return -EventScript_169AF5:: @ 8169AF5 - applymovement 4, Movement_FacePlayer +PalletTown_ProfessorOaksLab_EventScript_DexSceneOakFacePlayerAndRivalWest:: @ 8169AF5 + applymovement LOCALID_PROF_OAK, Movement_FacePlayer waitmovement 0 delay 15 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft - applymovement 4, Movement_WalkInPlaceFastestDown + applymovement LOCALID_PROF_OAK, Movement_WalkInPlaceFastestDown waitmovement 0 return -EventScript_169B14:: @ 8169B14 - applymovement 4, Movement_FacePlayer +PalletTown_ProfessorOaksLab_EventScript_DexSceneOakFacePlayerAndRivalEast:: @ 8169B14 + applymovement LOCALID_PROF_OAK, Movement_FacePlayer waitmovement 0 delay 15 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight - applymovement 4, Movement_WalkInPlaceFastestDown + applymovement LOCALID_PROF_OAK, Movement_WalkInPlaceFastestDown waitmovement 0 return -EventScript_169B33:: @ 8169B33 - applymovement 8, Movement_FacePlayer +PalletTown_ProfessorOaksLab_EventScript_DexSceneRivalFacePlayerNorth:: @ 8169B33 + applymovement LOCALID_RIVAL, Movement_FacePlayer applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft waitmovement 0 return -EventScript_169B45:: @ 8169B45 - applymovement 8, Movement_WalkInPlaceFastestUp +PalletTown_ProfessorOaksLab_EventScript_DexSceneRivalFacePlayerSouth:: @ 8169B45 + applymovement LOCALID_RIVAL, Movement_WalkInPlaceFastestUp applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestDown waitmovement 0 return -EventScript_169B57:: @ 8169B57 - applymovement 8, Movement_FacePlayer +PalletTown_ProfessorOaksLab_EventScript_DexSceneRivalFacePlayerEastWest:: @ 8169B57 + applymovement LOCALID_RIVAL, Movement_FacePlayer applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestDown waitmovement 0 return -EventScript_169B69:: @ 8169B69 - applymovement OBJ_EVENT_ID_PLAYER, Movement_169B91 - applymovement 8, Movement_169BA4 +PalletTown_ProfessorOaksLab_EventScript_RivalExitNorth:: @ 8169B69 + applymovement OBJ_EVENT_ID_PLAYER, PalletTown_ProfessorOaksLab_Movement_WatchRivalEnterEastWest + applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalExit waitmovement 0 return -EventScript_169B7B:: @ 8169B7B - applymovement 8, Movement_169BA4 +PalletTown_ProfessorOaksLab_EventScript_RivalExit:: @ 8169B7B + applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalExit waitmovement 0 return -EventScript_169B86:: @ 8169B86 +PalletTown_ProfessorOaksLab_EventScript_DexSceneOakFacePlayerAndRivalNorth:: @ 8169B86 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp waitmovement 0 return -Movement_169B91:: @ 8169B91 +PalletTown_ProfessorOaksLab_Movement_WatchRivalEnterEastWest:: @ 8169B91 delay_4 walk_in_place_fastest_down step_end -Movement_169B94:: @ 8169B94 +PalletTown_ProfessorOaksLab_Movement_WatchRivalEnterNorth:: @ 8169B94 walk_in_place_fastest_down delay_16 delay_16 @@ -1112,7 +1133,7 @@ Movement_169B94:: @ 8169B94 walk_in_place_fastest_left step_end -Movement_169B9D:: @ 8169B9D +PalletTown_ProfessorOaksLab_Movement_RivalEnter:: @ 8169B9D walk_up walk_up walk_up @@ -1121,7 +1142,7 @@ Movement_169B9D:: @ 8169B9D walk_up step_end -Movement_169BA4:: @ 8169BA4 +PalletTown_ProfessorOaksLab_Movement_RivalExit:: @ 8169BA4 walk_down walk_down walk_down @@ -1130,79 +1151,74 @@ Movement_169BA4:: @ 8169BA4 walk_down step_end - .equ VAR_OAKSLAB_PLAYER_STARTER_NO, VAR_TEMP_1 - .equ VAR_OAKSLAB_PLAYER_STARTER_SPECIES, VAR_TEMP_2 - .equ VAR_OAKSLAB_RIVAL_STARTER_SPECIES, VAR_TEMP_3 - .equ VAR_OAKSLAB_RIVAL_STARTER_OBJID, VAR_TEMP_4 - -PalletTown_ProfessorOaksLab_EventScript_169BAB:: @ 8169BAB +PalletTown_ProfessorOaksLab_EventScript_BulbasaurBall:: @ 8169BAB lock faceplayer - setvar VAR_OAKSLAB_PLAYER_STARTER_NO, 0 - setvar VAR_OAKSLAB_PLAYER_STARTER_SPECIES, SPECIES_BULBASAUR - setvar VAR_OAKSLAB_RIVAL_STARTER_SPECIES, SPECIES_CHARMANDER - setvar VAR_OAKSLAB_RIVAL_STARTER_OBJID, 7 + setvar PLAYER_STARTER_NUM, 0 + setvar PLAYER_STARTER_SPECIES, SPECIES_BULBASAUR + setvar RIVAL_STARTER_SPECIES, SPECIES_CHARMANDER + setvar RIVAL_STARTER_ID, LOCALID_CHARMANDER_BALL compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3 - goto_if_ge EventScript_169DE4 + goto_if_ge PalletTown_ProfessorOaksLab_EventScript_LastPokeBall compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 2 - goto_if_eq EventScript_169BE1 - msgbox gUnknown_818EA19 + goto_if_eq PalletTown_ProfessorOaksLab_EventScript_ConfirmStarterChoice + msgbox PalletTown_ProfessorOaksLab_Text_ThoseArePokeBalls release end -EventScript_169BE1:: @ 8169BE1 - applymovement 4, Movement_FaceRight +PalletTown_ProfessorOaksLab_EventScript_ConfirmStarterChoice:: @ 8169BE1 + applymovement LOCALID_PROF_OAK, Movement_FaceRight waitmovement 0 - drawmonpic VAR_OAKSLAB_PLAYER_STARTER_SPECIES, 10, 3 + drawmonpic PLAYER_STARTER_SPECIES, 10, 3 textcolor 0 - compare VAR_OAKSLAB_PLAYER_STARTER_NO, 0 - goto_if_eq EventScript_OakDescribesBulbasaur - compare VAR_OAKSLAB_PLAYER_STARTER_NO, 1 - goto_if_eq EventScript_OakDescribesCharmander - compare VAR_OAKSLAB_PLAYER_STARTER_NO, 2 - goto_if_eq EventScript_OakDescribesSquirtle + compare PLAYER_STARTER_NUM, 0 + goto_if_eq PalletTown_ProfessorOaksLab_EventScript_ConfirmBulbasaur + compare PLAYER_STARTER_NUM, 1 + goto_if_eq PalletTown_ProfessorOaksLab_EventScript_ConfirmCharmander + compare PLAYER_STARTER_NUM, 2 + goto_if_eq PalletTown_ProfessorOaksLab_EventScript_ConfirmSquirtle end -EventScript_OakDescribesBulbasaur:: @ 8169C14 - msgbox gUnknown_818E272, MSGBOX_YESNO +PalletTown_ProfessorOaksLab_EventScript_ConfirmBulbasaur:: @ 8169C14 + msgbox PalletTown_ProfessorOaksLab_Text_OakChoosingBulbasaur, MSGBOX_YESNO compare VAR_RESULT, YES - goto_if_eq EventScript_ThisPokeIsRealyEnergetic + goto_if_eq PalletTown_ProfessorOaksLab_EventScript_ChoseStarter compare VAR_RESULT, NO - goto_if_eq EventScript_DeclinedStarter + goto_if_eq PalletTown_ProfessorOaksLab_EventScript_DeclinedStarter end -EventScript_OakDescribesCharmander:: @ 8169C33 - msgbox gUnknown_818E207, MSGBOX_YESNO +PalletTown_ProfessorOaksLab_EventScript_ConfirmCharmander:: @ 8169C33 + msgbox PalletTown_ProfessorOaksLab_Text_OakChoosingSquirtle, MSGBOX_YESNO compare VAR_RESULT, YES - goto_if_eq EventScript_ThisPokeIsRealyEnergetic + goto_if_eq PalletTown_ProfessorOaksLab_EventScript_ChoseStarter compare VAR_RESULT, NO - goto_if_eq EventScript_DeclinedStarter + goto_if_eq PalletTown_ProfessorOaksLab_EventScript_DeclinedStarter end -EventScript_OakDescribesSquirtle:: @ 8169C52 - msgbox gUnknown_818E194, MSGBOX_YESNO +PalletTown_ProfessorOaksLab_EventScript_ConfirmSquirtle:: @ 8169C52 + msgbox PalletTown_ProfessorOaksLab_Text_OakChoosingCharmander, MSGBOX_YESNO compare VAR_RESULT, YES - goto_if_eq EventScript_ThisPokeIsRealyEnergetic + goto_if_eq PalletTown_ProfessorOaksLab_EventScript_ChoseStarter compare VAR_RESULT, NO - goto_if_eq EventScript_DeclinedStarter + goto_if_eq PalletTown_ProfessorOaksLab_EventScript_DeclinedStarter end -EventScript_DeclinedStarter:: @ 8169C71 +PalletTown_ProfessorOaksLab_EventScript_DeclinedStarter:: @ 8169C71 erasemonpic release end -EventScript_ThisPokeIsRealyEnergetic:: @ 8169C74 +PalletTown_ProfessorOaksLab_EventScript_ChoseStarter:: @ 8169C74 erasemonpic removeobject VAR_LAST_TALKED - msgbox gUnknown_818E2E5 + msgbox PalletTown_ProfessorOaksLab_Text_OakThisMonIsEnergetic call EventScript_1A6675 setflag FLAG_SYS_POKEMON_GET setflag FLAG_PALLET_LADY_NOT_BLOCKING_SIGN - givemon VAR_OAKSLAB_PLAYER_STARTER_SPECIES, 5, ITEM_NONE - copyvar VAR_STARTER_MON, VAR_OAKSLAB_PLAYER_STARTER_NO - getspeciesname 0, VAR_OAKSLAB_PLAYER_STARTER_SPECIES - message Text_18E30D + givemon PLAYER_STARTER_SPECIES, 5, ITEM_NONE + copyvar VAR_STARTER_MON, PLAYER_STARTER_NUM + getspeciesname 0, PLAYER_STARTER_SPECIES + message PalletTown_ProfessorOaksLab_Text_ReceivedMonFromOak waitmessage playfanfare MUS_FAN5 waitfanfare @@ -1210,63 +1226,63 @@ EventScript_ThisPokeIsRealyEnergetic:: @ 8169C74 compare VAR_RESULT, YES goto_if_eq EventScript_GiveNicknameToStarter compare VAR_RESULT, NO - goto_if_eq EventScript_SkipGiveNicknameToStarter + goto_if_eq PalletTown_ProfessorOaksLab_EventScript_RivalPicksStarter end EventScript_GiveNicknameToStarter:: @ 8169CCC setvar VAR_0x8004, 0 call EventScript_ChangePokemonNickname - goto EventScript_SkipGiveNicknameToStarter + goto PalletTown_ProfessorOaksLab_EventScript_RivalPicksStarter end -EventScript_SkipGiveNicknameToStarter:: @ 8169CDC +PalletTown_ProfessorOaksLab_EventScript_RivalPicksStarter:: @ 8169CDC closemessage - compare VAR_OAKSLAB_PLAYER_STARTER_NO, 0 - goto_if_eq EventScript_RivalWalksToCharmander - compare VAR_OAKSLAB_PLAYER_STARTER_NO, 1 - goto_if_eq EventScript_RivalWalksToSquirtle - compare VAR_OAKSLAB_PLAYER_STARTER_NO, 2 - goto_if_eq EventScript_RivalWalksToBulbasaur + compare PLAYER_STARTER_NUM, 0 + goto_if_eq PalletTown_ProfessorOaksLab_EventScript_RivalWalksToCharmander + compare PLAYER_STARTER_NUM, 1 + goto_if_eq PalletTown_ProfessorOaksLab_EventScript_RivalWalksToSquirtle + compare PLAYER_STARTER_NUM, 2 + goto_if_eq PalletTown_ProfessorOaksLab_EventScript_RivalWalksToBulbasaur end -EventScript_RivalWalksToCharmander:: @ 8169CFF - applymovement 8, Movement_RivalWalksToCharmander +PalletTown_ProfessorOaksLab_EventScript_RivalWalksToCharmander:: @ 8169CFF + applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalWalksToCharmander waitmovement 0 - goto Movement_RivalTakesHisStarter + goto PalletTown_ProfessorOaksLab_EventScript_RivalTakesStarter end -EventScript_RivalWalksToBulbasaur:: @ 8169D0F - applymovement 8, Movement_RivalWalksToBulbasaur +PalletTown_ProfessorOaksLab_EventScript_RivalWalksToBulbasaur:: @ 8169D0F + applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalWalksToBulbasaur waitmovement 0 - goto Movement_RivalTakesHisStarter + goto PalletTown_ProfessorOaksLab_EventScript_RivalTakesStarter end -EventScript_RivalWalksToSquirtle:: @ 8169D1F - applymovement 8, Movement_RivalWalksToSquirtle +PalletTown_ProfessorOaksLab_EventScript_RivalWalksToSquirtle:: @ 8169D1F + applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalWalksToSquirtle waitmovement 0 - goto Movement_RivalTakesHisStarter + goto PalletTown_ProfessorOaksLab_EventScript_RivalTakesStarter end -Movement_RivalTakesHisStarter:: @ 8169D2F +PalletTown_ProfessorOaksLab_EventScript_RivalTakesStarter:: @ 8169D2F textcolor 0 - msgbox gUnknown_818DD34 - removeobject VAR_OAKSLAB_RIVAL_STARTER_OBJID + msgbox PalletTown_ProfessorOaksLab_Text_RivalIllTakeThisOneThen + removeobject RIVAL_STARTER_ID textcolor 3 - getspeciesname 0, VAR_OAKSLAB_RIVAL_STARTER_SPECIES - message Text_18DD52 + getspeciesname 0, RIVAL_STARTER_SPECIES + message PalletTown_ProfessorOaksLab_Text_RivalReceivedMonFromOak waitmessage playfanfare MUS_FAN5 waitfanfare setvar VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3 - call_if_set FLAG_PALLET_TOWN_LADY_MOVED_FROM_SIGN, EventScript_169D5C + call_if_set FLAG_PALLET_TOWN_LADY_MOVED_FROM_SIGN, PalletTown_ProfessorOaksLab_EventScript_ReadyEndSignLadyScene release end -EventScript_169D5C:: @ 8169D5C +PalletTown_ProfessorOaksLab_EventScript_ReadyEndSignLadyScene:: @ 8169D5C setvar VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 1 return -Movement_RivalWalksToCharmander:: @ 8169D62 +PalletTown_ProfessorOaksLab_Movement_RivalWalksToCharmander:: @ 8169D62 walk_down walk_down walk_right @@ -1277,7 +1293,7 @@ Movement_RivalWalksToCharmander:: @ 8169D62 walk_up step_end -Movement_RivalWalksToBulbasaur:: @ 8169D6B +PalletTown_ProfessorOaksLab_Movement_RivalWalksToBulbasaur:: @ 8169D6B walk_down walk_right walk_right @@ -1286,7 +1302,7 @@ Movement_RivalWalksToBulbasaur:: @ 8169D6B walk_in_place_fastest_up step_end -Movement_RivalWalksToSquirtle:: @ 8169D72 +PalletTown_ProfessorOaksLab_Movement_RivalWalksToSquirtle:: @ 8169D72 walk_down walk_right walk_right @@ -1294,98 +1310,98 @@ Movement_RivalWalksToSquirtle:: @ 8169D72 walk_in_place_fastest_up step_end -PalletTown_ProfessorOaksLab_EventScript_169D78:: @ 8169D78 +PalletTown_ProfessorOaksLab_EventScript_SquirtleBall:: @ 8169D78 lock faceplayer - setvar VAR_OAKSLAB_PLAYER_STARTER_NO, 1 - setvar VAR_OAKSLAB_PLAYER_STARTER_SPECIES, SPECIES_SQUIRTLE - setvar VAR_OAKSLAB_RIVAL_STARTER_SPECIES, SPECIES_BULBASAUR - setvar VAR_OAKSLAB_RIVAL_STARTER_OBJID, 5 + setvar PLAYER_STARTER_NUM, 1 + setvar PLAYER_STARTER_SPECIES, SPECIES_SQUIRTLE + setvar RIVAL_STARTER_SPECIES, SPECIES_BULBASAUR + setvar RIVAL_STARTER_ID, LOCALID_BULBASAUR_BALL compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3 - goto_if_ge EventScript_169DE4 + goto_if_ge PalletTown_ProfessorOaksLab_EventScript_LastPokeBall compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 2 - goto_if_eq EventScript_169BE1 - msgbox gUnknown_818EA19 + goto_if_eq PalletTown_ProfessorOaksLab_EventScript_ConfirmStarterChoice + msgbox PalletTown_ProfessorOaksLab_Text_ThoseArePokeBalls release end -PalletTown_ProfessorOaksLab_EventScript_169DAE:: @ 8169DAE +PalletTown_ProfessorOaksLab_EventScript_CharmanderBall:: @ 8169DAE lock faceplayer - setvar VAR_OAKSLAB_PLAYER_STARTER_NO, 2 - setvar VAR_OAKSLAB_PLAYER_STARTER_SPECIES, SPECIES_CHARMANDER - setvar VAR_OAKSLAB_RIVAL_STARTER_SPECIES, SPECIES_SQUIRTLE - setvar VAR_OAKSLAB_RIVAL_STARTER_OBJID, 6 + setvar PLAYER_STARTER_NUM, 2 + setvar PLAYER_STARTER_SPECIES, SPECIES_CHARMANDER + setvar RIVAL_STARTER_SPECIES, SPECIES_SQUIRTLE + setvar RIVAL_STARTER_ID, LOCALID_SQUIRTLE_BALL compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3 - goto_if_ge EventScript_169DE4 + goto_if_ge PalletTown_ProfessorOaksLab_EventScript_LastPokeBall compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 2 - goto_if_eq EventScript_169BE1 - msgbox gUnknown_818EA19 + goto_if_eq PalletTown_ProfessorOaksLab_EventScript_ConfirmStarterChoice + msgbox PalletTown_ProfessorOaksLab_Text_ThoseArePokeBalls release end -EventScript_169DE4:: @ 8169DE4 - msgbox gUnknown_818EA45 +PalletTown_ProfessorOaksLab_EventScript_LastPokeBall:: @ 8169DE4 + msgbox PalletTown_ProfessorOaksLab_Text_OaksLastMon release end -PalletTown_ProfessorOaksLab_EventScript_169DEE:: @ 8169DEE +PalletTown_ProfessorOaksLab_EventScript_Aide1:: @ 8169DEE lock faceplayer - goto_if_set FLAG_SYS_GAME_CLEAR, EventScript_169E03 - msgbox gUnknown_818EBE6 + goto_if_set FLAG_SYS_GAME_CLEAR, PalletTown_ProfessorOaksLab_EventScript_Aide1GameClear + msgbox PalletTown_ProfessorOaksLab_Text_StudyAsOaksAide release end -EventScript_169E03:: @ 8169E03 +PalletTown_ProfessorOaksLab_EventScript_Aide1GameClear:: @ 8169E03 famechecker FAMECHECKER_OAK, 5 - msgbox gUnknown_818ED15 + msgbox PalletTown_ProfessorOaksLab_Text_OakIsGoingToHaveRadioShow release end -PalletTown_ProfessorOaksLab_EventScript_169E1A:: @ 8169E1A +PalletTown_ProfessorOaksLab_EventScript_Aide2:: @ 8169E1A lock faceplayer - goto_if_set FLAG_SYS_GAME_CLEAR, EventScript_169E2F - msgbox gUnknown_818EBE6 + goto_if_set FLAG_SYS_GAME_CLEAR, PalletTown_ProfessorOaksLab_EventScript_Aide2GameClear + msgbox PalletTown_ProfessorOaksLab_Text_StudyAsOaksAide release end -EventScript_169E2F:: @ 8169E2F +PalletTown_ProfessorOaksLab_EventScript_Aide2GameClear:: @ 8169E2F famechecker FAMECHECKER_DAISY, 0 - msgbox gUnknown_818EC0B + msgbox PalletTown_ProfessorOaksLab_Text_DaisyWillGroomMons release end -PalletTown_ProfessorOaksLab_EventScript_169E46:: @ 8169E46 +PalletTown_ProfessorOaksLab_EventScript_Aide3:: @ 8169E46 lock faceplayer famechecker FAMECHECKER_OAK, 2 - msgbox gUnknown_818ED81 + msgbox PalletTown_ProfessorOaksLab_Text_OakIsAuthorityOnMons release end -PalletTown_ProfessorOaksLab_EventScript_169E5F:: @ 8169E5F - msgbox gUnknown_818E9E5, MSGBOX_NPC +PalletTown_ProfessorOaksLab_EventScript_Pokedex:: @ 8169E5F + msgbox PalletTown_ProfessorOaksLab_Text_BlankEncyclopedia, MSGBOX_NPC end -PalletTown_ProfessorOaksLab_EventScript_169E68:: @ 8169E68 - msgbox gUnknown_818EAF4, MSGBOX_SIGN +PalletTown_ProfessorOaksLab_EventScript_Computer:: @ 8169E68 + msgbox PalletTown_ProfessorOaksLab_Text_EmailMessage, MSGBOX_SIGN end -PalletTown_ProfessorOaksLab_EventScript_169E71:: @ 8169E71 - msgbox gUnknown_818EA66, MSGBOX_SIGN +PalletTown_ProfessorOaksLab_EventScript_LeftSign:: @ 8169E71 + msgbox PalletTown_ProfessorOaksLab_Text_PressStartToOpenMenu, MSGBOX_SIGN end -PalletTown_ProfessorOaksLab_EventScript_169E7A:: @ 8169E7A +PalletTown_ProfessorOaksLab_EventScript_RightSign:: @ 8169E7A lockall compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 6 - goto_if_ge EventScript_169E90 - msgbox gUnknown_818EA84 + goto_if_ge PalletTown_ProfessorOaksLab_EventScript_RightSignAlt + msgbox PalletTown_ProfessorOaksLab_Text_SaveOptionInMenu releaseall end -EventScript_169E90:: @ 8169E90 - msgbox gUnknown_818EAB6 +PalletTown_ProfessorOaksLab_EventScript_RightSignAlt:: @ 8169E90 + msgbox PalletTown_ProfessorOaksLab_Text_AllMonTypesHaveStrongAndWeakPoints releaseall end diff --git a/data/maps/PalletTown_ProfessorOaksLab/text.inc b/data/maps/PalletTown_ProfessorOaksLab/text.inc index e437d4b39..ad7e8b7a1 100644 --- a/data/maps/PalletTown_ProfessorOaksLab/text.inc +++ b/data/maps/PalletTown_ProfessorOaksLab/text.inc @@ -1,37 +1,37 @@ -gUnknown_818DC67:: @ 818DC67 +PalletTown_ProfessorOaksLab_Text_RivalGrampsIsntAround:: @ 818DC67 .string "{RIVAL}: What, it's only {PLAYER}?\n" .string "Gramps isn't around.$" -gUnknown_818DC94:: @ 818DC94 +PalletTown_ProfessorOaksLab_Text_RivalFedUpWithWaiting:: @ 818DC94 .string "{RIVAL}: Gramps!\n" .string "I'm fed up with waiting!$" -gUnknown_818DCB9:: @ 818DCB9 +PalletTown_ProfessorOaksLab_Text_RivalNoFairWhatAboutMe:: @ 818DCB9 .string "{RIVAL}: Hey! Gramps! No fair!\n" .string "What about me?$" -gUnknown_818DCE2:: @ 818DCE2 +PalletTown_ProfessorOaksLab_Text_RivalGoChoosePlayer:: @ 818DCE2 .string "{RIVAL}: Heh, I don't need to be\n" .string "greedy like you. I'm mature!\p" .string "Go ahead and choose, {PLAYER}!$" -gUnknown_818DD34:: @ 818DD34 +PalletTown_ProfessorOaksLab_Text_RivalIllTakeThisOneThen:: @ 818DD34 .string "{RIVAL}: I'll take this one, then!$" -Text_18DD52:: @ 818DD52 +PalletTown_ProfessorOaksLab_Text_RivalReceivedMonFromOak:: @ 818DD52 .string "{RIVAL} received the {STR_VAR_1}\n" .string "from PROF. OAK!$" -gUnknown_818DD75:: @ 818DD75 +PalletTown_ProfessorOaksLab_Text_RivalMyMonLooksTougher:: @ 818DD75 .string "{RIVAL}: My POKéMON looks a lot\n" .string "tougher than yours.$" -gUnknown_818DDA4:: @ 818DDA4 +PalletTown_ProfessorOaksLab_Text_RivalLetsCheckOutMons:: @ 818DDA4 .string "{RIVAL}: Wait, {PLAYER}!\n" .string "Let's check out our POKéMON!\p" .string "Come on, I'll take you on!$" -Text_18DDEA:: @ 818DDEA +PalletTown_ProfessorOaksLab_Text_RivalDefeat:: @ 818DDEA .string "WHAT?\n" .string "Unbelievable!\l" .string "I picked the wrong POKéMON!$" @@ -41,24 +41,24 @@ Text_RivalVictory:: @ 818DE1A .string "{RIVAL}: Yeah!\n" .string "Am I great or what?$" -gUnknown_818DE38:: @ 818DE38 +PalletTown_ProfessorOaksLab_Text_RivalGoToughenMyMon:: @ 818DE38 .string "{RIVAL}: Okay! I'll make my\n" .string "POKéMON battle to toughen it up!\p" .string "{PLAYER}! Gramps!\n" .string "Smell you later!$" -gUnknown_818DE8D:: @ 818DE8D +PalletTown_ProfessorOaksLab_Text_RivalGramps:: @ 818DE8D .string "{RIVAL}: Gramps!$" -gUnknown_818DE99:: @ 818DE99 +PalletTown_ProfessorOaksLab_Text_RivalWhatDidYouCallMeFor:: @ 818DE99 .string "{RIVAL}: I almost forgot!\n" .string "What did you call me for?$" -gUnknown_818DEC8:: @ 818DEC8 +PalletTown_ProfessorOaksLab_Text_RivalLeaveItToMeGramps:: @ 818DEC8 .string "{RIVAL}: All right, Gramps!\n" .string "Leave it all to me!$" -gUnknown_818DEF3:: @ 818DEF3 +PalletTown_ProfessorOaksLab_Text_RivalTellSisNotToGiveYouMap:: @ 818DEF3 .string "{PLAYER}, I hate to say it, but you\n" .string "won't be necessary for this.\p" .string "I know! I'll borrow a TOWN MAP\n" @@ -68,7 +68,7 @@ gUnknown_818DEF3:: @ 818DEF3 .string "Don't bother coming around to\n" .string "my place after this!$" -gUnknown_818DFBC:: @ 818DFBC +PalletTown_ProfessorOaksLab_Text_OakThreeMonsChooseOne:: @ 818DFBC .string "OAK: {RIVAL}?\n" .string "Let me think…\p" .string "Oh, that's right, I told you to\n" @@ -85,59 +85,59 @@ gUnknown_818DFBC:: @ 818DFBC .string "You can have one.\n" .string "Go on, choose!$" -gUnknown_818E0EA:: @ 818E0EA +PalletTown_ProfessorOaksLab_Text_OakBePatientRival:: @ 818E0EA .string "OAK: Be patient, {RIVAL}.\n" .string "You can have one, too!$" -gUnknown_818E116:: @ 818E116 +PalletTown_ProfessorOaksLab_Text_OakWhichOneWillYouChoose:: @ 818E116 .string "OAK: Now, {PLAYER}.\p" .string "Inside those three POKé BALLS are\n" .string "POKéMON.\p" .string "Which one will you choose for\n" .string "yourself?$" -gUnknown_818E177:: @ 818E177 +PalletTown_ProfessorOaksLab_Text_OakHeyDontGoAwayYet:: @ 818E177 .string "OAK: Hey!\n" .string "Don't go away yet!$" -gUnknown_818E194:: @ 818E194 +PalletTown_ProfessorOaksLab_Text_OakChoosingCharmander:: @ 818E194 .string "Ah! CHARMANDER is your choice.\n" .string "You should raise it patiently.\p" .string "So, {PLAYER}, you're claiming the\n" .string "FIRE POKéMON CHARMANDER?$" -gUnknown_818E207:: @ 818E207 +PalletTown_ProfessorOaksLab_Text_OakChoosingSquirtle:: @ 818E207 .string "Hm! SQUIRTLE is your choice.\n" .string "It's one worth raising.\p" .string "So, {PLAYER}, you've decided on the\n" .string "WATER POKéMON SQUIRTLE?$" -gUnknown_818E272:: @ 818E272 +PalletTown_ProfessorOaksLab_Text_OakChoosingBulbasaur:: @ 818E272 .string "I see! BULBASAUR is your choice.\n" .string "It's very easy to raise.\p" .string "So, {PLAYER}, you want to go with\n" .string "the GRASS POKéMON BULBASAUR?$" -gUnknown_818E2E5:: @ 818E2E5 +PalletTown_ProfessorOaksLab_Text_OakThisMonIsEnergetic:: @ 818E2E5 .string "This POKéMON is really quite\n" .string "energetic!$" -Text_18E30D:: @ 818E30D +PalletTown_ProfessorOaksLab_Text_ReceivedMonFromOak:: @ 818E30D .string "{PLAYER} received the {STR_VAR_1}\n" .string "from PROF. OAK!$" -gUnknown_818E330:: @ 818E330 +PalletTown_ProfessorOaksLab_Text_OakCanReachNextTownWithMon:: @ 818E330 .string "OAK: If a wild POKéMON appears,\n" .string "your POKéMON can battle it.\p" .string "With it at your side, you should be\n" .string "able to reach the next town.$" -gUnknown_818E3AD:: @ 818E3AD +PalletTown_ProfessorOaksLab_Text_OakBattleMonForItToGrow:: @ 818E3AD .string "OAK: {PLAYER}, raise your young\n" .string "POKéMON by making it battle.\p" .string "It has to battle for it to grow.$" -gUnknown_818E405:: @ 818E405 +PalletTown_ProfessorOaksLab_Text_OakHaveSomethingForMe:: @ 818E405 .string "OAK: Oh, {PLAYER}!\n" .string "How is my old POKéMON?\p" .string "Well, it seems to be growing more\n" @@ -147,35 +147,35 @@ gUnknown_818E405:: @ 818E405 .string "What's that?\n" .string "You have something for me?$" -Text_18E4AF:: @ 818E4AF +PalletTown_ProfessorOaksLab_Text_DeliveredOaksParcel:: @ 818E4AF .string "{PLAYER} delivered OAK'S PARCEL.$" -gUnknown_818E4CA:: @ 818E4CA +PalletTown_ProfessorOaksLab_Text_OakCustomBallIOrdered:: @ 818E4CA .string "Ah! \n" .string "It's the custom POKé BALL!\p" .string "I had it on order.\n" .string "Thank you!$" -gUnknown_818E508:: @ 818E508 +PalletTown_ProfessorOaksLab_Text_OakHaveRequestForYouTwo:: @ 818E508 .string "OAK: Oh, right!\n" .string "I have a request for you two.$" -gUnknown_818E536:: @ 818E536 +PalletTown_ProfessorOaksLab_Text_OakPokedexOnDesk:: @ 818E536 .string "On the desk there is my invention,\n" .string "the POKéDEX!\p" .string "It automatically records data on\n" .string "POKéMON you've seen or caught.\p" .string "It's a high-tech encyclopedia!$" -gUnknown_818E5C5:: @ 818E5C5 +PalletTown_ProfessorOaksLab_Text_OakTakeTheseWithYou:: @ 818E5C5 .string "OAK: {PLAYER} and {RIVAL}.\n" .string "Take these with you.$" -Text_18E5EA:: @ 818E5EA +PalletTown_ProfessorOaksLab_Text_ReceivedPokedexFromOak:: @ 818E5EA .string "{PLAYER} received the POKéDEX\n" .string "from PROF. OAK.$" -gUnknown_818E612:: @ 818E612 +PalletTown_ProfessorOaksLab_Text_OakCatchMonsForDataTakeThese:: @ 818E612 .string "OAK: You can't get detailed data\n" .string "on POKéMON by just seeing them.\p" .string "You must catch them to obtain\n" @@ -183,10 +183,10 @@ gUnknown_818E612:: @ 818E612 .string "So, here are some tools for\n" .string "catching wild POKéMON.$" -gUnknown_818E6B3:: @ 818E6B3 +PalletTown_ProfessorOaksLab_Text_ReceivedFivePokeBalls:: @ 818E6B3 .string "{PLAYER} received five POKé BALLS.$" -gUnknown_818E6D0:: @ 818E6D0 +PalletTown_ProfessorOaksLab_Text_OakExplainCatching:: @ 818E6D0 .string "When a wild POKéMON appears,\n" .string "it's fair game.\p" .string "Just throw a POKé BALL at it and\n" @@ -195,7 +195,7 @@ gUnknown_818E6D0:: @ 818E6D0 .string "A healthy POKéMON can escape.\n" .string "You have to be lucky!$" -gUnknown_818E784:: @ 818E784 +PalletTown_ProfessorOaksLab_Text_OakCompleteMonGuideWasMyDream:: @ 818E784 .string "To make a complete guide on all\n" .string "the POKéMON in the world…\p" .string "That was my dream!\p" @@ -207,11 +207,11 @@ gUnknown_818E784:: @ 818E784 .string "This is a great undertaking in\n" .string "POKéMON history!$" -gUnknown_818E871:: @ 818E871 +PalletTown_ProfessorOaksLab_Text_OakMonsAroundWorldWait:: @ 818E871 .string "POKéMON around the world wait for\n" .string "you, {PLAYER}!$" -gUnknown_818E89C:: @ 818E89C +PalletTown_ProfessorOaksLab_Text_OakAddedNothingToPokedex:: @ 818E89C .string "Ah, {PLAYER}!\n" .string "How is your POKéDEX shaping up?\p" .string "{RIVAL} has already caught some\n" @@ -223,34 +223,34 @@ gUnknown_818E89C:: @ 818E89C .string "I'll give you these, so do try a\n" .string "little harder.$" -gUnknown_818E98E:: @ 818E98E +PalletTown_ProfessorOaksLab_Text_OakComeSeeMeSometime:: @ 818E98E .string "OAK: Come see me sometime.\p" .string "After all, I want to know how your\n" .string "POKéDEX is coming along.$" -gUnknown_818E9E5:: @ 818E9E5 +PalletTown_ProfessorOaksLab_Text_BlankEncyclopedia:: @ 818E9E5 .string "It's like an encyclopedia, but the\n" .string "pages are blank.$" -gUnknown_818EA19:: @ 818EA19 +PalletTown_ProfessorOaksLab_Text_ThoseArePokeBalls:: @ 818EA19 .string "Those are POKé BALLS.\n" .string "They contain POKéMON!$" -gUnknown_818EA45:: @ 818EA45 +PalletTown_ProfessorOaksLab_Text_OaksLastMon:: @ 818EA45 .string "That's PROF. OAK's last POKéMON.$" -gUnknown_818EA66:: @ 818EA66 +PalletTown_ProfessorOaksLab_Text_PressStartToOpenMenu:: @ 818EA66 .string "Press START to open the MENU!$" -gUnknown_818EA84:: @ 818EA84 +PalletTown_ProfessorOaksLab_Text_SaveOptionInMenu:: @ 818EA84 .string "The SAVE option is on the MENU.\n" .string "Use it regularly.$" -gUnknown_818EAB6:: @ 818EAB6 +PalletTown_ProfessorOaksLab_Text_AllMonTypesHaveStrongAndWeakPoints:: @ 818EAB6 .string "All POKéMON types have strong and\n" .string "weak points against others.$" -gUnknown_818EAF4:: @ 818EAF4 +PalletTown_ProfessorOaksLab_Text_EmailMessage:: @ 818EAF4 .string "There's an e-mail message here.\p" .string "…\p" .string "Finally!\n" @@ -264,11 +264,11 @@ gUnknown_818EAF4:: @ 818EAF4 .string "PROF. OAK, please visit us!\n" .string "…$" -gUnknown_818EBE6:: @ 818EBE6 +PalletTown_ProfessorOaksLab_Text_StudyAsOaksAide:: @ 818EBE6 .string "I study POKéMON as PROF. OAK's\n" .string "AIDE.$" -gUnknown_818EC0B:: @ 818EC0B +PalletTown_ProfessorOaksLab_Text_DaisyWillGroomMons:: @ 818EC0B .string "Hi, {PLAYER}. I bet you've become\n" .string "good friends with your POKéMON.\p" .string "By the way, did you know about\n" @@ -280,25 +280,25 @@ gUnknown_818EC0B:: @ 818EC0B .string "This is a secret, so please don't\n" .string "tell anyone.$" -gUnknown_818ED15:: @ 818ED15 +PalletTown_ProfessorOaksLab_Text_OakIsGoingToHaveRadioShow:: @ 818ED15 .string "PROF. OAK is going to have his own\n" .string "radio show soon.\p" .string "The program will be called PROF.\n" .string "OAK's POKéMON SEMINAR.$" -gUnknown_818ED81:: @ 818ED81 +PalletTown_ProfessorOaksLab_Text_OakIsAuthorityOnMons:: @ 818ED81 .string "PROF. OAK may not look like much,\n" .string "but he's the authority on POKéMON.\p" .string "Many POKéMON TRAINERS hold him in\n" .string "high regard.$" -gUnknown_818EDF5:: @ 818EDF5 +PalletTown_ProfessorOaksLab_Text_OakFavorToAskYouPlayer:: @ 818EDF5 .string "Ah, now this is excellent!\p" .string "{PLAYER}, I have another important\n" .string "favor to ask of you.\p" .string "I need you to listen closely.$" -gUnknown_818EE60:: @ 818EE60 +PalletTown_ProfessorOaksLab_Text_OakSightingsOfRareMons:: @ 818EE60 .string "Recently, there have been sightings\n" .string "of many rare POKéMON species.\p" .string "I'm talking about POKéMON that\n" @@ -308,7 +308,7 @@ gUnknown_818EE60:: @ 818EE60 .string "Since I can't do it, {PLAYER}, I'd\n" .string "like you to go in my place.$" -gUnknown_818EF59:: @ 818EF59 +PalletTown_ProfessorOaksLab_Text_RivalJustLetMeHandleEverything:: @ 818EF59 .string "{RIVAL}: Hey, I heard that!\p" .string "Gramps, what's with favoring\n" .string "{PLAYER} over me all the time?\p" @@ -317,27 +317,27 @@ gUnknown_818EF59:: @ 818EF59 .string "You should just let me handle\n" .string "everything.$" -gUnknown_818F004:: @ 818F004 +PalletTown_ProfessorOaksLab_Text_OakNeedYourHelpTooNeedToSeePokedexes:: @ 818F004 .string "OAK: I know, I know.\n" .string "Of course I need your help, too.\p" .string "Now, I need to see both your\n" .string "POKéDEXES.$" -gUnknown_818F062:: @ 818F062 +PalletTown_ProfessorOaksLab_Text_OakTookBothPokedexUnits:: @ 818F062 .string "PROF. OAK took both POKéDEX\n" .string "units.$" -gUnknown_818F085:: @ 818F085 +PalletTown_ProfessorOaksLab_Text_OakNowTheseUnitsCanRecordMoreData:: @ 818F085 .string "… … … … … …\p" .string "… … … … … …\p" .string "…And that's done!\p" .string "Now these units can record data on\n" .string "a lot more POKéMON.$" -Text_18F0E8:: @ 818F0E8 +PalletTown_ProfessorOaksLab_Text_PlayersPokedexWasUpgraded:: @ 818F0E8 .string "{PLAYER}'s POKéDEX was upgraded!$" -gUnknown_818F103:: @ 818F103 +PalletTown_ProfessorOaksLab_Text_OakMustReallyWorkToFillPokedex:: @ 818F103 .string "Now, {PLAYER} and {RIVAL}!\p" .string "This time, you really must work\n" .string "towards filling your POKéDEXES.\p" @@ -346,7 +346,7 @@ gUnknown_818F103:: @ 818F103 .string "Truly, this is a monumentally great\n" .string "undertaking in POKéMON history!$" -gUnknown_818F1DB:: @ 818F1DB +PalletTown_ProfessorOaksLab_Text_RivalIllCompleteThePokedex:: @ 818F1DB .string "{RIVAL}: Gramps, calm down.\n" .string "Don't get so excited.\p" .string "I'll get the POKéDEX completed,\n" diff --git a/data/maps/Route15/map.json b/data/maps/Route15/map.json index cd0581a20..ef6dee02a 100644 --- a/data/maps/Route15/map.json +++ b/data/maps/Route15/map.json @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route15_EventScript_1AAD67", + "script": "Route15_EventScript_Yazmin", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 5, - "script": "Route15_EventScript_1AACEB", + "script": "Route15_EventScript_Edwin", "flag": "0" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, - "script": "Route15_EventScript_1AAD29", + "script": "Route15_EventScript_Chester", "flag": "0" }, { @@ -75,7 +75,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route15_EventScript_1AADA5", + "script": "Route15_EventScript_Kindra", "flag": "0" }, { @@ -88,7 +88,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, - "script": "Route15_EventScript_1AACAD", + "script": "Route15_EventScript_Olivia", "flag": "0" }, { @@ -101,7 +101,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, - "script": "Route15_EventScript_1AAC31", + "script": "Route15_EventScript_Alex", "flag": "0" }, { @@ -114,7 +114,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route15_EventScript_1AABF3", + "script": "Route15_EventScript_Ernest", "flag": "0" }, { @@ -127,7 +127,7 @@ "movement_range_y": 4, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route15_EventScript_1AADE3", + "script": "Route15_EventScript_Becky", "flag": "0" }, { @@ -140,7 +140,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, - "script": "Route15_EventScript_1AAC6F", + "script": "Route15_EventScript_Grace", "flag": "0" }, { @@ -153,7 +153,7 @@ "movement_range_y": 4, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route15_EventScript_1AAE21", + "script": "Route15_EventScript_Celia", "flag": "0" }, { @@ -179,7 +179,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route15_EventScript_1AAEA5", + "script": "Route15_EventScript_Ron", "flag": "0" }, { @@ -192,7 +192,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route15_EventScript_1AAE5F", + "script": "Route15_EventScript_Mya", "flag": "0" }, { @@ -233,7 +233,7 @@ "x": 41, "y": 11, "elevation": 0, - "script": "Route15_EventScript_1680DC" + "script": "Route15_EventScript_RouteSign" } ] } diff --git a/data/maps/Route15/scripts.inc b/data/maps/Route15/scripts.inc index 40890250c..85d24e49b 100644 --- a/data/maps/Route15/scripts.inc +++ b/data/maps/Route15/scripts.inc @@ -1,6 +1,6 @@ Route15_MapScripts:: @ 81680DB .byte 0 -Route15_EventScript_1680DC:: @ 81680DC - msgbox gUnknown_8186A77, MSGBOX_SIGN +Route15_EventScript_RouteSign:: @ 81680DC + msgbox Route15_Text_RouteSign, MSGBOX_SIGN end diff --git a/data/maps/Route15/text.inc b/data/maps/Route15/text.inc index 33c60e7dc..be3e38e6c 100644 --- a/data/maps/Route15/text.inc +++ b/data/maps/Route15/text.inc @@ -1,154 +1,154 @@ -Text_18650B:: @ 818650B +Route15_Text_KindraIntro:: @ 818650B .string "I just got some POKéMON in trades.\n" .string "Can I try them out on you?$" -Text_186549:: @ 8186549 +Route15_Text_KindraDefeat:: @ 8186549 .string "Not good enough!$" -Text_18655A:: @ 818655A +Route15_Text_KindraPostBattle:: @ 818655A .string "You can't change the nickname of\n" .string "any POKéMON you get in a trade.\p" .string "Only the Original TRAINER can get\n" .string "the nickname changed.$" -Text_1865D3:: @ 81865D3 +Route15_Text_BeckyIntro:: @ 81865D3 .string "You look gentle, so I think I can\n" .string "beat you.\p" .string "I'll give it a go!$" -Text_186612:: @ 8186612 +Route15_Text_BeckyDefeat:: @ 8186612 .string "No, wrong!$" -Text_18661D:: @ 818661D +Route15_Text_BeckyPostBattle:: @ 818661D .string "I'm afraid of BIKERS. They look so\n" .string "ugly and mean!$" -Text_18664F:: @ 818664F +Route15_Text_EdwinIntro:: @ 818664F .string "When I whistle, I can summon bird\n" .string "POKéMON.$" -Text_18667A:: @ 818667A +Route15_Text_EdwinDefeat:: @ 818667A .string "Ow!\n" .string "That's tragic!$" -Text_18668D:: @ 818668D +Route15_Text_EdwinPostBattle:: @ 818668D .string "Maybe I'm not cut out for battles.\n" .string "I'm not the right type, I guess.$" -Text_1866D1:: @ 81866D1 +Route15_Text_ChesterIntro:: @ 81866D1 .string "Hmm? My birds are shivering!\n" .string "You're good, aren't you?$" -Text_186707:: @ 8186707 +Route15_Text_ChesterDefeat:: @ 8186707 .string "Just as I thought!$" -Text_18671A:: @ 818671A +Route15_Text_ChesterPostBattle:: @ 818671A .string "This is so obvious, you should know\n" .string "this, but…\p" .string "Moves like EARTHQUAKE and FISSURE\n" .string "have no effect on bird POKéMON.$" -Text_18678B:: @ 818678B +Route15_Text_GraceIntro:: @ 818678B .string "Oh, you're a little cutie!\n" .string "So like a darling POKéMON!$" -Text_1867C1:: @ 81867C1 +Route15_Text_GraceDefeat:: @ 81867C1 .string "You looked so cute, too!$" -Text_1867DA:: @ 81867DA +Route15_Text_GracePostBattle:: @ 81867DA .string "I forgive you.\n" .string "I can take it.\l" .string "I'm a big girl now.$" -Text_18680C:: @ 818680C +Route15_Text_OliviaIntro:: @ 818680C .string "I raise POKéMON for protection\n" .string "because I live alone.$" -Text_186841:: @ 8186841 +Route15_Text_OliviaDefeat:: @ 8186841 .string "POKéMON isn't about winning or\n" .string "losing for me.$" -Text_18686F:: @ 818686F +Route15_Text_OliviaPostBattle:: @ 818686F .string "I love having my POKéMON greet me\n" .string "when I get home.\p" .string "It's so reassuring.$" -Text_1868B6:: @ 81868B6 +Route15_Text_ErnestIntro:: @ 81868B6 .string "Hey, kid! C'mon!\n" .string "I just got these off some loser!$" -Text_1868E8:: @ 81868E8 +Route15_Text_ErnestDefeat:: @ 81868E8 .string "Why not?$" -Text_1868F1:: @ 81868F1 +Route15_Text_ErnestPostBattle:: @ 81868F1 .string "Life's too short.\n" .string "It's cool to live as an outlaw.\l" .string "TEAM ROCKET RULES!$" -Text_186936:: @ 8186936 +Route15_Text_AlexIntro:: @ 8186936 .string "Fork over all your cash when you\n" .string "lose to me, kid!$" -Text_186968:: @ 8186968 +Route15_Text_AlexDefeat:: @ 8186968 .string "That can't be true!$" -Text_18697C:: @ 818697C +Route15_Text_AlexPostBattle:: @ 818697C .string "I was just joking about the money.\n" .string "Don't take me all serious.$" -Text_1869BA:: @ 81869BA +Route15_Text_CeliaIntro:: @ 81869BA .string "What's cool and happening?\n" .string "Trading POKéMON!$" -Text_1869E6:: @ 81869E6 +Route15_Text_CeliaDefeat:: @ 81869E6 .string "I said trade!$" -Text_1869F4:: @ 81869F4 +Route15_Text_CeliaPostBattle:: @ 81869F4 .string "I trade POKéMON with my friends\n" .string "all the time.$" -Text_186A22:: @ 8186A22 +Route15_Text_YazminIntro:: @ 8186A22 .string "Want to play with my POKéMON?$" -Text_186A40:: @ 8186A40 +Route15_Text_YazminDefeat:: @ 8186A40 .string "I was too impatient!$" -Text_186A55:: @ 8186A55 +Route15_Text_YazminPostBattle:: @ 8186A55 .string "I'll go train with weaker people.$" -gUnknown_8186A77:: @ 8186A77 +Route15_Text_RouteSign:: @ 8186A77 .string "ROUTE 15\n" .string "West to FUCHSIA CITY$" -Text_186A95:: @ 8186A95 +Route15_Text_MyaIntro:: @ 8186A95 .string "MYA: You're perfect.\n" .string "Help me train my little brother?$" -Text_186ACB:: @ 8186ACB +Route15_Text_MyaDefeat:: @ 8186ACB .string "MYA: RON, you have to focus!\n" .string "Concentrate on what you're doing!$" -Text_186B0A:: @ 8186B0A +Route15_Text_MyaPostBattle:: @ 8186B0A .string "MYA: Okay, we'll turn it up.\n" .string "I'll add to our training menu!$" -Text_186B46:: @ 8186B46 +Route15_Text_MyaNotEnoughMons:: @ 8186B46 .string "MYA: Do you want to challenge us?\n" .string "You'll need two POKéMON, though.$" -Text_186B89:: @ 8186B89 +Route15_Text_RonIntro:: @ 8186B89 .string "RON: My sister gets scary when we\n" .string "lose.$" -Text_186BB1:: @ 8186BB1 +Route15_Text_RonDefeat:: @ 8186BB1 .string "RON: Oh, no, no…\n" .string "Sis, I'm sorry!$" -Text_186BD2:: @ 8186BD2 +Route15_Text_RonPostBattle:: @ 8186BD2 .string "RON: Oh, bleah…\n" .string "I wish I had a nice sister…$" -Text_186BFE:: @ 8186BFE +Route15_Text_RonNotEnoughMons:: @ 8186BFE .string "RON: Did you want to battle with\n" .string "my sister and me?\p" .string "You need two POKéMON, then.$" diff --git a/data/maps/Route15_WestEntrance_1F/map.json b/data/maps/Route15_WestEntrance_1F/map.json index 39bf0cb41..fb1f9cacd 100644 --- a/data/maps/Route15_WestEntrance_1F/map.json +++ b/data/maps/Route15_WestEntrance_1F/map.json @@ -25,7 +25,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route15_WestEntrance_1F_EventScript_170089", + "script": "Route15_WestEntrance_1F_EventScript_Guard", "flag": "0" } ], diff --git a/data/maps/Route15_WestEntrance_1F/scripts.inc b/data/maps/Route15_WestEntrance_1F/scripts.inc index 9f753e6c9..222be2356 100644 --- a/data/maps/Route15_WestEntrance_1F/scripts.inc +++ b/data/maps/Route15_WestEntrance_1F/scripts.inc @@ -1,6 +1,6 @@ Route15_WestEntrance_1F_MapScripts:: @ 8170088 .byte 0 -Route15_WestEntrance_1F_EventScript_170089:: @ 8170089 - msgbox gUnknown_819F560, MSGBOX_NPC +Route15_WestEntrance_1F_EventScript_Guard:: @ 8170089 + msgbox Route15_WestEntrance_1F_Text_OaksAideCameByHere, MSGBOX_NPC end diff --git a/data/maps/Route15_WestEntrance_1F/text.inc b/data/maps/Route15_WestEntrance_1F/text.inc index e843e10a8..6cdbe8a2a 100644 --- a/data/maps/Route15_WestEntrance_1F/text.inc +++ b/data/maps/Route15_WestEntrance_1F/text.inc @@ -1,4 +1,4 @@ -gUnknown_819F560:: @ 819F560 +Route15_WestEntrance_1F_Text_OaksAideCameByHere:: @ 819F560 .string "Are you the kid who's working on\n" .string "a POKéDEX?\p" .string "PROF. OAK's AIDE came by here.$" diff --git a/data/maps/Route15_WestEntrance_2F/map.json b/data/maps/Route15_WestEntrance_2F/map.json index b11b7224a..8317b4d84 100644 --- a/data/maps/Route15_WestEntrance_2F/map.json +++ b/data/maps/Route15_WestEntrance_2F/map.json @@ -25,7 +25,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route15_WestEntrance_2F_EventScript_1700B9", + "script": "Route15_WestEntrance_2F_EventScript_Aide", "flag": "0" } ], @@ -45,14 +45,14 @@ "x": 4, "y": 1, "elevation": 0, - "script": "Route15_WestEntrance_2F_EventScript_170093" + "script": "Route15_WestEntrance_2F_EventScript_LeftBinoculars" }, { "type": "bg_event_type_0", "x": 8, "y": 1, "elevation": 0, - "script": "Route15_WestEntrance_2F_EventScript_1700B0" + "script": "Route15_WestEntrance_2F_EventScript_RightBinoculars" } ] } diff --git a/data/maps/Route15_WestEntrance_2F/scripts.inc b/data/maps/Route15_WestEntrance_2F/scripts.inc index 088a65876..851ceb07f 100644 --- a/data/maps/Route15_WestEntrance_2F/scripts.inc +++ b/data/maps/Route15_WestEntrance_2F/scripts.inc @@ -1,9 +1,11 @@ +.equ REQUIRED_CAUGHT_MONS, 50 + Route15_WestEntrance_2F_MapScripts:: @ 8170092 .byte 0 -Route15_WestEntrance_2F_EventScript_170093:: @ 8170093 +Route15_WestEntrance_2F_EventScript_LeftBinoculars:: @ 8170093 lockall - msgbox gUnknown_819F79C + msgbox Route15_WestEntrance_2F_Text_LargeShiningBird drawmonpic SPECIES_ARTICUNO, 10, 3 delay 20 waitbuttonpress @@ -13,40 +15,40 @@ Route15_WestEntrance_2F_EventScript_170093:: @ 8170093 releaseall end -Route15_WestEntrance_2F_EventScript_1700B0:: @ 81700B0 - msgbox gUnknown_819F7F8, MSGBOX_SIGN +Route15_WestEntrance_2F_EventScript_RightBinoculars:: @ 81700B0 + msgbox Route15_WestEntrance_2F_Text_SmallIslandOnHorizon, MSGBOX_SIGN end -Route15_WestEntrance_2F_EventScript_1700B9:: @ 81700B9 +Route15_WestEntrance_2F_EventScript_Aide:: @ 81700B9 lock faceplayer - call EventScript_170145 - goto_if_set FLAG_GOT_EXP_SHARE_FROM_OAKS_AIDE, EventScript_17013B - msgbox gUnknown_819F5AB, MSGBOX_YESNO + call Route15_WestEntrance_2F_EventScript_GetAideRequestInfo + goto_if_set FLAG_GOT_EXP_SHARE_FROM_OAKS_AIDE, Route15_WestEntrance_2F_EventScript_AlreadyGotExpShare + msgbox Route15_WestEntrance_2F_Text_GiveItemIfCaughtEnough, MSGBOX_YESNO compare VAR_RESULT, NO goto_if_eq Aide_EventScript_DeclineCheckMons setvar VAR_0x8004, 0 specialvar VAR_RESULT, Special_GetPokedexCount getnumberstring 2, VAR_0x8006 - call EventScript_170145 - compare VAR_0x8006, 50 + call Route15_WestEntrance_2F_EventScript_GetAideRequestInfo + compare VAR_0x8006, REQUIRED_CAUGHT_MONS goto_if_lt Aide_EventScript_HaventCaughtEnough - msgbox gUnknown_819F6AA + msgbox Route15_WestEntrance_2F_Text_GreatHereYouGo checkitemspace ITEM_EXP_SHARE, 1 compare VAR_RESULT, FALSE goto_if_eq Aide_EventScript_NoRoomForItem - giveitem_msg gUnknown_819F6FD, ITEM_EXP_SHARE + giveitem_msg Route15_WestEntrance_2F_Text_ReceivedItemFromAide, ITEM_EXP_SHARE setflag FLAG_GOT_EXP_SHARE_FROM_OAKS_AIDE - msgbox gUnknown_819F71F + msgbox Route15_WestEntrance_2F_Text_ExplainExpShare release end -EventScript_17013B:: @ 817013B - msgbox gUnknown_819F71F +Route15_WestEntrance_2F_EventScript_AlreadyGotExpShare:: @ 817013B + msgbox Route15_WestEntrance_2F_Text_ExplainExpShare release end -EventScript_170145:: @ 8170145 - getnumberstring 0, 50 +Route15_WestEntrance_2F_EventScript_GetAideRequestInfo:: @ 8170145 + getnumberstring 0, REQUIRED_CAUGHT_MONS getitemname 1, ITEM_EXP_SHARE return diff --git a/data/maps/Route15_WestEntrance_2F/text.inc b/data/maps/Route15_WestEntrance_2F/text.inc index e5518b8e2..c3c9866eb 100644 --- a/data/maps/Route15_WestEntrance_2F/text.inc +++ b/data/maps/Route15_WestEntrance_2F/text.inc @@ -1,4 +1,4 @@ -gUnknown_819F5AB:: @ 819F5AB +Route15_WestEntrance_2F_Text_GiveItemIfCaughtEnough:: @ 819F5AB .string "Hi! Remember me?\n" .string "I'm one of PROF. OAK's AIDES.\p" .string "If your POKéDEX has complete data\n" @@ -10,30 +10,30 @@ gUnknown_819F5AB:: @ 819F5AB .string "Have you gathered data on at least\n" .string "{STR_VAR_1} kinds of POKéMON?$" -gUnknown_819F6AA:: @ 819F6AA +Route15_WestEntrance_2F_Text_GreatHereYouGo:: @ 819F6AA .string "Great! You have caught or owned\n" .string "{STR_VAR_3} kinds of POKéMON!\p" .string "Congratulations!\n" .string "Here you go!$" -gUnknown_819F6FD:: @ 819F6FD +Route15_WestEntrance_2F_Text_ReceivedItemFromAide:: @ 819F6FD .string "{PLAYER} received the {STR_VAR_2}\n" .string "from the AIDE.$" -gUnknown_819F71F:: @ 819F71F +Route15_WestEntrance_2F_Text_ExplainExpShare:: @ 819F71F .string "EXP. SHARE is an item to be held\n" .string "by a POKéMON.\p" .string "The POKéMON will receive a share\n" .string "of the EXP. Points without having\l" .string "to battle.$" -gUnknown_819F79C:: @ 819F79C +Route15_WestEntrance_2F_Text_LargeShiningBird:: @ 819F79C .string "Let's see what the binoculars have\n" .string "to show…\p" .string "A large, shining bird is flying\n" .string "toward the sea.$" -gUnknown_819F7F8:: @ 819F7F8 +Route15_WestEntrance_2F_Text_SmallIslandOnHorizon:: @ 819F7F8 .string "Let's see what the binoculars have\n" .string "to show…\p" .string "It looks like a small island on\n" diff --git a/data/maps/Route16/map.json b/data/maps/Route16/map.json index 45617a334..b88cbe12c 100644 --- a/data/maps/Route16/map.json +++ b/data/maps/Route16/map.json @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route16_EventScript_1AAEEB", + "script": "Route16_EventScript_Lao", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route16_EventScript_1AAFA5", + "script": "Route16_EventScript_Koji", "flag": "0" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route16_EventScript_1AAFE3", + "script": "Route16_EventScript_Luke", "flag": "0" }, { @@ -75,7 +75,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route16_EventScript_1AAF67", + "script": "Route16_EventScript_Ruben", "flag": "0" }, { @@ -88,7 +88,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route16_EventScript_1AAF29", + "script": "Route16_EventScript_Hideo", "flag": "0" }, { @@ -101,7 +101,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route16_EventScript_1AB021", + "script": "Route16_EventScript_Camron", "flag": "0" }, { @@ -127,7 +127,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route16_EventScript_1AB0A5", + "script": "Route16_EventScript_Lea", "flag": "0" }, { @@ -140,7 +140,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route16_EventScript_1AB05F", + "script": "Route16_EventScript_Jed", "flag": "0" }, { diff --git a/data/maps/Route16/scripts.inc b/data/maps/Route16/scripts.inc index 1d7c6657c..27a5efccc 100644 --- a/data/maps/Route16/scripts.inc +++ b/data/maps/Route16/scripts.inc @@ -14,18 +14,18 @@ Route16_EventScript_RemoveSnorlax:: @ 81680FF Route16_OnTransition:: @ 8168103 compare VAR_MAP_SCENE_ROUTE16, 1 - call_if_eq Route16_EventScript_EnterCyclingRoad + call_if_eq Route16_OnTransitionCyclingRoad end -Route16_EventScript_EnterCyclingRoad:: @ 816810F +Route16_OnTransitionCyclingRoad:: @ 816810F setflag FLAG_SYS_ON_CYCLING_ROAD return Route16_OnWarp:: @ 8168113 - map_script_2 VAR_MAP_SCENE_ROUTE16, 1, Route16_EventScript_WarpIntoCyclingRoad + map_script_2 VAR_MAP_SCENE_ROUTE16, 1, Route16_OnWarpCyclingRoad .2byte 0 -Route16_EventScript_WarpIntoCyclingRoad:: @ 816811D +Route16_OnWarpCyclingRoad:: @ 816811D special Special_ForcePlayerOntoBike end diff --git a/data/maps/Route16/text.inc b/data/maps/Route16/text.inc index 5131934b1..ca3507cc7 100644 --- a/data/maps/Route16/text.inc +++ b/data/maps/Route16/text.inc @@ -1,66 +1,66 @@ -Text_186C4D:: @ 8186C4D +Route16_Text_LaoIntro:: @ 8186C4D .string "What do you want?$" -Text_186C5F:: @ 8186C5F +Route16_Text_LaoDefeat:: @ 8186C5F .string "Don't you dare laugh!$" -Text_186C75:: @ 8186C75 +Route16_Text_LaoPostBattle:: @ 8186C75 .string "We like just hanging here.\n" .string "What's it to you?$" -Text_186CA2:: @ 8186CA2 +Route16_Text_KojiIntro:: @ 8186CA2 .string "Nice BIKE!\n" .string "Hand it over!$" -Text_186CBB:: @ 8186CBB +Route16_Text_KojiDefeat:: @ 8186CBB .string "Knockout!$" -Text_186CC5:: @ 8186CC5 +Route16_Text_KojiPostBattle:: @ 8186CC5 .string "Forget it, who needs your BIKE!$" -Text_186CE5:: @ 8186CE5 +Route16_Text_LukeIntro:: @ 8186CE5 .string "Come out and play, little mouse!$" -Text_186D06:: @ 8186D06 +Route16_Text_LukeDefeat:: @ 8186D06 .string "You little rat!$" -Text_186D16:: @ 8186D16 +Route16_Text_LukePostBattle:: @ 8186D16 .string "I hate losing!\n" .string "Get out of my face!$" -Text_186D39:: @ 8186D39 +Route16_Text_HideoIntro:: @ 8186D39 .string "Hey, you just bumped me!$" -Text_186D52:: @ 8186D52 +Route16_Text_HideoDefeat:: @ 8186D52 .string "Kaboom!$" -Text_186D5A:: @ 8186D5A +Route16_Text_HideoPostBattle:: @ 8186D5A .string "We'll always be hanging around here\n" .string "even if you don't like it.\p" .string "You can detour to VERMILION from\n" .string "FUCHSIA going along the coast.$" -Text_186DD9:: @ 8186DD9 +Route16_Text_CamronIntro:: @ 8186DD9 .string "I'm feeling hungry and mean!\n" .string "I need a punching bag!$" -Text_186E0D:: @ 8186E0D +Route16_Text_CamronDefeat:: @ 8186E0D .string "Bad, bad, bad!$" -Text_186E1C:: @ 8186E1C +Route16_Text_CamronPostBattle:: @ 8186E1C .string "If I'm going to have POKéMON, they\n" .string "may as well be ferocious.\p" .string "I'd use them to leave my enemies\n" .string "in tatters.$" -Text_186E86:: @ 8186E86 +Route16_Text_RubenIntro:: @ 8186E86 .string "Hey, there!\n" .string "Let's have ourselves a good time!$" -Text_186EB4:: @ 8186EB4 +Route16_Text_RubenDefeat:: @ 8186EB4 .string "Don't make me mad!$" -Text_186EC7:: @ 8186EC7 +Route16_Text_RubenPostBattle:: @ 8186EC7 .string "I get my kicks by harassing people\n" .string "with my stinking POKéMON.\p" .string "They're great for startling people.\n" @@ -78,35 +78,35 @@ Route16_Text_RouteSign:: @ 8186F98 .string "ROUTE 16\n" .string "CELADON CITY - FUCHSIA CITY$" -Text_186FBD:: @ 8186FBD +Route16_Text_JedIntro:: @ 8186FBD .string "JED: Our love knows no bounds.\n" .string "We're in love and we show it!$" -Text_186FFA:: @ 8186FFA +Route16_Text_JedDefeat:: @ 8186FFA .string "JED: Oh, no!\n" .string "My love has seen me as a loser!$" -Text_187027:: @ 8187027 +Route16_Text_JedPostBattle:: @ 8187027 .string "JED: Listen, LEA.\n" .string "You need to focus less on me.$" -Text_187057:: @ 8187057 +Route16_Text_JedNotEnoughMons:: @ 8187057 .string "JED: You have just one POKéMON?\n" .string "Is there no love in your heart?$" -Text_187097:: @ 8187097 +Route16_Text_LeaIntro:: @ 8187097 .string "LEA: Sometimes, the intensity of\n" .string "our love scares me.$" -Text_1870CC:: @ 81870CC +Route16_Text_LeaDefeat:: @ 81870CC .string "LEA: Ohh! But JED looks cool\n" .string "even in a loss!$" -Text_1870F9:: @ 81870F9 +Route16_Text_LeaPostBattle:: @ 81870F9 .string "LEA: Ehehe, I'm sorry.\n" .string "JED is so cool.$" -Text_187120:: @ 8187120 +Route16_Text_LeaNotEnoughMons:: @ 8187120 .string "LEA: Oh, you don't have two\n" .string "POKéMON with you?\p" .string "Doesn't it feel lonely for you or\n" diff --git a/data/maps/Route16_House/map.json b/data/maps/Route16_House/map.json index ec7b219d3..3421f6eba 100644 --- a/data/maps/Route16_House/map.json +++ b/data/maps/Route16_House/map.json @@ -25,7 +25,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route16_House_EventScript_17014F", + "script": "Route16_House_EventScript_Woman", "flag": "0" }, { @@ -38,7 +38,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route16_House_EventScript_1701AF", + "script": "Route16_House_EventScript_Fearow", "flag": "0" } ], diff --git a/data/maps/Route16_House/scripts.inc b/data/maps/Route16_House/scripts.inc index 94ed9b932..baf6fcc32 100644 --- a/data/maps/Route16_House/scripts.inc +++ b/data/maps/Route16_House/scripts.inc @@ -1,36 +1,36 @@ Route16_House_MapScripts:: @ 817014E .byte 0 -Route16_House_EventScript_17014F:: @ 817014F +Route16_House_EventScript_Woman:: @ 817014F lock faceplayer - goto_if_set FLAG_GOT_HM02, EventScript_1701A5 - msgbox gUnknown_819F851 + goto_if_set FLAG_GOT_HM02, Route16_House_EventScript_AlreadyGotHM02 + msgbox Route16_House_Text_FoundMySecretRetreat checkitemspace ITEM_HM02, 1 compare VAR_RESULT, FALSE - goto_if_eq EventScript_17019B - giveitem_msg gUnknown_819F8C0, ITEM_HM02 - msgbox gUnknown_819F8E0 + goto_if_eq Route16_House_EventScript_NoRoomForHM02 + giveitem_msg Route16_House_Text_ReceivedHM02FromGirl, ITEM_HM02 + msgbox Route16_House_Text_ExplainHM02 setflag FLAG_GOT_HM02 release end -EventScript_17019B:: @ 817019B - msgbox gUnknown_819F92D +Route16_House_EventScript_NoRoomForHM02:: @ 817019B + msgbox Route16_House_Text_DontHaveAnyRoomForThis release end -EventScript_1701A5:: @ 81701A5 - msgbox gUnknown_819F8E0 +Route16_House_EventScript_AlreadyGotHM02:: @ 81701A5 + msgbox Route16_House_Text_ExplainHM02 release end -Route16_House_EventScript_1701AF:: @ 81701AF +Route16_House_EventScript_Fearow:: @ 81701AF lock faceplayer waitse playmoncry SPECIES_FEAROW, 0 - msgbox gUnknown_819F94F + msgbox Route16_House_Text_Fearow waitmoncry release end diff --git a/data/maps/Route16_House/text.inc b/data/maps/Route16_House/text.inc index 136cf9604..2cdfe38d9 100644 --- a/data/maps/Route16_House/text.inc +++ b/data/maps/Route16_House/text.inc @@ -1,21 +1,21 @@ -gUnknown_819F851:: @ 819F851 +Route16_House_Text_FoundMySecretRetreat:: @ 819F851 .string "Oh, dear.\n" .string "You've found my secret retreat.\p" .string "Please don't tell anyone I'm here.\n" .string "I'll make it up to you with this!$" -gUnknown_819F8C0:: @ 819F8C0 +Route16_House_Text_ReceivedHM02FromGirl:: @ 819F8C0 .string "{PLAYER} received HM02\n" .string "from the girl.$" -gUnknown_819F8E0:: @ 819F8E0 +Route16_House_Text_ExplainHM02:: @ 819F8E0 .string "HM02 is FLY.\n" .string "It's a wonderfully convenient move.\p" .string "Please, put it to good use.$" -gUnknown_819F92D:: @ 819F92D +Route16_House_Text_DontHaveAnyRoomForThis:: @ 819F92D .string "You don't have any room for this.$" -gUnknown_819F94F:: @ 819F94F +Route16_House_Text_Fearow:: @ 819F94F .string "FEAROW: Kyueen!$" diff --git a/data/maps/Route16_NorthEntrance_1F/map.json b/data/maps/Route16_NorthEntrance_1F/map.json index 133fd5b09..515800a2c 100644 --- a/data/maps/Route16_NorthEntrance_1F/map.json +++ b/data/maps/Route16_NorthEntrance_1F/map.json @@ -25,7 +25,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route16_NorthEntrance_1F_EventScript_1701DB", + "script": "Route16_NorthEntrance_1F_EventScript_Guard", "flag": "0" }, { @@ -38,7 +38,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route16_NorthEntrance_1F_EventScript_1702B5", + "script": "Route16_NorthEntrance_1F_EventScript_OldMan", "flag": "0" } ], @@ -87,7 +87,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_ROUTE16", "var_value": 1, - "script": "Route16_NorthEntrance_1F_EventScript_1A77B6" + "script": "EventScript_SetExitingCyclingRoad" }, { "type": "trigger", @@ -96,7 +96,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_ROUTE16", "var_value": 0, - "script": "Route16_NorthEntrance_1F_EventScript_1A77C1" + "script": "EventScript_SetEnteringCyclingRoad" }, { "type": "trigger", @@ -105,7 +105,7 @@ "elevation": 3, "var": "VAR_TEMP_1", "var_value": 0, - "script": "Route16_NorthEntrance_1F_EventScript_1701E4" + "script": "Route16_NorthEntrance_1F_EventScript_NeedBikeTriggerTop" }, { "type": "trigger", @@ -114,7 +114,7 @@ "elevation": 3, "var": "VAR_TEMP_1", "var_value": 0, - "script": "Route16_NorthEntrance_1F_EventScript_1701F0" + "script": "Route16_NorthEntrance_1F_EventScript_NeedBikeTriggerMidTop" }, { "type": "trigger", @@ -123,7 +123,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_ROUTE16", "var_value": 0, - "script": "Route16_NorthEntrance_1F_EventScript_1A77C1" + "script": "EventScript_SetEnteringCyclingRoad" }, { "type": "trigger", @@ -132,7 +132,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_ROUTE16", "var_value": 0, - "script": "Route16_NorthEntrance_1F_EventScript_1A77C1" + "script": "EventScript_SetEnteringCyclingRoad" }, { "type": "trigger", @@ -141,7 +141,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_ROUTE16", "var_value": 1, - "script": "Route16_NorthEntrance_1F_EventScript_1A77B6" + "script": "EventScript_SetExitingCyclingRoad" }, { "type": "trigger", @@ -150,7 +150,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_ROUTE16", "var_value": 1, - "script": "Route16_NorthEntrance_1F_EventScript_1A77B6" + "script": "EventScript_SetExitingCyclingRoad" }, { "type": "trigger", @@ -159,7 +159,7 @@ "elevation": 3, "var": "VAR_TEMP_1", "var_value": 0, - "script": "Route16_NorthEntrance_1F_EventScript_1701FC" + "script": "Route16_NorthEntrance_1F_EventScript_NeedBikeTriggerMid" }, { "type": "trigger", @@ -168,7 +168,7 @@ "elevation": 3, "var": "VAR_TEMP_1", "var_value": 0, - "script": "Route16_NorthEntrance_1F_EventScript_170208" + "script": "Route16_NorthEntrance_1F_EventScript_NeedBikeTriggerMidBottom" }, { "type": "trigger", @@ -177,7 +177,7 @@ "elevation": 3, "var": "VAR_TEMP_1", "var_value": 0, - "script": "Route16_NorthEntrance_1F_EventScript_170214" + "script": "Route16_NorthEntrance_1F_EventScript_NeedBikeTriggerBottom" } ], "bg_events": [] diff --git a/data/maps/Route16_NorthEntrance_1F/scripts.inc b/data/maps/Route16_NorthEntrance_1F/scripts.inc index a99a1ec18..d00ba5805 100644 --- a/data/maps/Route16_NorthEntrance_1F/scripts.inc +++ b/data/maps/Route16_NorthEntrance_1F/scripts.inc @@ -4,115 +4,115 @@ Route16_NorthEntrance_1F_MapScripts:: @ 81701C2 Route16_NorthEntrance_1F_OnTransition:: @ 81701C8 clearflag FLAG_SYS_ON_CYCLING_ROAD - call_if_set FLAG_GOT_BICYCLE, EventScript_1701D5 + call_if_set FLAG_GOT_BICYCLE, Route16_NorthEntrance_1F_EventScript_DisableNeedBikeTrigger end -EventScript_1701D5:: @ 81701D5 +Route16_NorthEntrance_1F_EventScript_DisableNeedBikeTrigger:: @ 81701D5 setvar VAR_TEMP_1, 1 return -Route16_NorthEntrance_1F_EventScript_1701DB:: @ 81701DB - msgbox gUnknown_819F98B, MSGBOX_NPC +Route16_NorthEntrance_1F_EventScript_Guard:: @ 81701DB + msgbox Route16_NorthEntrance_1F_Text_CyclingRoadIsDownhillCourse, MSGBOX_NPC end -Route16_NorthEntrance_1F_EventScript_1701E4:: @ 81701E4 +Route16_NorthEntrance_1F_EventScript_NeedBikeTriggerTop:: @ 81701E4 lockall setvar VAR_0x8008, 0 - goto EventScript_170220 + goto Route16_NorthEntrance_1F_EventScript_NeedBikeTrigger end -Route16_NorthEntrance_1F_EventScript_1701F0:: @ 81701F0 +Route16_NorthEntrance_1F_EventScript_NeedBikeTriggerMidTop:: @ 81701F0 lockall setvar VAR_0x8008, 1 - goto EventScript_170220 + goto Route16_NorthEntrance_1F_EventScript_NeedBikeTrigger end -Route16_NorthEntrance_1F_EventScript_1701FC:: @ 81701FC +Route16_NorthEntrance_1F_EventScript_NeedBikeTriggerMid:: @ 81701FC lockall setvar VAR_0x8008, 2 - goto EventScript_170220 + goto Route16_NorthEntrance_1F_EventScript_NeedBikeTrigger end -Route16_NorthEntrance_1F_EventScript_170208:: @ 8170208 +Route16_NorthEntrance_1F_EventScript_NeedBikeTriggerMidBottom:: @ 8170208 lockall setvar VAR_0x8008, 3 - goto EventScript_170220 + goto Route16_NorthEntrance_1F_EventScript_NeedBikeTrigger end -Route16_NorthEntrance_1F_EventScript_170214:: @ 8170214 +Route16_NorthEntrance_1F_EventScript_NeedBikeTriggerBottom:: @ 8170214 lockall setvar VAR_0x8008, 4 - goto EventScript_170220 + goto Route16_NorthEntrance_1F_EventScript_NeedBikeTrigger end -EventScript_170220:: @ 8170220 +Route16_NorthEntrance_1F_EventScript_NeedBikeTrigger:: @ 8170220 textcolor 0 - msgbox gUnknown_819F9CC + msgbox Route16_NorthEntrance_1F_Text_ExcuseMeWaitUp closemessage applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp waitmovement 0 delay 20 compare VAR_0x8008, 1 - call_if_eq EventScript_170279 + call_if_eq Route16_NorthEntrance_1F_EventScript_PlayerWalkToCounterMidTop compare VAR_0x8008, 2 - call_if_eq EventScript_170284 + call_if_eq Route16_NorthEntrance_1F_EventScript_PlayerWalkToCounterMid compare VAR_0x8008, 3 - call_if_eq EventScript_17028F + call_if_eq Route16_NorthEntrance_1F_EventScript_PlayerWalkToCounterMidBottom compare VAR_0x8008, 4 - call_if_eq EventScript_17029A - msgbox gUnknown_819F95F + call_if_eq Route16_NorthEntrance_1F_EventScript_PlayerWalkToCounterBottom + msgbox Route16_NorthEntrance_1F_Text_NoPedestriansOnCyclingRoad closemessage - applymovement OBJ_EVENT_ID_PLAYER, Movement_1702B3 + applymovement OBJ_EVENT_ID_PLAYER, Route16_NorthEntrance_1F_Movement_WalkRight waitmovement 0 releaseall end -EventScript_170279:: @ 8170279 - applymovement OBJ_EVENT_ID_PLAYER, Movement_1702A5 +Route16_NorthEntrance_1F_EventScript_PlayerWalkToCounterMidTop:: @ 8170279 + applymovement OBJ_EVENT_ID_PLAYER, Route16_NorthEntrance_1F_Movement_WalkUp waitmovement 0 return -EventScript_170284:: @ 8170284 - applymovement OBJ_EVENT_ID_PLAYER, Movement_1702A7 +Route16_NorthEntrance_1F_EventScript_PlayerWalkToCounterMid:: @ 8170284 + applymovement OBJ_EVENT_ID_PLAYER, Route16_NorthEntrance_1F_Movement_WalkUp2 waitmovement 0 return -EventScript_17028F:: @ 817028F - applymovement OBJ_EVENT_ID_PLAYER, Movement_1702AA +Route16_NorthEntrance_1F_EventScript_PlayerWalkToCounterMidBottom:: @ 817028F + applymovement OBJ_EVENT_ID_PLAYER, Route16_NorthEntrance_1F_Movement_WalkUp3 waitmovement 0 return -EventScript_17029A:: @ 817029A - applymovement OBJ_EVENT_ID_PLAYER, Movement_1702AE +Route16_NorthEntrance_1F_EventScript_PlayerWalkToCounterBottom:: @ 817029A + applymovement OBJ_EVENT_ID_PLAYER, Route16_NorthEntrance_1F_Movement_WalkUp4 waitmovement 0 return -Movement_1702A5:: @ 81702A5 +Route16_NorthEntrance_1F_Movement_WalkUp:: @ 81702A5 walk_up step_end -Movement_1702A7:: @ 81702A7 +Route16_NorthEntrance_1F_Movement_WalkUp2:: @ 81702A7 walk_up walk_up step_end -Movement_1702AA:: @ 81702AA +Route16_NorthEntrance_1F_Movement_WalkUp3:: @ 81702AA walk_up walk_up walk_up step_end -Movement_1702AE:: @ 81702AE +Route16_NorthEntrance_1F_Movement_WalkUp4:: @ 81702AE walk_up walk_up walk_up walk_up step_end -Movement_1702B3:: @ 81702B3 +Route16_NorthEntrance_1F_Movement_WalkRight:: @ 81702B3 walk_right step_end -Route16_NorthEntrance_1F_EventScript_1702B5:: @ 81702B5 - msgbox gUnknown_819F9E8, MSGBOX_NPC +Route16_NorthEntrance_1F_EventScript_OldMan:: @ 81702B5 + msgbox Route16_NorthEntrance_1F_Text_HowdYouGetInGoodEffort, MSGBOX_NPC end diff --git a/data/maps/Route16_NorthEntrance_1F/text.inc b/data/maps/Route16_NorthEntrance_1F/text.inc index 8cc60117c..156e93bfa 100644 --- a/data/maps/Route16_NorthEntrance_1F/text.inc +++ b/data/maps/Route16_NorthEntrance_1F/text.inc @@ -1,16 +1,16 @@ -gUnknown_819F95F:: @ 819F95F +Route16_NorthEntrance_1F_Text_NoPedestriansOnCyclingRoad:: @ 819F95F .string "No pedestrians are allowed on\n" .string "CYCLING ROAD!$" -gUnknown_819F98B:: @ 819F98B +Route16_NorthEntrance_1F_Text_CyclingRoadIsDownhillCourse:: @ 819F98B .string "CYCLING ROAD is a downhill course\n" .string "by the sea. It's a great ride.$" -gUnknown_819F9CC:: @ 819F9CC +Route16_NorthEntrance_1F_Text_ExcuseMeWaitUp:: @ 819F9CC .string "Excuse me!\n" .string "Wait up, please!$" -gUnknown_819F9E8:: @ 819F9E8 +Route16_NorthEntrance_1F_Text_HowdYouGetInGoodEffort:: @ 819F9E8 .string "How'd you get in?\n" .string "Good effort!$" diff --git a/data/maps/Route16_NorthEntrance_2F/map.json b/data/maps/Route16_NorthEntrance_2F/map.json index 03d205867..103929172 100644 --- a/data/maps/Route16_NorthEntrance_2F/map.json +++ b/data/maps/Route16_NorthEntrance_2F/map.json @@ -25,7 +25,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route16_NorthEntrance_2F_EventScript_1702BF", + "script": "Route16_NorthEntrance_2F_EventScript_LittleBoy", "flag": "0" }, { @@ -38,7 +38,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route16_NorthEntrance_2F_EventScript_1702C8", + "script": "Route16_NorthEntrance_2F_EventScript_LittleGirl", "flag": "0" }, { @@ -51,7 +51,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route16_NorthEntrance_2F_EventScript_1702E3", + "script": "Route16_NorthEntrance_2F_EventScript_Aide", "flag": "0" } ], @@ -71,14 +71,14 @@ "x": 4, "y": 1, "elevation": 0, - "script": "Route16_NorthEntrance_2F_EventScript_1702D1" + "script": "Route16_NorthEntrance_2F_EventScript_LeftBinoculars" }, { "type": "bg_event_type_0", "x": 8, "y": 1, "elevation": 0, - "script": "Route16_NorthEntrance_2F_EventScript_1702DA" + "script": "Route16_NorthEntrance_2F_EventScript_RightBinoculars" } ] } diff --git a/data/maps/Route16_NorthEntrance_2F/scripts.inc b/data/maps/Route16_NorthEntrance_2F/scripts.inc index 7ccba34c8..0843978f2 100644 --- a/data/maps/Route16_NorthEntrance_2F/scripts.inc +++ b/data/maps/Route16_NorthEntrance_2F/scripts.inc @@ -1,52 +1,54 @@ +.equ REQUIRED_CAUGHT_MONS, 40 + Route16_NorthEntrance_2F_MapScripts:: @ 81702BE .byte 0 -Route16_NorthEntrance_2F_EventScript_1702BF:: @ 81702BF - msgbox gUnknown_819FA07, MSGBOX_NPC +Route16_NorthEntrance_2F_EventScript_LittleBoy:: @ 81702BF + msgbox Route16_NorthEntrance_2F_Text_OnBikeRideWithGirlfriend, MSGBOX_NPC end -Route16_NorthEntrance_2F_EventScript_1702C8:: @ 81702C8 - msgbox gUnknown_819FA41, MSGBOX_NPC +Route16_NorthEntrance_2F_EventScript_LittleGirl:: @ 81702C8 + msgbox Route16_NorthEntrance_2F_Text_RidingTogetherOnNewBikes, MSGBOX_NPC end -Route16_NorthEntrance_2F_EventScript_1702D1:: @ 81702D1 - msgbox gUnknown_819FA6F, MSGBOX_SIGN +Route16_NorthEntrance_2F_EventScript_LeftBinoculars:: @ 81702D1 + msgbox Route16_NorthEntrance_2F_Text_ItsCeladonDeptStore, MSGBOX_SIGN end -Route16_NorthEntrance_2F_EventScript_1702DA:: @ 81702DA - msgbox gUnknown_819FAB9, MSGBOX_SIGN +Route16_NorthEntrance_2F_EventScript_RightBinoculars:: @ 81702DA + msgbox Route16_NorthEntrance_2F_Text_LongPathOverWater, MSGBOX_SIGN end -Route16_NorthEntrance_2F_EventScript_1702E3:: @ 81702E3 +Route16_NorthEntrance_2F_EventScript_Aide:: @ 81702E3 lock faceplayer - call EventScript_17036F - goto_if_set FLAG_GOT_AMULET_COIN_FROM_OAKS_AIDE, EventScript_170365 - msgbox gUnknown_819FB0E, MSGBOX_YESNO + call Route16_NorthEntrance_2F_EventScript_GetAideRequestInfo + goto_if_set FLAG_GOT_AMULET_COIN_FROM_OAKS_AIDE, Route16_NorthEntrance_2F_EventScript_AlreadyGotAmuletCoin + msgbox Route16_NorthEntrance_2F_Text_GiveAmuletCoinIfCaught40, MSGBOX_YESNO compare VAR_RESULT, NO goto_if_eq Aide_EventScript_DeclineCheckMons setvar VAR_0x8004, 0 specialvar VAR_RESULT, Special_GetPokedexCount getnumberstring 2, VAR_0x8006 - call EventScript_17036F - compare VAR_0x8006, 40 + call Route16_NorthEntrance_2F_EventScript_GetAideRequestInfo + compare VAR_0x8006, REQUIRED_CAUGHT_MONS goto_if_lt Aide_EventScript_HaventCaughtEnough - msgbox gUnknown_819FC15 + msgbox Route16_NorthEntrance_2F_Text_GreatHereYouGo checkitemspace ITEM_AMULET_COIN, 1 compare VAR_RESULT, FALSE goto_if_eq Aide_EventScript_NoRoomForItem - giveitem_msg gUnknown_819FC68, ITEM_AMULET_COIN + giveitem_msg Route16_NorthEntrance_2F_Text_ReceivedAmuletCoinFromAide, ITEM_AMULET_COIN setflag FLAG_GOT_AMULET_COIN_FROM_OAKS_AIDE - msgbox gUnknown_819FC93 + msgbox Route16_NorthEntrance_2F_Text_ExplainAmuletCoin release end -EventScript_170365:: @ 8170365 - msgbox gUnknown_819FC93 +Route16_NorthEntrance_2F_EventScript_AlreadyGotAmuletCoin:: @ 8170365 + msgbox Route16_NorthEntrance_2F_Text_ExplainAmuletCoin release end -EventScript_17036F:: @ 817036F - getnumberstring 0, 40 +Route16_NorthEntrance_2F_EventScript_GetAideRequestInfo:: @ 817036F + getnumberstring 0, REQUIRED_CAUGHT_MONS getitemname 1, ITEM_AMULET_COIN return diff --git a/data/maps/Route16_NorthEntrance_2F/text.inc b/data/maps/Route16_NorthEntrance_2F/text.inc index 4839bfe8a..37c518fb4 100644 --- a/data/maps/Route16_NorthEntrance_2F/text.inc +++ b/data/maps/Route16_NorthEntrance_2F/text.inc @@ -1,23 +1,23 @@ -gUnknown_819FA07:: @ 819FA07 +Route16_NorthEntrance_2F_Text_OnBikeRideWithGirlfriend:: @ 819FA07 .string "I'm on a relaxing ride on my new\n" .string "bike with my girlfriend.$" -gUnknown_819FA41:: @ 819FA41 +Route16_NorthEntrance_2F_Text_RidingTogetherOnNewBikes:: @ 819FA41 .string "We're going riding together on our\n" .string "new bikes.$" -gUnknown_819FA6F:: @ 819FA6F +Route16_NorthEntrance_2F_Text_ItsCeladonDeptStore:: @ 819FA6F .string "Let's see what the binoculars have\n" .string "to show…\p" .string "It's the CELADON DEPT. STORE!$" -gUnknown_819FAB9:: @ 819FAB9 +Route16_NorthEntrance_2F_Text_LongPathOverWater:: @ 819FAB9 .string "Let's see what the binoculars have\n" .string "to show…\p" .string "There's a long path over water far\n" .string "away.$" -gUnknown_819FB0E:: @ 819FB0E +Route16_NorthEntrance_2F_Text_GiveAmuletCoinIfCaught40:: @ 819FB0E .string "Hi! Remember me?\n" .string "I'm one of PROF. OAK's AIDES.\p" .string "If your POKéDEX has complete data\n" @@ -29,17 +29,17 @@ gUnknown_819FB0E:: @ 819FB0E .string "Have you gathered data on at least\n" .string "40 kinds of POKéMON?$" -gUnknown_819FC15:: @ 819FC15 +Route16_NorthEntrance_2F_Text_GreatHereYouGo:: @ 819FC15 .string "Great! You have caught or owned\n" .string "{STR_VAR_3} kinds of POKéMON!\p" .string "Congratulations!\n" .string "Here you go!$" -gUnknown_819FC68:: @ 819FC68 +Route16_NorthEntrance_2F_Text_ReceivedAmuletCoinFromAide:: @ 819FC68 .string "{PLAYER} received the AMULET COIN\n" .string "from the AIDE.$" -gUnknown_819FC93:: @ 819FC93 +Route16_NorthEntrance_2F_Text_ExplainAmuletCoin:: @ 819FC93 .string "An AMULET COIN is an item to be\n" .string "held by a POKéMON.\p" .string "If the POKéMON appears in a winning\n" diff --git a/data/maps/Route17/map.json b/data/maps/Route17/map.json index fd640db01..43ec14e88 100644 --- a/data/maps/Route17/map.json +++ b/data/maps/Route17/map.json @@ -36,7 +36,7 @@ "movement_range_y": 6, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route17_EventScript_1AB319", + "script": "Route17_EventScript_Virgil", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 5, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route17_EventScript_1AB221", + "script": "Route17_EventScript_Isaiah", "flag": "0" }, { @@ -62,7 +62,7 @@ "movement_range_y": 2, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route17_EventScript_1AB1E3", + "script": "Route17_EventScript_Raul", "flag": "0" }, { @@ -75,7 +75,7 @@ "movement_range_y": 5, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route17_EventScript_1AB129", + "script": "Route17_EventScript_Nikolas", "flag": "0" }, { @@ -88,7 +88,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 5, - "script": "Route17_EventScript_1AB0EB", + "script": "Route17_EventScript_Billy", "flag": "0" }, { @@ -101,7 +101,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 4, - "script": "Route17_EventScript_1AB29D", + "script": "Route17_EventScript_Jamal", "flag": "0" }, { @@ -114,7 +114,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "Route17_EventScript_1AB25F", + "script": "Route17_EventScript_Zeek", "flag": "0" }, { @@ -127,7 +127,7 @@ "movement_range_y": 5, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route17_EventScript_1AB2DB", + "script": "Route17_EventScript_Corey", "flag": "0" }, { @@ -140,7 +140,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route17_EventScript_1AB1A5", + "script": "Route17_EventScript_William", "flag": "0" }, { @@ -153,7 +153,7 @@ "movement_range_y": 5, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route17_EventScript_1AB167", + "script": "Route17_EventScript_Jaxon", "flag": "0" } ], @@ -165,42 +165,42 @@ "x": 12, "y": 97, "elevation": 0, - "script": "Route17_EventScript_1681DB" + "script": "Route17_EventScript_RouteSign" }, { "type": "bg_event_type_0", "x": 12, "y": 83, "elevation": 0, - "script": "Route17_EventScript_1681D2" + "script": "Route17_EventScript_TrainerTips2" }, { "type": "bg_event_type_0", "x": 12, "y": 68, "elevation": 0, - "script": "Route17_EventScript_1681C9" + "script": "Route17_EventScript_TrainerTips1" }, { "type": "bg_event_type_0", "x": 12, "y": 53, "elevation": 0, - "script": "Route17_EventScript_1681C0" + "script": "Route17_EventScript_ItemsNotice" }, { "type": "bg_event_type_0", "x": 12, "y": 125, "elevation": 3, - "script": "Route17_EventScript_1681E4" + "script": "Route17_EventScript_BallsNotice" }, { "type": "bg_event_type_0", "x": 11, "y": 157, "elevation": 0, - "script": "Route17_EventScript_1681ED" + "script": "Route17_EventScript_CyclingRoadSign" }, { "type": "hidden_item", diff --git a/data/maps/Route17/scripts.inc b/data/maps/Route17/scripts.inc index 8633ab23e..787e68e04 100644 --- a/data/maps/Route17/scripts.inc +++ b/data/maps/Route17/scripts.inc @@ -1,26 +1,26 @@ Route17_MapScripts:: @ 81681BF .byte 0 -Route17_EventScript_1681C0:: @ 81681C0 - msgbox gUnknown_81874E4, MSGBOX_SIGN +Route17_EventScript_ItemsNotice:: @ 81681C0 + msgbox Route17_Text_WatchOutForDiscardedItems, MSGBOX_SIGN end -Route17_EventScript_1681C9:: @ 81681C9 - msgbox gUnknown_8187512, MSGBOX_SIGN +Route17_EventScript_TrainerTips1:: @ 81681C9 + msgbox Route17_Text_SameSpeciesGrowDifferentRates, MSGBOX_SIGN end -Route17_EventScript_1681D2:: @ 81681D2 - msgbox gUnknown_818757B, MSGBOX_SIGN +Route17_EventScript_TrainerTips2:: @ 81681D2 + msgbox Route17_Text_PressBToStayInPlace, MSGBOX_SIGN end -Route17_EventScript_1681DB:: @ 81681DB - msgbox gUnknown_81875BE, MSGBOX_SIGN +Route17_EventScript_RouteSign:: @ 81681DB + msgbox Route17_Text_RouteSign, MSGBOX_SIGN end -Route17_EventScript_1681E4:: @ 81681E4 - msgbox gUnknown_81875E3, MSGBOX_SIGN +Route17_EventScript_BallsNotice:: @ 81681E4 + msgbox Route17_Text_DontThrowGameThrowBalls, MSGBOX_SIGN end -Route17_EventScript_1681ED:: @ 81681ED - msgbox gUnknown_8187622, MSGBOX_SIGN +Route17_EventScript_CyclingRoadSign:: @ 81681ED + msgbox Route17_Text_CyclingRoadSign, MSGBOX_SIGN end diff --git a/data/maps/Route17/text.inc b/data/maps/Route17/text.inc index eff5f0726..21d7978a3 100644 --- a/data/maps/Route17/text.inc +++ b/data/maps/Route17/text.inc @@ -1,131 +1,131 @@ -Text_18717E:: @ 818717E +Route17_Text_RaulIntro:: @ 818717E .string "There's no getting rich quick in\n" .string "battling kids.$" -Text_1871AE:: @ 81871AE +Route17_Text_RaulDefeat:: @ 81871AE .string "Burned out!$" -Text_1871BA:: @ 81871BA +Route17_Text_RaulPostBattle:: @ 81871BA .string "You can find good stuff lying\n" .string "around on CYCLING ROAD.\p" .string "There's good money in picking them\n" .string "up and selling them.$" -Text_187228:: @ 8187228 +Route17_Text_IsaiahIntro:: @ 8187228 .string "I'm mighty proud of my bod, kiddo.\n" .string "Come on!$" -Text_187254:: @ 8187254 +Route17_Text_IsaiahDefeat:: @ 8187254 .string "Whoo!$" -Text_18725A:: @ 818725A +Route17_Text_IsaiahPostBattle:: @ 818725A .string "I could belly-bump you outta\n" .string "here!$" -Text_18727D:: @ 818727D +Route17_Text_VirgilIntro:: @ 818727D .string "You heading to FUCHSIA?$" -Text_187295:: @ 8187295 +Route17_Text_VirgilDefeat:: @ 8187295 .string "Crash and burn!$" -Text_1872A5:: @ 81872A5 +Route17_Text_VirgilPostBattle:: @ 81872A5 .string "I love racing downhill!$" -Text_1872BD:: @ 81872BD +Route17_Text_BillyIntro:: @ 81872BD .string "We're BIKERS!\n" .string "We rule the roads, man!$" -Text_1872E3:: @ 81872E3 +Route17_Text_BillyDefeat:: @ 81872E3 .string "Smoked!$" -Text_1872EB:: @ 81872EB +Route17_Text_BillyPostBattle:: @ 81872EB .string "Are you looking for adventure?$" -Text_18730A:: @ 818730A +Route17_Text_NikolasIntro:: @ 818730A .string "Let VOLTORB electrify you!$" -Text_187325:: @ 8187325 +Route17_Text_NikolasDefeat:: @ 8187325 .string "Grounded out!$" -Text_187333:: @ 8187333 +Route17_Text_NikolasPostBattle:: @ 8187333 .string "I got my VOLTORB at the abandoned\n" .string "POWER PLANT.$" -Text_187362:: @ 8187362 +Route17_Text_ZeekIntro:: @ 8187362 .string "I leveled up my POKéMON, but it\n" .string "won't evolve. Why?$" -Text_187395:: @ 8187395 +Route17_Text_ZeekDefeat:: @ 8187395 .string "Why, you!$" -Text_18739F:: @ 818739F +Route17_Text_ZeekPostBattle:: @ 818739F .string "Maybe some POKéMON need element\n" .string "STONES to evolve.$" -Text_1873D1:: @ 81873D1 +Route17_Text_JamalIntro:: @ 81873D1 .string "I need a little exercise!$" -Text_1873EB:: @ 81873EB +Route17_Text_JamalDefeat:: @ 81873EB .string "Whew!\n" .string "Good workout!$" -Text_1873FF:: @ 81873FF +Route17_Text_JamalPostBattle:: @ 81873FF .string "I'm sure I lost weight there!$" -Text_18741D:: @ 818741D +Route17_Text_CoreyIntro:: @ 818741D .string "Be a rebel!$" -Text_187429:: @ 8187429 +Route17_Text_CoreyDefeat:: @ 8187429 .string "Aaaargh!$" -Text_187432:: @ 8187432 +Route17_Text_CoreyPostBattle:: @ 8187432 .string "Be ready to fight for your beliefs!$" -Text_187456:: @ 8187456 +Route17_Text_JaxonIntro:: @ 8187456 .string "Nice BIKE!\n" .string "How's it handle?$" -Text_187472:: @ 8187472 +Route17_Text_JaxonDefeat:: @ 8187472 .string "Shoot!$" -Text_187479:: @ 8187479 +Route17_Text_JaxonPostBattle:: @ 8187479 .string "The slope makes it hard to steer.$" -Text_18749B:: @ 818749B +Route17_Text_WilliamIntro:: @ 818749B .string "Get lost, kid!\n" .string "I'm bushed!$" -Text_1874B6:: @ 81874B6 +Route17_Text_WilliamDefeat:: @ 81874B6 .string "Are you satisfied?$" -Text_1874C9:: @ 81874C9 +Route17_Text_WilliamPostBattle:: @ 81874C9 .string "I need to catch a few z's!$" -gUnknown_81874E4:: @ 81874E4 +Route17_Text_WatchOutForDiscardedItems:: @ 81874E4 .string "It's a notice.\p" .string "Watch out for discarded items.$" -gUnknown_8187512:: @ 8187512 +Route17_Text_SameSpeciesGrowDifferentRates:: @ 8187512 .string "TRAINER TIPS\p" .string "All POKéMON are unique.\p" .string "Even POKéMON of the same species\n" .string "and level grow at different rates.$" -gUnknown_818757B:: @ 818757B +Route17_Text_PressBToStayInPlace:: @ 818757B .string "TRAINER TIPS\p" .string "Press the B Button to stay in place\n" .string "while on a slope.$" -gUnknown_81875BE:: @ 81875BE +Route17_Text_RouteSign:: @ 81875BE .string "ROUTE 17\n" .string "CELADON CITY - FUCHSIA CITY$" -gUnknown_81875E3:: @ 81875E3 +Route17_Text_DontThrowGameThrowBalls:: @ 81875E3 .string "It's a notice!\p" .string "Don't throw the game, throw POKé\n" .string "BALLS instead!$" -gUnknown_8187622:: @ 8187622 +Route17_Text_CyclingRoadSign:: @ 8187622 .string "CYCLING ROAD\n" .string "Slope ends here!$" diff --git a/data/maps/Route18/map.json b/data/maps/Route18/map.json index 86eb04352..6976a7570 100644 --- a/data/maps/Route18/map.json +++ b/data/maps/Route18/map.json @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 4, - "script": "Route18_EventScript_1AB3D3", + "script": "Route18_EventScript_Jacob", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route18_EventScript_1AB395", + "script": "Route18_EventScript_Ramiro", "flag": "0" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 6, - "script": "Route18_EventScript_1AB357", + "script": "Route18_EventScript_Wilton", "flag": "0" } ], @@ -89,14 +89,14 @@ "x": 37, "y": 7, "elevation": 0, - "script": "Route18_EventScript_168228" + "script": "Route18_EventScript_CyclingRoadSign" }, { "type": "bg_event_type_0", "x": 52, "y": 7, "elevation": 0, - "script": "Route18_EventScript_16821F" + "script": "Route18_EventScript_RouteSign" } ] } diff --git a/data/maps/Route18/scripts.inc b/data/maps/Route18/scripts.inc index 25fda03c2..43d2b029e 100644 --- a/data/maps/Route18/scripts.inc +++ b/data/maps/Route18/scripts.inc @@ -5,25 +5,25 @@ Route18_MapScripts:: @ 81681F6 Route18_OnTransition:: @ 8168201 compare VAR_MAP_SCENE_ROUTE16, 1 - call_if_eq EventScript_16820D + call_if_eq Route18_OnTransitionCyclingRoad end -EventScript_16820D:: @ 816820D +Route18_OnTransitionCyclingRoad:: @ 816820D setflag FLAG_SYS_ON_CYCLING_ROAD return Route18_OnWarp:: @ 8168211 - map_script_2 VAR_MAP_SCENE_ROUTE16, 1, EventScript_16821B + map_script_2 VAR_MAP_SCENE_ROUTE16, 1, Route18_OnWarpCyclingRoad .2byte 0 -EventScript_16821B:: @ 816821B +Route18_OnWarpCyclingRoad:: @ 816821B special Special_ForcePlayerOntoBike end -Route18_EventScript_16821F:: @ 816821F - msgbox gUnknown_8187757, MSGBOX_SIGN +Route18_EventScript_RouteSign:: @ 816821F + msgbox Route18_Text_RouteSign, MSGBOX_SIGN end -Route18_EventScript_168228:: @ 8168228 - msgbox gUnknown_818777C, MSGBOX_SIGN +Route18_EventScript_CyclingRoadSign:: @ 8168228 + msgbox Route18_Text_CyclingRoadSign, MSGBOX_SIGN end diff --git a/data/maps/Route18/text.inc b/data/maps/Route18/text.inc index c22a6360a..107804cfb 100644 --- a/data/maps/Route18/text.inc +++ b/data/maps/Route18/text.inc @@ -1,40 +1,40 @@ -Text_187640:: @ 8187640 +Route18_Text_WiltonIntro:: @ 8187640 .string "I always check every grassy area\n" .string "for new POKéMON.$" -Text_187672:: @ 8187672 +Route18_Text_WiltonDefeat:: @ 8187672 .string "Tch!$" -Text_187677:: @ 8187677 +Route18_Text_WiltonPostBattle:: @ 8187677 .string "I wish I had a BIKE!$" -Text_18768C:: @ 818768C +Route18_Text_RamiroIntro:: @ 818768C .string "Kurukkoo!\n" .string "How do you like my birdcall?$" -Text_1876B3:: @ 81876B3 +Route18_Text_RamiroDefeat:: @ 81876B3 .string "I had to bug you!$" -Text_1876C5:: @ 81876C5 +Route18_Text_RamiroPostBattle:: @ 81876C5 .string "I collect sea POKéMON on weekends\n" .string "because the sea is so close.$" -Text_187704:: @ 8187704 +Route18_Text_JacobIntro:: @ 8187704 .string "This is my turf!\n" .string "Get out of here!$" -Text_187726:: @ 8187726 +Route18_Text_JacobDefeat:: @ 8187726 .string "Darn!$" -Text_18772C:: @ 818772C +Route18_Text_JacobPostBattle:: @ 818772C .string "This is my fave area for catching\n" .string "POKéMON.$" -gUnknown_8187757:: @ 8187757 +Route18_Text_RouteSign:: @ 8187757 .string "ROUTE 18\n" .string "CELADON CITY - FUCHSIA CITY$" -gUnknown_818777C:: @ 818777C +Route18_Text_CyclingRoadSign:: @ 818777C .string "CYCLING ROAD\n" .string "No pedestrians permitted!$" diff --git a/data/maps/Route18_EastEntrance_1F/map.json b/data/maps/Route18_EastEntrance_1F/map.json index 9b1250ac4..c7c04b124 100644 --- a/data/maps/Route18_EastEntrance_1F/map.json +++ b/data/maps/Route18_EastEntrance_1F/map.json @@ -25,7 +25,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route18_EastEntrance_1F_EventScript_170391", + "script": "Route18_EastEntrance_1F_EventScript_Guard", "flag": "0" } ], @@ -60,7 +60,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_ROUTE16", "var_value": 0, - "script": "Route18_EastEntrance_1F_EventScript_1A77C1" + "script": "EventScript_SetEnteringCyclingRoad" }, { "type": "trigger", @@ -69,7 +69,7 @@ "elevation": 3, "var": "VAR_TEMP_1", "var_value": 0, - "script": "Route18_EastEntrance_1F_EventScript_17039A" + "script": "Route18_EastEntrance_1F_EventScript_NeedBikeTriggerTop" }, { "type": "trigger", @@ -78,7 +78,7 @@ "elevation": 3, "var": "VAR_TEMP_1", "var_value": 0, - "script": "Route18_EastEntrance_1F_EventScript_1703A6" + "script": "Route18_EastEntrance_1F_EventScript_NeedBikeTriggerMidTop" }, { "type": "trigger", @@ -87,7 +87,7 @@ "elevation": 3, "var": "VAR_TEMP_1", "var_value": 0, - "script": "Route18_EastEntrance_1F_EventScript_1703B2" + "script": "Route18_EastEntrance_1F_EventScript_NeedBikeTriggerMid" }, { "type": "trigger", @@ -96,7 +96,7 @@ "elevation": 3, "var": "VAR_TEMP_1", "var_value": 0, - "script": "Route18_EastEntrance_1F_EventScript_1703BE" + "script": "Route18_EastEntrance_1F_EventScript_NeedBikeTriggerMidBottom" }, { "type": "trigger", @@ -105,7 +105,7 @@ "elevation": 3, "var": "VAR_TEMP_1", "var_value": 0, - "script": "Route18_EastEntrance_1F_EventScript_1703CA" + "script": "Route18_EastEntrance_1F_EventScript_NeedBikeTriggerBottom" }, { "type": "trigger", @@ -114,7 +114,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_ROUTE16", "var_value": 1, - "script": "Route18_EastEntrance_1F_EventScript_1A77B6" + "script": "EventScript_SetExitingCyclingRoad" }, { "type": "trigger", @@ -123,7 +123,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_ROUTE16", "var_value": 1, - "script": "Route18_EastEntrance_1F_EventScript_1A77B6" + "script": "EventScript_SetExitingCyclingRoad" }, { "type": "trigger", @@ -132,7 +132,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_ROUTE16", "var_value": 1, - "script": "Route18_EastEntrance_1F_EventScript_1A77B6" + "script": "EventScript_SetExitingCyclingRoad" }, { "type": "trigger", @@ -141,7 +141,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_ROUTE16", "var_value": 0, - "script": "Route18_EastEntrance_1F_EventScript_1A77C1" + "script": "EventScript_SetEnteringCyclingRoad" }, { "type": "trigger", @@ -150,7 +150,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_ROUTE16", "var_value": 0, - "script": "Route18_EastEntrance_1F_EventScript_1A77C1" + "script": "EventScript_SetEnteringCyclingRoad" } ], "bg_events": [] diff --git a/data/maps/Route18_EastEntrance_1F/scripts.inc b/data/maps/Route18_EastEntrance_1F/scripts.inc index e49eb285f..0a6b3b56f 100644 --- a/data/maps/Route18_EastEntrance_1F/scripts.inc +++ b/data/maps/Route18_EastEntrance_1F/scripts.inc @@ -4,111 +4,111 @@ Route18_EastEntrance_1F_MapScripts:: @ 8170378 Route18_EastEntrance_1F_OnTransition:: @ 817037E clearflag FLAG_SYS_ON_CYCLING_ROAD - call_if_set FLAG_GOT_BICYCLE, EventScript_17038B + call_if_set FLAG_GOT_BICYCLE, Route18_EastEntrance_1F_EventScript_DisableNeedBikeTrigger end -EventScript_17038B:: @ 817038B +Route18_EastEntrance_1F_EventScript_DisableNeedBikeTrigger:: @ 817038B setvar VAR_TEMP_1, 1 return -Route18_EastEntrance_1F_EventScript_170391:: @ 8170391 - msgbox gUnknown_819FD3A, MSGBOX_NPC +Route18_EastEntrance_1F_EventScript_Guard:: @ 8170391 + msgbox Route18_EastEntrance_1F_Text_CyclingRoadAllUphillFromHere, MSGBOX_NPC end -Route18_EastEntrance_1F_EventScript_17039A:: @ 817039A +Route18_EastEntrance_1F_EventScript_NeedBikeTriggerTop:: @ 817039A lockall setvar VAR_0x8008, 0 - goto EventScript_1703D6 + goto Route18_EastEntrance_1F_EventScript_NeedBikeTrigger end -Route18_EastEntrance_1F_EventScript_1703A6:: @ 81703A6 +Route18_EastEntrance_1F_EventScript_NeedBikeTriggerMidTop:: @ 81703A6 lockall setvar VAR_0x8008, 1 - goto EventScript_1703D6 + goto Route18_EastEntrance_1F_EventScript_NeedBikeTrigger end -Route18_EastEntrance_1F_EventScript_1703B2:: @ 81703B2 +Route18_EastEntrance_1F_EventScript_NeedBikeTriggerMid:: @ 81703B2 lockall setvar VAR_0x8008, 2 - goto EventScript_1703D6 + goto Route18_EastEntrance_1F_EventScript_NeedBikeTrigger end -Route18_EastEntrance_1F_EventScript_1703BE:: @ 81703BE +Route18_EastEntrance_1F_EventScript_NeedBikeTriggerMidBottom:: @ 81703BE lockall setvar VAR_0x8008, 3 - goto EventScript_1703D6 + goto Route18_EastEntrance_1F_EventScript_NeedBikeTrigger end -Route18_EastEntrance_1F_EventScript_1703CA:: @ 81703CA +Route18_EastEntrance_1F_EventScript_NeedBikeTriggerBottom:: @ 81703CA lockall setvar VAR_0x8008, 4 - goto EventScript_1703D6 + goto Route18_EastEntrance_1F_EventScript_NeedBikeTrigger end -EventScript_1703D6:: @ 81703D6 +Route18_EastEntrance_1F_EventScript_NeedBikeTrigger:: @ 81703D6 textcolor 0 - msgbox gUnknown_819FD60 + msgbox Route18_EastEntrance_1F_Text_ExcuseMe closemessage applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp waitmovement 0 delay 20 compare VAR_0x8008, 1 - call_if_eq EventScript_17042F + call_if_eq Route18_EastEntrance_1F_EventScript_PlayerWalkToCounterMidTop compare VAR_0x8008, 2 - call_if_eq EventScript_17043A + call_if_eq Route18_EastEntrance_1F_EventScript_PlayerWalkToCounterMid compare VAR_0x8008, 3 - call_if_eq EventScript_170445 + call_if_eq Route18_EastEntrance_1F_EventScript_PlayerWalkToCounterMidBottom compare VAR_0x8008, 4 - call_if_eq EventScript_170450 - msgbox gUnknown_819FD0C + call_if_eq Route18_EastEntrance_1F_EventScript_PlayerWalkToCounterBottom + msgbox Route18_EastEntrance_1F_Text_NeedBicycleForCyclingRoad closemessage - applymovement OBJ_EVENT_ID_PLAYER, Movement_170469 + applymovement OBJ_EVENT_ID_PLAYER, Route18_EastEntrance_1F_Movement_WalkRight waitmovement 0 releaseall end -EventScript_17042F:: @ 817042F - applymovement OBJ_EVENT_ID_PLAYER, Movement_17045B +Route18_EastEntrance_1F_EventScript_PlayerWalkToCounterMidTop:: @ 817042F + applymovement OBJ_EVENT_ID_PLAYER, Route18_EastEntrance_1F_Movement_WalkUp waitmovement 0 return -EventScript_17043A:: @ 817043A - applymovement OBJ_EVENT_ID_PLAYER, Movement_17045D +Route18_EastEntrance_1F_EventScript_PlayerWalkToCounterMid:: @ 817043A + applymovement OBJ_EVENT_ID_PLAYER, Route18_EastEntrance_1F_Movement_WalkUp2 waitmovement 0 return -EventScript_170445:: @ 8170445 - applymovement OBJ_EVENT_ID_PLAYER, Movement_170460 +Route18_EastEntrance_1F_EventScript_PlayerWalkToCounterMidBottom:: @ 8170445 + applymovement OBJ_EVENT_ID_PLAYER, Route18_EastEntrance_1F_Movement_WalkUp3 waitmovement 0 return -EventScript_170450:: @ 8170450 - applymovement OBJ_EVENT_ID_PLAYER, Movement_170464 +Route18_EastEntrance_1F_EventScript_PlayerWalkToCounterBottom:: @ 8170450 + applymovement OBJ_EVENT_ID_PLAYER, Route18_EastEntrance_1F_Movement_WalkUp4 waitmovement 0 return -Movement_17045B:: @ 817045B +Route18_EastEntrance_1F_Movement_WalkUp:: @ 817045B walk_up step_end -Movement_17045D:: @ 817045D +Route18_EastEntrance_1F_Movement_WalkUp2:: @ 817045D walk_up walk_up step_end -Movement_170460:: @ 8170460 +Route18_EastEntrance_1F_Movement_WalkUp3:: @ 8170460 walk_up walk_up walk_up step_end -Movement_170464:: @ 8170464 +Route18_EastEntrance_1F_Movement_WalkUp4:: @ 8170464 walk_up walk_up walk_up walk_up step_end -Movement_170469:: @ 8170469 +Route18_EastEntrance_1F_Movement_WalkRight:: @ 8170469 walk_right step_end diff --git a/data/maps/Route18_EastEntrance_1F/text.inc b/data/maps/Route18_EastEntrance_1F/text.inc index 5de293cba..9551d993f 100644 --- a/data/maps/Route18_EastEntrance_1F/text.inc +++ b/data/maps/Route18_EastEntrance_1F/text.inc @@ -1,11 +1,11 @@ -gUnknown_819FD0C:: @ 819FD0C +Route18_EastEntrance_1F_Text_NeedBicycleForCyclingRoad:: @ 819FD0C .string "You need a BICYCLE to go out on\n" .string "CYCLING ROAD!$" -gUnknown_819FD3A:: @ 819FD3A +Route18_EastEntrance_1F_Text_CyclingRoadAllUphillFromHere:: @ 819FD3A .string "CYCLING ROAD is all uphill from\n" .string "here.$" -gUnknown_819FD60:: @ 819FD60 +Route18_EastEntrance_1F_Text_ExcuseMe:: @ 819FD60 .string "Excuse me!$" diff --git a/data/maps/Route18_EastEntrance_2F/map.json b/data/maps/Route18_EastEntrance_2F/map.json index b542ae540..c5c7b0853 100644 --- a/data/maps/Route18_EastEntrance_2F/map.json +++ b/data/maps/Route18_EastEntrance_2F/map.json @@ -25,7 +25,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route18_EastEntrance_2F_EventScript_17047E", + "script": "Route18_EastEntrance_2F_EventScript_Haden", "flag": "0" } ], @@ -45,14 +45,14 @@ "x": 4, "y": 1, "elevation": 0, - "script": "Route18_EastEntrance_2F_EventScript_17046C" + "script": "Route18_EastEntrance_2F_EventScript_LeftBinoculars" }, { "type": "bg_event_type_0", "x": 8, "y": 1, "elevation": 0, - "script": "Route18_EastEntrance_2F_EventScript_170475" + "script": "Route18_EastEntrance_2F_EventScript_RightBinoculars" } ] } diff --git a/data/maps/Route18_EastEntrance_2F/scripts.inc b/data/maps/Route18_EastEntrance_2F/scripts.inc index ed29859ab..910f238e4 100644 --- a/data/maps/Route18_EastEntrance_2F/scripts.inc +++ b/data/maps/Route18_EastEntrance_2F/scripts.inc @@ -1,47 +1,47 @@ Route18_EastEntrance_2F_MapScripts:: @ 817046B .byte 0 -Route18_EastEntrance_2F_EventScript_17046C:: @ 817046C - msgbox gUnknown_819FD6B, MSGBOX_SIGN +Route18_EastEntrance_2F_EventScript_LeftBinoculars:: @ 817046C + msgbox Route18_EastEntrance_2F_Text_PalletTownInWest, MSGBOX_SIGN end -Route18_EastEntrance_2F_EventScript_170475:: @ 8170475 - msgbox gUnknown_819FDB3, MSGBOX_SIGN +Route18_EastEntrance_2F_EventScript_RightBinoculars:: @ 8170475 + msgbox Route18_EastEntrance_2F_Text_PeopleSwimming, MSGBOX_SIGN end -Route18_EastEntrance_2F_EventScript_17047E:: @ 817047E +Route18_EastEntrance_2F_EventScript_Haden:: @ 817047E lock faceplayer setvar VAR_0x8008, INGAME_TRADE_LICKITUNG call EventScript_GetInGameTradeSpeciesInfo - goto_if_set FLAG_DID_MARC_TRADE, EventScript_1704F0 + goto_if_set FLAG_DID_MARC_TRADE, Route18_EastEntrance_2F_EventScript_AlreadyTraded msgbox Trade_Text_LookingForMonWannaTradeForMon, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq EventScript_1704D8 + goto_if_eq Route18_EastEntrance_2F_EventScript_DeclineTrade call EventScript_ChooseMonForInGameTrade compare VAR_0x8004, PARTY_SIZE - goto_if_ge EventScript_1704D8 + goto_if_ge Route18_EastEntrance_2F_EventScript_DeclineTrade call EventScript_GetInGameTradeSpecies compare VAR_RESULT, VAR_0x8009 - goto_if_ne EventScript_1704E2 + goto_if_ne Route18_EastEntrance_2F_EventScript_NotRequestedMon call EventScript_DoInGameTrade msgbox Trade_Text_HeyThanks setflag FLAG_DID_MARC_TRADE release end -EventScript_1704D8:: @ 81704D8 +Route18_EastEntrance_2F_EventScript_DeclineTrade:: @ 81704D8 msgbox Trade_Text_AwwOhWell release end -EventScript_1704E2:: @ 81704E2 +Route18_EastEntrance_2F_EventScript_NotRequestedMon:: @ 81704E2 getspeciesname 0, VAR_0x8009 msgbox Trade_Text_WhatThatsNoMon release end -EventScript_1704F0:: @ 81704F0 +Route18_EastEntrance_2F_EventScript_AlreadyTraded:: @ 81704F0 msgbox Trade_Text_IsntMyOldMonGreat release end diff --git a/data/maps/Route18_EastEntrance_2F/text.inc b/data/maps/Route18_EastEntrance_2F/text.inc index 8a479371c..aac533f71 100644 --- a/data/maps/Route18_EastEntrance_2F/text.inc +++ b/data/maps/Route18_EastEntrance_2F/text.inc @@ -1,9 +1,9 @@ -gUnknown_819FD6B:: @ 819FD6B +Route18_EastEntrance_2F_Text_PalletTownInWest:: @ 819FD6B .string "Let's see what the binoculars have\n" .string "to show…\p" .string "PALLET TOWN is in the west.$" -gUnknown_819FDB3:: @ 819FDB3 +Route18_EastEntrance_2F_Text_PeopleSwimming:: @ 819FDB3 .string "Let's see what the binoculars have\n" .string "to show…\p" .string "There are people swimming.$" diff --git a/data/maps/Route19/map.json b/data/maps/Route19/map.json index b25ce0fec..d8f35ad21 100644 --- a/data/maps/Route19/map.json +++ b/data/maps/Route19/map.json @@ -36,7 +36,7 @@ "movement_range_y": 3, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "Route19_EventScript_1AB44F", + "script": "Route19_EventScript_Reece", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "Route19_EventScript_1AB411", + "script": "Route19_EventScript_Richard", "flag": "0" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "Route19_EventScript_1AB547", + "script": "Route19_EventScript_Tony", "flag": "0" }, { @@ -75,7 +75,7 @@ "movement_range_y": 3, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route19_EventScript_1AB48D", + "script": "Route19_EventScript_Matthew", "flag": "0" }, { @@ -88,7 +88,7 @@ "movement_range_y": 2, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route19_EventScript_1AB4CB", + "script": "Route19_EventScript_Douglas", "flag": "0" }, { @@ -101,7 +101,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 6, - "script": "Route19_EventScript_1AB509", + "script": "Route19_EventScript_David", "flag": "0" }, { @@ -114,7 +114,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route19_EventScript_1AB585", + "script": "Route19_EventScript_Axle", "flag": "0" }, { @@ -127,7 +127,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route19_EventScript_1AB601", + "script": "Route19_EventScript_Alice", "flag": "0" }, { @@ -140,7 +140,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route19_EventScript_1AB63F", + "script": "Route19_EventScript_Connie", "flag": "0" }, { @@ -153,7 +153,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route19_EventScript_1AB5C3", + "script": "Route19_EventScript_Anya", "flag": "0" }, { @@ -166,7 +166,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route19_EventScript_1AB67D", + "script": "Route19_EventScript_Lia", "flag": "0" }, { @@ -179,7 +179,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route19_EventScript_1AB6C3", + "script": "Route19_EventScript_Luc", "flag": "0" } ], @@ -191,7 +191,7 @@ "x": 13, "y": 12, "elevation": 0, - "script": "Route19_EventScript_168232" + "script": "Route19_EventScript_RouteSign" } ] } diff --git a/data/maps/Route19/scripts.inc b/data/maps/Route19/scripts.inc index 16d6e4669..10b361e83 100644 --- a/data/maps/Route19/scripts.inc +++ b/data/maps/Route19/scripts.inc @@ -1,6 +1,6 @@ Route19_MapScripts:: @ 8168231 .byte 0 -Route19_EventScript_168232:: @ 8168232 - msgbox gUnknown_8187C06, MSGBOX_SIGN +Route19_EventScript_RouteSign:: @ 8168232 + msgbox Route19_Text_RouteSign, MSGBOX_SIGN end diff --git a/data/maps/Route19/text.inc b/data/maps/Route19/text.inc index 7d399f364..a414146b4 100644 --- a/data/maps/Route19/text.inc +++ b/data/maps/Route19/text.inc @@ -1,154 +1,154 @@ -Text_1877A3:: @ 81877A3 +Route19_Text_RichardIntro:: @ 81877A3 .string "I have to exercise and warm up\n" .string "before going out for a swim.$" -Text_1877DF:: @ 81877DF +Route19_Text_RichardDefeat:: @ 81877DF .string "All warmed up!$" -Text_1877EE:: @ 81877EE +Route19_Text_RichardPostBattle:: @ 81877EE .string "Thanks, kid!\n" .string "I'm ready for a swim.$" -Text_187811:: @ 8187811 +Route19_Text_ReeceIntro:: @ 8187811 .string "Wait! Slow down!\n" .string "You'll have a heart attack!$" -Text_18783E:: @ 818783E +Route19_Text_ReeceDefeat:: @ 818783E .string "Ooh!\n" .string "That's chilly!$" -Text_187852:: @ 8187852 +Route19_Text_ReecePostBattle:: @ 8187852 .string "Watch out for TENTACOOL.\n" .string "They sting so painfully.$" -Text_187884:: @ 8187884 +Route19_Text_MatthewIntro:: @ 8187884 .string "I love swimming!\n" .string "What about you?$" -Text_1878A5:: @ 81878A5 +Route19_Text_MatthewDefeat:: @ 81878A5 .string "Belly flop!$" -Text_1878B1:: @ 81878B1 +Route19_Text_MatthewPostBattle:: @ 81878B1 .string "I can beat even marine POKéMON\n" .string "at swimming.$" -Text_1878DD:: @ 81878DD +Route19_Text_DouglasIntro:: @ 81878DD .string "What's beyond the horizon?$" -Text_1878F8:: @ 81878F8 +Route19_Text_DouglasDefeat:: @ 81878F8 .string "Glub!$" -Text_1878FE:: @ 81878FE +Route19_Text_DouglasPostBattle:: @ 81878FE .string "I see a couple of islands over\n" .string "yonder!$" -Text_187925:: @ 8187925 +Route19_Text_DavidIntro:: @ 8187925 .string "I tried diving for POKéMON, but it\n" .string "was a no-go.$" -Text_187955:: @ 8187955 +Route19_Text_DavidDefeat:: @ 8187955 .string "Help!$" -Text_18795B:: @ 818795B +Route19_Text_DavidPostBattle:: @ 818795B .string "I guess you have to fish for sea\n" .string "POKéMON.$" -Text_187985:: @ 8187985 +Route19_Text_TonyIntro:: @ 8187985 .string "I look at the sea to forget all\n" .string "the bad things that happened.$" -Text_1879C3:: @ 81879C3 +Route19_Text_TonyDefeat:: @ 81879C3 .string "Ooh!\n" .string "Traumatic!$" -Text_1879D3:: @ 81879D3 +Route19_Text_TonyPostBattle:: @ 81879D3 .string "I'm looking at the sea to forget\n" .string "the bad thing that happened!$" -Text_187A11:: @ 8187A11 +Route19_Text_AnyaIntro:: @ 8187A11 .string "Oh, I just love your ride!\n" .string "Can I have it if I win?$" -Text_187A44:: @ 8187A44 +Route19_Text_AnyaDefeat:: @ 8187A44 .string "Oh! I lost!$" -Text_187A50:: @ 8187A50 +Route19_Text_AnyaPostBattle:: @ 8187A50 .string "It's still a long way to go to\n" .string "SEAFOAM ISLANDS…\p" .string "I want to go back to FUCHSIA…$" -Text_187A9E:: @ 8187A9E +Route19_Text_AliceIntro:: @ 8187A9E .string "Swimming's great!\n" .string "Sunburns aren't!$" -Text_187AC1:: @ 8187AC1 +Route19_Text_AliceDefeat:: @ 8187AC1 .string "Shocker!$" -Text_187ACA:: @ 8187ACA +Route19_Text_AlicePostBattle:: @ 8187ACA .string "My boyfriend wanted to swim to\n" .string "SEAFOAM ISLANDS.$" -Text_187AFA:: @ 8187AFA +Route19_Text_AxleIntro:: @ 8187AFA .string "Ahoy, there!\n" .string "These waters are treacherous!$" -Text_187B25:: @ 8187B25 +Route19_Text_AxleDefeat:: @ 8187B25 .string "Ooh!\n" .string "Dangerous!$" -Text_187B35:: @ 8187B35 +Route19_Text_AxlePostBattle:: @ 8187B35 .string "M-my legs! They cramped up!\n" .string "Glub, glub…$" -Text_187B5D:: @ 8187B5D +Route19_Text_ConnieIntro:: @ 8187B5D .string "I swam here with my friends…\n" .string "I'm tired…$" -Text_187B85:: @ 8187B85 +Route19_Text_ConnieDefeat:: @ 8187B85 .string "I'm exhausted…$" -Text_187B94:: @ 8187B94 +Route19_Text_ConniePostBattle:: @ 8187B94 .string "If I were to ride a POKéMON on\n" .string "the sea, I'd like a LAPRAS.\p" .string "LAPRAS is so big, I bet it\n" .string "would keep me dry on water.$" -gUnknown_8187C06:: @ 8187C06 +Route19_Text_RouteSign:: @ 8187C06 .string "SEA ROUTE 19\n" .string "FUCHSIA CITY - SEAFOAM ISLANDS$" -Text_187C32:: @ 8187C32 +Route19_Text_LiaIntro:: @ 8187C32 .string "LIA: I'm looking after my brother.\n" .string "He just became a TRAINER.$" -Text_187C6F:: @ 8187C6F +Route19_Text_LiaDefeat:: @ 8187C6F .string "LIA: That's no way to treat my\n" .string "little brother!$" -Text_187C9E:: @ 8187C9E +Route19_Text_LiaPostBattle:: @ 8187C9E .string "LIA: Do you have a younger\n" .string "brother?\p" .string "I hope you're teaching him all\n" .string "sorts of things.$" -Text_187CF2:: @ 8187CF2 +Route19_Text_LiaNotEnoughMons:: @ 8187CF2 .string "LIA: I want to battle together\n" .string "with my little brother.\p" .string "Don't you have two POKéMON?$" -Text_187D45:: @ 8187D45 +Route19_Text_LucIntro:: @ 8187D45 .string "LUC: My big sis taught me how\n" .string "to swim and train POKéMON.$" -Text_187D7E:: @ 8187D7E +Route19_Text_LucDefeat:: @ 8187D7E .string "LUC: Oh, wow!\n" .string "Someone tougher than my big sis!$" -Text_187DAD:: @ 8187DAD +Route19_Text_LucPostBattle:: @ 8187DAD .string "LUC: My big sis is strong and nice.\n" .string "I think she's awesome!$" -Text_187DE8:: @ 8187DE8 +Route19_Text_LucNotEnoughMons:: @ 8187DE8 .string "LUC: I don't want to if I can't\n" .string "battle you with my big sis.\p" .string "Don't you have two POKéMON?$" diff --git a/data/maps/Route20/map.json b/data/maps/Route20/map.json index 7a4de5f4f..04f110847 100644 --- a/data/maps/Route20/map.json +++ b/data/maps/Route20/map.json @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "Route20_EventScript_1AB83F", + "script": "Route20_EventScript_Melissa", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route20_EventScript_1AB8F9", + "script": "Route20_EventScript_Missy", "flag": "0" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 4, - "script": "Route20_EventScript_1AB801", + "script": "Route20_EventScript_Nora", "flag": "0" }, { @@ -75,7 +75,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route20_EventScript_1AB8BB", + "script": "Route20_EventScript_Roger", "flag": "0" }, { @@ -88,7 +88,7 @@ "movement_range_y": 4, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route20_EventScript_1AB747", + "script": "Route20_EventScript_Dean", "flag": "0" }, { @@ -101,7 +101,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, - "script": "Route20_EventScript_1AB937", + "script": "Route20_EventScript_Irene", "flag": "0" }, { @@ -114,7 +114,7 @@ "movement_range_y": 3, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route20_EventScript_1AB709", + "script": "Route20_EventScript_Barry", "flag": "0" }, { @@ -127,7 +127,7 @@ "movement_range_y": 3, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route20_EventScript_1AB785", + "script": "Route20_EventScript_Darrin", "flag": "0" }, { @@ -140,7 +140,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 5, - "script": "Route20_EventScript_1AB87D", + "script": "Route20_EventScript_Shirley", "flag": "0" }, { @@ -153,7 +153,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route20_EventScript_1AB7C3", + "script": "Route20_EventScript_Tiffany", "flag": "0" }, { @@ -166,7 +166,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route20_EventScript_1ACE36", + "script": "Route20_EventScript_Camper", "flag": "0" } ], @@ -193,14 +193,14 @@ "x": 68, "y": 14, "elevation": 0, - "script": "Route20_EventScript_168280" + "script": "Route20_EventScript_SeafoamIslandsSign" }, { "type": "bg_event_type_0", "x": 64, "y": 8, "elevation": 0, - "script": "Route20_EventScript_168280" + "script": "Route20_EventScript_SeafoamIslandsSign" }, { "type": "hidden_item", diff --git a/data/maps/Route20/scripts.inc b/data/maps/Route20/scripts.inc index a034c3610..7ef352f82 100644 --- a/data/maps/Route20/scripts.inc +++ b/data/maps/Route20/scripts.inc @@ -3,11 +3,11 @@ Route20_MapScripts:: @ 816823B .byte 0 Route20_OnTransition:: @ 8168241 - call_if_unset FLAG_STOPPED_SEAFOAM_B3F_CURRENT, EventScript_168254 - call_if_unset FLAG_STOPPED_SEAFOAM_B4F_CURRENT, EventScript_16826D + call_if_unset FLAG_STOPPED_SEAFOAM_B3F_CURRENT, Route20_EventScript_ResetSeafoamBouldersForB3F + call_if_unset FLAG_STOPPED_SEAFOAM_B4F_CURRENT, Route20_EventScript_ResetSeafoamBouldersForB4F end -EventScript_168254:: @ 8168254 +Route20_EventScript_ResetSeafoamBouldersForB3F:: @ 8168254 clearflag FLAG_HIDE_SEAFOAM_1F_BOULDER_1 clearflag FLAG_HIDE_SEAFOAM_1F_BOULDER_2 setflag FLAG_HIDE_SEAFOAM_B1F_BOULDER_1 @@ -18,7 +18,7 @@ EventScript_168254:: @ 8168254 setflag FLAG_HIDE_SEAFOAM_B3F_BOULDER_2 return -EventScript_16826D:: @ 816826D +Route20_EventScript_ResetSeafoamBouldersForB4F:: @ 816826D clearflag FLAG_HIDE_SEAFOAM_B3F_BOULDER_3 clearflag FLAG_HIDE_SEAFOAM_B3F_BOULDER_4 clearflag FLAG_HIDE_SEAFOAM_B3F_BOULDER_5 @@ -27,6 +27,6 @@ EventScript_16826D:: @ 816826D setflag FLAG_HIDE_SEAFOAM_B4F_BOULDER_2 return -Route20_EventScript_168280:: @ 8168280 - msgbox gUnknown_81882D1, MSGBOX_SIGN +Route20_EventScript_SeafoamIslandsSign:: @ 8168280 + msgbox Route20_Text_SeafoamIslands, MSGBOX_SIGN end diff --git a/data/maps/Route20/text.inc b/data/maps/Route20/text.inc index 3abceaeba..5ca372ef6 100644 --- a/data/maps/Route20/text.inc +++ b/data/maps/Route20/text.inc @@ -1,119 +1,119 @@ -Text_187E40:: @ 8187E40 +Route20_Text_BarryIntro:: @ 8187E40 .string "The water is shallow here.\n" .string "There are many people swimming.$" -Text_187E7B:: @ 8187E7B +Route20_Text_BarryDefeat:: @ 8187E7B .string "Splash!$" -Text_187E83:: @ 8187E83 +Route20_Text_BarryPostBattle:: @ 8187E83 .string "I wish I could ride my POKéMON.\n" .string "I bet you're not tired.$" -Text_187EBB:: @ 8187EBB +Route20_Text_ShirleyIntro:: @ 8187EBB .string "SEAFOAM is a quiet getaway.\n" .string "I'm vacationing here.$" -Text_187EED:: @ 8187EED +Route20_Text_ShirleyDefeat:: @ 8187EED .string "Quit it!$" -Text_187EF6:: @ 8187EF6 +Route20_Text_ShirleyPostBattle:: @ 8187EF6 .string "There's a huge cavern underneath\n" .string "this island.$" -Text_187F24:: @ 8187F24 +Route20_Text_TiffanyIntro:: @ 8187F24 .string "I love floating with the fishes\n" .string "here among the waves.$" -Text_187F5A:: @ 8187F5A +Route20_Text_TiffanyDefeat:: @ 8187F5A .string "Yowch!$" -Text_187F61:: @ 8187F61 +Route20_Text_TiffanyPostBattle:: @ 8187F61 .string "Want to float with me?$" -Text_187F78:: @ 8187F78 +Route20_Text_IreneIntro:: @ 8187F78 .string "Are you on vacation, too?$" -Text_187F92:: @ 8187F92 +Route20_Text_IreneDefeat:: @ 8187F92 .string "No mercy at all!$" -Text_187FA3:: @ 8187FA3 +Route20_Text_IrenePostBattle:: @ 8187FA3 .string "SEAFOAM used to be a single island\n" .string "in the distant past.$" -Text_187FDB:: @ 8187FDB +Route20_Text_DeanIntro:: @ 8187FDB .string "Check out my buff physique!$" -Text_187FF7:: @ 8187FF7 +Route20_Text_DeanDefeat:: @ 8187FF7 .string "Wimpy!$" -Text_187FFE:: @ 8187FFE +Route20_Text_DeanPostBattle:: @ 8187FFE .string "I should've been buffing up my\n" .string "POKéMON, not me!$" -Text_18802E:: @ 818802E +Route20_Text_DarrinIntro:: @ 818802E .string "Why are you riding a POKéMON?\n" .string "Can't you swim?$" -Text_18805C:: @ 818805C +Route20_Text_DarrinDefeat:: @ 818805C .string "Ouch!\n" .string "Torpedoed!$" -Text_18806D:: @ 818806D +Route20_Text_DarrinPostBattle:: @ 818806D .string "Riding a POKéMON sure looks fun!$" -Text_18808E:: @ 818808E +Route20_Text_RogerIntro:: @ 818808E .string "I rode my bird POKéMON here.$" -Text_1880AB:: @ 81880AB +Route20_Text_RogerDefeat:: @ 81880AB .string "Oh, no!\n" .string "Now what am I to do?$" -Text_1880C8:: @ 81880C8 +Route20_Text_RogerPostBattle:: @ 81880C8 .string "My birds are exhausted.\n" .string "They can't FLY me back!$" -Text_1880F8:: @ 81880F8 +Route20_Text_NoraIntro:: @ 81880F8 .string "My boyfriend gave me big pearls.$" -Text_188119:: @ 8188119 +Route20_Text_NoraDefeat:: @ 8188119 .string "Oh, no!\n" .string "My pearls were in them!$" -Text_188139:: @ 8188139 +Route20_Text_NoraPostBattle:: @ 8188139 .string "Will my pearls grow bigger inside\n" .string "CLOYSTER?$" -Text_188165:: @ 8188165 +Route20_Text_MissyIntro:: @ 8188165 .string "I swam here from CINNABAR ISLAND.\n" .string "It wasn't easy, I tell you.$" -Text_1881A3:: @ 81881A3 +Route20_Text_MissyDefeat:: @ 81881A3 .string "I'm so disappointed!$" -Text_1881B8:: @ 81881B8 +Route20_Text_MissyPostBattle:: @ 81881B8 .string "POKéMON have taken over an\n" .string "abandoned mansion on CINNABAR.\p" .string "They call it the POKéMON MANSION\n" .string "now.$" -Text_188218:: @ 8188218 +Route20_Text_MelissaIntro:: @ 8188218 .string "CINNABAR, in the west, has a LAB\n" .string "for POKéMON.\p" .string "My daddy works there.$" -Text_18825C:: @ 818825C +Route20_Text_MelissaDefeat:: @ 818825C .string "Wait!\n" .string "You're supposed to wait!$" -Text_18827B:: @ 818827B +Route20_Text_MelissaPostBattle:: @ 818827B .string "CINNABAR is a volcanic island.\p" .string "I heard it rose out of the sea\n" .string "when a volcano erupted.$" -gUnknown_81882D1:: @ 81882D1 +Route20_Text_SeafoamIslands:: @ 81882D1 .string "SEAFOAM ISLANDS$" -Text_1882E1:: @ 81882E1 +Route20_Text_MistyTrainsHere:: @ 81882E1 .string "Strong TRAINERS and WATER POKéMON\n" .string "are common sights in these parts.\p" .string "They say that MISTY of the\n" diff --git a/data/maps/Route21_North/map.json b/data/maps/Route21_North/map.json index 556dd9746..05b91c5d3 100644 --- a/data/maps/Route21_North/map.json +++ b/data/maps/Route21_North/map.json @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 0, - "script": "Route21_North_EventScript_1AB975", + "script": "Route21_North_EventScript_Ronald", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 0, - "script": "Route21_North_EventScript_1AB9F1", + "script": "Route21_North_EventScript_Wade", "flag": "0" }, { @@ -62,7 +62,7 @@ "movement_range_y": 2, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route21_North_EventScript_1ABA6D", + "script": "Route21_North_EventScript_Spencer", "flag": "0" }, { @@ -75,7 +75,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route21_North_EventScript_1ABB65", + "script": "Route21_North_EventScript_Lil", "flag": "0" }, { @@ -88,7 +88,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route21_North_EventScript_1ABBAB", + "script": "Route21_North_EventScript_Ian", "flag": "0" }, { diff --git a/data/maps/Route21_North/text.inc b/data/maps/Route21_North/text.inc index ad1ec12d3..67b93c175 100644 --- a/data/maps/Route21_North/text.inc +++ b/data/maps/Route21_North/text.inc @@ -1,42 +1,49 @@ -Text_18835A:: @ 818835A +Route21_North_Text_RonaldIntro:: @ 818835A .string "You want to know if the fish are\n" .string "biting?$" -Text_188383:: @ 8188383 +Route21_North_Text_RonaldDefeat:: @ 8188383 .string "Dang!$" -Text_188389:: @ 8188389 +Route21_North_Text_RonaldPostBattle:: @ 8188389 .string "I can't catch anything good.\n" .string "Not one good POKéMON to be had!$" -Text_1883C6:: @ 81883C6 +Route21_North_Text_WadeIntro:: @ 81883C6 .string "I got a big haul!\n" .string "Wanna go for it?$" -Text_1883E9:: @ 81883E9 +Route21_North_Text_WadeDefeat:: @ 81883E9 .string "Heheh, MAGIKARP just don't make\n" .string "the grade, do they?$" -Text_18841D:: @ 818841D +Route21_North_Text_WadePostBattle:: @ 818841D .string "I seem to only catch MAGIKARP!$" -Text_18843C:: @ 818843C +Route21_North_Text_SpencerIntro:: @ 818843C .string "The sea cleanses my body and soul!$" -Text_18845F:: @ 818845F +Route21_North_Text_SpencerDefeat:: @ 818845F .string "Ayah!$" -Text_188465:: @ 8188465 +Route21_North_Text_SpencerPostBattle:: @ 8188465 .string "The sea is great and all, but I\n" .string "like the mountains, too.$" -Text_18849E:: @ 818849E +@ Below is the battle text for the Cue Ball that was on Route 21 in Gen 1. +@ This trainer wasnt used in Gen 3 so their text goes unused/untranslated +@ English translations from RB are listed + +@ "What's wrong with me swimming?" +Route21_North_Text_CueBallIntro:: @ 818849E .string "おれだって たまには\n" .string "およぎに くるぜ！$" -Text_1884B3:: @ 81884B3 +@ "Cheap shot!" +Route21_North_Text_CueBallDefeat:: @ 81884B3 .string "ぐわわ！$" -Text_1884B8:: @ 81884B8 +@ "I look like what? A studded inner tube? Get lost!" +Route21_North_Text_CueBallPostBattle:: @ 81884B8 .string "うきやすそう だと？\n" .string "うるせー おおきな おせわだッ！$" diff --git a/data/maps/Route21_South/map.json b/data/maps/Route21_South/map.json index ef43a429b..8e9398b68 100644 --- a/data/maps/Route21_South/map.json +++ b/data/maps/Route21_South/map.json @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 0, - "script": "Route21_South_EventScript_1AB9B3", + "script": "Route21_South_EventScript_Claude", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 0, - "script": "Route21_South_EventScript_1ABA2F", + "script": "Route21_South_EventScript_Nolan", "flag": "0" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "Route21_South_EventScript_1ABAAB", + "script": "Route21_South_EventScript_Jack", "flag": "0" }, { @@ -75,7 +75,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "Route21_South_EventScript_1ABAE9", + "script": "Route21_South_EventScript_Jerome", "flag": "0" }, { @@ -88,7 +88,7 @@ "movement_range_y": 2, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 4, - "script": "Route21_South_EventScript_1ABB27", + "script": "Route21_South_EventScript_Roland", "flag": "0" } ], diff --git a/data/maps/Route21_South/text.inc b/data/maps/Route21_South/text.inc index 8700006ef..255c1eaed 100644 --- a/data/maps/Route21_South/text.inc +++ b/data/maps/Route21_South/text.inc @@ -1,87 +1,87 @@ -Text_1884D4:: @ 81884D4 +Route21_South_Text_JackIntro:: @ 81884D4 .string "I caught my POKéMON at sea.$" -Text_1884F0:: @ 81884F0 +Route21_South_Text_JackDefeat:: @ 81884F0 .string "Diver!!\n" .string "Down!!$" -Text_1884FF:: @ 81884FF +Route21_South_Text_JackPostBattle:: @ 81884FF .string "Where'd you catch your POKéMON?$" -Text_18851F:: @ 818851F +Route21_South_Text_JeromeIntro:: @ 818851F .string "Right now, I'm in a triathlon meet.$" -Text_188543:: @ 8188543 +Route21_South_Text_JeromeDefeat:: @ 8188543 .string "Pant…\n" .string "Pant… Pant…$" -Text_188555:: @ 8188555 +Route21_South_Text_JeromePostBattle:: @ 8188555 .string "I'm beat! But, I still have the\n" .string "bike race and marathon left!$" -Text_188592:: @ 8188592 +Route21_South_Text_RolandIntro:: @ 8188592 .string "Ahh!\n" .string "Feel the sun and the wind!$" -Text_1885B2:: @ 81885B2 +Route21_South_Text_RolandDefeat:: @ 81885B2 .string "Yow!\n" .string "I lost!$" -Text_1885BF:: @ 81885BF +Route21_South_Text_RolandPostBattle:: @ 81885BF .string "I'm sunburnt to a crisp!$" -Text_1885D8:: @ 81885D8 +Route21_South_Text_ClaudeIntro:: @ 81885D8 .string "Hey, don't scare away the fish!$" -Text_1885F8:: @ 81885F8 +Route21_South_Text_ClaudeDefeat:: @ 81885F8 .string "Sorry! I'm just so frustrated from\n" .string "not catching anything.$" -Text_188632:: @ 8188632 +Route21_South_Text_ClaudePostBattle:: @ 8188632 .string "Sheesh, I haven't caught a thing.\n" .string "Could this place actually be a\l" .string "giant pool or something?$" -Text_18868C:: @ 818868C +Route21_South_Text_NolanIntro:: @ 818868C .string "Keep me company till I get a hit.$" -Text_1886AE:: @ 81886AE +Route21_South_Text_NolanDefeat:: @ 81886AE .string "That burned some time.$" -Text_1886C5:: @ 81886C5 +Route21_South_Text_NolanPostBattle:: @ 81886C5 .string "Oh wait!\n" .string "I got a bite! Yeah!$" -Text_1886E2:: @ 81886E2 +Route21_North_Text_LilIntro:: @ 81886E2 .string "LIL: Huh? A battle?\n" .string "IAN, can't you do it alone?$" -Text_188712:: @ 8188712 +Route21_North_Text_LilDefeat:: @ 8188712 .string "LIL: Oh, see?\n" .string "We lost. Happy now?$" -Text_188734:: @ 8188734 +Route21_North_Text_LilPostBattle:: @ 8188734 .string "LIL: I'm tired.\n" .string "Can't we go home already?$" -Text_18875E:: @ 818875E +Route21_North_Text_LilNotEnoughMons:: @ 818875E .string "LIL: Huh? A battle?\n" .string "I can't be bothered to do it alone.\l" .string "Bring two POKéMON, won't you?$" -Text_1887B4:: @ 81887B4 +Route21_North_Text_IanIntro:: @ 81887B4 .string "IAN: My sis doesn't get enough\n" .string "exercise, so I made her come.$" -Text_1887F1:: @ 81887F1 +Route21_North_Text_IanDefeat:: @ 81887F1 .string "IAN: Awww, Sis!\n" .string "Get it together!$" -Text_188812:: @ 8188812 +Route21_North_Text_IanPostBattle:: @ 8188812 .string "IAN: Come on, Sis!\p" .string "You're not going to lose weight\n" .string "like this!$" -Text_188850:: @ 8188850 +Route21_North_Text_IanNotEnoughMons:: @ 8188850 .string "IAN: We want a two-on-two battle.\n" .string "So can you bring two POKéMON?$" diff --git a/data/maps/Route24/map.json b/data/maps/Route24/map.json index 29b394c67..a12005d3f 100644 --- a/data/maps/Route24/map.json +++ b/data/maps/Route24/map.json @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route24_EventScript_168620", + "script": "Route24_EventScript_Rocket", "flag": "FLAG_HIDE_NUGGET_BRIDGE_ROCKET" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, - "script": "Route24_EventScript_1A972D", + "script": "Route24_EventScript_Ethan", "flag": "0" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, - "script": "Route24_EventScript_1A9673", + "script": "Route24_EventScript_Reli", "flag": "0" }, { @@ -75,7 +75,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, - "script": "Route24_EventScript_1A95F7", + "script": "Route24_EventScript_Timmy", "flag": "0" }, { @@ -88,7 +88,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, - "script": "Route24_EventScript_1A96B1", + "script": "Route24_EventScript_Ali", "flag": "0" }, { @@ -101,7 +101,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, - "script": "Route24_EventScript_1A9635", + "script": "Route24_EventScript_Cale", "flag": "0" }, { @@ -114,7 +114,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 5, - "script": "Route24_EventScript_1A96EF", + "script": "Route24_EventScript_Shane", "flag": "0" }, { @@ -140,7 +140,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_ROUTE24", "var_value": 0, - "script": "Route24_EventScript_168660" + "script": "Route24_EventScript_RocketTriggerLeft" }, { "type": "trigger", @@ -149,7 +149,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_ROUTE24", "var_value": 0, - "script": "Route24_EventScript_16866C" + "script": "Route24_EventScript_RocketTriggerRight" } ], "bg_events": [ diff --git a/data/maps/Route24/scripts.inc b/data/maps/Route24/scripts.inc index e30913e52..7a22f64e8 100644 --- a/data/maps/Route24/scripts.inc +++ b/data/maps/Route24/scripts.inc @@ -1,103 +1,105 @@ +.equ LOCALID_ROCKET, 1 + Route24_MapScripts:: @ 816861F .byte 0 -Route24_EventScript_168620:: @ 8168620 +Route24_EventScript_Rocket:: @ 8168620 lock faceplayer compare VAR_MAP_SCENE_ROUTE24, 1 - goto_if_eq EventScript_168656 - msgbox gUnknown_8188C3C + goto_if_eq Route24_EventScript_RocketPostBattle + msgbox Route24_Text_JustEarnedFabulousPrize checkitemspace ITEM_NUGGET, 1 compare VAR_RESULT, FALSE - goto_if_eq EventScript_16864C - call EventScript_1686B9 + goto_if_eq Route24_EventScript_NoRoomForNugget + call Route24_EventScript_BattleRocket release end -EventScript_16864C:: @ 816864C - msgbox gUnknown_8188CC2 +Route24_EventScript_NoRoomForNugget:: @ 816864C + msgbox Route24_Text_YouDontHaveAnyRoom release end -EventScript_168656:: @ 8168656 - msgbox gUnknown_8188DF1 +Route24_EventScript_RocketPostBattle:: @ 8168656 + msgbox Route24_Text_YoudBecomeTopRocketLeader release end -Route24_EventScript_168660:: @ 8168660 +Route24_EventScript_RocketTriggerLeft:: @ 8168660 lockall setvar VAR_TEMP_1, 0 - goto EventScript_168678 + goto Route24_EventScript_RocketTrigger end -Route24_EventScript_16866C:: @ 816866C +Route24_EventScript_RocketTriggerRight:: @ 816866C lockall setvar VAR_TEMP_1, 1 - goto EventScript_168678 + goto Route24_EventScript_RocketTrigger end -EventScript_168678:: @ 8168678 +Route24_EventScript_RocketTrigger:: @ 8168678 textcolor 0 compare VAR_TEMP_1, 0 - call_if_eq EventScript_1686FD + call_if_eq Route24_EventScript_RocketApproachPlayer compare VAR_TEMP_1, 1 - call_if_eq EventScript_168708 + call_if_eq Route24_EventScript_RocketMotionToPlayer applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight waitmovement 0 - msgbox gUnknown_8188C3C + msgbox Route24_Text_JustEarnedFabulousPrize checkitemspace ITEM_NUGGET, 1 - compare VAR_RESULT, 0 - goto_if_eq EventScript_168713 - call EventScript_1686B9 + compare VAR_RESULT, FALSE + goto_if_eq Route24_EventScript_NoRoomForNuggetTrigger + call Route24_EventScript_BattleRocket releaseall end -EventScript_1686B9:: @ 81686B9 - giveitem_msg gUnknown_8188C93, ITEM_NUGGET - message Text_188CDB +Route24_EventScript_BattleRocket:: @ 81686B9 + giveitem_msg Route24_Text_ReceivedNuggetFromMysteryTrainer, ITEM_NUGGET + message Route24_Text_JoinTeamRocket waitmessage playbgm MUS_ROCKET, 0 waitbuttonpress - setvar VAR_LAST_TALKED, 1 - trainerbattle_no_intro TRAINER_TEAM_ROCKET_GRUNT_6, Text_188DDC - msgbox gUnknown_8188DF1 + setvar VAR_LAST_TALKED, LOCALID_ROCKET + trainerbattle_no_intro TRAINER_TEAM_ROCKET_GRUNT_6, Route24_Text_RocketDefeat + msgbox Route24_Text_YoudBecomeTopRocketLeader setvar VAR_MAP_SCENE_ROUTE24, 1 return -EventScript_1686FD:: @ 81686FD - applymovement 1, Movement_16873E +Route24_EventScript_RocketApproachPlayer:: @ 81686FD + applymovement LOCALID_ROCKET, Route24_Movement_RocketApproachPlayer waitmovement 0 return -EventScript_168708:: @ 8168708 - applymovement 1, Movement_WalkInPlaceFastestLeft +Route24_EventScript_RocketMotionToPlayer:: @ 8168708 + applymovement LOCALID_ROCKET, Movement_WalkInPlaceFastestLeft waitmovement 0 return -EventScript_168713:: @ 8168713 - msgbox gUnknown_8188CC2 +Route24_EventScript_NoRoomForNuggetTrigger:: @ 8168713 + msgbox Route24_Text_YouDontHaveAnyRoom closemessage - applymovement OBJ_EVENT_ID_PLAYER, Movement_168743 + applymovement OBJ_EVENT_ID_PLAYER, Route24_Movement_WalkDown waitmovement 0 compare VAR_TEMP_1, 0 - call_if_eq EventScript_168733 + call_if_eq Route24_EventScript_RocketWalkBackToPos release end -EventScript_168733:: @ 8168733 - applymovement 1, Movement_168740 +Route24_EventScript_RocketWalkBackToPos:: @ 8168733 + applymovement LOCALID_ROCKET, Route24_Movement_RocketWalkBackToPos waitmovement 0 return -Movement_16873E:: @ 816873E +Route24_Movement_RocketApproachPlayer:: @ 816873E walk_left step_end -Movement_168740:: @ 8168740 +Route24_Movement_RocketWalkBackToPos:: @ 8168740 walk_right walk_in_place_fastest_left step_end -Movement_168743:: @ 8168743 +Route24_Movement_WalkDown:: @ 8168743 walk_down step_end diff --git a/data/maps/Route24/text.inc b/data/maps/Route24/text.inc index 04ef64ea5..7b9d09e6f 100644 --- a/data/maps/Route24/text.inc +++ b/data/maps/Route24/text.inc @@ -1,16 +1,16 @@ -gUnknown_8188C3C:: @ 8188C3C +Route24_Text_JustEarnedFabulousPrize:: @ 8188C3C .string "Congratulations! You beat our\n" .string "five contest TRAINERS!\p" .string "You just earned a fabulous prize!$" -gUnknown_8188C93:: @ 8188C93 +Route24_Text_ReceivedNuggetFromMysteryTrainer:: @ 8188C93 .string "{PLAYER} received a NUGGET\n" .string "from the mystery TRAINER!$" -gUnknown_8188CC2:: @ 8188CC2 +Route24_Text_YouDontHaveAnyRoom:: @ 8188CC2 .string "You don't have any room!$" -Text_188CDB:: @ 8188CDB +Route24_Text_JoinTeamRocket:: @ 8188CDB .string "By the way, how would you like to\n" .string "join TEAM ROCKET?\p" .string "We're a group of professional\n" @@ -23,13 +23,78 @@ Text_188CDB:: @ 8188CDB .string "I'll make you an offer you can't\n" .string "refuse!$" -Text_188DDC:: @ 8188DDC +Route24_Text_RocketDefeat:: @ 8188DDC .string "Arrgh!\n" .string "You are good!$" -gUnknown_8188DF1:: @ 8188DF1 +Route24_Text_YoudBecomeTopRocketLeader:: @ 8188DF1 .string "With your ability, you'd become\n" .string "a top leader in TEAM ROCKET.\p" .string "Come on, think of the opportunity!\n" .string "Don't let this chance go to waste.$" +Route24_Text_ShaneIntro:: @ 8188E74 + .string "I saw your feat from the grass!$" + +Route24_Text_ShaneDefeat:: @ 8188E94 + .string "I thought not!$" + +Route24_Text_ShanePostBattle:: @ 8188EA3 + .string "I hid because the people on the\n" + .string "bridge frightened me.$" + +Route24_Text_EthanIntro:: @ 8188ED9 + .string "Okay! I'm No. 5!\n" + .string "I'll stomp you!$" + +Route24_Text_EthanDefeat:: @ 8188EFA + .string "Whoa!\n" + .string "Too much!$" + +Route24_Text_EthanPostBattle:: @ 8188F0A + .string "I did my best. I have no regrets!$" + +Route24_Text_ReliIntro:: @ 8188F2C + .string "I'm No. 4!\n" + .string "Getting tired?$" + +Route24_Text_ReliDefeat:: @ 8188F46 + .string "I lost, too!$" + +Route24_Text_ReliPostBattle:: @ 8188F53 + .string "I did my best, so I've no regrets!$" + +Route24_Text_TimmyIntro:: @ 8188F76 + .string "Here's No. 3!\n" + .string "I won't be easy!$" + +Route24_Text_TimmyDefeat:: @ 8188F95 + .string "Ow!\n" + .string "Stomped flat!$" + +Route24_Text_TimmyPostBattle:: @ 8188FA7 + .string "I did my best. I have no regrets!$" + +Route24_Text_AliIntro:: @ 8188FC9 + .string "I'm second!\n" + .string "Now it's serious!$" + +Route24_Text_AliDefeat:: @ 8188FE7 + .string "How could I lose?$" + +Route24_Text_AliPostBattle:: @ 8188FF9 + .string "I did my best. I have no regrets!$" + +Route24_Text_CaleIntro:: @ 818901B + .string "People call this the NUGGET\n" + .string "BRIDGE!\p" + .string "Beat us five TRAINERS and win\n" + .string "a fabulous prize!\p" + .string "Think you got what it takes?$" + +Route24_Text_CaleDefeat:: @ 818908C + .string "Whoo!\n" + .string "Good stuff!$" + +Route24_Text_CalePostBattle:: @ 818909E + .string "I did my best. I have no regrets!$" diff --git a/data/maps/Route25/map.json b/data/maps/Route25/map.json index b36fe20cf..eee743a54 100644 --- a/data/maps/Route25/map.json +++ b/data/maps/Route25/map.json @@ -31,7 +31,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 4, - "script": "Route25_EventScript_1A98A1", + "script": "Route25_EventScript_Franklin", "flag": "0" }, { @@ -44,7 +44,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, - "script": "Route25_EventScript_1A976B", + "script": "Route25_EventScript_Joey", "flag": "0" }, { @@ -57,7 +57,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, - "script": "Route25_EventScript_1A991D", + "script": "Route25_EventScript_Wayne", "flag": "0" }, { @@ -70,7 +70,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, - "script": "Route25_EventScript_1A97A9", + "script": "Route25_EventScript_Dan", "flag": "0" }, { @@ -83,7 +83,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, - "script": "Route25_EventScript_1A9825", + "script": "Route25_EventScript_Kelsey", "flag": "0" }, { @@ -96,7 +96,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "Route25_EventScript_1A98DF", + "script": "Route25_EventScript_Nob", "flag": "0" }, { @@ -109,7 +109,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "Route25_EventScript_1A995B", + "script": "Route25_EventScript_Flint", "flag": "0" }, { @@ -122,7 +122,7 @@ "movement_range_y": 3, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, - "script": "Route25_EventScript_1A97E7", + "script": "Route25_EventScript_Chad", "flag": "0" }, { @@ -135,7 +135,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "Route25_EventScript_1A9863", + "script": "Route25_EventScript_Haley", "flag": "0" }, { @@ -174,7 +174,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route25_EventScript_1ACE4F", + "script": "Route25_EventScript_Beauty", "flag": "0" }, { @@ -187,7 +187,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route25_EventScript_16874F", + "script": "Route25_EventScript_Man", "flag": "0" } ], @@ -207,7 +207,7 @@ "x": 48, "y": 4, "elevation": 0, - "script": "Route25_EventScript_168746" + "script": "Route25_EventScript_SeaCottageSign" }, { "type": "hidden_item", diff --git a/data/maps/Route25/scripts.inc b/data/maps/Route25/scripts.inc index d214cdbf6..4dc03b3e9 100644 --- a/data/maps/Route25/scripts.inc +++ b/data/maps/Route25/scripts.inc @@ -1,10 +1,10 @@ Route25_MapScripts:: @ 8168745 .byte 0 -Route25_EventScript_168746:: @ 8168746 - msgbox gUnknown_818954C, MSGBOX_SIGN +Route25_EventScript_SeaCottageSign:: @ 8168746 + msgbox Route25_Text_SeaCottageSign, MSGBOX_SIGN end -Route25_EventScript_16874F:: @ 816874F - msgbox gUnknown_81895C2, MSGBOX_NPC +Route25_EventScript_Man:: @ 816874F + msgbox Route25_Text_AreYouHereAlone, MSGBOX_NPC end diff --git a/data/maps/Route25/text.inc b/data/maps/Route25/text.inc index cdc124108..56bf3df94 100644 --- a/data/maps/Route25/text.inc +++ b/data/maps/Route25/text.inc @@ -1,184 +1,118 @@ -Text_188E74:: @ 8188E74 - .string "I saw your feat from the grass!$" - -Text_188E94:: @ 8188E94 - .string "I thought not!$" - -Text_188EA3:: @ 8188EA3 - .string "I hid because the people on the\n" - .string "bridge frightened me.$" - -Text_188ED9:: @ 8188ED9 - .string "Okay! I'm No. 5!\n" - .string "I'll stomp you!$" - -Text_188EFA:: @ 8188EFA - .string "Whoa!\n" - .string "Too much!$" - -Text_188F0A:: @ 8188F0A - .string "I did my best. I have no regrets!$" - -Text_188F2C:: @ 8188F2C - .string "I'm No. 4!\n" - .string "Getting tired?$" - -Text_188F46:: @ 8188F46 - .string "I lost, too!$" - -Text_188F53:: @ 8188F53 - .string "I did my best, so I've no regrets!$" - -Text_188F76:: @ 8188F76 - .string "Here's No. 3!\n" - .string "I won't be easy!$" - -Text_188F95:: @ 8188F95 - .string "Ow!\n" - .string "Stomped flat!$" - -Text_188FA7:: @ 8188FA7 - .string "I did my best. I have no regrets!$" - -Text_188FC9:: @ 8188FC9 - .string "I'm second!\n" - .string "Now it's serious!$" - -Text_188FE7:: @ 8188FE7 - .string "How could I lose?$" - -Text_188FF9:: @ 8188FF9 - .string "I did my best. I have no regrets!$" - -Text_18901B:: @ 818901B - .string "People call this the NUGGET\n" - .string "BRIDGE!\p" - .string "Beat us five TRAINERS and win\n" - .string "a fabulous prize!\p" - .string "Think you got what it takes?$" - -Text_18908C:: @ 818908C - .string "Whoo!\n" - .string "Good stuff!$" - -Text_18909E:: @ 818909E - .string "I did my best. I have no regrets!$" - -Text_1890C0:: @ 81890C0 +Route25_Text_JoeyIntro:: @ 81890C0 .string "Local TRAINERS come here to\n" .string "practice.$" -Text_1890E6:: @ 81890E6 +Route25_Text_JoeyDefeat:: @ 81890E6 .string "You're decent.$" -Text_1890F5:: @ 81890F5 +Route25_Text_JoeyPostBattle:: @ 81890F5 .string "All POKéMON have weaknesses.\n" .string "Even the strongest ones.\p" .string "That's why it's best to raise\n" .string "POKéMON of different types.$" -Text_189165:: @ 8189165 +Route25_Text_DanIntro:: @ 8189165 .string "Dad took me to a great party on\n" .string "the S.S. ANNE at VERMILION CITY.$" -Text_1891A6:: @ 81891A6 +Route25_Text_DanDefeat:: @ 81891A6 .string "I'm not mad!$" -Text_1891B3:: @ 81891B3 +Route25_Text_DanPostBattle:: @ 81891B3 .string "On the S.S. ANNE, I saw TRAINERS\n" .string "from around the world.$" -Text_1891EB:: @ 81891EB +Route25_Text_FlintIntro:: @ 81891EB .string "I'm a cool guy.\n" .string "I've got a girlfriend!$" -Text_189212:: @ 8189212 +Route25_Text_FlintDefeat:: @ 8189212 .string "Aww, darn…$" -Text_18921D:: @ 818921D +Route25_Text_FlintPostBattle:: @ 818921D .string "Oh, well.\n" .string "My girlfriend will cheer me up.$" -Text_189247:: @ 8189247 +Route25_Text_KelseyIntro:: @ 8189247 .string "Hi!\n" .string "My boyfriend is cool!$" -Text_189261:: @ 8189261 +Route25_Text_KelseyDefeat:: @ 8189261 .string "My conditioning isn't the best…$" -Text_189281:: @ 8189281 +Route25_Text_KelseyPostBattle:: @ 8189281 .string "I wish my boyfriend was as good\n" .string "as you.$" -Text_1892A9:: @ 81892A9 +Route25_Text_ChadIntro:: @ 81892A9 .string "I had this feeling…\n" .string "I knew I had to battle you!$" -Text_1892D9:: @ 81892D9 +Route25_Text_ChadDefeat:: @ 81892D9 .string "I knew I'd lose, too!$" -Text_1892EF:: @ 81892EF +Route25_Text_ChadPostBattle:: @ 81892EF .string "If your POKéMON gets confused,\n" .string "switch it out.\p" .string "That's a good tactic.$" -Text_189333:: @ 8189333 +Route25_Text_HaleyIntro:: @ 8189333 .string "My friend has many cute POKéMON.\n" .string "I'm so jealous!$" -Text_189364:: @ 8189364 +Route25_Text_HaleyDefeat:: @ 8189364 .string "I'm not so jealous!$" -Text_189378:: @ 8189378 +Route25_Text_HaleyPostBattle:: @ 8189378 .string "You came from MT. MOON?\n" .string "May I have a CLEFAIRY?$" -Text_1893A7:: @ 81893A7 +Route25_Text_FranklinIntro:: @ 81893A7 .string "I just got down from MT. MOON,\n" .string "but I've still got gas in the tank!$" -Text_1893EA:: @ 81893EA +Route25_Text_FranklinDefeat:: @ 81893EA .string "You worked hard!$" -Text_1893FB:: @ 81893FB +Route25_Text_FranklinPostBattle:: @ 81893FB .string "Drat!\n" .string "A ZUBAT bit me back in that cave.$" -Text_189423:: @ 8189423 +Route25_Text_NobIntro:: @ 8189423 .string "I'm off to see a POKéMANIAC's\n" .string "collection at the cape.$" -Text_189459:: @ 8189459 +Route25_Text_NobDefeat:: @ 8189459 .string "You done got me, and real good,\n" .string "too!$" -Text_18947E:: @ 818947E +Route25_Text_NobPostBattle:: @ 818947E .string "The POKéMANIAC sure lives up to\n" .string "his name.\p" .string "His collection includes many rare\n" .string "species of POKéMON.$" -Text_1894DE:: @ 81894DE +Route25_Text_WayneIntro:: @ 81894DE .string "You're going to see BILL?\n" .string "First, we battle!$" -Text_18950A:: @ 818950A +Route25_Text_WayneDefeat:: @ 818950A .string "You're something.$" -Text_18951C:: @ 818951C +Route25_Text_WaynePostBattle:: @ 818951C .string "The trail below is a shortcut to\n" .string "CERULEAN CITY.$" -gUnknown_818954C:: @ 818954C +Route25_Text_SeaCottageSign:: @ 818954C .string "SEA COTTAGE\n" .string "BILL lives here!$" -Text_189569:: @ 8189569 +Route25_Text_MistyHighHopesAboutThisPlace:: @ 8189569 .string "This cape is a famous date spot.\p" .string "MISTY, the GYM LEADER, has high\n" .string "hopes about this place.$" -gUnknown_81895C2:: @ 81895C2 +Route25_Text_AreYouHereAlone:: @ 81895C2 .string "Hello, are you here alone?\p" .string "If you're out at CERULEAN's cape…\n" .string "Well, it should be as a couple.$" diff --git a/data/maps/Route25_SeaCottage/map.json b/data/maps/Route25_SeaCottage/map.json index 94327ef65..e8ac1df8d 100644 --- a/data/maps/Route25_SeaCottage/map.json +++ b/data/maps/Route25_SeaCottage/map.json @@ -25,7 +25,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route25_SeaCottage_EventScript_17054B", + "script": "Route25_SeaCottage_EventScript_Bill", "flag": "FLAG_HIDE_BILL_HUMAN_SEA_COTTAGE" }, { @@ -38,7 +38,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route25_SeaCottage_EventScript_17054B", + "script": "Route25_SeaCottage_EventScript_Bill", "flag": "FLAG_HIDE_BILL_CLEFAIRY" } ], @@ -72,7 +72,7 @@ "x": 4, "y": 5, "elevation": 0, - "script": "Route25_SeaCottage_EventScript_1706DD" + "script": "Route25_SeaCottage_EventScript_Computer" } ] } diff --git a/data/maps/Route25_SeaCottage/scripts.inc b/data/maps/Route25_SeaCottage/scripts.inc index ed5aca2c8..57c724c29 100644 --- a/data/maps/Route25_SeaCottage/scripts.inc +++ b/data/maps/Route25_SeaCottage/scripts.inc @@ -1,143 +1,150 @@ +.equ LOCALID_BILL_HUMAN, 1 +.equ LOCALID_BILL_CLEFAIRY, 2 + +.equ BILL_IN_TELEPORTER, FLAG_TEMP_2 +.equ RETURN_AFTER_SS_TICKET, FLAG_TEMP_3 + Route25_SeaCottage_MapScripts:: @ 8170523 map_script MAP_SCRIPT_ON_TRANSITION, Route25_SeaCottage_OnTransition .byte 0 Route25_SeaCottage_OnTransition:: @ 8170529 - call_if_unset FLAG_HELPED_BILL_IN_SEA_COTTAGE, EventScript_17053C - call_if_set FLAG_GOT_SS_TICKET, EventScript_170547 + call_if_unset FLAG_HELPED_BILL_IN_SEA_COTTAGE, Route25_SeaCottage_EventScript_HideClefairyBill + call_if_set FLAG_GOT_SS_TICKET, Route25_SeaCottage_EventScript_SetReturnedAfterSSTicket end -EventScript_17053C:: @ 817053C +Route25_SeaCottage_EventScript_HideClefairyBill:: @ 817053C clearflag FLAG_HIDE_BILL_CLEFAIRY - setobjectxyperm 1, 3, 3 + setobjectxyperm LOCALID_BILL_HUMAN, 3, 3 return -EventScript_170547:: @ 8170547 - setflag FLAG_TEMP_3 +Route25_SeaCottage_EventScript_SetReturnedAfterSSTicket:: @ 8170547 + setflag RETURN_AFTER_SS_TICKET return -Route25_SeaCottage_EventScript_17054B:: @ 817054B +Route25_SeaCottage_EventScript_Bill:: @ 817054B lock faceplayer - goto_if_set FLAG_TEMP_3, EventScript_1706C8 - goto_if_set FLAG_GOT_SS_TICKET, EventScript_170640 - goto_if_set FLAG_HELPED_BILL_IN_SEA_COTTAGE, EventScript_17064A + goto_if_set RETURN_AFTER_SS_TICKET, Route25_SeaCottage_EventScript_BillGoLookAtPC + goto_if_set FLAG_GOT_SS_TICKET, Route25_SeaCottage_EventScript_BillGoToSSAnne + goto_if_set FLAG_HELPED_BILL_IN_SEA_COTTAGE, Route25_SeaCottage_EventScript_BillGiveSSTicket checkplayergender compare VAR_RESULT, MALE - goto_if_eq EventScript_170580 + goto_if_eq Route25_SeaCottage_EventScript_BillAskForHelpMale compare VAR_RESULT, FEMALE - goto_if_eq EventScript_17058E + goto_if_eq Route25_SeaCottage_EventScript_BillAskForHelpFemale end -EventScript_170580:: @ 8170580 - msgbox gUnknown_819FDFA, MSGBOX_YESNO - goto EventScript_17059C +Route25_SeaCottage_EventScript_BillAskForHelpMale:: @ 8170580 + msgbox Route25_SeaCottage_Text_ImBillHelpMeOutPal, MSGBOX_YESNO + goto Route25_SeaCottage_EventScript_BillAskForHelp end -EventScript_17058E:: @ 817058E - msgbox gUnknown_819FEE6, MSGBOX_YESNO - goto EventScript_17059C +Route25_SeaCottage_EventScript_BillAskForHelpFemale:: @ 817058E + msgbox Route25_SeaCottage_Text_ImBillHelpMeOutLady, MSGBOX_YESNO + goto Route25_SeaCottage_EventScript_BillAskForHelp end -EventScript_17059C:: @ 817059C +Route25_SeaCottage_EventScript_BillAskForHelp:: @ 817059C compare VAR_RESULT, NO - call_if_eq EventScript_170600 - msgbox gUnknown_819FFD3 + call_if_eq Route25_SeaCottage_EventScript_DeclineHelpBill + msgbox Route25_SeaCottage_Text_RunCellSeparationOnPC closemessage delay 10 compare VAR_FACING, DIR_SOUTH - call_if_eq EventScript_17062A + call_if_eq Route25_SeaCottage_EventScript_BillWalkToTeleporterSouth compare VAR_FACING, DIR_NORTH - call_if_eq EventScript_170635 + call_if_eq Route25_SeaCottage_EventScript_BillWalkToTeleporter compare VAR_FACING, DIR_WEST - call_if_eq EventScript_170635 + call_if_eq Route25_SeaCottage_EventScript_BillWalkToTeleporter compare VAR_FACING, DIR_EAST - call_if_eq EventScript_170635 + call_if_eq Route25_SeaCottage_EventScript_BillWalkToTeleporter opendoor 10, 3 waitdooranim - applymovement 2, Movement_1706DB + applymovement LOCALID_BILL_CLEFAIRY, Route25_SeaCottage_Movement_BillEnterTeleporter waitmovement 0 - removeobject 2 + removeobject LOCALID_BILL_CLEFAIRY playse SE_C_MAKU_D closedoor 10, 3 waitdooranim - setflag FLAG_TEMP_2 + setflag BILL_IN_TELEPORTER release end -EventScript_170600:: @ 8170600 +@ Just returns after message, execution continues as if player had said yes +Route25_SeaCottage_EventScript_DeclineHelpBill:: @ 8170600 checkplayergender compare VAR_RESULT, MALE - call_if_eq EventScript_170618 + call_if_eq Route25_SeaCottage_EventScript_DeclineHelpBillMale compare VAR_RESULT, FEMALE - call_if_eq EventScript_170621 + call_if_eq Route25_SeaCottage_EventScript_DeclineHelpBillFemale return -EventScript_170618:: @ 8170618 - msgbox gUnknown_81A0035 +Route25_SeaCottage_EventScript_DeclineHelpBillMale:: @ 8170618 + msgbox Route25_SeaCottage_Text_NoPleaseChief return -EventScript_170621:: @ 8170621 - msgbox gUnknown_81A00B6 +Route25_SeaCottage_EventScript_DeclineHelpBillFemale:: @ 8170621 + msgbox Route25_SeaCottage_Text_NoPleaseBeautiful return -EventScript_17062A:: @ 817062A - applymovement 2, Movement_1706D5 +Route25_SeaCottage_EventScript_BillWalkToTeleporterSouth:: @ 817062A + applymovement LOCALID_BILL_CLEFAIRY, Route25_SeaCottage_Movement_BillWalkToTeleporterSouth waitmovement 0 return -EventScript_170635:: @ 8170635 - applymovement 2, Movement_1706D2 +Route25_SeaCottage_EventScript_BillWalkToTeleporter:: @ 8170635 + applymovement LOCALID_BILL_CLEFAIRY, Route25_SeaCottage_Movement_BillWalkToTeleporter waitmovement 0 return -EventScript_170640:: @ 8170640 - msgbox gUnknown_81A02CF +Route25_SeaCottage_EventScript_BillGoToSSAnne:: @ 8170640 + msgbox Route25_SeaCottage_Text_SSAnnePartyYouGoInstead release end -EventScript_17064A:: @ 817064A +Route25_SeaCottage_EventScript_BillGiveSSTicket:: @ 817064A famechecker FAMECHECKER_BILL, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005 checkplayergender compare VAR_RESULT, MALE - call_if_eq EventScript_1706AC + call_if_eq Route25_SeaCottage_EventScript_BillThanksMale compare VAR_RESULT, FEMALE - call_if_eq EventScript_1706B5 + call_if_eq Route25_SeaCottage_EventScript_BillThanksFemale checkitemspace ITEM_SS_TICKET, 1 compare VAR_RESULT, FALSE - goto_if_eq EventScript_1706BE - giveitem_msg gUnknown_81A028E, ITEM_SS_TICKET, 1, MUS_FAN5 + goto_if_eq Route25_SeaCottage_EventScript_NoRoomForSSTicket + giveitem_msg Route25_SeaCottage_Text_ReceivedSSTicketFromBill, ITEM_SS_TICKET, 1, MUS_FAN5 setflag FLAG_GOT_SS_TICKET_DUP setflag FLAG_HIDE_NUGGET_BRIDGE_ROCKET setflag FLAG_GOT_SS_TICKET setflag FLAG_SYS_NOT_SOMEONES_PC - goto EventScript_170640 + goto Route25_SeaCottage_EventScript_BillGoToSSAnne end -EventScript_1706AC:: @ 81706AC - msgbox gUnknown_81A013B +Route25_SeaCottage_EventScript_BillThanksMale:: @ 81706AC + msgbox Route25_SeaCottage_Text_ThanksBudTakeThis return -EventScript_1706B5:: @ 81706B5 - msgbox gUnknown_81A01E4 +Route25_SeaCottage_EventScript_BillThanksFemale:: @ 81706B5 + msgbox Route25_SeaCottage_Text_ThanksLadyTakeThis return -EventScript_1706BE:: @ 81706BE - msgbox gUnknown_81A02B4 +Route25_SeaCottage_EventScript_NoRoomForSSTicket:: @ 81706BE + msgbox Route25_SeaCottage_Text_YouveGotTooMuchStuff release end -EventScript_1706C8:: @ 81706C8 - msgbox gUnknown_81A03AB +Route25_SeaCottage_EventScript_BillGoLookAtPC:: @ 81706C8 + msgbox Route25_SeaCottage_Text_CheckOutRareMonsOnPC release end -Movement_1706D2:: @ 81706D2 +Route25_SeaCottage_Movement_BillWalkToTeleporter:: @ 81706D2 walk_up walk_up step_end -Movement_1706D5:: @ 81706D5 +Route25_SeaCottage_Movement_BillWalkToTeleporterSouth:: @ 81706D5 walk_right walk_up walk_up @@ -145,85 +152,85 @@ Movement_1706D5:: @ 81706D5 walk_in_place_fastest_up step_end -Movement_1706DB:: @ 81706DB +Route25_SeaCottage_Movement_BillEnterTeleporter:: @ 81706DB walk_up step_end -Route25_SeaCottage_EventScript_1706DD:: @ 81706DD +Route25_SeaCottage_EventScript_Computer:: @ 81706DD lockall - goto_if_set FLAG_TEMP_3, EventScript_1707CA - goto_if_set FLAG_TEMP_2, EventScript_1706FA - msgbox gUnknown_81A0402 + goto_if_set RETURN_AFTER_SS_TICKET, Route25_SeaCottage_EventScript_OpenBillsMonList + goto_if_set BILL_IN_TELEPORTER, Route25_SeaCottage_EventScript_RunCellSeparator + msgbox Route25_SeaCottage_Text_TeleporterIsDisplayed releaseall end -EventScript_1706FA:: @ 81706FA +Route25_SeaCottage_EventScript_RunCellSeparator:: @ 81706FA fadeoutbgm 0 - msgbox gUnknown_81A042D + msgbox Route25_SeaCottage_Text_InitiatedTeleportersCellSeparator closemessage - clearflag FLAG_TEMP_2 + clearflag BILL_IN_TELEPORTER setflag FLAG_HELPED_BILL_IN_SEA_COTTAGE special SpawnCameraObject - applymovement OBJ_EVENT_ID_CAMERA, Movement_1707BE + applymovement OBJ_EVENT_ID_CAMERA, Route25_SeaCottage_Movement_CameraPanToTeleporters waitmovement 0 delay 35 playse SE_PIN waitse setvar VAR_0x8004, 0 - special sub_809C4A8 + special AnimateTeleporterHousing delay 10 - call EventScript_1707B6 - call EventScript_1707B6 - call EventScript_1707B6 - call EventScript_1707B6 - call EventScript_1707B6 - call EventScript_1707B6 - call EventScript_1707B6 + call Route25_SeaCottage_EventScript_PlayTeleporterBeepSE + call Route25_SeaCottage_EventScript_PlayTeleporterBeepSE + call Route25_SeaCottage_EventScript_PlayTeleporterBeepSE + call Route25_SeaCottage_EventScript_PlayTeleporterBeepSE + call Route25_SeaCottage_EventScript_PlayTeleporterBeepSE + call Route25_SeaCottage_EventScript_PlayTeleporterBeepSE + call Route25_SeaCottage_EventScript_PlayTeleporterBeepSE setvar VAR_0x8004, 1 - special sub_809C4A8 + special AnimateTeleporterHousing playse SE_TK_WARPIN - special sub_809C5FC + special AnimateTeleporterCable waitse - call EventScript_1707B6 - call EventScript_1707B6 - call EventScript_1707B6 - call EventScript_1707B6 - call EventScript_1707B6 + call Route25_SeaCottage_EventScript_PlayTeleporterBeepSE + call Route25_SeaCottage_EventScript_PlayTeleporterBeepSE + call Route25_SeaCottage_EventScript_PlayTeleporterBeepSE + call Route25_SeaCottage_EventScript_PlayTeleporterBeepSE + call Route25_SeaCottage_EventScript_PlayTeleporterBeepSE opendoor 3, 3 waitdooranim fadeinbgm 0 - addobject 1 + addobject LOCALID_BILL_HUMAN clearflag FLAG_HIDE_BILL_HUMAN_SEA_COTTAGE delay 50 playfanfare MUS_FANFA1 - applymovement 1, Movement_170888 + applymovement LOCALID_BILL_HUMAN, Route25_SeaCottage_Movement_BillExitTeleporter waitmovement 0 waitfanfare - applymovement OBJ_EVENT_ID_CAMERA, Movement_1707C3 + applymovement OBJ_EVENT_ID_CAMERA, Route25_SeaCottage_Movement_CameraPanBackFromTeleporters waitmovement 0 playse SE_C_MAKU_D closedoor 3, 3 waitdooranim - applymovement 1, Movement_170881 + applymovement LOCALID_BILL_HUMAN, Route25_SeaCottage_Movement_BillWalkToMiddleOfRoom waitmovement 0 special RemoveCameraObject releaseall end -EventScript_1707B6:: @ 81707B6 +Route25_SeaCottage_EventScript_PlayTeleporterBeepSE:: @ 81707B6 playse SE_BOWA waitse delay 20 return -Movement_1707BE:: @ 81707BE +Route25_SeaCottage_Movement_CameraPanToTeleporters:: @ 81707BE walk_up walk_up walk_right walk_right step_end -Movement_1707C3:: @ 81707C3 +Route25_SeaCottage_Movement_CameraPanBackFromTeleporters:: @ 81707C3 delay_16 delay_16 walk_down @@ -232,65 +239,65 @@ Movement_1707C3:: @ 81707C3 walk_left step_end -EventScript_1707CA:: @ 81707CA - msgbox gUnknown_81A045B - goto EventScript_1707D8 +Route25_SeaCottage_EventScript_OpenBillsMonList:: @ 81707CA + msgbox Route25_SeaCottage_Text_BillsFavoriteMonList + goto Route25_SeaCottage_EventScript_BillsMonList end -EventScript_1707D8:: @ 81707D8 - message Text_1A0479 +Route25_SeaCottage_EventScript_BillsMonList:: @ 81707D8 + message Route25_SeaCottage_Text_SeeWhichMon waitmessage multichoice 0, 0, MULTICHOICE_EEVEELUTIONS, FALSE switch VAR_RESULT - case 0, EventScript_17082B - case 1, EventScript_170840 - case 2, EventScript_170855 - case 3, EventScript_17086A - case 4, EventScript_17087F - case 127, EventScript_17087F + case 0, Route25_SeaCottage_EventScript_ViewEevee + case 1, Route25_SeaCottage_EventScript_ViewFlareon + case 2, Route25_SeaCottage_EventScript_ViewJolteon + case 3, Route25_SeaCottage_EventScript_ViewVaporeon + case 4, Route25_SeaCottage_EventScript_ExitBillsMonList + case 127, Route25_SeaCottage_EventScript_ExitBillsMonList end -EventScript_17082B:: @ 817082B +Route25_SeaCottage_EventScript_ViewEevee:: @ 817082B drawmonpic SPECIES_EEVEE, 10, 3 waitbuttonpress erasemonpic setvar VAR_0x8004, SPECIES_EEVEE special Special_SetSeenMon - goto EventScript_1707D8 + goto Route25_SeaCottage_EventScript_BillsMonList end -EventScript_170840:: @ 8170840 +Route25_SeaCottage_EventScript_ViewFlareon:: @ 8170840 drawmonpic SPECIES_FLAREON, 10, 3 waitbuttonpress erasemonpic setvar VAR_0x8004, SPECIES_FLAREON special Special_SetSeenMon - goto EventScript_1707D8 + goto Route25_SeaCottage_EventScript_BillsMonList end -EventScript_170855:: @ 8170855 +Route25_SeaCottage_EventScript_ViewJolteon:: @ 8170855 drawmonpic SPECIES_JOLTEON, 10, 3 waitbuttonpress erasemonpic setvar VAR_0x8004, SPECIES_JOLTEON special Special_SetSeenMon - goto EventScript_1707D8 + goto Route25_SeaCottage_EventScript_BillsMonList end -EventScript_17086A:: @ 817086A +Route25_SeaCottage_EventScript_ViewVaporeon:: @ 817086A drawmonpic SPECIES_VAPOREON, 10, 3 waitbuttonpress erasemonpic setvar VAR_0x8004, SPECIES_VAPOREON special Special_SetSeenMon - goto EventScript_1707D8 + goto Route25_SeaCottage_EventScript_BillsMonList end -EventScript_17087F:: @ 817087F +Route25_SeaCottage_EventScript_ExitBillsMonList:: @ 817087F releaseall end -Movement_170881:: @ 8170881 +Route25_SeaCottage_Movement_BillWalkToMiddleOfRoom:: @ 8170881 walk_right walk_right walk_right @@ -299,6 +306,6 @@ Movement_170881:: @ 8170881 walk_down step_end -Movement_170888:: @ 8170888 +Route25_SeaCottage_Movement_BillExitTeleporter:: @ 8170888 walk_down step_end diff --git a/data/maps/Route25_SeaCottage/text.inc b/data/maps/Route25_SeaCottage/text.inc index 6ecacdd89..9fd189426 100644 --- a/data/maps/Route25_SeaCottage/text.inc +++ b/data/maps/Route25_SeaCottage/text.inc @@ -1,4 +1,4 @@ -gUnknown_819FDFA:: @ 819FDFA +Route25_SeaCottage_Text_ImBillHelpMeOutPal:: @ 819FDFA .string "Hiya! I'm a POKéMON…\n" .string "…No I'm not!\p" .string "Call me BILL!\n" @@ -11,7 +11,7 @@ gUnknown_819FDFA:: @ 819FDFA .string "So, how about it?\n" .string "Help me out here!$" -gUnknown_819FEE6:: @ 819FEE6 +Route25_SeaCottage_Text_ImBillHelpMeOutLady:: @ 819FEE6 .string "Hiya! I'm a POKéMON…\n" .string "…No I'm not!\p" .string "Call me BILL!\n" @@ -24,13 +24,13 @@ gUnknown_819FEE6:: @ 819FEE6 .string "So, how about it?\n" .string "Help me out here!$" -gUnknown_819FFD3:: @ 819FFD3 +Route25_SeaCottage_Text_RunCellSeparationOnPC:: @ 819FFD3 .string "Wait till I get inside the\n" .string "TELEPORTER.\p" .string "When I do, go to my PC and run\n" .string "the Cell Separation System.$" -gUnknown_81A0035:: @ 81A0035 +Route25_SeaCottage_Text_NoPleaseChief:: @ 81A0035 .string "No!?\n" .string "Now don't be so cold!\p" .string "Come on, you gotta help a guy in\n" @@ -40,7 +40,7 @@ gUnknown_81A0035:: @ 81A0035 .string "Okay?\l" .string "All right!$" -gUnknown_81A00B6:: @ 81A00B6 +Route25_SeaCottage_Text_NoPleaseBeautiful:: @ 81A00B6 .string "No!?\n" .string "Now don't be so cold!\p" .string "Come on, you gotta help a guy in\n" @@ -50,7 +50,7 @@ gUnknown_81A00B6:: @ 81A00B6 .string "Okay?\l" .string "All right!$" -gUnknown_81A013B:: @ 81A013B +Route25_SeaCottage_Text_ThanksBudTakeThis:: @ 81A013B .string "BILL: Yeehah!\n" .string "Thanks, bud! I owe you one!\p" .string "So, did you come to see my\n" @@ -60,7 +60,7 @@ gUnknown_81A013B:: @ 81A013B .string "I've got to thank you…\n" .string "Oh, here, maybe this'll do.$" -gUnknown_81A01E4:: @ 81A01E4 +Route25_SeaCottage_Text_ThanksLadyTakeThis:: @ 81A01E4 .string "BILL: Yeehah!\n" .string "Thanks, lady! I owe you one!\p" .string "So, did you come to see my\n" @@ -70,14 +70,14 @@ gUnknown_81A01E4:: @ 81A01E4 .string "I've got to thank you…\n" .string "Oh, here, maybe this'll do.$" -gUnknown_81A028E:: @ 81A028E +Route25_SeaCottage_Text_ReceivedSSTicketFromBill:: @ 81A028E .string "{PLAYER} received an S.S. TICKET\n" .string "from BILL.$" -gUnknown_81A02B4:: @ 81A02B4 +Route25_SeaCottage_Text_YouveGotTooMuchStuff:: @ 81A02B4 .string "You've got too much stuff!$" -gUnknown_81A02CF:: @ 81A02CF +Route25_SeaCottage_Text_SSAnnePartyYouGoInstead:: @ 81A02CF .string "That cruise ship S.S. ANNE is in\n" .string "VERMILION CITY.\p" .string "I hear there are lots of TRAINERS\n" @@ -87,22 +87,22 @@ gUnknown_81A02CF:: @ 81A02CF .string "Why don't you go instead of me?\n" .string "Go on and have a good time.$" -gUnknown_81A03AB:: @ 81A03AB +Route25_SeaCottage_Text_CheckOutRareMonsOnPC:: @ 81A03AB .string "BILL: Feel like checking out some\n" .string "of my rare POKéMON on my PC?\p" .string "Go on, check out my PC.$" -gUnknown_81A0402:: @ 81A0402 +Route25_SeaCottage_Text_TeleporterIsDisplayed:: @ 81A0402 .string "TELEPORTER is displayed on the PC\n" .string "monitor.$" -gUnknown_81A042D:: @ 81A042D +Route25_SeaCottage_Text_InitiatedTeleportersCellSeparator:: @ 81A042D .string "{PLAYER} initiated the TELEPORTER's\n" .string "Cell Separator.$" -gUnknown_81A045B:: @ 81A045B +Route25_SeaCottage_Text_BillsFavoriteMonList:: @ 81A045B .string "BILL's favorite POKéMON list!$" -Text_1A0479:: @ 81A0479 +Route25_SeaCottage_Text_SeeWhichMon:: @ 81A0479 .string "Which POKéMON do you want to see?$" diff --git a/data/scripts/fame_checker.inc b/data/scripts/fame_checker.inc index 67d34232c..c844cc115 100644 --- a/data/scripts/fame_checker.inc +++ b/data/scripts/fame_checker.inc @@ -59,19 +59,19 @@ PewterCity_Museum_1F_EventScript_PokemonJournalBrock:: @ 81ACE1C releaseall end -Route20_EventScript_1ACE36:: @ 81ACE36 +Route20_EventScript_Camper:: @ 81ACE36 lock faceplayer famechecker FAMECHECKER_MISTY, 3 - msgbox Text_1882E1 + msgbox Route20_Text_MistyTrainsHere release end -Route25_EventScript_1ACE4F:: @ 81ACE4F +Route25_EventScript_Beauty:: @ 81ACE4F lock faceplayer famechecker FAMECHECKER_MISTY, 4 - msgbox Text_189569 + msgbox Route25_Text_MistyHighHopesAboutThisPlace release end diff --git a/data/scripts/pc.inc b/data/scripts/pc.inc index 6e266bdfc..16cb13647 100644 --- a/data/scripts/pc.inc +++ b/data/scripts/pc.inc @@ -11,8 +11,9 @@ EventScript_PC:: @ 81A6955 goto EventScript_PCMainMenu end +@ For when the player first arrives on One Island EventScript_PCDisabled:: @ 81A698E - msgbox Text_UsualPCServicesUnavailable + msgbox OneIsland_PokemonCenter_1F_Text_UsualPCServicesUnavailable releaseall end @@ -90,7 +91,7 @@ EventScript_AccessProfOaksPC:: @ 81A6A7A compare VAR_RESULT, NO goto_if_eq EventScript_ExitOaksPC setflag FLAG_OAKS_RATING_IS_VIA_PC - call ProfOak_EventScript_RatePokedex + call PokedexRating_EventScript_Rate clearflag FLAG_OAKS_RATING_IS_VIA_PC goto EventScript_ExitOaksPC end diff --git a/data/scripts/pokedex_rating.inc b/data/scripts/pokedex_rating.inc index 4a3d39042..8d313d200 100644 --- a/data/scripts/pokedex_rating.inc +++ b/data/scripts/pokedex_rating.inc @@ -1,40 +1,40 @@ -ProfOak_EventScript_RatePokedexInPerson:: @ 81A737B +PokedexRating_EventScript_RateInPerson:: @ 81A737B goto_if_questlog EventScript_ReleaseEnd special sub_8112364 - call_if_set FLAG_OAK_SAW_DEX_COMPLETION, ProfOak_EventScript_DexCompleteIntro - call_if_unset FLAG_OAK_SAW_DEX_COMPLETION, ProfOak_EventScript_NormalIntro - call ProfOak_EventScript_RatePokedex + call_if_set FLAG_OAK_SAW_DEX_COMPLETION, PokedexRating_EventScript_DexCompleteIntro + call_if_unset FLAG_OAK_SAW_DEX_COMPLETION, PokedexRating_EventScript_NormalIntro + call PokedexRating_EventScript_Rate return -ProfOak_EventScript_DexCompleteIntro:: @ 81A73A4 - msgbox Text_LoveSeeingYourPokedex +PokedexRating_EventScript_DexCompleteIntro:: @ 81A73A4 + msgbox PokedexRating_Text_LoveSeeingYourPokedex return -ProfOak_EventScript_NormalIntro:: @ 81A73AD - msgbox Text_HowIsPokedexComingAlong +PokedexRating_EventScript_NormalIntro:: @ 81A73AD + msgbox PokedexRating_Text_HowIsPokedexComingAlong return -ProfOak_EventScript_ShowRatingMsg:: @ 81A73B6 +PokedexRating_EventScript_ShowRatingMsg:: @ 81A73B6 copyvar VAR_0x8004, VAR_0x8009 special Special_GetProfOaksRatingMessage waitmessage compare VAR_RESULT, FALSE - call_if_eq ProfOak_EventScript_RatingFanfare + call_if_eq PokedexRating_EventScript_NormalFanfare compare VAR_RESULT, TRUE - call_if_eq ProfOak_EventScript_DexCompleteFanfare + call_if_eq PokedexRating_EventScript_DexCompleteFanfare waitfanfare waitbuttonpress return -ProfOak_EventScript_RatingFanfare:: @ 81A73D8 +PokedexRating_EventScript_NormalFanfare:: @ 81A73D8 playfanfare MUS_FAN2 return -ProfOak_EventScript_DexCompleteFanfare:: @ 81A73DC +PokedexRating_EventScript_DexCompleteFanfare:: @ 81A73DC playfanfare MUS_FANFA5 return -ProfOak_EventScript_RatePokedex:: @ 81A73E0 +PokedexRating_EventScript_Rate:: @ 81A73E0 setvar VAR_0x8004, 31 special HelpSystem_BackupSomeVariable special Special_SetSomeVariable @@ -45,40 +45,40 @@ ProfOak_EventScript_RatePokedex:: @ 81A73E0 copyvar VAR_0x800A, VAR_RESULT getnumberstring 0, VAR_0x8008 @ Num Kanto Seen getnumberstring 1, VAR_0x8009 @ Num Kanto Caught - msgbox Text_YouveSeenXAndOwnedYMons - call_if_unset FLAG_OAKS_RATING_IS_VIA_PC, ProfOak_EventScript_SetTextColor - call ProfOak_EventScript_ShowRatingMsg + msgbox PokedexRating_Text_SeenXOwnedY + call_if_unset FLAG_OAKS_RATING_IS_VIA_PC, PokedexRating_EventScript_SetTextColor + call PokedexRating_EventScript_ShowRatingMsg compare VAR_0x800A, FALSE - goto_if_eq ProfOak_EventScript_EndRatePokedex @ National Dex not enabled + goto_if_eq PokedexRating_EventScript_EndRating @ National Dex not enabled setvar VAR_0x8004, 1 specialvar VAR_RESULT, Special_GetPokedexCount copyvar VAR_0x8008, VAR_0x8005 copyvar VAR_0x8009, VAR_0x8006 getnumberstring 0, VAR_0x8008 @ Num National Seen getnumberstring 1, VAR_0x8009 @ Num National Caught - msgbox Text_AndNationalDexSeenXOwnedY + msgbox PokedexRating_Text_NationalDexSeenXOwnedY specialvar VAR_RESULT, HasAllMons compare VAR_RESULT, FALSE - goto_if_eq ProfOak_EventScript_DexIncomplete + goto_if_eq PokedexRating_EventScript_DexIncomplete compare VAR_RESULT, TRUE - goto_if_eq ProfOak_EventScript_DexComplete + goto_if_eq PokedexRating_EventScript_DexComplete end -ProfOak_EventScript_SetTextColor:: @ 81A746D +PokedexRating_EventScript_SetTextColor:: @ 81A746D textcolor 0 return -ProfOak_EventScript_DexIncomplete:: @ 81A7470 - msgbox Text_LookForwardToFilledNationalDex - goto ProfOak_EventScript_EndRatePokedex +PokedexRating_EventScript_DexIncomplete:: @ 81A7470 + msgbox PokedexRating_Text_LookForwardToFilledNationalDex + goto PokedexRating_EventScript_EndRating end -ProfOak_EventScript_DexComplete:: @ 81A747E +PokedexRating_EventScript_DexComplete:: @ 81A747E setflag FLAG_OAK_SAW_DEX_COMPLETION - msgbox Text_YouveCompletedDex - goto ProfOak_EventScript_EndRatePokedex + msgbox PokedexRating_Text_YouveCompletedDex + goto PokedexRating_EventScript_EndRating end -ProfOak_EventScript_EndRatePokedex:: @ 81A748F +PokedexRating_EventScript_EndRating:: @ 81A748F special HelpSystem_RestoreSomeVariable return diff --git a/data/scripts/trainers.inc b/data/scripts/trainers.inc index 3d5f60008..eaa76b1fa 100644 --- a/data/scripts/trainers.inc +++ b/data/scripts/trainers.inc @@ -115,199 +115,199 @@ Route4_EventScript_CrissyRematch:: @ 81A95E0 msgbox Route4_Text_CrissyPostBattle, MSGBOX_AUTOCLOSE end -Route24_EventScript_1A95F7:: @ 81A95F7 - trainerbattle_single TRAINER_YOUNGSTER_TIMMY, Text_188F76, Text_188F95 +Route24_EventScript_Timmy:: @ 81A95F7 + trainerbattle_single TRAINER_YOUNGSTER_TIMMY, Route24_Text_TimmyIntro, Route24_Text_TimmyDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1A961E - msgbox Text_188FA7, MSGBOX_AUTOCLOSE + goto_if_eq Route24_EventScript_TimmyRematch + msgbox Route24_Text_TimmyPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1A961E:: @ 81A961E - trainerbattle_rematch TRAINER_YOUNGSTER_TIMMY, Text_1C3657, Text_188F95 - msgbox Text_188FA7, MSGBOX_AUTOCLOSE +Route24_EventScript_TimmyRematch:: @ 81A961E + trainerbattle_rematch TRAINER_YOUNGSTER_TIMMY, Route24_Text_TimmyRematchIntro, Route24_Text_TimmyDefeat + msgbox Route24_Text_TimmyPostBattle, MSGBOX_AUTOCLOSE end -Route24_EventScript_1A9635:: @ 81A9635 - trainerbattle_single TRAINER_BUG_CATCHER_CALE, Text_18901B, Text_18908C +Route24_EventScript_Cale:: @ 81A9635 + trainerbattle_single TRAINER_BUG_CATCHER_CALE, Route24_Text_CaleIntro, Route24_Text_CaleDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1A965C - msgbox Text_18909E, MSGBOX_AUTOCLOSE + goto_if_eq Route24_EventScript_CaleRematch + msgbox Route24_Text_CalePostBattle, MSGBOX_AUTOCLOSE end -EventScript_1A965C:: @ 81A965C - trainerbattle_rematch TRAINER_BUG_CATCHER_CALE, Text_1C36DA, Text_18908C - msgbox Text_18909E, MSGBOX_AUTOCLOSE +Route24_EventScript_CaleRematch:: @ 81A965C + trainerbattle_rematch TRAINER_BUG_CATCHER_CALE, Route24_Text_CaleRematchIntro, Route24_Text_CaleDefeat + msgbox Route24_Text_CalePostBattle, MSGBOX_AUTOCLOSE end -Route24_EventScript_1A9673:: @ 81A9673 - trainerbattle_single TRAINER_LASS_RELI, Text_188F2C, Text_188F46 +Route24_EventScript_Reli:: @ 81A9673 + trainerbattle_single TRAINER_LASS_RELI, Route24_Text_ReliIntro, Route24_Text_ReliDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1A969A - msgbox Text_188F53, MSGBOX_AUTOCLOSE + goto_if_eq Route24_EventScript_ReliRematch + msgbox Route24_Text_ReliPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1A969A:: @ 81A969A - trainerbattle_rematch TRAINER_LASS_RELI, Text_1C3624, Text_188F46 - msgbox Text_188F53, MSGBOX_AUTOCLOSE +Route24_EventScript_ReliRematch:: @ 81A969A + trainerbattle_rematch TRAINER_LASS_RELI, Route24_Text_ReliRematchIntro, Route24_Text_ReliDefeat + msgbox Route24_Text_ReliPostBattle, MSGBOX_AUTOCLOSE end -Route24_EventScript_1A96B1:: @ 81A96B1 - trainerbattle_single TRAINER_LASS_ALI, Text_188FC9, Text_188FE7 +Route24_EventScript_Ali:: @ 81A96B1 + trainerbattle_single TRAINER_LASS_ALI, Route24_Text_AliIntro, Route24_Text_AliDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1A96D8 - msgbox Text_188FF9, MSGBOX_AUTOCLOSE + goto_if_eq Route24_EventScript_AliRematch + msgbox Route24_Text_AliPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1A96D8:: @ 81A96D8 - trainerbattle_rematch TRAINER_LASS_ALI, Text_1C3685, Text_188FE7 - msgbox Text_188FF9, MSGBOX_AUTOCLOSE +Route24_EventScript_AliRematch:: @ 81A96D8 + trainerbattle_rematch TRAINER_LASS_ALI, Route24_Text_AliRematchIntro, Route24_Text_AliDefeat + msgbox Route24_Text_AliPostBattle, MSGBOX_AUTOCLOSE end -Route24_EventScript_1A96EF:: @ 81A96EF - trainerbattle_single TRAINER_CAMPER_SHANE, Text_188E74, Text_188E94 +Route24_EventScript_Shane:: @ 81A96EF + trainerbattle_single TRAINER_CAMPER_SHANE, Route24_Text_ShaneIntro, Route24_Text_ShaneDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1A9716 - msgbox Text_188EA3, MSGBOX_AUTOCLOSE + goto_if_eq Route24_EventScript_ShaneRematch + msgbox Route24_Text_ShanePostBattle, MSGBOX_AUTOCLOSE end -EventScript_1A9716:: @ 81A9716 - trainerbattle_rematch TRAINER_CAMPER_SHANE, Text_1C35EE, Text_188E94 - msgbox Text_188EA3, MSGBOX_AUTOCLOSE +Route24_EventScript_ShaneRematch:: @ 81A9716 + trainerbattle_rematch TRAINER_CAMPER_SHANE, Route24_Text_ShaneRematchIntro, Route24_Text_ShaneDefeat + msgbox Route24_Text_ShanePostBattle, MSGBOX_AUTOCLOSE end -Route24_EventScript_1A972D:: @ 81A972D - trainerbattle_single TRAINER_CAMPER_ETHAN, Text_188ED9, Text_188EFA +Route24_EventScript_Ethan:: @ 81A972D + trainerbattle_single TRAINER_CAMPER_ETHAN, Route24_Text_EthanIntro, Route24_Text_EthanDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1A9754 - msgbox Text_188F0A, MSGBOX_AUTOCLOSE + goto_if_eq Route24_EventScript_EthanRematch + msgbox Route24_Text_EthanPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1A9754:: @ 81A9754 - trainerbattle_rematch TRAINER_CAMPER_ETHAN, Text_1C360E, Text_188EFA - msgbox Text_188F0A, MSGBOX_AUTOCLOSE +Route24_EventScript_EthanRematch:: @ 81A9754 + trainerbattle_rematch TRAINER_CAMPER_ETHAN, Route24_Text_EthanRematchIntro, Route24_Text_EthanDefeat + msgbox Route24_Text_EthanPostBattle, MSGBOX_AUTOCLOSE end -Route25_EventScript_1A976B:: @ 81A976B - trainerbattle_single TRAINER_YOUNGSTER_JOEY, Text_1890C0, Text_1890E6 +Route25_EventScript_Joey:: @ 81A976B + trainerbattle_single TRAINER_YOUNGSTER_JOEY, Route25_Text_JoeyIntro, Route25_Text_JoeyDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1A9792 - msgbox Text_1890F5, MSGBOX_AUTOCLOSE + goto_if_eq Route25_EventScript_JoeyRematch + msgbox Route25_Text_JoeyPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1A9792:: @ 81A9792 - trainerbattle_rematch TRAINER_YOUNGSTER_JOEY, Text_1C33E7, Text_1890E6 - msgbox Text_1890F5, MSGBOX_AUTOCLOSE +Route25_EventScript_JoeyRematch:: @ 81A9792 + trainerbattle_rematch TRAINER_YOUNGSTER_JOEY, Route25_Text_JoeyRematchIntro, Route25_Text_JoeyDefeat + msgbox Route25_Text_JoeyPostBattle, MSGBOX_AUTOCLOSE end -Route25_EventScript_1A97A9:: @ 81A97A9 - trainerbattle_single TRAINER_YOUNGSTER_DAN, Text_189165, Text_1891A6 +Route25_EventScript_Dan:: @ 81A97A9 + trainerbattle_single TRAINER_YOUNGSTER_DAN, Route25_Text_DanIntro, Route25_Text_DanDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1A97D0 - msgbox Text_1891B3, MSGBOX_AUTOCLOSE + goto_if_eq Route25_EventScript_DanRematch + msgbox Route25_Text_DanPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1A97D0:: @ 81A97D0 - trainerbattle_rematch TRAINER_YOUNGSTER_DAN, Text_1C3404, Text_1891A6 - msgbox Text_1891B3, MSGBOX_AUTOCLOSE +Route25_EventScript_DanRematch:: @ 81A97D0 + trainerbattle_rematch TRAINER_YOUNGSTER_DAN, Route25_Text_DanRematchIntro, Route25_Text_DanDefeat + msgbox Route25_Text_DanPostBattle, MSGBOX_AUTOCLOSE end -Route25_EventScript_1A97E7:: @ 81A97E7 - trainerbattle_single TRAINER_YOUNGSTER_CHAD, Text_1892A9, Text_1892D9 +Route25_EventScript_Chad:: @ 81A97E7 + trainerbattle_single TRAINER_YOUNGSTER_CHAD, Route25_Text_ChadIntro, Route25_Text_ChadDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1A980E - msgbox Text_1892EF, MSGBOX_AUTOCLOSE + goto_if_eq Route25_EventScript_ChadRematch + msgbox Route25_Text_ChadPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1A980E:: @ 81A980E - trainerbattle_rematch TRAINER_YOUNGSTER_CHAD, Text_1C34D4, Text_1892D9 - msgbox Text_1892EF, MSGBOX_AUTOCLOSE +Route25_EventScript_ChadRematch:: @ 81A980E + trainerbattle_rematch TRAINER_YOUNGSTER_CHAD, Route25_Text_ChadRematchIntro, Route25_Text_ChadDefeat + msgbox Route25_Text_ChadPostBattle, MSGBOX_AUTOCLOSE end -Route25_EventScript_1A9825:: @ 81A9825 - trainerbattle_single TRAINER_PICNICKER_KELSEY, Text_189247, Text_189261 +Route25_EventScript_Kelsey:: @ 81A9825 + trainerbattle_single TRAINER_PICNICKER_KELSEY, Route25_Text_KelseyIntro, Route25_Text_KelseyDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1A984C - msgbox Text_189281, MSGBOX_AUTOCLOSE + goto_if_eq Route25_EventScript_KelseyRematch + msgbox Route25_Text_KelseyPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1A984C:: @ 81A984C - trainerbattle_rematch TRAINER_PICNICKER_KELSEY, Text_1C349C, Text_189261 - msgbox Text_189281, MSGBOX_AUTOCLOSE +Route25_EventScript_KelseyRematch:: @ 81A984C + trainerbattle_rematch TRAINER_PICNICKER_KELSEY, Route25_Text_KelseyRematchIntro, Route25_Text_KelseyDefeat + msgbox Route25_Text_KelseyPostBattle, MSGBOX_AUTOCLOSE end -Route25_EventScript_1A9863:: @ 81A9863 - trainerbattle_single TRAINER_LASS_HALEY, Text_189333, Text_189364 +Route25_EventScript_Haley:: @ 81A9863 + trainerbattle_single TRAINER_LASS_HALEY, Route25_Text_HaleyIntro, Route25_Text_HaleyDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1A988A - msgbox Text_189378, MSGBOX_AUTOCLOSE + goto_if_eq Route25_EventScript_HaleyRematch + msgbox Route25_Text_HaleyPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1A988A:: @ 81A988A - trainerbattle_rematch TRAINER_LASS_HALEY, Text_1C350A, Text_189364 - msgbox Text_189378, MSGBOX_AUTOCLOSE +Route25_EventScript_HaleyRematch:: @ 81A988A + trainerbattle_rematch TRAINER_LASS_HALEY, Route25_Text_HaleyRematchIntro, Route25_Text_HaleyDefeat + msgbox Route25_Text_HaleyPostBattle, MSGBOX_AUTOCLOSE end -Route25_EventScript_1A98A1:: @ 81A98A1 - trainerbattle_single TRAINER_HIKER_FRANKLIN, Text_1893A7, Text_1893EA +Route25_EventScript_Franklin:: @ 81A98A1 + trainerbattle_single TRAINER_HIKER_FRANKLIN, Route25_Text_FranklinIntro, Route25_Text_FranklinDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1A98C8 - msgbox Text_1893FB, MSGBOX_AUTOCLOSE + goto_if_eq Route25_EventScript_FranklinRematch + msgbox Route25_Text_FranklinPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1A98C8:: @ 81A98C8 - trainerbattle_rematch TRAINER_HIKER_FRANKLIN, Text_1C353B, Text_1893EA - msgbox Text_1893FB, MSGBOX_AUTOCLOSE +Route25_EventScript_FranklinRematch:: @ 81A98C8 + trainerbattle_rematch TRAINER_HIKER_FRANKLIN, Route25_Text_FranklinRematchIntro, Route25_Text_FranklinDefeat + msgbox Route25_Text_FranklinPostBattle, MSGBOX_AUTOCLOSE end -Route25_EventScript_1A98DF:: @ 81A98DF - trainerbattle_single TRAINER_HIKER_NOB, Text_189423, Text_189459 +Route25_EventScript_Nob:: @ 81A98DF + trainerbattle_single TRAINER_HIKER_NOB, Route25_Text_NobIntro, Route25_Text_NobDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1A9906 - msgbox Text_18947E, MSGBOX_AUTOCLOSE + goto_if_eq Route25_EventScript_NobRematch + msgbox Route25_Text_NobPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1A9906:: @ 81A9906 - trainerbattle_rematch TRAINER_HIKER_NOB, Text_1C357E, Text_189459 - msgbox Text_18947E, MSGBOX_AUTOCLOSE +Route25_EventScript_NobRematch:: @ 81A9906 + trainerbattle_rematch TRAINER_HIKER_NOB, Route25_Text_NobRematchIntro, Route25_Text_NobDefeat + msgbox Route25_Text_NobPostBattle, MSGBOX_AUTOCLOSE end -Route25_EventScript_1A991D:: @ 81A991D - trainerbattle_single TRAINER_HIKER_WAYNE, Text_1894DE, Text_18950A +Route25_EventScript_Wayne:: @ 81A991D + trainerbattle_single TRAINER_HIKER_WAYNE, Route25_Text_WayneIntro, Route25_Text_WayneDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1A9944 - msgbox Text_18951C, MSGBOX_AUTOCLOSE + goto_if_eq Route25_EventScript_WayneRematch + msgbox Route25_Text_WaynePostBattle, MSGBOX_AUTOCLOSE end -EventScript_1A9944:: @ 81A9944 - trainerbattle_rematch TRAINER_HIKER_WAYNE, Text_1C35BC, Text_18950A - msgbox Text_18951C, MSGBOX_AUTOCLOSE +Route25_EventScript_WayneRematch:: @ 81A9944 + trainerbattle_rematch TRAINER_HIKER_WAYNE, Route25_Text_WayneRematchIntro, Route25_Text_WayneDefeat + msgbox Route25_Text_WaynePostBattle, MSGBOX_AUTOCLOSE end -Route25_EventScript_1A995B:: @ 81A995B - trainerbattle_single TRAINER_CAMPER_FLINT, Text_1891EB, Text_189212 +Route25_EventScript_Flint:: @ 81A995B + trainerbattle_single TRAINER_CAMPER_FLINT, Route25_Text_FlintIntro, Route25_Text_FlintDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1A9982 - msgbox Text_18921D, MSGBOX_AUTOCLOSE + goto_if_eq Route25_EventScript_FlintRematch + msgbox Route25_Text_FlintPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1A9982:: @ 81A9982 - trainerbattle_rematch TRAINER_CAMPER_FLINT, Text_1C3445, Text_189212 - msgbox Text_18921D, MSGBOX_AUTOCLOSE +Route25_EventScript_FlintRematch:: @ 81A9982 + trainerbattle_rematch TRAINER_CAMPER_FLINT, Route25_Text_FlintRematchIntro, Route25_Text_FlintDefeat + msgbox Route25_Text_FlintPostBattle, MSGBOX_AUTOCLOSE end Route6_EventScript_Keigo:: @ 81A9999 @@ -1285,1031 +1285,1031 @@ Route14_EventScript_JanRematch:: @ 81AABD8 msgbox Route14_Text_JanPostBattle, MSGBOX_AUTOCLOSE end -Route15_EventScript_1AABF3:: @ 81AABF3 - trainerbattle_single TRAINER_BIKER_ERNEST, Text_1868B6, Text_1868E8 +Route15_EventScript_Ernest:: @ 81AABF3 + trainerbattle_single TRAINER_BIKER_ERNEST, Route15_Text_ErnestIntro, Route15_Text_ErnestDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AAC1A - msgbox Text_1868F1, MSGBOX_AUTOCLOSE + goto_if_eq Route15_EventScript_ErnestRematch + msgbox Route15_Text_ErnestPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AAC1A:: @ 81AAC1A - trainerbattle_rematch TRAINER_BIKER_ERNEST, Text_1C27E7, Text_1868E8 - msgbox Text_1868F1, MSGBOX_AUTOCLOSE +Route15_EventScript_ErnestRematch:: @ 81AAC1A + trainerbattle_rematch TRAINER_BIKER_ERNEST, Route15_Text_ErnestRematchIntro, Route15_Text_ErnestDefeat + msgbox Route15_Text_ErnestPostBattle, MSGBOX_AUTOCLOSE end -Route15_EventScript_1AAC31:: @ 81AAC31 - trainerbattle_single TRAINER_BIKER_ALEX, Text_186936, Text_186968 +Route15_EventScript_Alex:: @ 81AAC31 + trainerbattle_single TRAINER_BIKER_ALEX, Route15_Text_AlexIntro, Route15_Text_AlexDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AAC58 - msgbox Text_18697C, MSGBOX_AUTOCLOSE + goto_if_eq Route15_EventScript_AlexRematch + msgbox Route15_Text_AlexPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AAC58:: @ 81AAC58 - trainerbattle_rematch TRAINER_BIKER_ALEX, Text_1C2814, Text_186968 - msgbox Text_18697C, MSGBOX_AUTOCLOSE +Route15_EventScript_AlexRematch:: @ 81AAC58 + trainerbattle_rematch TRAINER_BIKER_ALEX, Route15_Text_AlexRematchIntro, Route15_Text_AlexDefeat + msgbox Route15_Text_AlexPostBattle, MSGBOX_AUTOCLOSE end -Route15_EventScript_1AAC6F:: @ 81AAC6F - trainerbattle_single TRAINER_BEAUTY_GRACE, Text_18678B, Text_1867C1 +Route15_EventScript_Grace:: @ 81AAC6F + trainerbattle_single TRAINER_BEAUTY_GRACE, Route15_Text_GraceIntro, Route15_Text_GraceDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AAC96 - msgbox Text_1867DA, MSGBOX_AUTOCLOSE + goto_if_eq Route15_EventScript_GraceRematch + msgbox Route15_Text_GracePostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AAC96:: @ 81AAC96 - trainerbattle_rematch TRAINER_BEAUTY_GRACE, Text_1C2753, Text_1867C1 - msgbox Text_1867DA, MSGBOX_AUTOCLOSE +Route15_EventScript_GraceRematch:: @ 81AAC96 + trainerbattle_rematch TRAINER_BEAUTY_GRACE, Route15_Text_GraceRematchIntro, Route15_Text_GraceDefeat + msgbox Route15_Text_GracePostBattle, MSGBOX_AUTOCLOSE end -Route15_EventScript_1AACAD:: @ 81AACAD - trainerbattle_single TRAINER_BEAUTY_OLIVIA, Text_18680C, Text_186841 +Route15_EventScript_Olivia:: @ 81AACAD + trainerbattle_single TRAINER_BEAUTY_OLIVIA, Route15_Text_OliviaIntro, Route15_Text_OliviaDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AACD4 - msgbox Text_18686F, MSGBOX_AUTOCLOSE + goto_if_eq Route15_EventScript_OliviaRematch + msgbox Route15_Text_OliviaPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AACD4:: @ 81AACD4 - trainerbattle_rematch TRAINER_BEAUTY_OLIVIA, Text_1C279D, Text_186841 - msgbox Text_18686F, MSGBOX_AUTOCLOSE +Route15_EventScript_OliviaRematch:: @ 81AACD4 + trainerbattle_rematch TRAINER_BEAUTY_OLIVIA, Route15_Text_OliviaRematchIntro, Route15_Text_OliviaDefeat + msgbox Route15_Text_OliviaPostBattle, MSGBOX_AUTOCLOSE end -Route15_EventScript_1AACEB:: @ 81AACEB - trainerbattle_single TRAINER_BIRD_KEEPER_EDWIN, Text_18664F, Text_18667A +Route15_EventScript_Edwin:: @ 81AACEB + trainerbattle_single TRAINER_BIRD_KEEPER_EDWIN, Route15_Text_EdwinIntro, Route15_Text_EdwinDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AAD12 - msgbox Text_18668D, MSGBOX_AUTOCLOSE + goto_if_eq Route15_EventScript_EdwinRematch + msgbox Route15_Text_EdwinPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AAD12:: @ 81AAD12 - trainerbattle_rematch TRAINER_BIRD_KEEPER_EDWIN, Text_1C26D3, Text_18667A - msgbox Text_18668D, MSGBOX_AUTOCLOSE +Route15_EventScript_EdwinRematch:: @ 81AAD12 + trainerbattle_rematch TRAINER_BIRD_KEEPER_EDWIN, Route15_Text_EdwinRematchIntro, Route15_Text_EdwinDefeat + msgbox Route15_Text_EdwinPostBattle, MSGBOX_AUTOCLOSE end -Route15_EventScript_1AAD29:: @ 81AAD29 - trainerbattle_single TRAINER_BIRD_KEEPER_CHESTER, Text_1866D1, Text_186707 +Route15_EventScript_Chester:: @ 81AAD29 + trainerbattle_single TRAINER_BIRD_KEEPER_CHESTER, Route15_Text_ChesterIntro, Route15_Text_ChesterDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AAD50 - msgbox Text_18671A, MSGBOX_AUTOCLOSE + goto_if_eq Route15_EventScript_ChesterRematch + msgbox Route15_Text_ChesterPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AAD50:: @ 81AAD50 - trainerbattle_rematch TRAINER_BIRD_KEEPER_CHESTER, Text_1C2717, Text_186707 - msgbox Text_18671A, MSGBOX_AUTOCLOSE +Route15_EventScript_ChesterRematch:: @ 81AAD50 + trainerbattle_rematch TRAINER_BIRD_KEEPER_CHESTER, Route15_Text_ChesterRematchIntro, Route15_Text_ChesterDefeat + msgbox Route15_Text_ChesterPostBattle, MSGBOX_AUTOCLOSE end -Route15_EventScript_1AAD67:: @ 81AAD67 - trainerbattle_single TRAINER_PICNICKER_YAZMIN, Text_186A22, Text_186A40 +Route15_EventScript_Yazmin:: @ 81AAD67 + trainerbattle_single TRAINER_PICNICKER_YAZMIN, Route15_Text_YazminIntro, Route15_Text_YazminDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AAD8E - msgbox Text_186A55, MSGBOX_AUTOCLOSE + goto_if_eq Route15_EventScript_YazminRematch + msgbox Route15_Text_YazminPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AAD8E:: @ 81AAD8E - trainerbattle_rematch TRAINER_PICNICKER_YAZMIN, Text_1C287D, Text_186A40 - msgbox Text_186A55, MSGBOX_AUTOCLOSE +Route15_EventScript_YazminRematch:: @ 81AAD8E + trainerbattle_rematch TRAINER_PICNICKER_YAZMIN, Route15_Text_YazminRematchIntro, Route15_Text_YazminDefeat + msgbox Route15_Text_YazminPostBattle, MSGBOX_AUTOCLOSE end -Route15_EventScript_1AADA5:: @ 81AADA5 - trainerbattle_single TRAINER_PICNICKER_KINDRA, Text_18650B, Text_186549 +Route15_EventScript_Kindra:: @ 81AADA5 + trainerbattle_single TRAINER_PICNICKER_KINDRA, Route15_Text_KindraIntro, Route15_Text_KindraDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AADCC - msgbox Text_18655A, MSGBOX_AUTOCLOSE + goto_if_eq Route15_EventScript_KindraRematch + msgbox Route15_Text_KindraPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AADCC:: @ 81AADCC - trainerbattle_rematch TRAINER_PICNICKER_KINDRA, Text_1C2650, Text_186549 - msgbox Text_18655A, MSGBOX_AUTOCLOSE +Route15_EventScript_KindraRematch:: @ 81AADCC + trainerbattle_rematch TRAINER_PICNICKER_KINDRA, Route15_Text_KindraRematchIntro, Route15_Text_KindraDefeat + msgbox Route15_Text_KindraPostBattle, MSGBOX_AUTOCLOSE end -Route15_EventScript_1AADE3:: @ 81AADE3 - trainerbattle_single TRAINER_PICNICKER_BECKY, Text_1865D3, Text_186612 +Route15_EventScript_Becky:: @ 81AADE3 + trainerbattle_single TRAINER_PICNICKER_BECKY, Route15_Text_BeckyIntro, Route15_Text_BeckyDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AAE0A - msgbox Text_18661D, MSGBOX_AUTOCLOSE + goto_if_eq Route15_EventScript_BeckyRematch + msgbox Route15_Text_BeckyPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AAE0A:: @ 81AAE0A - trainerbattle_rematch TRAINER_PICNICKER_BECKY, Text_1C268D, Text_186612 - msgbox Text_18661D, MSGBOX_AUTOCLOSE +Route15_EventScript_BeckyRematch:: @ 81AAE0A + trainerbattle_rematch TRAINER_PICNICKER_BECKY, Route15_Text_BeckyRematchIntro, Route15_Text_BeckyDefeat + msgbox Route15_Text_BeckyPostBattle, MSGBOX_AUTOCLOSE end -Route15_EventScript_1AAE21:: @ 81AAE21 - trainerbattle_single TRAINER_PICNICKER_CELIA, Text_1869BA, Text_1869E6 +Route15_EventScript_Celia:: @ 81AAE21 + trainerbattle_single TRAINER_PICNICKER_CELIA, Route15_Text_CeliaIntro, Route15_Text_CeliaDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AAE48 - msgbox Text_1869F4, MSGBOX_AUTOCLOSE + goto_if_eq Route15_EventScript_CeliaRematch + msgbox Route15_Text_CeliaPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AAE48:: @ 81AAE48 - trainerbattle_rematch TRAINER_PICNICKER_CELIA, Text_1C2846, Text_1869E6 - msgbox Text_1869F4, MSGBOX_AUTOCLOSE +Route15_EventScript_CeliaRematch:: @ 81AAE48 + trainerbattle_rematch TRAINER_PICNICKER_CELIA, Route15_Text_CeliaRematchIntro, Route15_Text_CeliaDefeat + msgbox Route15_Text_CeliaPostBattle, MSGBOX_AUTOCLOSE end -Route15_EventScript_1AAE5F:: @ 81AAE5F - trainerbattle_double TRAINER_CRUSH_KIN_RON_MYA, Text_186A95, Text_186ACB, Text_186B46 +Route15_EventScript_Mya:: @ 81AAE5F + trainerbattle_double TRAINER_CRUSH_KIN_RON_MYA, Route15_Text_MyaIntro, Route15_Text_MyaDefeat, Route15_Text_MyaNotEnoughMons specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AAE8A - msgbox Text_186B0A, MSGBOX_AUTOCLOSE + goto_if_eq Route15_EventScript_MyaRematch + msgbox Route15_Text_MyaPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AAE8A:: @ 81AAE8A - trainerbattle_rematch_double TRAINER_CRUSH_KIN_RON_MYA, Text_1C28A1, Text_186ACB, Text_186B46 - msgbox Text_186B0A, MSGBOX_AUTOCLOSE +Route15_EventScript_MyaRematch:: @ 81AAE8A + trainerbattle_rematch_double TRAINER_CRUSH_KIN_RON_MYA, Route15_Text_MyaRematchIntro, Route15_Text_MyaDefeat, Route15_Text_MyaNotEnoughMons + msgbox Route15_Text_MyaPostBattle, MSGBOX_AUTOCLOSE end -Route15_EventScript_1AAEA5:: @ 81AAEA5 - trainerbattle_double TRAINER_CRUSH_KIN_RON_MYA, Text_186B89, Text_186BB1, Text_186BFE +Route15_EventScript_Ron:: @ 81AAEA5 + trainerbattle_double TRAINER_CRUSH_KIN_RON_MYA, Route15_Text_RonIntro, Route15_Text_RonDefeat, Route15_Text_RonNotEnoughMons specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AAED0 - msgbox Text_186BD2, MSGBOX_AUTOCLOSE + goto_if_eq Route15_EventScript_RonRematch + msgbox Route15_Text_RonPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AAED0:: @ 81AAED0 - trainerbattle_rematch_double TRAINER_CRUSH_KIN_RON_MYA, Text_1C28EC, Text_186BB1, Text_186BFE - msgbox Text_186BD2, MSGBOX_AUTOCLOSE +Route15_EventScript_RonRematch:: @ 81AAED0 + trainerbattle_rematch_double TRAINER_CRUSH_KIN_RON_MYA, Route15_Text_RonRematchIntro, Route15_Text_RonDefeat, Route15_Text_RonNotEnoughMons + msgbox Route15_Text_RonPostBattle, MSGBOX_AUTOCLOSE end -Route16_EventScript_1AAEEB:: @ 81AAEEB - trainerbattle_single TRAINER_BIKER_LAO, Text_186C4D, Text_186C5F +Route16_EventScript_Lao:: @ 81AAEEB + trainerbattle_single TRAINER_BIKER_LAO, Route16_Text_LaoIntro, Route16_Text_LaoDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AAF12 - msgbox Text_186C75, MSGBOX_AUTOCLOSE + goto_if_eq Route16_EventScript_LaoRematch + msgbox Route16_Text_LaoPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AAF12:: @ 81AAF12 - trainerbattle_rematch TRAINER_BIKER_LAO, Text_1C2913, Text_186C5F - msgbox Text_186C75, MSGBOX_AUTOCLOSE +Route16_EventScript_LaoRematch:: @ 81AAF12 + trainerbattle_rematch TRAINER_BIKER_LAO, Route16_Text_LaoRematchIntro, Route16_Text_LaoDefeat + msgbox Route16_Text_LaoPostBattle, MSGBOX_AUTOCLOSE end -Route16_EventScript_1AAF29:: @ 81AAF29 - trainerbattle_single TRAINER_BIKER_HIDEO, Text_186D39, Text_186D52 +Route16_EventScript_Hideo:: @ 81AAF29 + trainerbattle_single TRAINER_BIKER_HIDEO, Route16_Text_HideoIntro, Route16_Text_HideoDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AAF50 - msgbox Text_186D5A, MSGBOX_AUTOCLOSE + goto_if_eq Route16_EventScript_HideoRematch + msgbox Route16_Text_HideoPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AAF50:: @ 81AAF50 - trainerbattle_rematch TRAINER_BIKER_HIDEO, Text_1C297B, Text_186D52 - msgbox Text_186D5A, MSGBOX_AUTOCLOSE +Route16_EventScript_HideoRematch:: @ 81AAF50 + trainerbattle_rematch TRAINER_BIKER_HIDEO, Route16_Text_HideoRematchIntro, Route16_Text_HideoDefeat + msgbox Route16_Text_HideoPostBattle, MSGBOX_AUTOCLOSE end -Route16_EventScript_1AAF67:: @ 81AAF67 - trainerbattle_single TRAINER_BIKER_RUBEN, Text_186E86, Text_186EB4 +Route16_EventScript_Ruben:: @ 81AAF67 + trainerbattle_single TRAINER_BIKER_RUBEN, Route16_Text_RubenIntro, Route16_Text_RubenDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AAF8E - msgbox Text_186EC7, MSGBOX_AUTOCLOSE + goto_if_eq Route16_EventScript_RubenRematch + msgbox Route16_Text_RubenPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AAF8E:: @ 81AAF8E - trainerbattle_rematch TRAINER_BIKER_RUBEN, Text_1C29EB, Text_186EB4 - msgbox Text_186EC7, MSGBOX_AUTOCLOSE +Route16_EventScript_RubenRematch:: @ 81AAF8E + trainerbattle_rematch TRAINER_BIKER_RUBEN, Route16_Text_RubenRematchIntro, Route16_Text_RubenDefeat + msgbox Route16_Text_RubenPostBattle, MSGBOX_AUTOCLOSE end -Route16_EventScript_1AAFA5:: @ 81AAFA5 - trainerbattle_single TRAINER_CUE_BALL_KOJI, Text_186CA2, Text_186CBB +Route16_EventScript_Koji:: @ 81AAFA5 + trainerbattle_single TRAINER_CUE_BALL_KOJI, Route16_Text_KojiIntro, Route16_Text_KojiDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AAFCC - msgbox Text_186CC5, MSGBOX_AUTOCLOSE + goto_if_eq Route16_EventScript_KojiRematch + msgbox Route16_Text_KojiPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AAFCC:: @ 81AAFCC - trainerbattle_rematch TRAINER_CUE_BALL_KOJI, Text_1C2925, Text_186CBB - msgbox Text_186CC5, MSGBOX_AUTOCLOSE +Route16_EventScript_KojiRematch:: @ 81AAFCC + trainerbattle_rematch TRAINER_CUE_BALL_KOJI, Route16_Text_KojiRematchIntro, Route16_Text_KojiDefeat + msgbox Route16_Text_KojiPostBattle, MSGBOX_AUTOCLOSE end -Route16_EventScript_1AAFE3:: @ 81AAFE3 - trainerbattle_single TRAINER_CUE_BALL_LUKE, Text_186CE5, Text_186D06 +Route16_EventScript_Luke:: @ 81AAFE3 + trainerbattle_single TRAINER_CUE_BALL_LUKE, Route16_Text_LukeIntro, Route16_Text_LukeDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AB00A - msgbox Text_186D16, MSGBOX_AUTOCLOSE + goto_if_eq Route16_EventScript_LukeRematch + msgbox Route16_Text_LukePostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AB00A:: @ 81AB00A - trainerbattle_rematch TRAINER_CUE_BALL_LUKE, Text_1C2944, Text_186D06 - msgbox Text_186D16, MSGBOX_AUTOCLOSE +Route16_EventScript_LukeRematch:: @ 81AB00A + trainerbattle_rematch TRAINER_CUE_BALL_LUKE, Route16_Text_LukeRematchIntro, Route16_Text_LukeDefeat + msgbox Route16_Text_LukePostBattle, MSGBOX_AUTOCLOSE end -Route16_EventScript_1AB021:: @ 81AB021 - trainerbattle_single TRAINER_CUE_BALL_CAMRON, Text_186DD9, Text_186E0D +Route16_EventScript_Camron:: @ 81AB021 + trainerbattle_single TRAINER_CUE_BALL_CAMRON, Route16_Text_CamronIntro, Route16_Text_CamronDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AB048 - msgbox Text_186E1C, MSGBOX_AUTOCLOSE + goto_if_eq Route16_EventScript_CamronRematch + msgbox Route16_Text_CamronPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AB048:: @ 81AB048 - trainerbattle_rematch TRAINER_CUE_BALL_CAMRON, Text_1C29B0, Text_186E0D - msgbox Text_186E1C, MSGBOX_AUTOCLOSE +Route16_EventScript_CamronRematch:: @ 81AB048 + trainerbattle_rematch TRAINER_CUE_BALL_CAMRON, Route16_Text_CamronRematchIntro, Route16_Text_CamronDefeat + msgbox Route16_Text_CamronPostBattle, MSGBOX_AUTOCLOSE end -Route16_EventScript_1AB05F:: @ 81AB05F - trainerbattle_double TRAINER_YOUNG_COUPLE_LEA_JED, Text_186FBD, Text_186FFA, Text_187057 +Route16_EventScript_Jed:: @ 81AB05F + trainerbattle_double TRAINER_YOUNG_COUPLE_LEA_JED, Route16_Text_JedIntro, Route16_Text_JedDefeat, Route16_Text_JedNotEnoughMons specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AB08A - msgbox Text_187027, MSGBOX_AUTOCLOSE + goto_if_eq Route16_EventScript_JedRematch + msgbox Route16_Text_JedPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AB08A:: @ 81AB08A - trainerbattle_rematch_double TRAINER_YOUNG_COUPLE_LEA_JED, Text_1C2A19, Text_186FFA, Text_187057 - msgbox Text_187027, MSGBOX_AUTOCLOSE +Route16_EventScript_JedRematch:: @ 81AB08A + trainerbattle_rematch_double TRAINER_YOUNG_COUPLE_LEA_JED, Route16_Text_JedRematchIntro, Route16_Text_JedDefeat, Route16_Text_JedNotEnoughMons + msgbox Route16_Text_JedPostBattle, MSGBOX_AUTOCLOSE end -Route16_EventScript_1AB0A5:: @ 81AB0A5 - trainerbattle_double TRAINER_YOUNG_COUPLE_LEA_JED, Text_187097, Text_1870CC, Text_187120 +Route16_EventScript_Lea:: @ 81AB0A5 + trainerbattle_double TRAINER_YOUNG_COUPLE_LEA_JED, Route16_Text_LeaIntro, Route16_Text_LeaDefeat, Route16_Text_LeaNotEnoughMons specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AB0D0 - msgbox Text_1870F9, MSGBOX_AUTOCLOSE + goto_if_eq Route16_EventScript_LeaRematch + msgbox Route16_Text_LeaPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AB0D0:: @ 81AB0D0 - trainerbattle_rematch_double TRAINER_YOUNG_COUPLE_LEA_JED, Text_1C2A53, Text_1870CC, Text_187120 - msgbox Text_1870F9, MSGBOX_AUTOCLOSE +Route16_EventScript_LeaRematch:: @ 81AB0D0 + trainerbattle_rematch_double TRAINER_YOUNG_COUPLE_LEA_JED, Route16_Text_LeaRematchIntro, Route16_Text_LeaDefeat, Route16_Text_LeaNotEnoughMons + msgbox Route16_Text_LeaPostBattle, MSGBOX_AUTOCLOSE end -Route17_EventScript_1AB0EB:: @ 81AB0EB - trainerbattle_single TRAINER_BIKER_BILLY, Text_1872BD, Text_1872E3 +Route17_EventScript_Billy:: @ 81AB0EB + trainerbattle_single TRAINER_BIKER_BILLY, Route17_Text_BillyIntro, Route17_Text_BillyDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AB112 - msgbox Text_1872EB, MSGBOX_AUTOCLOSE + goto_if_eq Route17_EventScript_BillyRematch + msgbox Route17_Text_BillyPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AB112:: @ 81AB112 - trainerbattle_rematch TRAINER_BIKER_BILLY, Text_1C2B06, Text_1872E3 - msgbox Text_1872EB, MSGBOX_AUTOCLOSE +Route17_EventScript_BillyRematch:: @ 81AB112 + trainerbattle_rematch TRAINER_BIKER_BILLY, Route17_Text_BillyRematchIntro, Route17_Text_BillyDefeat + msgbox Route17_Text_BillyPostBattle, MSGBOX_AUTOCLOSE end -Route17_EventScript_1AB129:: @ 81AB129 - trainerbattle_single TRAINER_BIKER_NIKOLAS, Text_18730A, Text_187325 +Route17_EventScript_Nikolas:: @ 81AB129 + trainerbattle_single TRAINER_BIKER_NIKOLAS, Route17_Text_NikolasIntro, Route17_Text_NikolasDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AB150 - msgbox Text_187333, MSGBOX_AUTOCLOSE + goto_if_eq Route17_EventScript_NikolasRematch + msgbox Route17_Text_NikolasPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AB150:: @ 81AB150 - trainerbattle_rematch TRAINER_BIKER_NIKOLAS, Text_1C2B2C, Text_187325 - msgbox Text_187333, MSGBOX_AUTOCLOSE +Route17_EventScript_NikolasRematch:: @ 81AB150 + trainerbattle_rematch TRAINER_BIKER_NIKOLAS, Route17_Text_NikolasRematchIntro, Route17_Text_NikolasDefeat + msgbox Route17_Text_NikolasPostBattle, MSGBOX_AUTOCLOSE end -Route17_EventScript_1AB167:: @ 81AB167 - trainerbattle_single TRAINER_BIKER_JAXON, Text_187456, Text_187472 +Route17_EventScript_Jaxon:: @ 81AB167 + trainerbattle_single TRAINER_BIKER_JAXON, Route17_Text_JaxonIntro, Route17_Text_JaxonDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AB18E - msgbox Text_187479, MSGBOX_AUTOCLOSE + goto_if_eq Route17_EventScript_JaxonRematch + msgbox Route17_Text_JaxonPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AB18E:: @ 81AB18E - trainerbattle_rematch TRAINER_BIKER_JAXON, Text_1C2BE6, Text_187472 - msgbox Text_187479, MSGBOX_AUTOCLOSE +Route17_EventScript_JaxonRematch:: @ 81AB18E + trainerbattle_rematch TRAINER_BIKER_JAXON, Route17_Text_JaxonRematchIntro, Route17_Text_JaxonDefeat + msgbox Route17_Text_JaxonPostBattle, MSGBOX_AUTOCLOSE end -Route17_EventScript_1AB1A5:: @ 81AB1A5 - trainerbattle_single TRAINER_BIKER_WILLIAM, Text_18749B, Text_1874B6 +Route17_EventScript_William:: @ 81AB1A5 + trainerbattle_single TRAINER_BIKER_WILLIAM, Route17_Text_WilliamIntro, Route17_Text_WilliamDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AB1CC - msgbox Text_1874C9, MSGBOX_AUTOCLOSE + goto_if_eq Route17_EventScript_WilliamRematch + msgbox Route17_Text_WilliamPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AB1CC:: @ 81AB1CC - trainerbattle_rematch TRAINER_BIKER_WILLIAM, Text_1C2C10, Text_1874B6 - msgbox Text_1874C9, MSGBOX_AUTOCLOSE +Route17_EventScript_WilliamRematch:: @ 81AB1CC + trainerbattle_rematch TRAINER_BIKER_WILLIAM, Route17_Text_WilliamRematchIntro, Route17_Text_WilliamDefeat + msgbox Route17_Text_WilliamPostBattle, MSGBOX_AUTOCLOSE end -Route17_EventScript_1AB1E3:: @ 81AB1E3 - trainerbattle_single TRAINER_CUE_BALL_RAUL, Text_18717E, Text_1871AE +Route17_EventScript_Raul:: @ 81AB1E3 + trainerbattle_single TRAINER_CUE_BALL_RAUL, Route17_Text_RaulIntro, Route17_Text_RaulDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AB20A - msgbox Text_1871BA, MSGBOX_AUTOCLOSE + goto_if_eq Route17_EventScript_RaulRematch + msgbox Route17_Text_RaulPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AB20A:: @ 81AB20A - trainerbattle_rematch TRAINER_CUE_BALL_RAUL, Text_1C2A88, Text_1871AE - msgbox Text_1871BA, MSGBOX_AUTOCLOSE +Route17_EventScript_RaulRematch:: @ 81AB20A + trainerbattle_rematch TRAINER_CUE_BALL_RAUL, Route17_Text_RaulRematchIntro, Route17_Text_RaulDefeat + msgbox Route17_Text_RaulPostBattle, MSGBOX_AUTOCLOSE end -Route17_EventScript_1AB221:: @ 81AB221 - trainerbattle_single TRAINER_CUE_BALL_ISAIAH, Text_187228, Text_187254 +Route17_EventScript_Isaiah:: @ 81AB221 + trainerbattle_single TRAINER_CUE_BALL_ISAIAH, Route17_Text_IsaiahIntro, Route17_Text_IsaiahDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AB248 - msgbox Text_18725A, MSGBOX_AUTOCLOSE + goto_if_eq Route17_EventScript_IsaiahRematch + msgbox Route17_Text_IsaiahPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AB248:: @ 81AB248 - trainerbattle_rematch TRAINER_CUE_BALL_ISAIAH, Text_1C2AC4, Text_187254 - msgbox Text_18725A, MSGBOX_AUTOCLOSE +Route17_EventScript_IsaiahRematch:: @ 81AB248 + trainerbattle_rematch TRAINER_CUE_BALL_ISAIAH, Route17_Text_IsaiahRematchIntro, Route17_Text_IsaiahDefeat + msgbox Route17_Text_IsaiahPostBattle, MSGBOX_AUTOCLOSE end -Route17_EventScript_1AB25F:: @ 81AB25F - trainerbattle_single TRAINER_CUE_BALL_ZEEK, Text_187362, Text_187395 +Route17_EventScript_Zeek:: @ 81AB25F + trainerbattle_single TRAINER_CUE_BALL_ZEEK, Route17_Text_ZeekIntro, Route17_Text_ZeekDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AB286 - msgbox Text_18739F, MSGBOX_AUTOCLOSE + goto_if_eq Route17_EventScript_ZeekRematch + msgbox Route17_Text_ZeekPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AB286:: @ 81AB286 - trainerbattle_rematch TRAINER_CUE_BALL_ZEEK, Text_1C2B5E, Text_187395 - msgbox Text_18739F, MSGBOX_AUTOCLOSE +Route17_EventScript_ZeekRematch:: @ 81AB286 + trainerbattle_rematch TRAINER_CUE_BALL_ZEEK, Route17_Text_ZeekRematchIntro, Route17_Text_ZeekDefeat + msgbox Route17_Text_ZeekPostBattle, MSGBOX_AUTOCLOSE end -Route17_EventScript_1AB29D:: @ 81AB29D - trainerbattle_single TRAINER_CUE_BALL_JAMAL, Text_1873D1, Text_1873EB +Route17_EventScript_Jamal:: @ 81AB29D + trainerbattle_single TRAINER_CUE_BALL_JAMAL, Route17_Text_JamalIntro, Route17_Text_JamalDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AB2C4 - msgbox Text_1873FF, MSGBOX_AUTOCLOSE + goto_if_eq Route17_EventScript_JamalRematch + msgbox Route17_Text_JamalPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AB2C4:: @ 81AB2C4 - trainerbattle_rematch TRAINER_CUE_BALL_JAMAL, Text_1C2B9C, Text_1873EB - msgbox Text_1873FF, MSGBOX_AUTOCLOSE +Route17_EventScript_JamalRematch:: @ 81AB2C4 + trainerbattle_rematch TRAINER_CUE_BALL_JAMAL, Route17_Text_JamalRematchIntro, Route17_Text_JamalDefeat + msgbox Route17_Text_JamalPostBattle, MSGBOX_AUTOCLOSE end -Route17_EventScript_1AB2DB:: @ 81AB2DB - trainerbattle_single TRAINER_CUE_BALL_COREY, Text_18741D, Text_187429 +Route17_EventScript_Corey:: @ 81AB2DB + trainerbattle_single TRAINER_CUE_BALL_COREY, Route17_Text_CoreyIntro, Route17_Text_CoreyDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AB302 - msgbox Text_187432, MSGBOX_AUTOCLOSE + goto_if_eq Route17_EventScript_CoreyRematch + msgbox Route17_Text_CoreyPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AB302:: @ 81AB302 - trainerbattle_rematch TRAINER_CUE_BALL_COREY, Text_1C2BDA, Text_187429 - msgbox Text_187432, MSGBOX_AUTOCLOSE +Route17_EventScript_CoreyRematch:: @ 81AB302 + trainerbattle_rematch TRAINER_CUE_BALL_COREY, Route17_Text_CoreyRematchIntro, Route17_Text_CoreyDefeat + msgbox Route17_Text_CoreyPostBattle, MSGBOX_AUTOCLOSE end -Route17_EventScript_1AB319:: @ 81AB319 - trainerbattle_single TRAINER_BIKER_VIRGIL, Text_18727D, Text_187295 +Route17_EventScript_Virgil:: @ 81AB319 + trainerbattle_single TRAINER_BIKER_VIRGIL, Route17_Text_VirgilIntro, Route17_Text_VirgilDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AB340 - msgbox Text_1872A5, MSGBOX_AUTOCLOSE + goto_if_eq Route17_EventScript_VirgilRematch + msgbox Route17_Text_VirgilPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AB340:: @ 81AB340 - trainerbattle_rematch TRAINER_BIKER_VIRGIL, Text_1C2AF0, Text_187295 - msgbox Text_1872A5, MSGBOX_AUTOCLOSE +Route17_EventScript_VirgilRematch:: @ 81AB340 + trainerbattle_rematch TRAINER_BIKER_VIRGIL, Route17_Text_VirgilRematchIntro, Route17_Text_VirgilDefeat + msgbox Route17_Text_VirgilPostBattle, MSGBOX_AUTOCLOSE end -Route18_EventScript_1AB357:: @ 81AB357 - trainerbattle_single TRAINER_BIRD_KEEPER_WILTON, Text_187640, Text_187672 +Route18_EventScript_Wilton:: @ 81AB357 + trainerbattle_single TRAINER_BIRD_KEEPER_WILTON, Route18_Text_WiltonIntro, Route18_Text_WiltonDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AB37E - msgbox Text_187677, MSGBOX_AUTOCLOSE + goto_if_eq Route18_EventScript_WiltonRematch + msgbox Route18_Text_WiltonPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AB37E:: @ 81AB37E - trainerbattle_rematch TRAINER_BIRD_KEEPER_WILTON, Text_1C2C2B, Text_187672 - msgbox Text_187677, MSGBOX_AUTOCLOSE +Route18_EventScript_WiltonRematch:: @ 81AB37E + trainerbattle_rematch TRAINER_BIRD_KEEPER_WILTON, Route18_Text_WiltonRematchIntro, Route18_Text_WiltonDefeat + msgbox Route18_Text_WiltonPostBattle, MSGBOX_AUTOCLOSE end -Route18_EventScript_1AB395:: @ 81AB395 - trainerbattle_single TRAINER_BIRD_KEEPER_RAMIRO, Text_18768C, Text_1876B3 +Route18_EventScript_Ramiro:: @ 81AB395 + trainerbattle_single TRAINER_BIRD_KEEPER_RAMIRO, Route18_Text_RamiroIntro, Route18_Text_RamiroDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AB3BC - msgbox Text_1876C5, MSGBOX_AUTOCLOSE + goto_if_eq Route18_EventScript_RamiroRematch + msgbox Route18_Text_RamiroPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AB3BC:: @ 81AB3BC - trainerbattle_rematch TRAINER_BIRD_KEEPER_RAMIRO, Text_1C2C7B, Text_1876B3 - msgbox Text_1876C5, MSGBOX_AUTOCLOSE +Route18_EventScript_RamiroRematch:: @ 81AB3BC + trainerbattle_rematch TRAINER_BIRD_KEEPER_RAMIRO, Route18_Text_RamiroRematchIntro, Route18_Text_RamiroDefeat + msgbox Route18_Text_RamiroPostBattle, MSGBOX_AUTOCLOSE end -Route18_EventScript_1AB3D3:: @ 81AB3D3 - trainerbattle_single TRAINER_BIRD_KEEPER_JACOB, Text_187704, Text_187726 +Route18_EventScript_Jacob:: @ 81AB3D3 + trainerbattle_single TRAINER_BIRD_KEEPER_JACOB, Route18_Text_JacobIntro, Route18_Text_JacobDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AB3FA - msgbox Text_18772C, MSGBOX_AUTOCLOSE + goto_if_eq Route18_EventScript_JacobRematch + msgbox Route18_Text_JacobPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AB3FA:: @ 81AB3FA - trainerbattle_rematch TRAINER_BIRD_KEEPER_JACOB, Text_1C2CA8, Text_187726 - msgbox Text_18772C, MSGBOX_AUTOCLOSE +Route18_EventScript_JacobRematch:: @ 81AB3FA + trainerbattle_rematch TRAINER_BIRD_KEEPER_JACOB, Route18_Text_JacobRematchIntro, Route18_Text_JacobDefeat + msgbox Route18_Text_JacobPostBattle, MSGBOX_AUTOCLOSE end -Route19_EventScript_1AB411:: @ 81AB411 - trainerbattle_single TRAINER_SWIMMER_MALE_RICHARD, Text_1877A3, Text_1877DF +Route19_EventScript_Richard:: @ 81AB411 + trainerbattle_single TRAINER_SWIMMER_MALE_RICHARD, Route19_Text_RichardIntro, Route19_Text_RichardDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AB438 - msgbox Text_1877EE, MSGBOX_AUTOCLOSE + goto_if_eq Route19_EventScript_RichardRematch + msgbox Route19_Text_RichardPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AB438:: @ 81AB438 - trainerbattle_rematch TRAINER_SWIMMER_MALE_RICHARD, Text_1C2CEE, Text_1877DF - msgbox Text_1877EE, MSGBOX_AUTOCLOSE +Route19_EventScript_RichardRematch:: @ 81AB438 + trainerbattle_rematch TRAINER_SWIMMER_MALE_RICHARD, Route19_Text_RichardRematchIntro, Route19_Text_RichardDefeat + msgbox Route19_Text_RichardPostBattle, MSGBOX_AUTOCLOSE end -Route19_EventScript_1AB44F:: @ 81AB44F - trainerbattle_single TRAINER_SWIMMER_MALE_REECE, Text_187811, Text_18783E +Route19_EventScript_Reece:: @ 81AB44F + trainerbattle_single TRAINER_SWIMMER_MALE_REECE, Route19_Text_ReeceIntro, Route19_Text_ReeceDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AB476 - msgbox Text_187852, MSGBOX_AUTOCLOSE + goto_if_eq Route19_EventScript_ReeceRematch + msgbox Route19_Text_ReecePostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AB476:: @ 81AB476 - trainerbattle_rematch TRAINER_SWIMMER_MALE_REECE, Text_1C2D19, Text_18783E - msgbox Text_187852, MSGBOX_AUTOCLOSE +Route19_EventScript_ReeceRematch:: @ 81AB476 + trainerbattle_rematch TRAINER_SWIMMER_MALE_REECE, Route19_Text_ReeceRematchIntro, Route19_Text_ReeceDefeat + msgbox Route19_Text_ReecePostBattle, MSGBOX_AUTOCLOSE end -Route19_EventScript_1AB48D:: @ 81AB48D - trainerbattle_single TRAINER_SWIMMER_MALE_MATTHEW, Text_187884, Text_1878A5 +Route19_EventScript_Matthew:: @ 81AB48D + trainerbattle_single TRAINER_SWIMMER_MALE_MATTHEW, Route19_Text_MatthewIntro, Route19_Text_MatthewDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AB4B4 - msgbox Text_1878B1, MSGBOX_AUTOCLOSE + goto_if_eq Route19_EventScript_MatthewRematch + msgbox Route19_Text_MatthewPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AB4B4:: @ 81AB4B4 - trainerbattle_rematch TRAINER_SWIMMER_MALE_MATTHEW, Text_1C2D4B, Text_1878A5 - msgbox Text_1878B1, MSGBOX_AUTOCLOSE +Route19_EventScript_MatthewRematch:: @ 81AB4B4 + trainerbattle_rematch TRAINER_SWIMMER_MALE_MATTHEW, Route19_Text_MatthewRematchIntro, Route19_Text_MatthewDefeat + msgbox Route19_Text_MatthewPostBattle, MSGBOX_AUTOCLOSE end -Route19_EventScript_1AB4CB:: @ 81AB4CB - trainerbattle_single TRAINER_SWIMMER_MALE_DOUGLAS, Text_1878DD, Text_1878F8 +Route19_EventScript_Douglas:: @ 81AB4CB + trainerbattle_single TRAINER_SWIMMER_MALE_DOUGLAS, Route19_Text_DouglasIntro, Route19_Text_DouglasDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AB4F2 - msgbox Text_1878FE, MSGBOX_AUTOCLOSE + goto_if_eq Route19_EventScript_DouglasRematch + msgbox Route19_Text_DouglasPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AB4F2:: @ 81AB4F2 - trainerbattle_rematch TRAINER_SWIMMER_MALE_DOUGLAS, Text_1C2D7D, Text_1878F8 - msgbox Text_1878FE, MSGBOX_AUTOCLOSE +Route19_EventScript_DouglasRematch:: @ 81AB4F2 + trainerbattle_rematch TRAINER_SWIMMER_MALE_DOUGLAS, Route19_Text_DouglasRematchIntro, Route19_Text_DouglasDefeat + msgbox Route19_Text_DouglasPostBattle, MSGBOX_AUTOCLOSE end -Route19_EventScript_1AB509:: @ 81AB509 - trainerbattle_single TRAINER_SWIMMER_MALE_DAVID, Text_187925, Text_187955 +Route19_EventScript_David:: @ 81AB509 + trainerbattle_single TRAINER_SWIMMER_MALE_DAVID, Route19_Text_DavidIntro, Route19_Text_DavidDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AB530 - msgbox Text_18795B, MSGBOX_AUTOCLOSE + goto_if_eq Route19_EventScript_DavidRematch + msgbox Route19_Text_DavidPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AB530:: @ 81AB530 - trainerbattle_rematch TRAINER_SWIMMER_MALE_DAVID, Text_1C2DA7, Text_187955 - msgbox Text_18795B, MSGBOX_AUTOCLOSE +Route19_EventScript_DavidRematch:: @ 81AB530 + trainerbattle_rematch TRAINER_SWIMMER_MALE_DAVID, Route19_Text_DavidRematchIntro, Route19_Text_DavidDefeat + msgbox Route19_Text_DavidPostBattle, MSGBOX_AUTOCLOSE end -Route19_EventScript_1AB547:: @ 81AB547 - trainerbattle_single TRAINER_SWIMMER_MALE_TONY, Text_187985, Text_1879C3 +Route19_EventScript_Tony:: @ 81AB547 + trainerbattle_single TRAINER_SWIMMER_MALE_TONY, Route19_Text_TonyIntro, Route19_Text_TonyDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AB56E - msgbox Text_1879D3, MSGBOX_AUTOCLOSE + goto_if_eq Route19_EventScript_TonyRematch + msgbox Route19_Text_TonyPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AB56E:: @ 81AB56E - trainerbattle_rematch TRAINER_SWIMMER_MALE_TONY, Text_1C2DE9, Text_1879C3 - msgbox Text_1879D3, MSGBOX_AUTOCLOSE +Route19_EventScript_TonyRematch:: @ 81AB56E + trainerbattle_rematch TRAINER_SWIMMER_MALE_TONY, Route19_Text_TonyRematchIntro, Route19_Text_TonyDefeat + msgbox Route19_Text_TonyPostBattle, MSGBOX_AUTOCLOSE end -Route19_EventScript_1AB585:: @ 81AB585 - trainerbattle_single TRAINER_SWIMMER_MALE_AXLE, Text_187AFA, Text_187B25 +Route19_EventScript_Axle:: @ 81AB585 + trainerbattle_single TRAINER_SWIMMER_MALE_AXLE, Route19_Text_AxleIntro, Route19_Text_AxleDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AB5AC - msgbox Text_187B35, MSGBOX_AUTOCLOSE + goto_if_eq Route19_EventScript_AxleRematch + msgbox Route19_Text_AxlePostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AB5AC:: @ 81AB5AC - trainerbattle_rematch TRAINER_SWIMMER_MALE_AXLE, Text_1C2EC0, Text_187B25 - msgbox Text_187B35, MSGBOX_AUTOCLOSE +Route19_EventScript_AxleRematch:: @ 81AB5AC + trainerbattle_rematch TRAINER_SWIMMER_MALE_AXLE, Route19_Text_AxleRematchIntro, Route19_Text_AxleDefeat + msgbox Route19_Text_AxlePostBattle, MSGBOX_AUTOCLOSE end -Route19_EventScript_1AB5C3:: @ 81AB5C3 - trainerbattle_single TRAINER_SWIMMER_FEMALE_ANYA, Text_187A11, Text_187A44 +Route19_EventScript_Anya:: @ 81AB5C3 + trainerbattle_single TRAINER_SWIMMER_FEMALE_ANYA, Route19_Text_AnyaIntro, Route19_Text_AnyaDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AB5EA - msgbox Text_187A50, MSGBOX_AUTOCLOSE + goto_if_eq Route19_EventScript_AnyaRematch + msgbox Route19_Text_AnyaPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AB5EA:: @ 81AB5EA - trainerbattle_rematch TRAINER_SWIMMER_FEMALE_ANYA, Text_1C2E4A, Text_187A44 - msgbox Text_187A50, MSGBOX_AUTOCLOSE +Route19_EventScript_AnyaRematch:: @ 81AB5EA + trainerbattle_rematch TRAINER_SWIMMER_FEMALE_ANYA, Route19_Text_AnyaRematchIntro, Route19_Text_AnyaDefeat + msgbox Route19_Text_AnyaPostBattle, MSGBOX_AUTOCLOSE end -Route19_EventScript_1AB601:: @ 81AB601 - trainerbattle_single TRAINER_SWIMMER_FEMALE_ALICE, Text_187A9E, Text_187AC1 +Route19_EventScript_Alice:: @ 81AB601 + trainerbattle_single TRAINER_SWIMMER_FEMALE_ALICE, Route19_Text_AliceIntro, Route19_Text_AliceDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AB628 - msgbox Text_187ACA, MSGBOX_AUTOCLOSE + goto_if_eq Route19_EventScript_AliceRematch + msgbox Route19_Text_AlicePostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AB628:: @ 81AB628 - trainerbattle_rematch TRAINER_SWIMMER_FEMALE_ALICE, Text_1C2E9D, Text_187AC1 - msgbox Text_187ACA, MSGBOX_AUTOCLOSE +Route19_EventScript_AliceRematch:: @ 81AB628 + trainerbattle_rematch TRAINER_SWIMMER_FEMALE_ALICE, Route19_Text_AliceRematchIntro, Route19_Text_AliceDefeat + msgbox Route19_Text_AlicePostBattle, MSGBOX_AUTOCLOSE end -Route19_EventScript_1AB63F:: @ 81AB63F - trainerbattle_single TRAINER_SWIMMER_FEMALE_CONNIE, Text_187B5D, Text_187B85 +Route19_EventScript_Connie:: @ 81AB63F + trainerbattle_single TRAINER_SWIMMER_FEMALE_CONNIE, Route19_Text_ConnieIntro, Route19_Text_ConnieDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AB666 - msgbox Text_187B94, MSGBOX_AUTOCLOSE + goto_if_eq Route19_EventScript_ConnieRematch + msgbox Route19_Text_ConniePostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AB666:: @ 81AB666 - trainerbattle_rematch TRAINER_SWIMMER_FEMALE_CONNIE, Text_1C2EFC, Text_187B85 - msgbox Text_187B94, MSGBOX_AUTOCLOSE +Route19_EventScript_ConnieRematch:: @ 81AB666 + trainerbattle_rematch TRAINER_SWIMMER_FEMALE_CONNIE, Route19_Text_ConnieRematchIntro, Route19_Text_ConnieDefeat + msgbox Route19_Text_ConniePostBattle, MSGBOX_AUTOCLOSE end -Route19_EventScript_1AB67D:: @ 81AB67D - trainerbattle_double TRAINER_SIS_AND_BRO_LIA_LUC, Text_187C32, Text_187C6F, Text_187CF2 +Route19_EventScript_Lia:: @ 81AB67D + trainerbattle_double TRAINER_SIS_AND_BRO_LIA_LUC, Route19_Text_LiaIntro, Route19_Text_LiaDefeat, Route19_Text_LiaNotEnoughMons specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AB6A8 - msgbox Text_187C9E, MSGBOX_AUTOCLOSE + goto_if_eq Route19_EventScript_LiaRematch + msgbox Route19_Text_LiaPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AB6A8:: @ 81AB6A8 - trainerbattle_rematch_double TRAINER_SIS_AND_BRO_LIA_LUC, Text_1C2F41, Text_187C6F, Text_187CF2 - msgbox Text_187C9E, MSGBOX_AUTOCLOSE +Route19_EventScript_LiaRematch:: @ 81AB6A8 + trainerbattle_rematch_double TRAINER_SIS_AND_BRO_LIA_LUC, Route19_Text_LiaRematchIntro, Route19_Text_LiaDefeat, Route19_Text_LiaNotEnoughMons + msgbox Route19_Text_LiaPostBattle, MSGBOX_AUTOCLOSE end -Route19_EventScript_1AB6C3:: @ 81AB6C3 - trainerbattle_double TRAINER_SIS_AND_BRO_LIA_LUC, Text_187D45, Text_187D7E, Text_187DE8 +Route19_EventScript_Luc:: @ 81AB6C3 + trainerbattle_double TRAINER_SIS_AND_BRO_LIA_LUC, Route19_Text_LucIntro, Route19_Text_LucDefeat, Route19_Text_LucNotEnoughMons specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AB6EE - msgbox Text_187DAD, MSGBOX_AUTOCLOSE + goto_if_eq Route19_EventScript_LucRematch + msgbox Route19_Text_LucPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AB6EE:: @ 81AB6EE - trainerbattle_rematch_double TRAINER_SIS_AND_BRO_LIA_LUC, Text_1C2FAE, Text_187D7E, Text_187DE8 - msgbox Text_187DAD, MSGBOX_AUTOCLOSE +Route19_EventScript_LucRematch:: @ 81AB6EE + trainerbattle_rematch_double TRAINER_SIS_AND_BRO_LIA_LUC, Route19_Text_LucRematchIntro, Route19_Text_LucDefeat, Route19_Text_LucNotEnoughMons + msgbox Route19_Text_LucPostBattle, MSGBOX_AUTOCLOSE end -Route20_EventScript_1AB709:: @ 81AB709 - trainerbattle_single TRAINER_SWIMMER_MALE_BARRY, Text_187E40, Text_187E7B +Route20_EventScript_Barry:: @ 81AB709 + trainerbattle_single TRAINER_SWIMMER_MALE_BARRY, Route20_Text_BarryIntro, Route20_Text_BarryDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AB730 - msgbox Text_187E83, MSGBOX_AUTOCLOSE + goto_if_eq Route20_EventScript_BarryRematch + msgbox Route20_Text_BarryPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AB730:: @ 81AB730 - trainerbattle_rematch TRAINER_SWIMMER_MALE_BARRY, Text_1C2FF3, Text_187E7B - msgbox Text_187E83, MSGBOX_AUTOCLOSE +Route20_EventScript_BarryRematch:: @ 81AB730 + trainerbattle_rematch TRAINER_SWIMMER_MALE_BARRY, Route20_Text_BarryRematchIntro, Route20_Text_BarryDefeat + msgbox Route20_Text_BarryPostBattle, MSGBOX_AUTOCLOSE end -Route20_EventScript_1AB747:: @ 81AB747 - trainerbattle_single TRAINER_SWIMMER_MALE_DEAN, Text_187FDB, Text_187FF7 +Route20_EventScript_Dean:: @ 81AB747 + trainerbattle_single TRAINER_SWIMMER_MALE_DEAN, Route20_Text_DeanIntro, Route20_Text_DeanDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AB76E - msgbox Text_187FFE, MSGBOX_AUTOCLOSE + goto_if_eq Route20_EventScript_DeanRematch + msgbox Route20_Text_DeanPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AB76E:: @ 81AB76E - trainerbattle_rematch TRAINER_SWIMMER_MALE_DEAN, Text_1C30B0, Text_187FF7 - msgbox Text_187FFE, MSGBOX_AUTOCLOSE +Route20_EventScript_DeanRematch:: @ 81AB76E + trainerbattle_rematch TRAINER_SWIMMER_MALE_DEAN, Route20_Text_DeanRematchIntro, Route20_Text_DeanDefeat + msgbox Route20_Text_DeanPostBattle, MSGBOX_AUTOCLOSE end -Route20_EventScript_1AB785:: @ 81AB785 - trainerbattle_single TRAINER_SWIMMER_MALE_DARRIN, Text_18802E, Text_18805C +Route20_EventScript_Darrin:: @ 81AB785 + trainerbattle_single TRAINER_SWIMMER_MALE_DARRIN, Route20_Text_DarrinIntro, Route20_Text_DarrinDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AB7AC - msgbox Text_18806D, MSGBOX_AUTOCLOSE + goto_if_eq Route20_EventScript_DarrinRematch + msgbox Route20_Text_DarrinPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AB7AC:: @ 81AB7AC - trainerbattle_rematch TRAINER_SWIMMER_MALE_DARRIN, Text_1C30ED, Text_18805C - msgbox Text_18806D, MSGBOX_AUTOCLOSE +Route20_EventScript_DarrinRematch:: @ 81AB7AC + trainerbattle_rematch TRAINER_SWIMMER_MALE_DARRIN, Route20_Text_DarrinRematchIntro, Route20_Text_DarrinDefeat + msgbox Route20_Text_DarrinPostBattle, MSGBOX_AUTOCLOSE end -Route20_EventScript_1AB7C3:: @ 81AB7C3 - trainerbattle_single TRAINER_SWIMMER_FEMALE_TIFFANY, Text_187F24, Text_187F5A +Route20_EventScript_Tiffany:: @ 81AB7C3 + trainerbattle_single TRAINER_SWIMMER_FEMALE_TIFFANY, Route20_Text_TiffanyIntro, Route20_Text_TiffanyDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AB7EA - msgbox Text_187F61, MSGBOX_AUTOCLOSE + goto_if_eq Route20_EventScript_TiffanyRematch + msgbox Route20_Text_TiffanyPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AB7EA:: @ 81AB7EA - trainerbattle_rematch TRAINER_SWIMMER_FEMALE_TIFFANY, Text_1C305F, Text_187F5A - msgbox Text_187F61, MSGBOX_AUTOCLOSE +Route20_EventScript_TiffanyRematch:: @ 81AB7EA + trainerbattle_rematch TRAINER_SWIMMER_FEMALE_TIFFANY, Route20_Text_TiffanyRematchIntro, Route20_Text_TiffanyDefeat + msgbox Route20_Text_TiffanyPostBattle, MSGBOX_AUTOCLOSE end -Route20_EventScript_1AB801:: @ 81AB801 - trainerbattle_single TRAINER_SWIMMER_FEMALE_NORA, Text_1880F8, Text_188119 +Route20_EventScript_Nora:: @ 81AB801 + trainerbattle_single TRAINER_SWIMMER_FEMALE_NORA, Route20_Text_NoraIntro, Route20_Text_NoraDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AB828 - msgbox Text_188139, MSGBOX_AUTOCLOSE + goto_if_eq Route20_EventScript_NoraRematch + msgbox Route20_Text_NoraPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AB828:: @ 81AB828 - trainerbattle_rematch TRAINER_SWIMMER_FEMALE_NORA, Text_1C3149, Text_188119 - msgbox Text_188139, MSGBOX_AUTOCLOSE +Route20_EventScript_NoraRematch:: @ 81AB828 + trainerbattle_rematch TRAINER_SWIMMER_FEMALE_NORA, Route20_Text_NoraRematchIntro, Route20_Text_NoraDefeat + msgbox Route20_Text_NoraPostBattle, MSGBOX_AUTOCLOSE end -Route20_EventScript_1AB83F:: @ 81AB83F - trainerbattle_single TRAINER_SWIMMER_FEMALE_MELISSA, Text_188218, Text_18825C +Route20_EventScript_Melissa:: @ 81AB83F + trainerbattle_single TRAINER_SWIMMER_FEMALE_MELISSA, Route20_Text_MelissaIntro, Route20_Text_MelissaDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AB866 - msgbox Text_18827B, MSGBOX_AUTOCLOSE + goto_if_eq Route20_EventScript_MelissaRematch + msgbox Route20_Text_MelissaPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AB866:: @ 81AB866 - trainerbattle_rematch TRAINER_SWIMMER_FEMALE_MELISSA, Text_1C31C4, Text_18825C - msgbox Text_18827B, MSGBOX_AUTOCLOSE +Route20_EventScript_MelissaRematch:: @ 81AB866 + trainerbattle_rematch TRAINER_SWIMMER_FEMALE_MELISSA, Route20_Text_MelissaRematchIntro, Route20_Text_MelissaDefeat + msgbox Route20_Text_MelissaPostBattle, MSGBOX_AUTOCLOSE end -Route20_EventScript_1AB87D:: @ 81AB87D - trainerbattle_single TRAINER_SWIMMER_FEMALE_SHIRLEY, Text_187EBB, Text_187EED +Route20_EventScript_Shirley:: @ 81AB87D + trainerbattle_single TRAINER_SWIMMER_FEMALE_SHIRLEY, Route20_Text_ShirleyIntro, Route20_Text_ShirleyDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AB8A4 - msgbox Text_187EF6, MSGBOX_AUTOCLOSE + goto_if_eq Route20_EventScript_ShirleyRematch + msgbox Route20_Text_ShirleyPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AB8A4:: @ 81AB8A4 - trainerbattle_rematch TRAINER_SWIMMER_FEMALE_SHIRLEY, Text_1C302E, Text_187EED - msgbox Text_187EF6, MSGBOX_AUTOCLOSE +Route20_EventScript_ShirleyRematch:: @ 81AB8A4 + trainerbattle_rematch TRAINER_SWIMMER_FEMALE_SHIRLEY, Route20_Text_ShirleyRematchIntro, Route20_Text_ShirleyDefeat + msgbox Route20_Text_ShirleyPostBattle, MSGBOX_AUTOCLOSE end -Route20_EventScript_1AB8BB:: @ 81AB8BB - trainerbattle_single TRAINER_BIRD_KEEPER_ROGER, Text_18808E, Text_1880AB +Route20_EventScript_Roger:: @ 81AB8BB + trainerbattle_single TRAINER_BIRD_KEEPER_ROGER, Route20_Text_RogerIntro, Route20_Text_RogerDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AB8E2 - msgbox Text_1880C8, MSGBOX_AUTOCLOSE + goto_if_eq Route20_EventScript_RogerRematch + msgbox Route20_Text_RogerPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AB8E2:: @ 81AB8E2 - trainerbattle_rematch TRAINER_BIRD_KEEPER_ROGER, Text_1C312C, Text_1880AB - msgbox Text_1880C8, MSGBOX_AUTOCLOSE +Route20_EventScript_RogerRematch:: @ 81AB8E2 + trainerbattle_rematch TRAINER_BIRD_KEEPER_ROGER, Route20_Text_RogerRematchIntro, Route20_Text_RogerDefeat + msgbox Route20_Text_RogerPostBattle, MSGBOX_AUTOCLOSE end -Route20_EventScript_1AB8F9:: @ 81AB8F9 - trainerbattle_single TRAINER_PICNICKER_MISSY, Text_188165, Text_1881A3 +Route20_EventScript_Missy:: @ 81AB8F9 + trainerbattle_single TRAINER_PICNICKER_MISSY, Route20_Text_MissyIntro, Route20_Text_MissyDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AB920 - msgbox Text_1881B8, MSGBOX_AUTOCLOSE + goto_if_eq Route20_EventScript_MissyRematch + msgbox Route20_Text_MissyPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AB920:: @ 81AB920 - trainerbattle_rematch TRAINER_PICNICKER_MISSY, Text_1C3185, Text_1881A3 - msgbox Text_1881B8, MSGBOX_AUTOCLOSE +Route20_EventScript_MissyRematch:: @ 81AB920 + trainerbattle_rematch TRAINER_PICNICKER_MISSY, Route20_Text_MissyRematchIntro, Route20_Text_MissyDefeat + msgbox Route20_Text_MissyPostBattle, MSGBOX_AUTOCLOSE end -Route20_EventScript_1AB937:: @ 81AB937 - trainerbattle_single TRAINER_PICNICKER_IRENE, Text_187F78, Text_187F92 +Route20_EventScript_Irene:: @ 81AB937 + trainerbattle_single TRAINER_PICNICKER_IRENE, Route20_Text_IreneIntro, Route20_Text_IreneDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AB95E - msgbox Text_187FA3, MSGBOX_AUTOCLOSE + goto_if_eq Route20_EventScript_IreneRematch + msgbox Route20_Text_IrenePostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AB95E:: @ 81AB95E - trainerbattle_rematch TRAINER_PICNICKER_IRENE, Text_1C3095, Text_187F92 - msgbox Text_187FA3, MSGBOX_AUTOCLOSE +Route20_EventScript_IreneRematch:: @ 81AB95E + trainerbattle_rematch TRAINER_PICNICKER_IRENE, Route20_Text_IreneRematchIntro, Route20_Text_IreneDefeat + msgbox Route20_Text_IrenePostBattle, MSGBOX_AUTOCLOSE end -Route21_North_EventScript_1AB975:: @ 81AB975 - trainerbattle_single TRAINER_FISHERMAN_RONALD, Text_18835A, Text_188383 +Route21_North_EventScript_Ronald:: @ 81AB975 + trainerbattle_single TRAINER_FISHERMAN_RONALD, Route21_North_Text_RonaldIntro, Route21_North_Text_RonaldDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AB99C - msgbox Text_188389, MSGBOX_AUTOCLOSE + goto_if_eq Route21_North_EventScript_RonaldRematch + msgbox Route21_North_Text_RonaldPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AB99C:: @ 81AB99C - trainerbattle_rematch TRAINER_FISHERMAN_RONALD, Text_1C3208, Text_188383 - msgbox Text_188389, MSGBOX_AUTOCLOSE +Route21_North_EventScript_RonaldRematch:: @ 81AB99C + trainerbattle_rematch TRAINER_FISHERMAN_RONALD, Route21_North_Text_RonaldRematchIntro, Route21_North_Text_RonaldDefeat + msgbox Route21_North_Text_RonaldPostBattle, MSGBOX_AUTOCLOSE end -Route21_South_EventScript_1AB9B3:: @ 81AB9B3 - trainerbattle_single TRAINER_FISHERMAN_CLAUDE, Text_1885D8, Text_1885F8 +Route21_South_EventScript_Claude:: @ 81AB9B3 + trainerbattle_single TRAINER_FISHERMAN_CLAUDE, Route21_South_Text_ClaudeIntro, Route21_South_Text_ClaudeDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AB9DA - msgbox Text_188632, MSGBOX_AUTOCLOSE + goto_if_eq Route21_South_EventScript_ClaudeRematch + msgbox Route21_South_Text_ClaudePostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AB9DA:: @ 81AB9DA - trainerbattle_rematch TRAINER_FISHERMAN_CLAUDE, Text_1C331D, Text_1885F8 - msgbox Text_188632, MSGBOX_AUTOCLOSE +Route21_South_EventScript_ClaudeRematch:: @ 81AB9DA + trainerbattle_rematch TRAINER_FISHERMAN_CLAUDE, Route21_South_Text_ClaudeRematchIntro, Route21_South_Text_ClaudeDefeat + msgbox Route21_South_Text_ClaudePostBattle, MSGBOX_AUTOCLOSE end -Route21_North_EventScript_1AB9F1:: @ 81AB9F1 - trainerbattle_single TRAINER_FISHERMAN_WADE, Text_1883C6, Text_1883E9 +Route21_North_EventScript_Wade:: @ 81AB9F1 + trainerbattle_single TRAINER_FISHERMAN_WADE, Route21_North_Text_WadeIntro, Route21_North_Text_WadeDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1ABA18 - msgbox Text_18841D, MSGBOX_AUTOCLOSE + goto_if_eq Route21_North_EventScript_WadeRematch + msgbox Route21_North_Text_WadePostBattle, MSGBOX_AUTOCLOSE end -EventScript_1ABA18:: @ 81ABA18 - trainerbattle_rematch TRAINER_FISHERMAN_WADE, Text_1C3231, Text_1883E9 - msgbox Text_18841D, MSGBOX_AUTOCLOSE +Route21_North_EventScript_WadeRematch:: @ 81ABA18 + trainerbattle_rematch TRAINER_FISHERMAN_WADE, Route21_North_Text_WadeRematchIntro, Route21_North_Text_WadeDefeat + msgbox Route21_North_Text_WadePostBattle, MSGBOX_AUTOCLOSE end -Route21_South_EventScript_1ABA2F:: @ 81ABA2F - trainerbattle_single TRAINER_FISHERMAN_NOLAN, Text_18868C, Text_1886AE +Route21_South_EventScript_Nolan:: @ 81ABA2F + trainerbattle_single TRAINER_FISHERMAN_NOLAN, Route21_South_Text_NolanIntro, Route21_South_Text_NolanDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1ABA56 - msgbox Text_1886C5, MSGBOX_AUTOCLOSE + goto_if_eq Route21_South_EventScript_NolanRematch + msgbox Route21_South_Text_NolanPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1ABA56:: @ 81ABA56 - trainerbattle_rematch TRAINER_FISHERMAN_NOLAN, Text_1C3356, Text_1886AE - msgbox Text_1886C5, MSGBOX_AUTOCLOSE +Route21_South_EventScript_NolanRematch:: @ 81ABA56 + trainerbattle_rematch TRAINER_FISHERMAN_NOLAN, Route21_South_Text_NolanRematchIntro, Route21_South_Text_NolanDefeat + msgbox Route21_South_Text_NolanPostBattle, MSGBOX_AUTOCLOSE end -Route21_North_EventScript_1ABA6D:: @ 81ABA6D - trainerbattle_single TRAINER_SWIMMER_MALE_SPENCER, Text_18843C, Text_18845F +Route21_North_EventScript_Spencer:: @ 81ABA6D + trainerbattle_single TRAINER_SWIMMER_MALE_SPENCER, Route21_North_Text_SpencerIntro, Route21_North_Text_SpencerDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1ABA94 - msgbox Text_188465, MSGBOX_AUTOCLOSE + goto_if_eq Route21_North_EventScript_SpencerRematch + msgbox Route21_North_Text_SpencerPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1ABA94:: @ 81ABA94 - trainerbattle_rematch TRAINER_SWIMMER_MALE_SPENCER, Text_1C3264, Text_18845F - msgbox Text_188465, MSGBOX_AUTOCLOSE +Route21_North_EventScript_SpencerRematch:: @ 81ABA94 + trainerbattle_rematch TRAINER_SWIMMER_MALE_SPENCER, Route21_North_Text_SpencerRematchIntro, Route21_North_Text_SpencerDefeat + msgbox Route21_North_Text_SpencerPostBattle, MSGBOX_AUTOCLOSE end -Route21_South_EventScript_1ABAAB:: @ 81ABAAB - trainerbattle_single TRAINER_SWIMMER_MALE_JACK, Text_1884D4, Text_1884F0 +Route21_South_EventScript_Jack:: @ 81ABAAB + trainerbattle_single TRAINER_SWIMMER_MALE_JACK, Route21_South_Text_JackIntro, Route21_South_Text_JackDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1ABAD2 - msgbox Text_1884FF, MSGBOX_AUTOCLOSE + goto_if_eq Route21_South_EventScript_JackRematch + msgbox Route21_South_Text_JackPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1ABAD2:: @ 81ABAD2 - trainerbattle_rematch TRAINER_SWIMMER_MALE_JACK, Text_1C3298, Text_1884F0 - msgbox Text_1884FF, MSGBOX_AUTOCLOSE +Route21_South_EventScript_JackRematch:: @ 81ABAD2 + trainerbattle_rematch TRAINER_SWIMMER_MALE_JACK, Route21_South_Text_JackRematchIntro, Route21_South_Text_JackDefeat + msgbox Route21_South_Text_JackPostBattle, MSGBOX_AUTOCLOSE end -Route21_South_EventScript_1ABAE9:: @ 81ABAE9 - trainerbattle_single TRAINER_SWIMMER_MALE_JEROME, Text_18851F, Text_188543 +Route21_South_EventScript_Jerome:: @ 81ABAE9 + trainerbattle_single TRAINER_SWIMMER_MALE_JEROME, Route21_South_Text_JeromeIntro, Route21_South_Text_JeromeDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1ABB10 - msgbox Text_188555, MSGBOX_AUTOCLOSE + goto_if_eq Route21_South_EventScript_JeromeRematch + msgbox Route21_South_Text_JeromePostBattle, MSGBOX_AUTOCLOSE end -EventScript_1ABB10:: @ 81ABB10 - trainerbattle_rematch TRAINER_SWIMMER_MALE_JEROME, Text_1C32D3, Text_188543 - msgbox Text_188555, MSGBOX_AUTOCLOSE +Route21_South_EventScript_JeromeRematch:: @ 81ABB10 + trainerbattle_rematch TRAINER_SWIMMER_MALE_JEROME, Route21_South_Text_JeromeRematchIntro, Route21_South_Text_JeromeDefeat + msgbox Route21_South_Text_JeromePostBattle, MSGBOX_AUTOCLOSE end -Route21_South_EventScript_1ABB27:: @ 81ABB27 - trainerbattle_single TRAINER_SWIMMER_MALE_ROLAND, Text_188592, Text_1885B2 +Route21_South_EventScript_Roland:: @ 81ABB27 + trainerbattle_single TRAINER_SWIMMER_MALE_ROLAND, Route21_South_Text_RolandIntro, Route21_South_Text_RolandDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1ABB4E - msgbox Text_1885BF, MSGBOX_AUTOCLOSE + goto_if_eq Route21_South_EventScript_RolandRematch + msgbox Route21_South_Text_RolandPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1ABB4E:: @ 81ABB4E - trainerbattle_rematch TRAINER_SWIMMER_MALE_ROLAND, Text_1C32FD, Text_1885B2 - msgbox Text_1885BF, MSGBOX_AUTOCLOSE +Route21_South_EventScript_RolandRematch:: @ 81ABB4E + trainerbattle_rematch TRAINER_SWIMMER_MALE_ROLAND, Route21_South_Text_RolandRematchIntro, Route21_South_Text_RolandDefeat + msgbox Route21_South_Text_RolandPostBattle, MSGBOX_AUTOCLOSE end -Route21_North_EventScript_1ABB65:: @ 81ABB65 - trainerbattle_double TRAINER_SIS_AND_BRO_LIL_IAN, Text_1886E2, Text_188712, Text_18875E +Route21_North_EventScript_Lil:: @ 81ABB65 + trainerbattle_double TRAINER_SIS_AND_BRO_LIL_IAN, Route21_North_Text_LilIntro, Route21_North_Text_LilDefeat, Route21_North_Text_LilNotEnoughMons specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1ABB90 - msgbox Text_188734, MSGBOX_AUTOCLOSE + goto_if_eq Route21_North_EventScript_LilRematch + msgbox Route21_North_Text_LilPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1ABB90:: @ 81ABB90 - trainerbattle_rematch_double TRAINER_SIS_AND_BRO_LIL_IAN, Text_1C3378, Text_188712, Text_18875E - msgbox Text_188734, MSGBOX_AUTOCLOSE +Route21_North_EventScript_LilRematch:: @ 81ABB90 + trainerbattle_rematch_double TRAINER_SIS_AND_BRO_LIL_IAN, Route21_North_Text_LilRematchIntro, Route21_North_Text_LilDefeat, Route21_North_Text_LilNotEnoughMons + msgbox Route21_North_Text_LilPostBattle, MSGBOX_AUTOCLOSE end -Route21_North_EventScript_1ABBAB:: @ 81ABBAB - trainerbattle_double TRAINER_SIS_AND_BRO_LIL_IAN, Text_1887B4, Text_1887F1, Text_188850 +Route21_North_EventScript_Ian:: @ 81ABBAB + trainerbattle_double TRAINER_SIS_AND_BRO_LIL_IAN, Route21_North_Text_IanIntro, Route21_North_Text_IanDefeat, Route21_North_Text_IanNotEnoughMons specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1ABBD6 - msgbox Text_188812, MSGBOX_AUTOCLOSE + goto_if_eq Route21_North_EventScript_IanRematch + msgbox Route21_North_Text_IanPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1ABBD6:: @ 81ABBD6 - trainerbattle_rematch_double TRAINER_SIS_AND_BRO_LIL_IAN, Text_1C33AE, Text_1887F1, Text_188850 - msgbox Text_188812, MSGBOX_AUTOCLOSE +Route21_North_EventScript_IanRematch:: @ 81ABBD6 + trainerbattle_rematch_double TRAINER_SIS_AND_BRO_LIL_IAN, Route21_North_Text_IanRematchIntro, Route21_North_Text_IanDefeat, Route21_North_Text_IanNotEnoughMons + msgbox Route21_North_Text_IanPostBattle, MSGBOX_AUTOCLOSE end -OneIsland_KindleRoad_EventScript_1ABBF1:: @ 81ABBF1 - trainerbattle_single TRAINER_SWIMMER_FEMALE_MARIA, Text_18961F, Text_18964D +OneIsland_KindleRoad_EventScript_Maria:: @ 81ABBF1 + trainerbattle_single TRAINER_SWIMMER_FEMALE_MARIA, OneIsland_KindleRoad_Text_MariaIntro, OneIsland_KindleRoad_Text_MariaDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1ABC18 - msgbox Text_189657, MSGBOX_AUTOCLOSE + goto_if_eq OneIsland_KindleRoad_EventScript_MariaRematch + msgbox OneIsland_KindleRoad_Text_MariaPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1ABC18:: @ 81ABC18 - trainerbattle_rematch TRAINER_SWIMMER_FEMALE_MARIA, Text_1C37B5, Text_18964D - msgbox Text_189657, MSGBOX_AUTOCLOSE +OneIsland_KindleRoad_EventScript_MariaRematch:: @ 81ABC18 + trainerbattle_rematch TRAINER_SWIMMER_FEMALE_MARIA, OneIsland_KindleRoad_Text_MariaRematchIntro, OneIsland_KindleRoad_Text_MariaDefeat + msgbox OneIsland_KindleRoad_Text_MariaPostBattle, MSGBOX_AUTOCLOSE end -OneIsland_KindleRoad_EventScript_1ABC2F:: @ 81ABC2F - trainerbattle_single TRAINER_SWIMMER_FEMALE_ABIGAIL, Text_18968C, Text_1896AC +OneIsland_KindleRoad_EventScript_Abigail:: @ 81ABC2F + trainerbattle_single TRAINER_SWIMMER_FEMALE_ABIGAIL, OneIsland_KindleRoad_Text_AbigailIntro, OneIsland_KindleRoad_Text_AbigailDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1ABC56 - msgbox Text_1896C1, MSGBOX_AUTOCLOSE + goto_if_eq OneIsland_KindleRoad_EventScript_AbigailRematch + msgbox OneIsland_KindleRoad_Text_AbigailPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1ABC56:: @ 81ABC56 - trainerbattle_rematch TRAINER_SWIMMER_FEMALE_ABIGAIL, Text_1C37E7, Text_1896AC - msgbox Text_1896C1, MSGBOX_AUTOCLOSE +OneIsland_KindleRoad_EventScript_AbigailRematch:: @ 81ABC56 + trainerbattle_rematch TRAINER_SWIMMER_FEMALE_ABIGAIL, OneIsland_KindleRoad_Text_AbigailRematchIntro, OneIsland_KindleRoad_Text_AbigailDefeat + msgbox OneIsland_KindleRoad_Text_AbigailPostBattle, MSGBOX_AUTOCLOSE end -OneIsland_KindleRoad_EventScript_1ABC6D:: @ 81ABC6D - trainerbattle_single TRAINER_SWIMMER_MALE_FINN, Text_1896F9, Text_189728 +OneIsland_KindleRoad_EventScript_Finn:: @ 81ABC6D + trainerbattle_single TRAINER_SWIMMER_MALE_FINN, OneIsland_KindleRoad_Text_FinnIntro, OneIsland_KindleRoad_Text_FinnDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1ABC94 - msgbox Text_189740, MSGBOX_AUTOCLOSE + goto_if_eq OneIsland_KindleRoad_EventScript_FinnRematch + msgbox OneIsland_KindleRoad_Text_FinnPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1ABC94:: @ 81ABC94 - trainerbattle_rematch TRAINER_SWIMMER_MALE_FINN, Text_1C3807, Text_189728 - msgbox Text_189740, MSGBOX_AUTOCLOSE +OneIsland_KindleRoad_EventScript_FinnRematch:: @ 81ABC94 + trainerbattle_rematch TRAINER_SWIMMER_MALE_FINN, OneIsland_KindleRoad_Text_FinnRematchIntro, OneIsland_KindleRoad_Text_FinnDefeat + msgbox OneIsland_KindleRoad_Text_FinnPostBattle, MSGBOX_AUTOCLOSE end -OneIsland_KindleRoad_EventScript_1ABCAB:: @ 81ABCAB - trainerbattle_single TRAINER_SWIMMER_MALE_GARRETT, Text_189767, Text_1897A4 +OneIsland_KindleRoad_EventScript_Garrett:: @ 81ABCAB + trainerbattle_single TRAINER_SWIMMER_MALE_GARRETT, OneIsland_KindleRoad_Text_GarrettIntro, OneIsland_KindleRoad_Text_GarrettDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1ABCD2 - msgbox Text_1897C5, MSGBOX_AUTOCLOSE + goto_if_eq OneIsland_KindleRoad_EventScript_GarrettRematch + msgbox OneIsland_KindleRoad_Text_GarrettPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1ABCD2:: @ 81ABCD2 - trainerbattle_rematch TRAINER_SWIMMER_MALE_GARRETT, Text_1C3835, Text_1897A4 - msgbox Text_1897C5, MSGBOX_AUTOCLOSE +OneIsland_KindleRoad_EventScript_GarrettRematch:: @ 81ABCD2 + trainerbattle_rematch TRAINER_SWIMMER_MALE_GARRETT, OneIsland_KindleRoad_Text_GarrettRematchIntro, OneIsland_KindleRoad_Text_GarrettDefeat + msgbox OneIsland_KindleRoad_Text_GarrettPostBattle, MSGBOX_AUTOCLOSE end -OneIsland_KindleRoad_EventScript_1ABCE9:: @ 81ABCE9 - trainerbattle_single TRAINER_FISHERMAN_TOMMY, Text_1897FF, Text_189833 +OneIsland_KindleRoad_EventScript_Tommy:: @ 81ABCE9 + trainerbattle_single TRAINER_FISHERMAN_TOMMY, OneIsland_KindleRoad_Text_TommyIntro, OneIsland_KindleRoad_Text_TommyDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1ABD10 - msgbox Text_18984B, MSGBOX_AUTOCLOSE + goto_if_eq OneIsland_KindleRoad_EventScript_TommyRematch + msgbox OneIsland_KindleRoad_Text_TommyPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1ABD10:: @ 81ABD10 - trainerbattle_rematch TRAINER_FISHERMAN_TOMMY, Text_1C386A, Text_189833 - msgbox Text_18984B, MSGBOX_AUTOCLOSE +OneIsland_KindleRoad_EventScript_TommyRematch:: @ 81ABD10 + trainerbattle_rematch TRAINER_FISHERMAN_TOMMY, OneIsland_KindleRoad_Text_TommyRematchIntro, OneIsland_KindleRoad_Text_TommyDefeat + msgbox OneIsland_KindleRoad_Text_TommyPostBattle, MSGBOX_AUTOCLOSE end -OneIsland_KindleRoad_EventScript_1ABD27:: @ 81ABD27 - trainerbattle_single TRAINER_CRUSH_GIRL_SHARON, Text_189883, Text_1898AB +OneIsland_KindleRoad_EventScript_Sharon:: @ 81ABD27 + trainerbattle_single TRAINER_CRUSH_GIRL_SHARON, OneIsland_KindleRoad_Text_SharonIntro, OneIsland_KindleRoad_Text_SharonDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1ABD4E - msgbox Text_1898C4, MSGBOX_AUTOCLOSE + goto_if_eq OneIsland_KindleRoad_EventScript_SharonRematch + msgbox OneIsland_KindleRoad_Text_SharonPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1ABD4E:: @ 81ABD4E - trainerbattle_rematch TRAINER_CRUSH_GIRL_SHARON, Text_1C389F, Text_1898AB - msgbox Text_1898C4, MSGBOX_AUTOCLOSE +OneIsland_KindleRoad_EventScript_SharonRematch:: @ 81ABD4E + trainerbattle_rematch TRAINER_CRUSH_GIRL_SHARON, OneIsland_KindleRoad_Text_SharonRematchIntro, OneIsland_KindleRoad_Text_SharonDefeat + msgbox OneIsland_KindleRoad_Text_SharonPostBattle, MSGBOX_AUTOCLOSE end -OneIsland_KindleRoad_EventScript_1ABD65:: @ 81ABD65 - trainerbattle_single TRAINER_CRUSH_GIRL_TANYA, Text_1898F0, Text_18991B +OneIsland_KindleRoad_EventScript_Tanya:: @ 81ABD65 + trainerbattle_single TRAINER_CRUSH_GIRL_TANYA, OneIsland_KindleRoad_Text_TanyaIntro, OneIsland_KindleRoad_Text_TanyaDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1ABD8C - msgbox Text_18992C, MSGBOX_AUTOCLOSE + goto_if_eq OneIsland_KindleRoad_EventScript_TanyaRematch + msgbox OneIsland_KindleRoad_Text_TanyaPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1ABD8C:: @ 81ABD8C - trainerbattle_rematch TRAINER_CRUSH_GIRL_TANYA, Text_1C38CA, Text_18991B - msgbox Text_18992C, MSGBOX_AUTOCLOSE +OneIsland_KindleRoad_EventScript_TanyaRematch:: @ 81ABD8C + trainerbattle_rematch TRAINER_CRUSH_GIRL_TANYA, OneIsland_KindleRoad_Text_TanyaRematchIntro, OneIsland_KindleRoad_Text_TanyaDefeat + msgbox OneIsland_KindleRoad_Text_TanyaPostBattle, MSGBOX_AUTOCLOSE end -OneIsland_KindleRoad_EventScript_1ABDA3:: @ 81ABDA3 - trainerbattle_single TRAINER_BLACK_BELT_SHEA, Text_189950, Text_18998C +OneIsland_KindleRoad_EventScript_Shea:: @ 81ABDA3 + trainerbattle_single TRAINER_BLACK_BELT_SHEA, OneIsland_KindleRoad_Text_SheaIntro, OneIsland_KindleRoad_Text_SheaDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1ABDCA - msgbox Text_189998, MSGBOX_AUTOCLOSE + goto_if_eq OneIsland_KindleRoad_EventScript_SheaRematch + msgbox OneIsland_KindleRoad_Text_SheaPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1ABDCA:: @ 81ABDCA - trainerbattle_rematch TRAINER_BLACK_BELT_SHEA, Text_1C38FA, Text_18998C - msgbox Text_189998, MSGBOX_AUTOCLOSE +OneIsland_KindleRoad_EventScript_SheaRematch:: @ 81ABDCA + trainerbattle_rematch TRAINER_BLACK_BELT_SHEA, OneIsland_KindleRoad_Text_SheaRematchIntro, OneIsland_KindleRoad_Text_SheaDefeat + msgbox OneIsland_KindleRoad_Text_SheaPostBattle, MSGBOX_AUTOCLOSE end -OneIsland_KindleRoad_EventScript_1ABDE1:: @ 81ABDE1 - trainerbattle_single TRAINER_BLACK_BELT_HUGH, Text_1899CE, Text_189A0A +OneIsland_KindleRoad_EventScript_Hugh:: @ 81ABDE1 + trainerbattle_single TRAINER_BLACK_BELT_HUGH, OneIsland_KindleRoad_Text_HughIntro, OneIsland_KindleRoad_Text_HughDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1ABE08 - msgbox Text_189A13, MSGBOX_AUTOCLOSE + goto_if_eq OneIsland_KindleRoad_EventScript_HughRematch + msgbox OneIsland_KindleRoad_Text_HughPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1ABE08:: @ 81ABE08 - trainerbattle_rematch TRAINER_BLACK_BELT_HUGH, Text_1C3943, Text_189A0A - msgbox Text_189A13, MSGBOX_AUTOCLOSE +OneIsland_KindleRoad_EventScript_HughRematch:: @ 81ABE08 + trainerbattle_rematch TRAINER_BLACK_BELT_HUGH, OneIsland_KindleRoad_Text_HughRematchIntro, OneIsland_KindleRoad_Text_HughDefeat + msgbox OneIsland_KindleRoad_Text_HughPostBattle, MSGBOX_AUTOCLOSE end -OneIsland_KindleRoad_EventScript_1ABE1F:: @ 81ABE1F - trainerbattle_single TRAINER_CAMPER_BRYCE, Text_189A53, Text_189A92 +OneIsland_KindleRoad_EventScript_Bryce:: @ 81ABE1F + trainerbattle_single TRAINER_CAMPER_BRYCE, OneIsland_KindleRoad_Text_BryceIntro, OneIsland_KindleRoad_Text_BryceDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1ABE46 - msgbox Text_189A9F, MSGBOX_AUTOCLOSE + goto_if_eq OneIsland_KindleRoad_EventScript_BryceRematch + msgbox OneIsland_KindleRoad_Text_BrycePostBattle, MSGBOX_AUTOCLOSE end -EventScript_1ABE46:: @ 81ABE46 - trainerbattle_rematch TRAINER_CAMPER_BRYCE, Text_1C3987, Text_189A92 - msgbox Text_189A9F, MSGBOX_AUTOCLOSE +OneIsland_KindleRoad_EventScript_BryceRematch:: @ 81ABE46 + trainerbattle_rematch TRAINER_CAMPER_BRYCE, OneIsland_KindleRoad_Text_BryceRematchIntro, OneIsland_KindleRoad_Text_BryceDefeat + msgbox OneIsland_KindleRoad_Text_BrycePostBattle, MSGBOX_AUTOCLOSE end -OneIsland_KindleRoad_EventScript_1ABE5D:: @ 81ABE5D - trainerbattle_single TRAINER_PICNICKER_CLAIRE, Text_189ACB, Text_189B0B +OneIsland_KindleRoad_EventScript_Claire:: @ 81ABE5D + trainerbattle_single TRAINER_PICNICKER_CLAIRE, OneIsland_KindleRoad_Text_ClaireIntro, OneIsland_KindleRoad_Text_ClaireDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1ABE84 - msgbox Text_189B24, MSGBOX_AUTOCLOSE + goto_if_eq OneIsland_KindleRoad_EventScript_ClaireRematch + msgbox OneIsland_KindleRoad_Text_ClairePostBattle, MSGBOX_AUTOCLOSE end -EventScript_1ABE84:: @ 81ABE84 - trainerbattle_rematch TRAINER_PICNICKER_CLAIRE, Text_1C39C6, Text_189B0B - msgbox Text_189B24, MSGBOX_AUTOCLOSE +OneIsland_KindleRoad_EventScript_ClaireRematch:: @ 81ABE84 + trainerbattle_rematch TRAINER_PICNICKER_CLAIRE, OneIsland_KindleRoad_Text_ClaireRematchIntro, OneIsland_KindleRoad_Text_ClaireDefeat + msgbox OneIsland_KindleRoad_Text_ClairePostBattle, MSGBOX_AUTOCLOSE end -OneIsland_KindleRoad_EventScript_1ABE9B:: @ 81ABE9B - trainerbattle_double TRAINER_CRUSH_KIN_MIK_KIA, Text_189B4D, Text_189B84, Text_189BDE +OneIsland_KindleRoad_EventScript_Kia:: @ 81ABE9B + trainerbattle_double TRAINER_CRUSH_KIN_MIK_KIA, OneIsland_KindleRoad_Text_KiaIntro, OneIsland_KindleRoad_Text_KiaDefeat, OneIsland_KindleRoad_Text_KiaNotEnoughMons specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1ABEC6 - msgbox Text_189BA3, MSGBOX_AUTOCLOSE + goto_if_eq OneIsland_KindleRoad_EventScript_KiaRematch + msgbox OneIsland_KindleRoad_Text_KiaPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1ABEC6:: @ 81ABEC6 - trainerbattle_rematch_double TRAINER_CRUSH_KIN_MIK_KIA, Text_1C3A05, Text_189B84, Text_189BDE - msgbox Text_189BA3, MSGBOX_AUTOCLOSE +OneIsland_KindleRoad_EventScript_KiaRematch:: @ 81ABEC6 + trainerbattle_rematch_double TRAINER_CRUSH_KIN_MIK_KIA, OneIsland_KindleRoad_Text_KiaRematchIntro, OneIsland_KindleRoad_Text_KiaDefeat, OneIsland_KindleRoad_Text_KiaNotEnoughMons + msgbox OneIsland_KindleRoad_Text_KiaPostBattle, MSGBOX_AUTOCLOSE end -OneIsland_KindleRoad_EventScript_1ABEE1:: @ 81ABEE1 - trainerbattle_double TRAINER_CRUSH_KIN_MIK_KIA, Text_189C33, Text_189C62, Text_189CAB +OneIsland_KindleRoad_EventScript_Mik:: @ 81ABEE1 + trainerbattle_double TRAINER_CRUSH_KIN_MIK_KIA, OneIsland_KindleRoad_Text_MikIntro, OneIsland_KindleRoad_Text_MikDefeat, OneIsland_KindleRoad_Text_MikNotEnoughMons specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1ABF0C - msgbox Text_189C7E, MSGBOX_AUTOCLOSE + goto_if_eq OneIsland_KindleRoad_EventScript_MikRematch + msgbox OneIsland_KindleRoad_Text_MikPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1ABF0C:: @ 81ABF0C - trainerbattle_rematch_double TRAINER_CRUSH_KIN_MIK_KIA, Text_1C3A55, Text_189C62, Text_189CAB - msgbox Text_189C7E, MSGBOX_AUTOCLOSE +OneIsland_KindleRoad_EventScript_MikRematch:: @ 81ABF0C + trainerbattle_rematch_double TRAINER_CRUSH_KIN_MIK_KIA, OneIsland_KindleRoad_Text_MikRematchIntro, OneIsland_KindleRoad_Text_MikDefeat, OneIsland_KindleRoad_Text_MikNotEnoughMons + msgbox OneIsland_KindleRoad_Text_MikPostBattle, MSGBOX_AUTOCLOSE end -OneIsland_TreasureBeach_EventScript_1ABF27:: @ 81ABF27 - trainerbattle_single TRAINER_SWIMMER_FEMALE_AMARA, Text_189D5A, Text_189D8B +OneIsland_TreasureBeach_EventScript_Amara:: @ 81ABF27 + trainerbattle_single TRAINER_SWIMMER_FEMALE_AMARA, OneIsland_TreasureBeach_Text_AmaraIntro, OneIsland_TreasureBeach_Text_AmaraDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1ABF4E - msgbox Text_189DA3, MSGBOX_AUTOCLOSE + goto_if_eq OneIsland_TreasureBeach_EventScript_AmaraRematch + msgbox OneIsland_TreasureBeach_Text_AmaraPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1ABF4E:: @ 81ABF4E - trainerbattle_rematch TRAINER_SWIMMER_FEMALE_AMARA, Text_1C3773, Text_189D8B - msgbox Text_189DA3, MSGBOX_AUTOCLOSE +OneIsland_TreasureBeach_EventScript_AmaraRematch:: @ 81ABF4E + trainerbattle_rematch TRAINER_SWIMMER_FEMALE_AMARA, OneIsland_TreasureBeach_Text_AmaraRematchIntro, OneIsland_TreasureBeach_Text_AmaraDefeat + msgbox OneIsland_TreasureBeach_Text_AmaraPostBattle, MSGBOX_AUTOCLOSE end ThreeIsland_BondBridge_EventScript_1ABF65:: @ 81ABF65 diff --git a/data/specials.inc b/data/specials.inc index 4ed38160d..19ea756a7 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -445,9 +445,9 @@ gSpecials:: @ 815FD60 def_special Special_BrailleCursorToggle def_special Script_ResetUnionRoomTrade def_special Special_PlayerPartyContainsSpeciesWithPlayerID - def_special sub_809C4A8 + def_special AnimateTeleporterHousing def_special IsDodrioInParty - def_special sub_809C5FC + def_special AnimateTeleporterCable def_special Special_InitElevatorFloorSelectMenuPos def_special Special_ComputeLoreleiDollCollection def_special Special_LoopWingFlapSound diff --git a/data/text/pokedex_rating.inc b/data/text/pokedex_rating.inc index 306cd5225..a31f9f171 100644 --- a/data/text/pokedex_rating.inc +++ b/data/text/pokedex_rating.inc @@ -1,119 +1,119 @@ -Text_HowIsPokedexComingAlong:: @ 81A6C51 +PokedexRating_Text_HowIsPokedexComingAlong:: @ 81A6C51 .string "OAK: Good to see you!\n" .string "How is your POKéDEX coming along?\p" .string "Here, let me take a look.$" -Text_YouveSeenXAndOwnedYMons:: @ 81A6CA3 +PokedexRating_Text_SeenXOwnedY:: @ 81A6CA3 .string "The amount of progress you've made\n" .string "on your POKéDEX is:\p" .string "{STR_VAR_1} POKéMON seen and\n" .string "{STR_VAR_2} POKéMON owned.\p" .string "{SIZE}ÁPROF. OAK's rating:$" -gUnknown_81A6D17:: @ 81A6D17 +PokedexRating_Text_LessThan10:: @ 81A6D17 .string "You still have lots to do.\p" .string "Go into every patch of grass you\n" .string "see and look for POKéMON!$" -gUnknown_81A6D6D:: @ 81A6D6D +PokedexRating_Text_LessThan20:: @ 81A6D6D .string "It looks as if you're getting on\n" .string "the right track!\p" .string "I've given one of my AIDES a FLASH\n" .string "HM. Make sure you go get it!$" -gUnknown_81A6DDF:: @ 81A6DDF +PokedexRating_Text_LessThan30:: @ 81A6DDF .string "Your POKéDEX could use a bit more\n" .string "volume still!\p" .string "Try to catch other species of\n" .string "POKéMON!$" -gUnknown_81A6E36:: @ 81A6E36 +PokedexRating_Text_LessThan40:: @ 81A6E36 .string "Good, it's apparent that you're\n" .string "trying hard!\p" .string "I've given one of my AIDES an\n" .string "ITEMFINDER. Be sure to collect it!$" -gUnknown_81A6EA4:: @ 81A6EA4 +PokedexRating_Text_LessThan50:: @ 81A6EA4 .string "Your POKéDEX is coming along quite\n" .string "well!\p" .string "I've given one of my AIDES an\n" .string "AMULET COIN. Be sure to get it!$" -gUnknown_81A6F0B:: @ 81A6F0B +PokedexRating_Text_LessThan60:: @ 81A6F0B .string "Ah, you've finally topped 50\n" .string "species!\p" .string "I've given one of my AIDES an EXP.\n" .string "SHARE. Be sure to go get it!$" -gUnknown_81A6F71:: @ 81A6F71 +PokedexRating_Text_LessThan70:: @ 81A6F71 .string "Hoho! This is turning into quite the\n" .string "respectable POKéDEX!$" -gUnknown_81A6FAB:: @ 81A6FAB +PokedexRating_Text_LessThan80:: @ 81A6FAB .string "Very good!\p" .string "I think you'll collect even more\n" .string "POKéMON by going fishing!$" -gUnknown_81A6FF1:: @ 81A6FF1 +PokedexRating_Text_LessThan90:: @ 81A6FF1 .string "Wonderful! Let me guess… You\n" .string "like to collect things, don't you?$" -gUnknown_81A7031:: @ 81A7031 +PokedexRating_Text_LessThan100:: @ 81A7031 .string "I'm impressed!\n" .string "It must have been difficult to do!$" -gUnknown_81A7063:: @ 81A7063 +PokedexRating_Text_LessThan110:: @ 81A7063 .string "You've finally hit 100 species!\n" .string "I can't believe how good you are!$" -gUnknown_81A70A5:: @ 81A70A5 +PokedexRating_Text_LessThan120:: @ 81A70A5 .string "You even have the evolved forms\n" .string "of POKéMON! Super!$" -gUnknown_81A70D8:: @ 81A70D8 +PokedexRating_Text_LessThan130:: @ 81A70D8 .string "Excellent! Trade with friends to\n" .string "get some more!$" -gUnknown_81A7108:: @ 81A7108 +PokedexRating_Text_LessThan140:: @ 81A7108 .string "Outstanding!\n" .string "You've become a real pro at this!$" -gUnknown_81A7137:: @ 81A7137 +PokedexRating_Text_LessThan150:: @ 81A7137 .string "I have nothing left to say!\n" .string "You're the POKéMON PROFESSOR now!$" -gUnknown_81A7175:: @ 81A7175 +PokedexRating_Text_Complete:: @ 81A7175 .string "Your POKéDEX is entirely complete!\n" .string "Congratulations!!$" -Text_AndNationalDexSeenXOwnedY:: @ 81A71AA +PokedexRating_Text_NationalDexSeenXOwnedY:: @ 81A71AA .string "And your NATIONAL POKéDEX is:\p" .string "{STR_VAR_1} POKéMON seen and\n" .string "{STR_VAR_2} POKéMON owned.$" -Text_LookForwardToFilledNationalDex:: @ 81A71EE +PokedexRating_Text_LookForwardToFilledNationalDex:: @ 81A71EE .string "I'll be looking forward to seeing\n" .string "you fill the NATIONAL POKéDEX!$" -Text_YouveCompletedDex:: @ 81A722F +PokedexRating_Text_YouveCompletedDex:: @ 81A722F .string "Finally…\p" .string "You've finally completed the\n" .string "POKéDEX!\p" .string "It's magnificent!\n" .string "Truly, this is a fantastic feat!$" -Text_1A7291:: @ 81A7291 +PokedexRating_Text_Wroooaaarrr:: @ 81A7291 .string "Wroooooooaaaaaarrrr!$" -Text_1A72A6:: @ 81A72A6 +PokedexRating_Text_HaHa:: @ 81A72A6 .string "はあ はあ‥$" -gUnknown_81A72AD:: @ 81A72AD +PokedexRating_Text_ThankYouMadeDreamReality:: @ 81A72AD .string "Thank you, {PLAYER}!\n" .string "Sincerely, thank you!\l" .string "You've made my dream a reality!$" -Text_LoveSeeingYourPokedex:: @ 81A72F2 +PokedexRating_Text_LoveSeeingYourPokedex:: @ 81A72F2 .string "OAK: Ah, welcome!\p" .string "Tell me, how is your POKéDEX\n" .string "coming along?\p" diff --git a/data/text/sign_lady.inc b/data/text/sign_lady.inc new file mode 100644 index 000000000..1c6d1c8f1 --- /dev/null +++ b/data/text/sign_lady.inc @@ -0,0 +1,30 @@ +@ For the NPC in Pallet Town that talks about the Trainer Tips sign + +PalletTown_Text_HmmIsThatRight:: @ 81B1C8B + .string "Hmm…\n" + .string "Is that right…$" + +PalletTown_Text_OhLookLook:: @ 81B1C9F + .string "Oh!\n" + .string "Look, look!$" + +PalletTown_Text_ReadItReadIt:: @ 81B1CAF + .string "Read it, read it!$" + +@ Used by sign +PalletTown_Text_PressStartToOpenMenu:: @ 81B1CC1 + .string "TRAINER TIPS\p" + .string "Press START to open the MENU!$" + +PalletTown_Text_SignsAreUsefulArentThey:: @ 81B1CEC + .string "Signs are useful, aren't they?$" + +PalletTown_Text_LookCopiedTrainerTipsSign:: @ 81B1D0B + .string "Look, look!\p" + .string "I copied what it said on one of\n" + .string "those TRAINER TIPS signs!$" + +@ Used by NPC +PalletTown_Text_PressStartToOpenMenuCopy:: @ 81B1D51 + .string "TRAINER TIPS!\p" + .string "Press START to open the MENU!$" diff --git a/data/text/trainers.inc b/data/text/trainers.inc index 1d3d373af..7a51a0585 100644 --- a/data/text/trainers.inc +++ b/data/text/trainers.inc @@ -367,339 +367,339 @@ Route14_Text_JanRematchIntro:: @ 81C261B .string "JAN: KIRI, here we go!\n" .string "Let's win for sure this time!$" -Text_1C2650:: @ 81C2650 +Route15_Text_KindraRematchIntro:: @ 81C2650 .string "I'm going to keep battling with the\n" .string "POKéMON I got in trades.$" -Text_1C268D:: @ 81C268D +Route15_Text_BeckyRematchIntro:: @ 81C268D .string "You look gentle, so I think I can\n" .string "beat you.\p" .string "I'll give it one more go!$" -Text_1C26D3:: @ 81C26D3 +Route15_Text_EdwinRematchIntro:: @ 81C26D3 .string "When I whistle, bird POKéMON\n" .string "gather around.\p" .string "They're amazingly cute!$" -Text_1C2717:: @ 81C2717 +Route15_Text_ChesterRematchIntro:: @ 81C2717 .string "Hmm? My birds are shivering!\n" .string "Wait, aren't you that TRAINER…$" -Text_1C2753:: @ 81C2753 +Route15_Text_GraceRematchIntro:: @ 81C2753 .string "Oh, you're a little cutie!\n" .string "So like a darling POKéMON!\l" .string "I remember you now!$" -Text_1C279D:: @ 81C279D +Route15_Text_OliviaRematchIntro:: @ 81C279D .string "I raise POKéMON for protection\n" .string "because I live alone.\p" .string "That hasn't changed.$" -Text_1C27E7:: @ 81C27E7 +Route15_Text_ErnestRematchIntro:: @ 81C27E7 .string "Hey, kid! C'mon!\n" .string "I got these off some loser!$" -Text_1C2814:: @ 81C2814 +Route15_Text_AlexRematchIntro:: @ 81C2814 .string "Fork over all your cash when you\n" .string "lose to me, kid!$" -Text_1C2846:: @ 81C2846 +Route15_Text_CeliaRematchIntro:: @ 81C2846 .string "What's cool and happening?\n" .string "Trading POKéMON, of course.$" -Text_1C287D:: @ 81C287D +Route15_Text_YazminRematchIntro:: @ 81C287D .string "Want to play with my POKéMON\n" .string "again?$" -Text_1C28A1:: @ 81C28A1 +Route15_Text_MyaRematchIntro:: @ 81C28A1 .string "MYA: Hi, we keep meeting,\n" .string "don't we?\p" .string "Help me train my little brother\n" .string "again?$" -Text_1C28EC:: @ 81C28EC +Route15_Text_RonRematchIntro:: @ 81C28EC .string "RON: My sister's gotten more\n" .string "powerful…$" -Text_1C2913:: @ 81C2913 +Route16_Text_LaoRematchIntro:: @ 81C2913 .string "What do you want?$" -Text_1C2925:: @ 81C2925 +Route16_Text_KojiRematchIntro:: @ 81C2925 .string "Nice BIKE!\n" .string "Hand it over quick!$" -Text_1C2944:: @ 81C2944 +Route16_Text_LukeRematchIntro:: @ 81C2944 .string "Come out and play, little mouse.\n" .string "I'll treat you right!$" -Text_1C297B:: @ 81C297B +Route16_Text_HideoRematchIntro:: @ 81C297B .string "Hey, wait a second!\n" .string "Don't call me and then run away!$" -Text_1C29B0:: @ 81C29B0 +Route16_Text_CamronRematchIntro:: @ 81C29B0 .string "I'm feeling hungry and mean!\n" .string "I really need a punching bag!$" -Text_1C29EB:: @ 81C29EB +Route16_Text_RubenRematchIntro:: @ 81C29EB .string "Hey, there!\n" .string "We'll have ourselves a good time!$" -Text_1C2A19:: @ 81C2A19 +Route16_Text_JedRematchIntro:: @ 81C2A19 .string "JED: Are you here to see our\n" .string "love, which knows no bounds?$" -Text_1C2A53:: @ 81C2A53 +Route16_Text_LeaRematchIntro:: @ 81C2A53 .string "LEA: Sometimes, the intensity of\n" .string "our love scares me.$" -Text_1C2A88:: @ 81C2A88 +Route17_Text_RaulRematchIntro:: @ 81C2A88 .string "I told you, there's no getting rich\n" .string "quick in battling kids.$" -Text_1C2AC4:: @ 81C2AC4 +Route17_Text_IsaiahRematchIntro:: @ 81C2AC4 .string "I'm mighty proud of my bod, kiddo.\n" .string "Come on!$" -Text_1C2AF0:: @ 81C2AF0 +Route17_Text_VirgilRematchIntro:: @ 81C2AF0 .string "You out for a stroll?$" -Text_1C2B06:: @ 81C2B06 +Route17_Text_BillyRematchIntro:: @ 81C2B06 .string "We're BIKERS!\n" .string "We rule the roads, man!$" -Text_1C2B2C:: @ 81C2B2C +Route17_Text_NikolasRematchIntro:: @ 81C2B2C .string "VOLTORB's going to seriously\n" .string "electrify you today!$" -Text_1C2B5E:: @ 81C2B5E +Route17_Text_ZeekRematchIntro:: @ 81C2B5E .string "I leveled up my POKéMON, but it\n" .string "absolutely won't evolve. Why?$" -Text_1C2B9C:: @ 81C2B9C +Route17_Text_JamalRematchIntro:: @ 81C2B9C .string "Gaah! I really need to exercise\n" .string "and seriously trim some flab!$" -Text_1C2BDA:: @ 81C2BDA +Route17_Text_CoreyRematchIntro:: @ 81C2BDA .string "Be a rebel!$" -Text_1C2BE6:: @ 81C2BE6 +Route17_Text_JaxonRematchIntro:: @ 81C2BE6 .string "Yep, that's a nice BIKE!\n" .string "How's it handle?$" -Text_1C2C10:: @ 81C2C10 +Route17_Text_WilliamRematchIntro:: @ 81C2C10 .string "Get lost, kid!\n" .string "I'm bushed!$" -Text_1C2C2B:: @ 81C2C2B +Route18_Text_WiltonRematchIntro:: @ 81C2C2B .string "I've been checking every grassy\n" .string "area for new POKéMON.\p" .string "But it's not always easy…$" -Text_1C2C7B:: @ 81C2C7B +Route18_Text_RamiroRematchIntro:: @ 81C2C7B .string "Koorukukukoo!\n" .string "Is my birdcall getting better?$" -Text_1C2CA8:: @ 81C2CA8 +Route18_Text_JacobRematchIntro:: @ 81C2CA8 .string "I warned you before, this is my\n" .string "turf!\p" .string "I don't want you coming around.$" -Text_1C2CEE:: @ 81C2CEE +Route19_Text_RichardRematchIntro:: @ 81C2CEE .string "I'm almost warmed up to go\n" .string "out for a swim.$" -Text_1C2D19:: @ 81C2D19 +Route19_Text_ReeceRematchIntro:: @ 81C2D19 .string "Wait! Slow down!\n" .string "What if you have a heart attack?$" -Text_1C2D4B:: @ 81C2D4B +Route19_Text_MatthewRematchIntro:: @ 81C2D4B .string "I love swimming!\n" .string "I guess you're the surfing type.$" -Text_1C2D7D:: @ 81C2D7D +Route19_Text_DouglasRematchIntro:: @ 81C2D7D .string "What's beyond the horizon?\n" .string "Have you seen?$" -Text_1C2DA7:: @ 81C2DA7 +Route19_Text_DavidRematchIntro:: @ 81C2DA7 .string "I tried diving for POKéMON again,\n" .string "but it was a no-go like before.$" -Text_1C2DE9:: @ 81C2DE9 +Route19_Text_TonyRematchIntro:: @ 81C2DE9 .string "I look at the sea to forget all\n" .string "the bad things that happened.\p" .string "…Like losing to you the last time!$" -Text_1C2E4A:: @ 81C2E4A +Route19_Text_AnyaRematchIntro:: @ 81C2E4A .string "You always get to ride your\n" .string "POKéMON…\p" .string "It looks so relaxing.\n" .string "Can I have it if I win?$" -Text_1C2E9D:: @ 81C2E9D +Route19_Text_AliceRematchIntro:: @ 81C2E9D .string "Swimming's great!\n" .string "Sunburns aren't!$" -Text_1C2EC0:: @ 81C2EC0 +Route19_Text_AxleRematchIntro:: @ 81C2EC0 .string "These waters are treacherous!\n" .string "You shouldn't come back here!$" -Text_1C2EFC:: @ 81C2EFC +Route19_Text_ConnieRematchIntro:: @ 81C2EFC .string "I swam here with my friends…\n" .string "I'm tired…\l" .string "Must we really battle again?$" -Text_1C2F41:: @ 81C2F41 +Route19_Text_LiaRematchIntro:: @ 81C2F41 .string "LIA: You know my brother just\n" .string "became a TRAINER, right?\p" .string "I want to make him better, so I\n" .string "need your help again.$" -Text_1C2FAE:: @ 81C2FAE +Route19_Text_LucRematchIntro:: @ 81C2FAE .string "LUC: My big sis taught me all\n" .string "about POKéMON.\p" .string "I wonder if I'm better?$" -Text_1C2FF3:: @ 81C2FF3 +Route20_Text_BarryRematchIntro:: @ 81C2FF3 .string "The water is shallow here.\n" .string "There are many people swimming.$" -Text_1C302E:: @ 81C302E +Route20_Text_ShirleyRematchIntro:: @ 81C302E .string "Are you jealous that I'm\n" .string "vacationing on SEAFOAM?$" -Text_1C305F:: @ 81C305F +Route20_Text_TiffanyRematchIntro:: @ 81C305F .string "I love floating with the fishes\n" .string "here among the waves.$" -Text_1C3095:: @ 81C3095 +Route20_Text_IreneRematchIntro:: @ 81C3095 .string "Were you on vacation, too?$" -Text_1C30B0:: @ 81C30B0 +Route20_Text_DeanRematchIntro:: @ 81C30B0 .string "Check out my physique!\p" .string "It's even more buff than ever\n" .string "before!$" -Text_1C30ED:: @ 81C30ED +Route20_Text_DarrinRematchIntro:: @ 81C30ED .string "Why are you riding a POKéMON?\n" .string "Haven't you learned to swim yet?$" -Text_1C312C:: @ 81C312C +Route20_Text_RogerRematchIntro:: @ 81C312C .string "I rode my bird POKéMON here.$" -Text_1C3149:: @ 81C3149 +Route20_Text_NoraRematchIntro:: @ 81C3149 .string "My boyfriend gave me big pearls.\n" .string "And, they've grown bigger!$" -Text_1C3185:: @ 81C3185 +Route20_Text_MissyRematchIntro:: @ 81C3185 .string "I swam here from CINNABAR ISLAND.\n" .string "It wasn't easy, like I said.$" -Text_1C31C4:: @ 81C31C4 +Route20_Text_MelissaRematchIntro:: @ 81C31C4 .string "CINNABAR, in the west, has a LAB\n" .string "for POKéMON.\p" .string "My daddy works there.$" -Text_1C3208:: @ 81C3208 +Route21_North_Text_RonaldRematchIntro:: @ 81C3208 .string "You want to know if the fish are\n" .string "biting?$" -Text_1C3231:: @ 81C3231 +Route21_North_Text_WadeRematchIntro:: @ 81C3231 .string "I got a big haul again!\n" .string "Wanna go for it once more?$" -Text_1C3264:: @ 81C3264 +Route21_North_Text_SpencerRematchIntro:: @ 81C3264 .string "The sea cleanses my body and soul!$" Text_1C3287:: @ 81C3287 .string "きょうも およぎに\n" .string "きちまったぜ$" -Text_1C3298:: @ 81C3298 +Route21_South_Text_JackRematchIntro:: @ 81C3298 .string "I caught my POKéMON at sea.\n" .string "And that's where I train them.$" -Text_1C32D3:: @ 81C32D3 +Route21_South_Text_JeromeRematchIntro:: @ 81C32D3 .string "Right now, I'm in another triathlon\n" .string "meet!$" -Text_1C32FD:: @ 81C32FD +Route21_South_Text_RolandRematchIntro:: @ 81C32FD .string "Ahh!\n" .string "Feel the sun and the wind!$" -Text_1C331D:: @ 81C331D +Route21_South_Text_ClaudeRematchIntro:: @ 81C331D .string "Hey, cut it out already.\n" .string "You always scare away the fish!$" -Text_1C3356:: @ 81C3356 +Route21_South_Text_NolanRematchIntro:: @ 81C3356 .string "Keep me company till I get a hit.$" -Text_1C3378:: @ 81C3378 +Route21_North_Text_LilRematchIntro:: @ 81C3378 .string "LIL: Huh? A battle again?\n" .string "IAN, can't you do it alone?$" -Text_1C33AE:: @ 81C33AE +Route21_North_Text_IanRematchIntro:: @ 81C33AE .string "IAN: My sis is still a slob.\n" .string "Help me get her into shape!$" -Text_1C33E7:: @ 81C33E7 +Route25_Text_JoeyRematchIntro:: @ 81C33E7 .string "I won't lose while I'm here!$" -Text_1C3404:: @ 81C3404 +Route25_Text_DanRematchIntro:: @ 81C3404 .string "Dad took me to a great party on\n" .string "the S.S. ANNE at VERMILION CITY.$" -Text_1C3445:: @ 81C3445 +Route25_Text_FlintRematchIntro:: @ 81C3445 .string "I'm a cool guy.\n" .string "I've got a girlfriend!\p" .string "I'll show her how cool I am for\n" .string "sure this time!$" -Text_1C349C:: @ 81C349C +Route25_Text_KelseyRematchIntro:: @ 81C349C .string "Hi!\n" .string "My boyfriend is cool!\l" .string "My conditioning's good today!$" -Text_1C34D4:: @ 81C34D4 +Route25_Text_ChadRematchIntro:: @ 81C34D4 .string "I had this feeling…\n" .string "I knew I had to battle you again!$" -Text_1C350A:: @ 81C350A +Route25_Text_HaleyRematchIntro:: @ 81C350A .string "My friend has many cute POKéMON.\n" .string "I'm so jealous!$" -Text_1C353B:: @ 81C353B +Route25_Text_FranklinRematchIntro:: @ 81C353B .string "I just trained up on MT. MOON,\n" .string "but I've still got gas in the tank!$" -Text_1C357E:: @ 81C357E +Route25_Text_NobRematchIntro:: @ 81C357E .string "A POKéMANIAC lives on the cape.\n" .string "Have you seen his collection?$" -Text_1C35BC:: @ 81C35BC +Route25_Text_WayneRematchIntro:: @ 81C35BC .string "You're going to see BILL again?\n" .string "First, we battle!$" -Text_1C35EE:: @ 81C35EE +Route24_Text_ShaneRematchIntro:: @ 81C35EE .string "I saw your feat from the grass!$" -Text_1C360E:: @ 81C360E +Route24_Text_EthanRematchIntro:: @ 81C360E .string "Okay!\n" .string "I'll stomp you!$" -Text_1C3624:: @ 81C3624 +Route24_Text_ReliRematchIntro:: @ 81C3624 .string "You always look so busy…\n" .string "Aren't you getting tired?$" -Text_1C3657:: @ 81C3657 +Route24_Text_TimmyRematchIntro:: @ 81C3657 .string "You really must love coming to\n" .string "NUGGET BRIDGE.$" -Text_1C3685:: @ 81C3685 +Route24_Text_AliRematchIntro:: @ 81C3685 .string "The time we battled…\p" .string "Even though I was the second in\n" .string "line, I was the best, wasn't I?$" -Text_1C36DA:: @ 81C36DA +Route24_Text_CaleRematchIntro:: @ 81C36DA .string "People call this the NUGGET\n" .string "BRIDGE!\p" .string "You've already beaten us, so you're\n" @@ -707,60 +707,60 @@ Text_1C36DA:: @ 81C36DA .string "…But, you're welcome to battle with\n" .string "us again.$" -Text_1C3773:: @ 81C3773 +OneIsland_TreasureBeach_Text_AmaraRematchIntro:: @ 81C3773 .string "Lying back, rocked by the waves…\n" .string "I don't notice time slipping by…$" -Text_1C37B5:: @ 81C37B5 +OneIsland_KindleRoad_Text_MariaRematchIntro:: @ 81C37B5 .string "The weather's gorgeous!\n" .string "I'll try not to spoil it.$" -Text_1C37E7:: @ 81C37E7 +OneIsland_KindleRoad_Text_AbigailRematchIntro:: @ 81C37E7 .string "My sunburn is starting to hurt…$" -Text_1C3807:: @ 81C3807 +OneIsland_KindleRoad_Text_FinnRematchIntro:: @ 81C3807 .string "The fire bird's mountain casts\n" .string "a huge shadow…$" -Text_1C3835:: @ 81C3835 +OneIsland_KindleRoad_Text_GarrettRematchIntro:: @ 81C3835 .string "I have this strong feeling that\n" .string "I can win this time!$" -Text_1C386A:: @ 81C386A +OneIsland_KindleRoad_Text_TommyRematchIntro:: @ 81C386A .string "Wait! Wait a second!\n" .string "I'm sure I've hooked a big one!$" -Text_1C389F:: @ 81C389F +OneIsland_KindleRoad_Text_SharonRematchIntro:: @ 81C389F .string "You'll help me out with my\n" .string "training again?$" -Text_1C38CA:: @ 81C38CA +OneIsland_KindleRoad_Text_TanyaRematchIntro:: @ 81C38CA .string "We haven't missed a single day of\n" .string "training yet!$" -Text_1C38FA:: @ 81C38FA +OneIsland_KindleRoad_Text_SheaRematchIntro:: @ 81C38FA .string "Every morning, before breakfast,\n" .string "I swim around this island…\l" .string "Three times!$" -Text_1C3943:: @ 81C3943 +OneIsland_KindleRoad_Text_HughRematchIntro:: @ 81C3943 .string "Dress appropriately for battle!\n" .string "Lose that frivolous outfit, I said!$" -Text_1C3987:: @ 81C3987 +OneIsland_KindleRoad_Text_BryceRematchIntro:: @ 81C3987 .string "You know, everything tastes great\n" .string "when you're out in the wild.$" -Text_1C39C6:: @ 81C39C6 +OneIsland_KindleRoad_Text_ClaireRematchIntro:: @ 81C39C6 .string "I ate too much again, so will you\n" .string "battle us for some exercise?$" -Text_1C3A05:: @ 81C3A05 +OneIsland_KindleRoad_Text_KiaRematchIntro:: @ 81C3A05 .string "KIA: My big brother and I make\n" .string "an awesome combination!\p" .string "We won't lose this time!$" -Text_1C3A55:: @ 81C3A55 +OneIsland_KindleRoad_Text_MikRematchIntro:: @ 81C3A55 .string "MIK: Together with KIA, we're\n" .string "afraid of nothing!\p" .string "We'll prove it to you this time!$" diff --git a/include/constants/metatile_labels.h b/include/constants/metatile_labels.h index b71e7d08f..01140a160 100644 --- a/include/constants/metatile_labels.h +++ b/include/constants/metatile_labels.h @@ -2,11 +2,46 @@ #define GUARD_METATILE_LABELS_H // gTileset_General +#define METATILE_General_Plain_Mowed 0x001 +#define METATILE_General_ThinTreeTop_Grass 0x00A +#define METATILE_General_WideTreeTopLeft_Grass 0x00B +#define METATILE_General_WideTreeTopRight_Grass 0x00C +#define METATILE_General_Plain_Grass 0x00D +#define METATILE_General_WideTreeTopLeft_Mowed 0x00E +#define METATILE_General_WideTreeTopRight_Mowed 0x00F +#define METATILE_General_ThinTreeTop_Mowed 0x013 #define METATILE_General_CalmWater 0x12B // gTileset_Mart #define METATILE_Mart_CounterMid_Top 0x2BF -#define METATILE_Mart_CounterMid_Bottom 0x2C0 +#define METATILE_Mart_CounterMid_Bottom 0x2C0 + +// gTileset_PokemonCenter +#define METATILE_PokemonCenter_NetworkMachine_ScreenLeft_On 0x35A +#define METATILE_PokemonCenter_NetworkMachine_ScreenRight_On 0x35B +#define METATILE_PokemonCenter_NetworkMachine_Ruby 0x35D +#define METATILE_PokemonCenter_NetworkMachine_Sapphire 0x35F +#define METATILE_PokemonCenter_Escalator_Top_Normal 0x2E4 +#define METATILE_PokemonCenter_Escalator_Top_Transition1 0x317 +#define METATILE_PokemonCenter_Escalator_Top_Transition2 0x315 +#define METATILE_PokemonCenter_Escalator_TopNext_Normal 0x2E3 +#define METATILE_PokemonCenter_Escalator_TopNext_Transition1 0x316 +#define METATILE_PokemonCenter_Escalator_TopNext_Transition2 0x314 +#define METATILE_PokemonCenter_Escalator_TopNextRail_Normal 0x2EB +#define METATILE_PokemonCenter_Escalator_TopNextRail_Transition1 0x31E +#define METATILE_PokemonCenter_Escalator_TopNextRail_Transition2 0x31C +#define METATILE_PokemonCenter_Escalator_Bottom_Normal 0x2D9 +#define METATILE_PokemonCenter_Escalator_Bottom_Transition1 0x313 +#define METATILE_PokemonCenter_Escalator_Bottom_Transition2 0x311 +#define METATILE_PokemonCenter_Escalator_BottomRail_Normal 0x2D1 +#define METATILE_PokemonCenter_Escalator_BottomRail_Transition1 0x30B +#define METATILE_PokemonCenter_Escalator_BottomRail_Transition2 0x309 +#define METATILE_PokemonCenter_Escalator_BottomNext_Normal 0x2D8 +#define METATILE_PokemonCenter_Escalator_BottomNext_Transition1 0x312 +#define METATILE_PokemonCenter_Escalator_BottomNext_Transition2 0x310 +#define METATILE_PokemonCenter_Escalator_BottomNextRail_Normal 0x2D0 +#define METATILE_PokemonCenter_Escalator_BottomNextRail_Transition1 0x30A +#define METATILE_PokemonCenter_Escalator_BottomNextRail_Transition2 0x308 // gTileset_VermilionGym #define METATILE_VermilionGym_Floor 0x281 @@ -39,6 +74,18 @@ #define METATILE_VermilionGym_Beam_Node_BottomRight_Edge_HalfOn 0x2C6 #define METATILE_VermilionGym_Beam_Node_BottomRight_HalfOn 0x2C7 +// gTileset_SeaCottage +#define METATILE_SeaCottage_Teleporter_Light_Green 0x28A +#define METATILE_SeaCottage_Teleporter_Light_Yellow 0x2B5 +#define METATILE_SeaCottage_Teleporter_Light_Red 0x2B6 +#define METATILE_SeaCottage_Teleporter_Cable_Top 0x285 +#define METATILE_SeaCottage_Teleporter_Cable_Bottom 0x2B4 +#define METATILE_SeaCottage_Teleporter_CableBall_Top 0x2B9 +#define METATILE_SeaCottage_Teleporter_CableBall_Bottom 0x2BA +#define METATILE_SeaCottage_Teleporter_Door 0x296 +#define METATILE_SeaCottage_Teleporter_Door_HalfGlowing 0x2B7 +#define METATILE_SeaCottage_Teleporter_Door_FullGlowing 0x2B8 + // gTileset_GameCorner #define METATILE_GameCorner_Floor_ShadeFull 0x292 #define METATILE_GameCorner_Floor_StairsTop 0x29D @@ -127,4 +174,20 @@ #define METATILE_TrainerTower_Floor_ShadeBottomLeft 0x287 #define METATILE_TrainerTower_CounterBarrier 0x2B4 +// gTileset_ViridianForest +#define METATILE_ViridianForest_HugeTreeTopMiddle_Grass 0x284 +#define METATILE_ViridianForest_HugeTreeTopMiddle_Mowed 0x281 + +// gTileset_CeladonCity +#define METATILE_CeladonCity_CyclingRoad_Grass 0x352 +#define METATILE_CeladonCity_CyclingRoad_Mowed 0x33E + +// gTileset_FuchsiaCity +#define METATILE_FuchsiaCity_SafariZoneTreeTopLeft_Grass 0x300 +#define METATILE_FuchsiaCity_SafariZoneTreeTopMiddle_Grass 0x301 +#define METATILE_FuchsiaCity_SafariZoneTreeTopRight_Grass 0x302 +#define METATILE_FuchsiaCity_SafariZoneTreeTopLeft_Mowed 0x310 +#define METATILE_FuchsiaCity_SafariZoneTreeTopMiddle_Mowed 0x311 +#define METATILE_FuchsiaCity_SafariZoneTreeTopRight_Mowed 0x312 + #endif // GUARD_METATILE_LABELS_H diff --git a/include/constants/vars.h b/include/constants/vars.h index 043f5bc39..ca3642ca3 100644 --- a/include/constants/vars.h +++ b/include/constants/vars.h @@ -90,7 +90,7 @@ #define VAR_0x402F 0x402F #define VAR_ICE_STEP_COUNT 0x4030 -#define VAR_STARTER_MON 0x4031 +#define VAR_STARTER_MON 0x4031 // 0: Bulbasaur, 1: Squirtle, 2: Charmander #define VAR_0x4032 0x4032 #define VAR_ENIGMA_BERRY_AVAILABLE 0x4033 diff --git a/include/event_object_movement.h b/include/event_object_movement.h index b713dbd7d..baf66d737 100644 --- a/include/event_object_movement.h +++ b/include/event_object_movement.h @@ -117,6 +117,8 @@ bool32 RfuUnionObjectIsInvisible(u8 objectEventId); void RfuUnionObjectStartWarp(u8 objectEventId, u8 animNo); bool32 RfuUnionObjectIsWarping(u8 objectEventId); +void sub_805F378(s16 x, s16 y); + // Exported data declarations extern const struct SpriteTemplate *const gFieldEffectObjectTemplatePointers[]; @@ -124,5 +126,7 @@ extern const struct SpritePalette gUnknown_83A5348; extern const struct SpriteTemplate * const gFieldEffectObjectTemplatePointers[]; extern const struct OamData gObjectEventBaseOam_32x32; extern const struct UCoords16 gUnknown_83A64C8[]; +extern const u16 gUnknown_8398648[]; +extern const u16 gUnknown_8398688[]; #endif // GUARD_EVENT_OBJECT_MOVEMENT_H diff --git a/include/event_scripts.h b/include/event_scripts.h index f026cb57a..bf16ed2ec 100644 --- a/include/event_scripts.h +++ b/include/event_scripts.h @@ -1201,4 +1201,7 @@ extern const u8 Text_MonSentToBoxBillsBoxFull[]; extern const u8 EventScript_BagItemCanBeRegistered[]; +// fldeff_cut +extern const u8 EventScript_FldEffCut[]; + #endif //GUARD_EVENT_SCRIPTS_H diff --git a/include/field_specials.h b/include/field_specials.h index 02069ff84..9653a9169 100644 --- a/include/field_specials.h +++ b/include/field_specials.h @@ -25,5 +25,7 @@ bool8 ShouldShowBoxWasFullMessage(void); u16 GetHiddenItemAttr(u32 hiddenItem, u8 attr); u8 GetUnlockedSeviiAreas(void); u32 GetPlayerTrainerId(void); +bool8 CutMoveRuinValleyCheck(void); +void CutMoveOpenDottedHoleDoor(void); #endif // GUARD_FIELD_SPECIALS_H diff --git a/include/fieldmap.h b/include/fieldmap.h index 406ec2959..a8e31685f 100644 --- a/include/fieldmap.h +++ b/include/fieldmap.h @@ -19,6 +19,7 @@ u32 MapGridGetMetatileBehaviorAt(int, int); u8 MapGridGetMetatileLayerTypeAt(s16 x, s16 y); void MapGridSetMetatileIdAt(int, int, u16); void MapGridSetMetatileEntryAt(int, int, u16); +u8 MapGridGetZCoordAt(s32 x, s32 y); void GetCameraCoords(u16*, u16*); bool8 MapGridIsImpassableAt(s32, s32); s32 GetMapBorderIdAt(s32, s32); @@ -29,8 +30,8 @@ struct MapConnection * GetMapConnectionAtPos(s16 x, s16 y); void sub_8059948(u8 a0, u8 a1); void save_serialize_map(void); -u32 sub_8058F1C(u32 original, u8 bit); -u32 sub_8058F48(s16 x, s16 y, u8 z); +u32 GetMetatileAttributeFromRawMetatileBehavior(u32 original, u8 bit); +u32 MapGridGetMetatileAttributeAt(s16 x, s16 y, u8 attr); void MapGridSetMetatileImpassabilityAt(s32 x, s32 y, bool32 arg2); #endif //GUARD_FIELDMAP_H diff --git a/include/fldeff.h b/include/fldeff.h index 51287f400..56e2dfbd9 100644 --- a/include/fldeff.h +++ b/include/fldeff.h @@ -10,7 +10,7 @@ gTasks[taskId].data[9] = (u32)func; extern struct MapPosition gPlayerFacingPosition; bool8 CheckObjectGraphicsInFrontOfPlayer(u8 graphicsId); -u8 oei_task_add(void); +u8 CreateFieldEffectShowMon(void); // flash u8 sub_80C9DCC(u8 lightLevel, u8 mapType); diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h index c599b68ab..57d8d0a35 100644 --- a/include/global.fieldmap.h +++ b/include/global.fieldmap.h @@ -3,6 +3,8 @@ #define OBJECT_EVENTS_COUNT 16 +#define METATILE_COLLISION_MASK 0x0C00 + enum { CONNECTION_SOUTH = 1, @@ -15,6 +17,8 @@ enum typedef void (*TilesetCB)(void); +#define METATILE_ID(tileset, name) (METATILE_##tileset##_##name) + struct Tileset { /*0x00*/ bool8 isCompressed; diff --git a/include/metatile_behavior.h b/include/metatile_behavior.h index d567ab77c..f3195e6c9 100644 --- a/include/metatile_behavior.h +++ b/include/metatile_behavior.h @@ -114,7 +114,7 @@ bool8 MetatileBehavior_UnusedReturnFalse_10(u8 metatileBehavior); bool8 MetatileBehavior_UnusedReturnFalse_11(u8 metatileBehavior); bool8 MetatileBehavior_UnusedReturnFalse_12(u8 metatileBehavior); bool8 MetatileBehavior_UnusedReturnFalse_13(u8 metatileBehavior); -bool8 sub_805A2BC(u8 metatileBehavior, u8 playerDirection); +bool8 TestMetatileAttributeBit(u8 attr, u8 bitmask); bool8 MetatileBehavior_UnusedIsSpinRight(u8 metatileBehavior); bool8 MetatileBehavior_UnusedIsSpinLeft(u8 metatileBehavior); bool8 MetatileBehavior_UnusedIsSpinUp(u8 metatileBehavior); diff --git a/include/sea_cottage_special_anim.h b/include/sea_cottage_special_anim.h deleted file mode 100644 index 5c939df12..000000000 --- a/include/sea_cottage_special_anim.h +++ /dev/null @@ -1,12 +0,0 @@ -#ifndef GUARD_SEA_COTTAGE_SPECIAL_ANIM_H -#define GUARD_SEA_COTTAGE_SPECIAL_ANIM_H - -#include "global.h" - -void sub_809C448(u8 a0); -void sub_809C460(void); -bool8 sub_809C474(void); -void sub_809C4A8(void); -void sub_809C5FC(void); - -#endif // GUARD_SEA_COTTAGE_SPECIAL_ANIM_H diff --git a/include/special_field_anim.h b/include/special_field_anim.h new file mode 100644 index 000000000..d21c932bf --- /dev/null +++ b/include/special_field_anim.h @@ -0,0 +1,10 @@ +#ifndef GUARD_SPECIAL_FIELD_ANIM_H +#define GUARD_SPECIAL_FIELD_ANIM_H + +#include "global.h" + +void StartEscalator(u8 a0); +void StopEscalator(void); +bool8 IsEscalatorMoving(void); + +#endif // GUARD_SPECIAL_FIELD_ANIM_H diff --git a/ld_script.txt b/ld_script.txt index 74607f92e..aed18fed9 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -131,14 +131,14 @@ SECTIONS { asm/pokemon_storage_system.o(.text); src/pokemon_icon.o(.text); src/script_movement.o(.text); - asm/fldeff_cut.o(.text); + src/fldeff_cut.o(.text); src/mail_data.o(.text); src/map_name_popup.o(.text); src/item_menu_icons.o(.text); src/battle_anim_mon_movement.o(.text); src/item.o(.text); src/shop.o(.text); - src/sea_cottage_special_anim.o(.text); + src/special_field_anim.o(.text); src/berry.o(.text); src/script_menu.o(.text); asm/naming_screen.o(.text); @@ -449,13 +449,13 @@ SECTIONS { src/trainer_card.o(.rodata); data/pokemon_storage_system.o(.rodata); src/pokemon_icon.o(.rodata); - data/fldeff_cut.o(.rodata); + src/fldeff_cut.o(.rodata); src/map_name_popup.o(.rodata); src/item_menu_icons.o(.rodata); src/battle_anim_mon_movement.o(.rodata); src/item.o(.rodata); src/shop.o(.rodata); - src/sea_cottage_special_anim.o(.rodata); + src/special_field_anim.o(.rodata); src/berry.o(.rodata); src/script_menu.o(.rodata); data/naming_screen.o(.rodata); diff --git a/src/field_fadetransition.c b/src/field_fadetransition.c index 6e937e026..16f691a2d 100644 --- a/src/field_fadetransition.c +++ b/src/field_fadetransition.c @@ -22,6 +22,7 @@ #include "event_object_lock.h" #include "start_menu.h" #include "constants/songs.h" +#include "constants/event_object_movement.h" static void sub_807DF4C(u8 a0); static void sub_807DFBC(u8 taskId); @@ -348,7 +349,7 @@ static void sub_807DFBC(u8 taskId) { PlayerGetDestCoords(&task->data[12], &task->data[13]); sub_807DCB0(TRUE); - ObjectEventSetHeldMovement(&gObjectEvents[GetObjectEventIdByLocalIdAndMap(0xFF, 0, 0)], 16); + ObjectEventSetHeldMovement(&gObjectEvents[GetObjectEventIdByLocalIdAndMap(0xFF, 0, 0)], MOVEMENT_ACTION_WALK_NORMAL_DOWN); task->data[0] = 8; } break; @@ -372,7 +373,7 @@ static void sub_807DFBC(u8 taskId) if (sub_807E418()) { sub_807DCB0(TRUE); - ObjectEventSetHeldMovement(&gObjectEvents[GetObjectEventIdByLocalIdAndMap(0xFF, 0, 0)], 16); + ObjectEventSetHeldMovement(&gObjectEvents[GetObjectEventIdByLocalIdAndMap(0xFF, 0, 0)], MOVEMENT_ACTION_WALK_NORMAL_DOWN); task->data[0] = 2; } break; @@ -752,7 +753,7 @@ static void sub_807E80C(u8 taskId) if (task->data[1] < 0 || gTasks[task->data[1]].isActive != TRUE) { ObjectEventClearAnimIfSpecialAnimActive(&gObjectEvents[GetObjectEventIdByLocalIdAndMap(0xFF, 0, 0)]); - ObjectEventSetHeldMovement(&gObjectEvents[GetObjectEventIdByLocalIdAndMap(0xFF, 0, 0)], 17); + ObjectEventSetHeldMovement(&gObjectEvents[GetObjectEventIdByLocalIdAndMap(0xFF, 0, 0)], MOVEMENT_ACTION_WALK_NORMAL_UP); task->data[0] = 2; } break; diff --git a/src/fieldmap.c b/src/fieldmap.c index 1f7d8b0b8..60ff70f10 100644 --- a/src/fieldmap.c +++ b/src/fieldmap.c @@ -16,37 +16,37 @@ struct ConnectionFlags }; static void InitMapLayoutData(struct MapHeader *mapHeader); -void map_copy_with_padding(u16 *map, u16 width, u16 height); -void mapheader_copy_mapdata_of_adjacent_maps(struct MapHeader *mapHeader); -void fillSouthConnection(struct MapHeader const *mapHeader, struct MapHeader const *connectedMapHeader, s32 offset); -void fillNorthConnection(struct MapHeader const *mapHeader, struct MapHeader const *connectedMapHeader, s32 offset); -void fillWestConnection(struct MapHeader const *mapHeader, struct MapHeader const *connectedMapHeader, s32 offset); -void fillEastConnection(struct MapHeader const *mapHeader, struct MapHeader const *connectedMapHeader, s32 offset); -void LoadSavedMapView(void); -struct MapConnection *sub_8059600(u8 direction, s32 x, s32 y); -bool8 sub_8059658(u8 direction, s32 x, s32 y, struct MapConnection *connection); -bool8 sub_80596BC(s32 x, s32 src_width, s32 dest_width, s32 offset); +static void map_copy_with_padding(u16 *map, u16 width, u16 height); +static void mapheader_copy_mapdata_of_adjacent_maps(struct MapHeader *mapHeader); +static void fillSouthConnection(struct MapHeader const *mapHeader, struct MapHeader const *connectedMapHeader, s32 offset); +static void fillNorthConnection(struct MapHeader const *mapHeader, struct MapHeader const *connectedMapHeader, s32 offset); +static void fillWestConnection(struct MapHeader const *mapHeader, struct MapHeader const *connectedMapHeader, s32 offset); +static void fillEastConnection(struct MapHeader const *mapHeader, struct MapHeader const *connectedMapHeader, s32 offset); +static void LoadSavedMapView(void); +static struct MapConnection *sub_8059600(u8 direction, s32 x, s32 y); +static bool8 sub_8059658(u8 direction, s32 x, s32 y, struct MapConnection *connection); +static bool8 sub_80596BC(s32 x, s32 src_width, s32 dest_width, s32 offset); struct BackupMapLayout VMap; -EWRAM_DATA u16 gBackupMapLayout[VIRTUAL_MAP_SIZE] = {}; +static EWRAM_DATA u16 gBackupMapLayout[VIRTUAL_MAP_SIZE] = {}; EWRAM_DATA struct MapHeader gMapHeader = {}; EWRAM_DATA struct Camera gCamera = {}; -EWRAM_DATA struct ConnectionFlags gMapConnectionFlags = {}; +static EWRAM_DATA struct ConnectionFlags gMapConnectionFlags = {}; -const struct ConnectionFlags sDummyConnectionFlags = {}; +static const struct ConnectionFlags sDummyConnectionFlags = {}; -const u32 gUnknown_8352EF0[] = { - 0x1ff, - 0x3e00, - 0x3c000, - 0xfc0000, - 0x7000000, +static const u32 sMetatileAttrMasks[] = { + 0x000001ff, + 0x00003e00, + 0x0003c000, + 0x00fc0000, + 0x07000000, 0x18000000, 0x60000000, 0x80000000 }; -const u8 gUnknown_8352F10[] = { +static const u8 sMetatileAttrShifts[] = { 0, 9, 14, @@ -87,7 +87,7 @@ static void InitMapLayoutData(struct MapHeader * mapHeader) mapheader_copy_mapdata_of_adjacent_maps(mapHeader); } -void map_copy_with_padding(u16 *map, u16 width, u16 height) +static void map_copy_with_padding(u16 *map, u16 width, u16 height) { s32 y; u16 *dest = VMap.map; @@ -101,7 +101,7 @@ void map_copy_with_padding(u16 *map, u16 width, u16 height) } } -void mapheader_copy_mapdata_of_adjacent_maps(struct MapHeader *mapHeader) +static void mapheader_copy_mapdata_of_adjacent_maps(struct MapHeader *mapHeader) { s32 count; struct MapConnection *connection; @@ -147,7 +147,7 @@ void mapheader_copy_mapdata_of_adjacent_maps(struct MapHeader *mapHeader) } } -void sub_8058B54(s32 x, s32 y, const struct MapHeader *connectedMapHeader, s32 x2, s32 y2, s32 width, s32 height) +static void sub_8058B54(s32 x, s32 y, const struct MapHeader *connectedMapHeader, s32 x2, s32 y2, s32 width, s32 height) { s32 i; u16 *src; @@ -166,7 +166,7 @@ void sub_8058B54(s32 x, s32 y, const struct MapHeader *connectedMapHeader, s32 x } } -void fillSouthConnection(struct MapHeader const *mapHeader, struct MapHeader const *connectedMapHeader, s32 offset) +static void fillSouthConnection(struct MapHeader const *mapHeader, struct MapHeader const *connectedMapHeader, s32 offset) { s32 x, y; s32 x2; @@ -213,7 +213,7 @@ void fillSouthConnection(struct MapHeader const *mapHeader, struct MapHeader con } } -void fillNorthConnection(struct MapHeader const *mapHeader, struct MapHeader const *connectedMapHeader, s32 offset) +static void fillNorthConnection(struct MapHeader const *mapHeader, struct MapHeader const *connectedMapHeader, s32 offset) { s32 x; s32 x2, y2; @@ -262,7 +262,7 @@ void fillNorthConnection(struct MapHeader const *mapHeader, struct MapHeader con } } -void fillWestConnection(struct MapHeader const *mapHeader, struct MapHeader const *connectedMapHeader, s32 offset) +static void fillWestConnection(struct MapHeader const *mapHeader, struct MapHeader const *connectedMapHeader, s32 offset) { s32 y; s32 x2, y2; @@ -308,7 +308,7 @@ void fillWestConnection(struct MapHeader const *mapHeader, struct MapHeader cons } } -void fillEastConnection(struct MapHeader const *mapHeader, struct MapHeader const *connectedMapHeader, s32 offset) +static void fillEastConnection(struct MapHeader const *mapHeader, struct MapHeader const *connectedMapHeader, s32 offset) { s32 x, y; s32 y2; @@ -443,28 +443,28 @@ u32 MapGridGetMetatileIdAt(s32 x, s32 y) return block & 0x3FF; } -u32 sub_8058F1C(u32 original, u8 bit) +u32 GetMetatileAttributeFromRawMetatileBehavior(u32 original, u8 bit) { if (bit >= 8) return original; - return (original & gUnknown_8352EF0[bit]) >> gUnknown_8352F10[bit]; + return (original & sMetatileAttrMasks[bit]) >> sMetatileAttrShifts[bit]; } -u32 sub_8058F48(s16 x, s16 y, u8 z) +u32 MapGridGetMetatileAttributeAt(s16 x, s16 y, u8 attr) { u16 metatileId = MapGridGetMetatileIdAt(x, y); - return GetBehaviorByMetatileIdAndMapLayout(gMapHeader.mapLayout, metatileId, z); + return GetBehaviorByMetatileIdAndMapLayout(gMapHeader.mapLayout, metatileId, attr); } u32 MapGridGetMetatileBehaviorAt(s32 x, s32 y) { - return sub_8058F48(x, y, 0); + return MapGridGetMetatileAttributeAt(x, y, 0); } u8 MapGridGetMetatileLayerTypeAt(s16 x, s16 y) { - return sub_8058F48(x, y, 6); + return MapGridGetMetatileAttributeAt(x, y, 6); } void MapGridSetMetatileIdAt(s32 x, s32 y, u16 metatile) @@ -512,12 +512,12 @@ u32 GetBehaviorByMetatileIdAndMapLayout(struct MapLayout *mapLayout, u16 metatil if (metatile < NUM_METATILES_IN_PRIMARY) { attributes = mapLayout->primaryTileset->metatileAttributes; - return sub_8058F1C(attributes[metatile], attr); + return GetMetatileAttributeFromRawMetatileBehavior(attributes[metatile], attr); } else if (metatile < 0x400) { attributes = mapLayout->secondaryTileset->metatileAttributes; - return sub_8058F1C(attributes[metatile - NUM_METATILES_IN_PRIMARY], attr); + return GetMetatileAttributeFromRawMetatileBehavior(attributes[metatile - NUM_METATILES_IN_PRIMARY], attr); } else { @@ -544,7 +544,7 @@ void save_serialize_map(void) } } -bool32 SavedMapViewIsEmpty(void) +static bool32 SavedMapViewIsEmpty(void) { u16 i; u32 marker = 0; @@ -559,12 +559,12 @@ bool32 SavedMapViewIsEmpty(void) return FALSE; } -void ClearSavedMapView(void) +static void ClearSavedMapView(void) { CpuFill16(0, gSaveBlock2Ptr->mapView, sizeof(gSaveBlock2Ptr->mapView)); } -void LoadSavedMapView(void) +static void LoadSavedMapView(void) { s32 i, j; s32 x, y; @@ -588,7 +588,7 @@ void LoadSavedMapView(void) } } -void sub_8059250(u8 a1) +static void sub_8059250(u8 a1) { s32 width; u16 *mapView; @@ -690,7 +690,7 @@ s32 GetMapBorderIdAt(s32 x, s32 y) return 0; } -s32 GetPostCameraMoveMapBorderId(s32 x, s32 y) +static s32 GetPostCameraMoveMapBorderId(s32 x, s32 y) { return GetMapBorderIdAt(7 + gSaveBlock1Ptr->pos.x + x, 7 + gSaveBlock1Ptr->pos.y + y); } @@ -708,7 +708,7 @@ bool32 CanCameraMoveInDirection(s32 direction) return TRUE; } -void sub_80594AC(struct MapConnection *connection, int direction, s32 x, s32 y) +static void sub_80594AC(struct MapConnection *connection, int direction, s32 x, s32 y) { struct MapHeader const *mapHeader; mapHeader = mapconnection_get_mapheader(connection); @@ -779,7 +779,7 @@ struct MapConnection *sub_8059600(u8 direction, s32 x, s32 y) } -bool8 sub_8059658(u8 direction, s32 x, s32 y, struct MapConnection *connection) +static bool8 sub_8059658(u8 direction, s32 x, s32 y, struct MapConnection *connection) { struct MapHeader const *mapHeader; mapHeader = mapconnection_get_mapheader(connection); @@ -795,7 +795,7 @@ bool8 sub_8059658(u8 direction, s32 x, s32 y, struct MapConnection *connection) return FALSE; } -bool8 sub_80596BC(s32 x, s32 src_width, s32 dest_width, s32 offset) +static bool8 sub_80596BC(s32 x, s32 src_width, s32 dest_width, s32 offset) { s32 offset2 = max(offset, 0); @@ -808,7 +808,7 @@ bool8 sub_80596BC(s32 x, s32 src_width, s32 dest_width, s32 offset) return FALSE; } -bool32 sub_80596E8(s32 x, s32 width) +static bool32 sub_80596E8(s32 x, s32 width) { if (x >= 0 && x < width) return TRUE; @@ -816,7 +816,7 @@ bool32 sub_80596E8(s32 x, s32 width) return FALSE; } -s32 sub_80596FC(struct MapConnection *connection, s32 x, s32 y) +static s32 sub_80596FC(struct MapConnection *connection, s32 x, s32 y) { struct MapHeader const *mapHeader; mapHeader = mapconnection_get_mapheader(connection); @@ -878,7 +878,7 @@ void GetCameraFocusCoords(u16 *x, u16 *y) *y = gSaveBlock1Ptr->pos.y + 7; } -void SetCameraCoords(u16 x, u16 y) +static void SetCameraCoords(u16 x, u16 y) { gSaveBlock1Ptr->pos.x = x; gSaveBlock1Ptr->pos.y = y; @@ -889,7 +889,7 @@ void GetCameraCoords(u16 *x, u16 *y) *x = gSaveBlock1Ptr->pos.x; *y = gSaveBlock1Ptr->pos.y; } -void copy_tileset_patterns_to_vram(struct Tileset const *tileset, u16 numTiles, u16 offset) +static void copy_tileset_patterns_to_vram(struct Tileset const *tileset, u16 numTiles, u16 offset) { if (tileset) { @@ -900,7 +900,7 @@ void copy_tileset_patterns_to_vram(struct Tileset const *tileset, u16 numTiles, } } -void copy_tileset_patterns_to_vram2(struct Tileset const *tileset, u16 numTiles, u16 offset) +static void copy_tileset_patterns_to_vram2(struct Tileset const *tileset, u16 numTiles, u16 offset) { if (tileset) { @@ -911,7 +911,7 @@ void copy_tileset_patterns_to_vram2(struct Tileset const *tileset, u16 numTiles, } } -void sub_80598CC(u16 a0, u16 a1) +static void sub_80598CC(u16 a0, u16 a1) { switch (gUnknown_2036E28) { @@ -955,7 +955,7 @@ void sub_8059948(u8 a0, u8 a1) CpuFastCopy(gPlttBufferUnfaded + a0 * 16, gPlttBufferFaded + a0 * 16, a1 * 16 * sizeof(u16)); } -void apply_map_tileset_palette(struct Tileset const *tileset, u16 destOffset, u16 size) +static void apply_map_tileset_palette(struct Tileset const *tileset, u16 destOffset, u16 size) { u16 black = RGB_BLACK; diff --git a/src/fldeff_cut.c b/src/fldeff_cut.c new file mode 100644 index 000000000..8617a1aaa --- /dev/null +++ b/src/fldeff_cut.c @@ -0,0 +1,299 @@ +#include "global.h" +#include "gflib.h" +#include "event_object_lock.h" +#include "event_object_movement.h" +#include "event_scripts.h" +#include "fieldmap.h" +#include "field_camera.h" +#include "field_specials.h" +#include "fldeff.h" +#include "field_effect.h" +#include "field_player_avatar.h" +#include "metatile_behavior.h" +#include "overworld.h" +#include "party_menu.h" +#include "script.h" +#include "trig.h" +#include "constants/event_objects.h" +#include "constants/songs.h" +#include "constants/metatile_labels.h" + +#define CUT_GRASS_SPRITE_COUNT 8 + +static EWRAM_DATA u8 *sCutGrassSpriteArrayPtr = NULL; +static EWRAM_DATA bool8 sScheduleOpenDottedHole = FALSE; + +static void FieldCallback_CutGrass(void); +static void FieldCallback_CutTree(void); +static void FieldMoveCallback_CutGrass(void); +static void SetCutGrassMetatileAt(s16 x, s16 y); +static void SpriteCallback_CutGrass_Init(struct Sprite * sprite); +static void SpriteCallback_CutGrass_Run(struct Sprite * sprite); +static void SpriteCallback_CutGrass_Cleanup(struct Sprite * sprite); +static void FieldMoveCallback_CutTree(void); + +static const u16 sCutGrassMetatileMapping[][2] = { + { + METATILE_ID(General, Plain_Grass), + METATILE_ID(General, Plain_Mowed) + }, { + METATILE_ID(General, ThinTreeTop_Grass), + METATILE_ID(General, ThinTreeTop_Mowed) + }, { + METATILE_ID(General, WideTreeTopLeft_Grass), + METATILE_ID(General, WideTreeTopLeft_Mowed) + }, { + METATILE_ID(General, WideTreeTopRight_Grass), + METATILE_ID(General, WideTreeTopRight_Mowed) + }, { + METATILE_ID(CeladonCity, CyclingRoad_Grass), + METATILE_ID(CeladonCity, CyclingRoad_Mowed) + }, { + METATILE_ID(FuchsiaCity, SafariZoneTreeTopLeft_Grass), + METATILE_ID(FuchsiaCity, SafariZoneTreeTopLeft_Mowed) + }, { + METATILE_ID(FuchsiaCity, SafariZoneTreeTopMiddle_Grass), + METATILE_ID(FuchsiaCity, SafariZoneTreeTopMiddle_Mowed) + }, { + METATILE_ID(FuchsiaCity, SafariZoneTreeTopRight_Grass), + METATILE_ID(FuchsiaCity, SafariZoneTreeTopRight_Mowed) + }, { + METATILE_ID(ViridianForest, HugeTreeTopMiddle_Grass), + METATILE_ID(ViridianForest, HugeTreeTopMiddle_Mowed) + }, { + 0xffff, + 0xffff + } +}; + +static const struct OamData sOamData_FldEff_CutGrass = { + .y = 0, + .affineMode = ST_OAM_AFFINE_OFF, + .objMode = ST_OAM_OBJ_NORMAL, + .mosaic = FALSE, + .bpp = ST_OAM_4BPP, + .shape = SPRITE_SHAPE(8x8), + .x = 0, + .matrixNum = 0, + .size = SPRITE_SIZE(8x8), + .tileNum = 0x001, + .priority = 1, + .paletteNum = 0x1, + .affineParam = 0 +}; + +static const union AnimCmd sSpriteAnim_Fldeff_CutGrass_0[] = { + ANIMCMD_FRAME(0, 30), + ANIMCMD_JUMP(0) +}; + +static const union AnimCmd *const sSpriteAnimTable_FldEff_CutGrass[] = { + sSpriteAnim_Fldeff_CutGrass_0 +}; + +static const struct SpriteFrameImage sSpriteFrameImages_FldEff_CutGrass[] = { + {gUnknown_8398648, 0x20} +}; + +const struct SpritePalette gFldEffPalette_CutGrass[] = { + gUnknown_8398688, 4096 +}; + +static const struct SpriteTemplate sSpriteTemplate_FldEff_CutGrass = { + .tileTag = 0xFFFF, + .paletteTag = 4096, + .oam = &sOamData_FldEff_CutGrass, + .anims = sSpriteAnimTable_FldEff_CutGrass, + .images = sSpriteFrameImages_FldEff_CutGrass, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = SpriteCallback_CutGrass_Init +}; + +static u8 MetatileAtCoordsIsGrassTile(s16 x, s16 y) +{ + return TestMetatileAttributeBit(MapGridGetMetatileAttributeAt(x, y, 1), 1); +} + +bool8 SetUpFieldMove_Cut(void) +{ + s16 x, y; + u8 i, j; + sScheduleOpenDottedHole = FALSE; + if (CutMoveRuinValleyCheck() == TRUE) + { + sScheduleOpenDottedHole = TRUE; + gFieldCallback2 = FieldCallback_PrepareFadeInFromMenu; + gPostMenuFieldCallback = FieldCallback_CutGrass; + return TRUE; + } + + if (CheckObjectGraphicsInFrontOfPlayer(OBJ_EVENT_GFX_CUT_TREE) == TRUE) + { + gFieldCallback2 = FieldCallback_PrepareFadeInFromMenu; + gPostMenuFieldCallback = FieldCallback_CutTree; + return TRUE; + } + else + { + // FIXME: this fakematch + register s32 neg1 asm("r8"); + struct MapPosition *pos; + PlayerGetDestCoords(&gPlayerFacingPosition.x, &gPlayerFacingPosition.y); + + for (i = 0, pos = &gPlayerFacingPosition, neg1 = 0xFFFF; i < 3; i++) + { + + y = i + neg1 + pos->y; + for (j = 0; j < 3; j++) + { + x = j + neg1 + pos->x; + if (MapGridGetZCoordAt(x, y) == pos->height) + { + if (MetatileAtCoordsIsGrassTile(x, y) == TRUE) + { + gFieldCallback2 = FieldCallback_PrepareFadeInFromMenu; + gPostMenuFieldCallback = FieldCallback_CutGrass; + return TRUE; + } + } + } + } + return FALSE; + } +} + +static void FieldCallback_CutGrass(void) +{ + FieldEffectStart(FLDEFF_USE_CUT_ON_GRASS); + gFieldEffectArguments[0] = GetCursorSelectionMonId(); +} + +bool8 FldEff_UseCutOnGrass(void) +{ + u8 taskId = CreateFieldEffectShowMon(); + FLDEFF_SET_FUNC_TO_DATA(FieldMoveCallback_CutGrass); + IncrementGameStat(GAME_STAT_USED_CUT); + return FALSE; +} + +static void FieldCallback_CutTree(void) +{ + gFieldEffectArguments[0] = GetCursorSelectionMonId(); + ScriptContext1_SetupScript(EventScript_FldEffCut); +} + +bool8 FldEff_UseCutOnTree(void) +{ + u8 taskId = CreateFieldEffectShowMon(); + FLDEFF_SET_FUNC_TO_DATA(FieldMoveCallback_CutTree); + IncrementGameStat(GAME_STAT_USED_CUT); + return FALSE; +} + +static void FieldMoveCallback_CutGrass(void) +{ + FieldEffectActiveListRemove(FLDEFF_USE_CUT_ON_GRASS); + if (sScheduleOpenDottedHole == TRUE) + CutMoveOpenDottedHoleDoor(); + else + FieldEffectStart(FLDEFF_CUT_GRASS); +} + +bool8 FldEff_CutGrass(void) +{ + u8 i, j; + s16 x, y; + // FIXME: this fakematch + register s32 neg1 asm("r9"); + struct MapPosition *pos; + + i = 0; + PlaySE(SE_W015); + PlayerGetDestCoords(&gPlayerFacingPosition.x, &gPlayerFacingPosition.y); + + for (i = 0, pos = &gPlayerFacingPosition, neg1 = 0xFFFF; i < 3; i++) + { + + y = i + neg1 + pos->y; + for (j = 0; j < 3; j++) + { + x = j + neg1 + pos->x; + if (MapGridGetZCoordAt(x, y) == pos->height) + { + if (MetatileAtCoordsIsGrassTile(x, y) == TRUE) + { + SetCutGrassMetatileAt(x, y); + sub_805F378(x, y); + } + } + } + } + DrawWholeMapView(); + sCutGrassSpriteArrayPtr = Alloc(CUT_GRASS_SPRITE_COUNT); + for (i = 0; i < 8; i++) + { + sCutGrassSpriteArrayPtr[i] = CreateSprite(&sSpriteTemplate_FldEff_CutGrass, gSprites[gPlayerAvatar.spriteId].oam.x + 8, gSprites[gPlayerAvatar.spriteId].oam.y + 20, 0); + gSprites[sCutGrassSpriteArrayPtr[i]].data[2] = i * (0x100 / CUT_GRASS_SPRITE_COUNT); + } + return FALSE; +} + +static void SetCutGrassMetatileAt(s16 x, s16 y) +{ + u16 i = 0; + u16 metatileId = MapGridGetMetatileIdAt(x, y); + while (1) + { + if (sCutGrassMetatileMapping[i][0] == 0xFFFF) + return; + if (sCutGrassMetatileMapping[i][0] == metatileId) + { + MapGridSetMetatileIdAt(x, y, sCutGrassMetatileMapping[i][1]); + break; + } + i++; + } +} + +static void SpriteCallback_CutGrass_Init(struct Sprite * sprite) +{ + sprite->data[0] = 8; + sprite->data[1] = 0; + sprite->data[3] = 0; + sprite->callback = SpriteCallback_CutGrass_Run; +} + +static void SpriteCallback_CutGrass_Run(struct Sprite * sprite) +{ + sprite->pos2.x = Sin(sprite->data[2], sprite->data[0]); + sprite->pos2.y = Cos(sprite->data[2], sprite->data[0]); + sprite->data[2] += 8; + sprite->data[2] &= 0xFF; + sprite->data[0]++; + sprite->data[0] += sprite->data[3] >> 2; + sprite->data[3]++; + if (sprite->data[1] != 28) + sprite->data[1]++; + else + sprite->callback = SpriteCallback_CutGrass_Cleanup; +} + +static void SpriteCallback_CutGrass_Cleanup(struct Sprite * sprite) +{ + u8 i; + for (i = 1; i < CUT_GRASS_SPRITE_COUNT; i++) + { + DestroySprite(&gSprites[sCutGrassSpriteArrayPtr[i]]); + } + FieldEffectStop(&gSprites[sCutGrassSpriteArrayPtr[0]], FLDEFF_CUT_GRASS); + Free(sCutGrassSpriteArrayPtr); + sub_80696C0(); + ScriptContext2_Disable(); +} + +static void FieldMoveCallback_CutTree(void) +{ + PlaySE(SE_W015); + FieldEffectActiveListRemove(FLDEFF_USE_CUT_ON_TREE); + EnableBothScriptContexts(); +} diff --git a/src/fldeff_dig.c b/src/fldeff_dig.c index 9e1686468..0eb0d3c1e 100644 --- a/src/fldeff_dig.c +++ b/src/fldeff_dig.c @@ -29,7 +29,7 @@ static void FieldCallback_Dig(void) bool8 FldEff_UseDig(void) { - u8 taskId = oei_task_add(); + u8 taskId = CreateFieldEffectShowMon(); FLDEFF_SET_FUNC_TO_DATA(sub_80C9AFC); SetPlayerAvatarTransitionFlags(PLAYER_AVATAR_FLAG_ON_FOOT); diff --git a/src/fldeff_rocksmash.c b/src/fldeff_rocksmash.c index 058922f06..397741806 100644 --- a/src/fldeff_rocksmash.c +++ b/src/fldeff_rocksmash.c @@ -12,12 +12,13 @@ #include "event_object_movement.h" #include "constants/songs.h" #include "constants/event_objects.h" +#include "constants/event_object_movement.h" #include "constants/maps.h" -static void task08_080C9820(u8 taskId); -static void sub_80C98FC(u8 taskId); -static void sub_80C98B0(u8 taskId); -static void sub_80C99A0(u8 taskId); +static void Task_FieldEffectShowMon_Init(u8 taskId); +static void Task_FieldEffectShowMon_WaitFldeff(u8 taskId); +static void Task_FieldEffectShowMon_WaitPlayerAnim(u8 taskId); +static void Task_FieldEffectShowMon_Cleanup(u8 taskId); static void sub_80C9A10(void); static void sub_80C9A60(void); @@ -36,13 +37,13 @@ bool8 CheckObjectGraphicsInFrontOfPlayer(u8 graphicsId) return TRUE; } -u8 oei_task_add(void) +u8 CreateFieldEffectShowMon(void) { GetXYCoordsOneStepInFrontOfPlayer(&gPlayerFacingPosition.x, &gPlayerFacingPosition.y); - return CreateTask(task08_080C9820, 8); + return CreateTask(Task_FieldEffectShowMon_Init, 8); } -static void task08_080C9820(u8 taskId) +static void Task_FieldEffectShowMon_Init(u8 taskId) { u8 mapObjId; @@ -54,48 +55,49 @@ static void task08_080C9820(u8 taskId) { if (gMapHeader.mapType == MAP_TYPE_UNDERWATER) { + // Leftover from RS, inhibits the player anim while underwater. FieldEffectStart(FLDEFF_FIELD_MOVE_SHOW_MON_INIT); - gTasks[taskId].func = sub_80C98FC; + gTasks[taskId].func = Task_FieldEffectShowMon_WaitFldeff; } else { sub_805CB70(); - ObjectEventSetHeldMovement(&gObjectEvents[mapObjId], 0x45); - gTasks[taskId].func = sub_80C98B0; + ObjectEventSetHeldMovement(&gObjectEvents[mapObjId], MOVEMENT_ACTION_UNKNOWN_STEP_45); + gTasks[taskId].func = Task_FieldEffectShowMon_WaitPlayerAnim; } } } -static void sub_80C98B0(u8 taskId) +static void Task_FieldEffectShowMon_WaitPlayerAnim(u8 taskId) { if (ObjectEventCheckHeldMovementStatus(&gObjectEvents[gPlayerAvatar.objectEventId]) == TRUE) { FieldEffectStart(FLDEFF_FIELD_MOVE_SHOW_MON_INIT); - gTasks[taskId].func = sub_80C98FC; + gTasks[taskId].func = Task_FieldEffectShowMon_WaitFldeff; } } -static void sub_80C98FC(u8 taskId) +static void Task_FieldEffectShowMon_WaitFldeff(u8 taskId) { if (!FieldEffectActiveListContains(FLDEFF_FIELD_MOVE_SHOW_MON)) { gFieldEffectArguments[1] = GetPlayerFacingDirection(); - if (gFieldEffectArguments[1] == 1) + if (gFieldEffectArguments[1] == DIR_SOUTH) gFieldEffectArguments[2] = 0; - if (gFieldEffectArguments[1] == 2) + if (gFieldEffectArguments[1] == DIR_NORTH) gFieldEffectArguments[2] = 1; - if (gFieldEffectArguments[1] == 3) + if (gFieldEffectArguments[1] == DIR_WEST) gFieldEffectArguments[2] = 2; - if (gFieldEffectArguments[1] == 4) + if (gFieldEffectArguments[1] == DIR_EAST) gFieldEffectArguments[2] = 3; ObjectEventSetGraphicsId(&gObjectEvents[gPlayerAvatar.objectEventId], GetPlayerAvatarGraphicsIdByCurrentState()); StartSpriteAnim(&gSprites[gPlayerAvatar.spriteId], gFieldEffectArguments[2]); - FieldEffectActiveListRemove(6); - gTasks[taskId].func = sub_80C99A0; + FieldEffectActiveListRemove(FLDEFF_FIELD_MOVE_SHOW_MON); + gTasks[taskId].func = Task_FieldEffectShowMon_Cleanup; } } -static void sub_80C99A0(u8 taskId) +static void Task_FieldEffectShowMon_Cleanup(u8 taskId) { FLDEFF_CALL_FUNC_IN_DATA(); gPlayerAvatar.unk6 = FALSE; @@ -121,7 +123,7 @@ static void sub_80C9A10(void) bool8 FldEff_UseRockSmash(void) { - u8 taskId = oei_task_add(); + u8 taskId = CreateFieldEffectShowMon(); FLDEFF_SET_FUNC_TO_DATA(sub_80C9A60); IncrementGameStat(GAME_STAT_USED_ROCK_SMASH); diff --git a/src/fldeff_strength.c b/src/fldeff_strength.c index 230b9c751..712d9f1c6 100644 --- a/src/fldeff_strength.c +++ b/src/fldeff_strength.c @@ -33,7 +33,7 @@ static void FldEff_UseStrength(void) bool8 sub_80D0860(void) { - u8 taskId = oei_task_add(); + u8 taskId = CreateFieldEffectShowMon(); FLDEFF_SET_FUNC_TO_DATA(sub_80D08A8); GetMonNickname(&gPlayerParty[gFieldEffectArguments[0]], gStringVar1); return FALSE; diff --git a/src/fldeff_sweetscent.c b/src/fldeff_sweetscent.c index 45c471e95..d827aff4d 100644 --- a/src/fldeff_sweetscent.c +++ b/src/fldeff_sweetscent.c @@ -43,7 +43,7 @@ bool8 FldEff_SweetScent(void) u8 taskId; SetWeatherScreenFadeOut(); - taskId = oei_task_add(); + taskId = CreateFieldEffectShowMon(); FLDEFF_SET_FUNC_TO_DATA(StartSweetScentFieldEffect); return FALSE; } diff --git a/src/fldeff_teleport.c b/src/fldeff_teleport.c index a66a332bf..44a7af732 100644 --- a/src/fldeff_teleport.c +++ b/src/fldeff_teleport.c @@ -28,7 +28,7 @@ static void FieldCallback_Teleport(void) bool8 FldEff_UseTeleport(void) { - u8 taskId = oei_task_add(); + u8 taskId = CreateFieldEffectShowMon(); FLDEFF_SET_FUNC_TO_DATA(StartTeleportFieldEffect); SetPlayerAvatarTransitionFlags(PLAYER_AVATAR_FLAG_ON_FOOT); return FALSE; diff --git a/src/metatile_behavior.c b/src/metatile_behavior.c index 8e07c1c97..7c05d1dde 100644 --- a/src/metatile_behavior.c +++ b/src/metatile_behavior.c @@ -16,39 +16,12 @@ static const bool8 sTileSurfable[METATILE_COUNT] = { [MB_SOUTHWARD_CURRENT] = TRUE }; -static const u8 sTileBitAttributes[] = { - 0x00, - 0x01, - 0x02, - 0x04, - 0x08, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00 +static const u8 sTileBitAttributes[32] = { + [0] = 0x00, + [1] = 0x01, + [2] = 0x02, + [3] = 0x04, + [4] = 0x08, }; bool8 MetatileBehavior_UnusedReturnTrue(u8 metatileBehavior) @@ -769,7 +742,7 @@ bool8 MetatileBehavior_UnusedReturnFalse_11(u8 metatileBehavior) { return FALSE; bool8 MetatileBehavior_UnusedReturnFalse_12(u8 metatileBehavior) { return FALSE; } bool8 MetatileBehavior_UnusedReturnFalse_13(u8 metatileBehavior) { return FALSE; } -bool8 sub_805A2BC(u8 arg1, u8 arg2) +bool8 TestMetatileAttributeBit(u8 arg1, u8 arg2) { if(sTileBitAttributes[arg1] & arg2) return TRUE; diff --git a/src/prof_pc.c b/src/prof_pc.c index d1f06a2ba..ce81d9ce8 100644 --- a/src/prof_pc.c +++ b/src/prof_pc.c @@ -4,22 +4,22 @@ #include "field_message_box.h" #include "constants/species.h" -extern const u8 gUnknown_81A6D17[]; -extern const u8 gUnknown_81A6D6D[]; -extern const u8 gUnknown_81A6DDF[]; -extern const u8 gUnknown_81A6E36[]; -extern const u8 gUnknown_81A6EA4[]; -extern const u8 gUnknown_81A6F0B[]; -extern const u8 gUnknown_81A6F71[]; -extern const u8 gUnknown_81A6FAB[]; -extern const u8 gUnknown_81A6FF1[]; -extern const u8 gUnknown_81A7031[]; -extern const u8 gUnknown_81A7063[]; -extern const u8 gUnknown_81A70A5[]; -extern const u8 gUnknown_81A70D8[]; -extern const u8 gUnknown_81A7108[]; -extern const u8 gUnknown_81A7137[]; -extern const u8 gUnknown_81A7175[]; +extern const u8 PokedexRating_Text_LessThan10[]; +extern const u8 PokedexRating_Text_LessThan20[]; +extern const u8 PokedexRating_Text_LessThan30[]; +extern const u8 PokedexRating_Text_LessThan40[]; +extern const u8 PokedexRating_Text_LessThan50[]; +extern const u8 PokedexRating_Text_LessThan60[]; +extern const u8 PokedexRating_Text_LessThan70[]; +extern const u8 PokedexRating_Text_LessThan80[]; +extern const u8 PokedexRating_Text_LessThan90[]; +extern const u8 PokedexRating_Text_LessThan100[]; +extern const u8 PokedexRating_Text_LessThan110[]; +extern const u8 PokedexRating_Text_LessThan120[]; +extern const u8 PokedexRating_Text_LessThan130[]; +extern const u8 PokedexRating_Text_LessThan140[]; +extern const u8 PokedexRating_Text_LessThan150[]; +extern const u8 PokedexRating_Text_Complete[]; u16 Special_GetPokedexCount(void) { @@ -41,65 +41,67 @@ static const u8 *GetProfOaksRatingMessageByCount(u16 count) gSpecialVar_Result = FALSE; if (count < 10) - return gUnknown_81A6D17; + return PokedexRating_Text_LessThan10; if (count < 20) - return gUnknown_81A6D6D; + return PokedexRating_Text_LessThan20; if (count < 30) - return gUnknown_81A6DDF; + return PokedexRating_Text_LessThan30; if (count < 40) - return gUnknown_81A6E36; + return PokedexRating_Text_LessThan40; if (count < 50) - return gUnknown_81A6EA4; + return PokedexRating_Text_LessThan50; if (count < 60) - return gUnknown_81A6F0B; + return PokedexRating_Text_LessThan60; if (count < 70) - return gUnknown_81A6F71; + return PokedexRating_Text_LessThan70; if (count < 80) - return gUnknown_81A6FAB; + return PokedexRating_Text_LessThan80; if (count < 90) - return gUnknown_81A6FF1; + return PokedexRating_Text_LessThan90; if (count < 100) - return gUnknown_81A7031; + return PokedexRating_Text_LessThan100; if (count < 110) - return gUnknown_81A7063; + return PokedexRating_Text_LessThan110; if (count < 120) - return gUnknown_81A70A5; + return PokedexRating_Text_LessThan120; if (count < 130) - return gUnknown_81A70D8; + return PokedexRating_Text_LessThan130; if (count < 140) - return gUnknown_81A7108; + return PokedexRating_Text_LessThan140; if (count < 150) - return gUnknown_81A7137; + return PokedexRating_Text_LessThan150; if (count == 150) { + // Mew doesn't count for completing the pokedex if (GetSetPokedexFlag(SpeciesToNationalPokedexNum(SPECIES_MEW), 1)) - return gUnknown_81A7137; + return PokedexRating_Text_LessThan150; + gSpecialVar_Result = TRUE; - return gUnknown_81A7175; + return PokedexRating_Text_Complete; } if (count == 151) { gSpecialVar_Result = TRUE; - return gUnknown_81A7175; + return PokedexRating_Text_Complete; } - return gUnknown_81A6D17; + return PokedexRating_Text_LessThan10; } void Special_GetProfOaksRatingMessage(void) diff --git a/src/quest_log.c b/src/quest_log.c index b747dd8b6..6e70ceea8 100644 --- a/src/quest_log.c +++ b/src/quest_log.c @@ -113,7 +113,7 @@ static EWRAM_DATA u16 *gUnknown_203AE90 = NULL; static EWRAM_DATA struct UnkStruct_203AE94 gUnknown_203AE94 = {0}; static EWRAM_DATA struct UnkStruct_203AE98 gUnknown_203AE98[32] = {0}; static EWRAM_DATA u16 sQuestLogIdx = 0; -static EWRAM_DATA u8 gUnknown_203AF9A[64][2] = {{0}}; +static EWRAM_DATA u8 sMovementScripts[64][2] = {{0}}; static EWRAM_DATA u16 gUnknown_203B01A = 0; static EWRAM_DATA u16 gUnknown_203B01C = 0; static EWRAM_DATA u16 sFlagOrVarPlayhead = 0; @@ -1551,24 +1551,24 @@ void sub_811246C(struct Sprite *sprite) struct ObjectEvent *objectEvent = &gObjectEvents[sprite->data[0]]; if (objectEvent->localId == OBJ_EVENT_ID_PLAYER) { - if (gUnknown_203AF9A[0][0] != OBJ_EVENT_ID_PLAYER) + if (sMovementScripts[0][0] != 0xFF) { - ObjectEventSetHeldMovement(objectEvent, gUnknown_203AF9A[0][0]); - gUnknown_203AF9A[0][0] = OBJ_EVENT_ID_PLAYER; + ObjectEventSetHeldMovement(objectEvent, sMovementScripts[0][0]); + sMovementScripts[0][0] = 0xFF; } - if (gUnknown_203AF9A[0][1] != OBJ_EVENT_ID_PLAYER) + if (sMovementScripts[0][1] != OBJ_EVENT_ID_PLAYER) { sub_8150454(); - gUnknown_203AF9A[0][1] = OBJ_EVENT_ID_PLAYER; + sMovementScripts[0][1] = OBJ_EVENT_ID_PLAYER; } sub_8063E28(objectEvent, sprite); } else { - if (gUnknown_203AF9A[objectEvent->localId][0] != OBJ_EVENT_ID_PLAYER) + if (sMovementScripts[objectEvent->localId][0] != 0xFF) { - ObjectEventSetHeldMovement(objectEvent, gUnknown_203AF9A[objectEvent->localId][0]); - gUnknown_203AF9A[objectEvent->localId][0] = OBJ_EVENT_ID_PLAYER; + ObjectEventSetHeldMovement(objectEvent, sMovementScripts[objectEvent->localId][0]); + sMovementScripts[objectEvent->localId][0] = 0xFF; } sub_8063E28(objectEvent, sprite); } @@ -1736,15 +1736,15 @@ static void sub_8112940(u8 a0, struct UnkStruct_203AE98 *a1, u16 a2) sNumQuestLogs = a2 / 8; for (i = 0; i < 0x40; i++) { - gUnknown_203AF9A[i][0] |= 0xFF; - gUnknown_203AF9A[i][1] |= 0xFF; + sMovementScripts[i][0] |= 0xFF; + sMovementScripts[i][1] |= 0xFF; } sQuestLogIdx = 0; gUnknown_203B01C = 0; gUnknown_3005E90 = (struct UnkStruct_3005E90){}; gUnknown_203B01A = gUnknown_3005E94[sQuestLogIdx].unk_4; - gUnknown_203AF9A[0][0] = gUnknown_3005E94[sQuestLogIdx].unk_3; - gUnknown_203AF9A[0][1] = 0xFF; + sMovementScripts[0][0] = gUnknown_3005E94[sQuestLogIdx].unk_3; + sMovementScripts[0][1] = 0xFF; gUnknown_3005E88 = 1; break; case 2: @@ -1807,10 +1807,10 @@ void sub_8112B3C(void) switch (gUnknown_3005E94[sQuestLogIdx].unk_6) { case 0: - gUnknown_203AF9A[gUnknown_3005E94[sQuestLogIdx].unk_0][0] = gUnknown_3005E94[sQuestLogIdx].unk_3; + sMovementScripts[gUnknown_3005E94[sQuestLogIdx].unk_0][0] = gUnknown_3005E94[sQuestLogIdx].unk_3; break; case 1: - gUnknown_203AF9A[gUnknown_3005E94[sQuestLogIdx].unk_0][1] = gUnknown_3005E94[sQuestLogIdx].unk_3; + sMovementScripts[gUnknown_3005E94[sQuestLogIdx].unk_0][1] = gUnknown_3005E94[sQuestLogIdx].unk_3; break; case 2: *(u32 *)&gUnknown_3005E90 = ((gUnknown_3005E94[sQuestLogIdx].unk_3 << 24) | (gUnknown_3005E94[sQuestLogIdx].unk_2 << 16) | (gUnknown_3005E94[sQuestLogIdx].unk_1 << 8) | (gUnknown_3005E94[sQuestLogIdx].unk_0 << 0)); diff --git a/src/sea_cottage_special_anim.c b/src/sea_cottage_special_anim.c deleted file mode 100644 index c63974a1f..000000000 --- a/src/sea_cottage_special_anim.c +++ /dev/null @@ -1,262 +0,0 @@ -#include "global.h" -#include "event_data.h" -#include "task.h" -#include "field_player_avatar.h" -#include "fieldmap.h" -#include "field_camera.h" - -static EWRAM_DATA u8 gUnknown_2039984 = 0; - -static void sub_809C1D8(u8 taskId, const s16 *a1, u16 a2); -static void sub_809C334(u8 taskId); -static void sub_809C500(u8 taskId); -static void sub_809C640(u8 taskId); - -static const u16 gUnknown_83DF0D4[] = {0x0308, 0x030a, 0x02d0}; -static const u16 gUnknown_83DF0DA[] = {0x0309, 0x030b, 0x02d1}; -static const u16 gUnknown_83DF0E0[] = {0x0310, 0x0312, 0x02d8}; -static const u16 gUnknown_83DF0E6[] = {0x0311, 0x0313, 0x02d9}; -static const u16 gUnknown_83DF0EC[] = {0x02e3, 0x0316, 0x0314}; -static const u16 gUnknown_83DF0F2[] = {0x02e4, 0x0317, 0x0315}; -static const u16 gUnknown_83DF0F8[] = {0x02eb, 0x031e, 0x031c}; - -// Functions -static void sub_809C1D8(u8 taskId, const s16 *a1, u16 a2) -{ - s16 r5, r3, r4; - s16 i, j; - - r5 = gTasks[taskId].data[4] - 1; - r3 = gTasks[taskId].data[5] - 1; - r4 = gTasks[taskId].data[1]; - - if (gTasks[taskId].data[2] == 0) - { - for (i = 0; i < 3; i++) - { - for (j = 0; j < 3; j++) - { - s32 id = MapGridGetMetatileIdAt(r5 + j, r3 + i); - - if (a1[r4] == (s16)id) - { - if (r4 != 2) - MapGridSetMetatileIdAt(r5 + j, r3 + i, a2 | a1[r4 + 1]); - else - MapGridSetMetatileIdAt(r5 + j, r3 + i, a2 | a1[0]); - } - } - } - } - else - { - for (i = 0; i < 3; i++) - { - for (j = 0; j < 3; j++) - { - s32 id = MapGridGetMetatileIdAt(r5 + j, r3 + i); - - if (a1[2 - r4] == (s16)id) - { - if (r4 != 2) - MapGridSetMetatileIdAt(r5 + j, r3 + i, a2 | a1[1 - r4]); - else - MapGridSetMetatileIdAt(r5 + j, r3 + i, a2 | a1[2]); - } - } - } - } -} - -static void sub_809C334(u8 taskId) -{ - s16 *data = gTasks[taskId].data; - u16 v1; - - data[3] = 1; - switch (data[0]) - { - case 0: - sub_809C1D8(taskId, gUnknown_83DF0D4, 0); - break; - case 1: - sub_809C1D8(taskId, gUnknown_83DF0DA, 0); - break; - case 2: - sub_809C1D8(taskId, gUnknown_83DF0E0, 0xC00); - break; - case 3: - sub_809C1D8(taskId, gUnknown_83DF0E6, 0); - break; - case 4: - sub_809C1D8(taskId, gUnknown_83DF0EC, 0xC00); - break; - case 5: - sub_809C1D8(taskId, gUnknown_83DF0F2, 0); - break; - case 6: - sub_809C1D8(taskId, gUnknown_83DF0F8, 0); - default: - break; - } - - data[0] = (data[0] + 1) & 7; - v1 = data[0] & 7; - if (v1 == 0) - { - DrawWholeMapView(); - data[1] = (data[1] + 1) % 3; - data[3] = v1; - } -} - -static u8 sub_809C3FC(u16 a0) -{ - u8 taskId; - s16 *data; - - taskId = CreateTask(sub_809C334, 0); - data = gTasks[taskId].data; - PlayerGetDestCoords(&data[4], &data[5]); - data[0] = 0; - data[1] = 0; - data[2] = a0; - sub_809C334(taskId); - return taskId; -} - -void sub_809C448(u8 a0) -{ - u8 taskId; - - taskId = sub_809C3FC(a0); - gUnknown_2039984 = taskId; -} - -void sub_809C460(void) -{ - DestroyTask(gUnknown_2039984); -} - -bool8 sub_809C474(void) -{ - if (gTasks[gUnknown_2039984].data[3] == 0) - { - if (gTasks[gUnknown_2039984].data[1] != 2) - return TRUE; - return FALSE; - } - else - { - return TRUE; - } -} - -// special 0x1b5 - creates a tile animaiton one block left two-four up the player -void sub_809C4A8(void) -{ - u8 taskId; - s16 *data; - - taskId = CreateTask(sub_809C500, 0); - gTasks[taskId].data[0] = 0; - gTasks[taskId].data[1] = 0; - data = gTasks[taskId].data; - PlayerGetDestCoords(&data[2], &data[3]); - if (gSpecialVar_0x8004 == 0) - { - gTasks[taskId].data[2] += 6; - gTasks[taskId].data[3] -= 5; - } - else - { - gTasks[taskId].data[2]--; - gTasks[taskId].data[3] -= 5; - } -} - -static void sub_809C500(u8 taskId) -{ - s16 *data = gTasks[taskId].data; - - if (data[0] == 0) - { - if ((data[1] & 1) == 0) - { - MapGridSetMetatileIdAt(data[2], data[3], 0xEB5); - MapGridSetMetatileIdAt(data[2], data[3] + 2, 0xEB7); - } - else - { - MapGridSetMetatileIdAt(data[2], data[3], 0xEB6); - MapGridSetMetatileIdAt(data[2], data[3] + 2, 0xEB8); - } - CurrentMapDrawMetatileAt(data[2], data[3]); - CurrentMapDrawMetatileAt(data[2], data[3] + 2); - } - - data[0]++; - if (data[0] != 0x10) - return; - - data[0] = 0; - data[1]++; - if (data[1] != 0xD) - return; - - MapGridSetMetatileIdAt(data[2], data[3], 0xE8A); - MapGridSetMetatileIdAt(data[2], data[3] + 2, 0xE96); - CurrentMapDrawMetatileAt(data[2], data[3]); - CurrentMapDrawMetatileAt(data[2], data[3] + 2); - DestroyTask(taskId); -} - -// special 0x1B7 - creates a tile animation two-six blocks right from the top-left corner of the screen -void sub_809C5FC(void) -{ - u8 taskId; - s16 *data; - - taskId = CreateTask(sub_809C640, 0); - gTasks[taskId].data[0] = 0; - gTasks[taskId].data[1] = 0; - data = gTasks[taskId].data; - PlayerGetDestCoords(&data[2], &data[3]); - gTasks[taskId].data[2] += 4; - gTasks[taskId].data[3] -= 5; -} - -static void sub_809C640(u8 taskId) -{ - s16 *data = gTasks[taskId].data; - - if (data[0] == 0) - { - if (data[1] != 0) - { - MapGridSetMetatileIdAt(data[2], data[3], 0xE85); - MapGridSetMetatileIdAt(data[2], data[3] + 1, 0xEB4); - CurrentMapDrawMetatileAt(data[2], data[3]); - CurrentMapDrawMetatileAt(data[2], data[3] + 1); - if (data[1] == 4) - { - DestroyTask(taskId); - return; - } - - data[2]--; - } - MapGridSetMetatileIdAt(data[2], data[3], 0xEB9); - MapGridSetMetatileIdAt(data[2], data[3] + 1, 0xEBA); - CurrentMapDrawMetatileAt(data[2], data[3]); - CurrentMapDrawMetatileAt(data[2], data[3] + 1); - } - - data[0]++; - if (data[0] == 4) - { - data[0] = 0; - data[1]++; - } -} - diff --git a/src/special_field_anim.c b/src/special_field_anim.c new file mode 100644 index 000000000..4193f0b5a --- /dev/null +++ b/src/special_field_anim.c @@ -0,0 +1,341 @@ +#include "global.h" +#include "event_data.h" +#include "task.h" +#include "field_player_avatar.h" +#include "fieldmap.h" +#include "field_camera.h" +#include "constants/metatile_labels.h" + +static EWRAM_DATA u8 sEscalatorTaskId = 0; + +static void SetEscalatorMetatile(u8 taskId, const s16 *metatileIds, u16 metatileMasks); +static void Task_DrawEscalator(u8 taskId); +static void Task_DrawTeleporterHousing(u8 taskId); +static void Task_DrawTeleporterCable(u8 taskId); + +#define ESCALATOR_STAGES 3 +#define LAST_ESCALATOR_STAGE (ESCALATOR_STAGES - 1) + +static const u16 sEscalatorMetatiles_BottomNextRail[ESCALATOR_STAGES] = +{ + METATILE_PokemonCenter_Escalator_BottomNextRail_Transition2, + METATILE_PokemonCenter_Escalator_BottomNextRail_Transition1, + METATILE_PokemonCenter_Escalator_BottomNextRail_Normal +}; + +static const u16 sEscalatorMetatiles_BottomRail[ESCALATOR_STAGES] = +{ + METATILE_PokemonCenter_Escalator_BottomRail_Transition2, + METATILE_PokemonCenter_Escalator_BottomRail_Transition1, + METATILE_PokemonCenter_Escalator_BottomRail_Normal +}; + +static const u16 sEscalatorMetatiles_BottomNext[ESCALATOR_STAGES] = +{ + METATILE_PokemonCenter_Escalator_BottomNext_Transition2, + METATILE_PokemonCenter_Escalator_BottomNext_Transition1, + METATILE_PokemonCenter_Escalator_BottomNext_Normal +}; + +static const u16 sEscalatorMetatiles_Bottom[ESCALATOR_STAGES] = +{ + METATILE_PokemonCenter_Escalator_Bottom_Transition2, + METATILE_PokemonCenter_Escalator_Bottom_Transition1, + METATILE_PokemonCenter_Escalator_Bottom_Normal +}; + +static const u16 sEscalatorMetatiles_TopNext[ESCALATOR_STAGES] = +{ + METATILE_PokemonCenter_Escalator_TopNext_Normal, + METATILE_PokemonCenter_Escalator_TopNext_Transition1, + METATILE_PokemonCenter_Escalator_TopNext_Transition2 +}; + +static const u16 sEscalatorMetatiles_Top[ESCALATOR_STAGES] = +{ + METATILE_PokemonCenter_Escalator_Top_Normal, + METATILE_PokemonCenter_Escalator_Top_Transition1, + METATILE_PokemonCenter_Escalator_Top_Transition2 +}; + +static const u16 sEscalatorMetatiles_TopNextRail[ESCALATOR_STAGES] = +{ + METATILE_PokemonCenter_Escalator_TopNextRail_Normal, + METATILE_PokemonCenter_Escalator_TopNextRail_Transition1, + METATILE_PokemonCenter_Escalator_TopNextRail_Transition2 +}; + +#define tState data[0] +#define tTransitionStage data[1] +#define tGoingUp data[2] +#define tDrawingEscalator data[3] +#define tPlayerX data[4] +#define tPlayerY data[5] + +static void SetEscalatorMetatile(u8 taskId, const s16 *metatileIds, u16 metatileMasks) +{ + s16 x, y, transitionStage; + s16 i, j; + + x = gTasks[taskId].tPlayerX - 1; + y = gTasks[taskId].tPlayerY - 1; + transitionStage = gTasks[taskId].tTransitionStage; + + // Check all the escalator sections and only progress the selected one to the next stage + if (!gTasks[taskId].tGoingUp) + { + for (i = 0; i < 3; i++) + { + for (j = 0; j < 3; j++) + { + s32 id = MapGridGetMetatileIdAt(x + j, y + i); + + if (metatileIds[transitionStage] == (s16)id) + { + if (transitionStage != LAST_ESCALATOR_STAGE) + MapGridSetMetatileIdAt(x + j, y + i, metatileMasks | metatileIds[transitionStage + 1]); + else + MapGridSetMetatileIdAt(x + j, y + i, metatileMasks | metatileIds[0]); + } + } + } + } + else + { + for (i = 0; i < 3; i++) + { + for (j = 0; j < 3; j++) + { + s32 id = MapGridGetMetatileIdAt(x + j, y + i); + + if (metatileIds[LAST_ESCALATOR_STAGE - transitionStage] == (s16)id) + { + if (transitionStage != LAST_ESCALATOR_STAGE) + MapGridSetMetatileIdAt(x + j, y + i, metatileMasks | metatileIds[1 - transitionStage]); + else + MapGridSetMetatileIdAt(x + j, y + i, metatileMasks | metatileIds[LAST_ESCALATOR_STAGE]); + } + } + } + } +} + +static void Task_DrawEscalator(u8 taskId) +{ + s16 *data = gTasks[taskId].data; + u16 state; + + tDrawingEscalator = TRUE; + + // Set tile for each section of the escalator in sequence for current transition stage + switch (tState) + { + case 0: + SetEscalatorMetatile(taskId, sEscalatorMetatiles_BottomNextRail, 0); + break; + case 1: + SetEscalatorMetatile(taskId, sEscalatorMetatiles_BottomRail, 0); + break; + case 2: + SetEscalatorMetatile(taskId, sEscalatorMetatiles_BottomNext, METATILE_COLLISION_MASK); + break; + case 3: + SetEscalatorMetatile(taskId, sEscalatorMetatiles_Bottom, 0); + break; + case 4: + SetEscalatorMetatile(taskId, sEscalatorMetatiles_TopNext, METATILE_COLLISION_MASK); + break; + case 5: + SetEscalatorMetatile(taskId, sEscalatorMetatiles_Top, 0); + break; + case 6: + SetEscalatorMetatile(taskId, sEscalatorMetatiles_TopNextRail, 0); + default: + break; + } + + tState = (tState + 1) & 7; + state = tState & 7; + + // If all sections of the escalator have been set, draw map and progress to next stage + if (state == 0) + { + DrawWholeMapView(); + tTransitionStage = (tTransitionStage + 1) % ESCALATOR_STAGES; + tDrawingEscalator = FALSE; + } +} + +static u8 CreateEscalatorTask(bool16 goingUp) +{ + u8 taskId; + s16 *data; + + taskId = CreateTask(Task_DrawEscalator, 0); + data = gTasks[taskId].data; + PlayerGetDestCoords(&tPlayerX, &tPlayerY); + tState = 0; + tTransitionStage = 0; + tGoingUp = goingUp; + Task_DrawEscalator(taskId); + return taskId; +} + +void StartEscalator(bool8 goingUp) +{ + u8 taskId; + + taskId = CreateEscalatorTask(goingUp); + sEscalatorTaskId = taskId; +} + +void StopEscalator(void) +{ + DestroyTask(sEscalatorTaskId); +} + +bool8 IsEscalatorMoving(void) +{ + if (gTasks[sEscalatorTaskId].tDrawingEscalator == FALSE) + { + if (gTasks[sEscalatorTaskId].tTransitionStage != LAST_ESCALATOR_STAGE) + return TRUE; + return FALSE; + } + else + { + return TRUE; + } +} + +#undef tState +#undef tTransitionStage +#undef tGoingUp +#undef tDrawingEscalator +#undef tPlayerX +#undef tPlayerY + +#define tTimer data[0] +#define tState data[1] +#define tX data[2] +#define tY data[3] + +void AnimateTeleporterHousing(void) +{ + u8 taskId; + s16 *data; + + taskId = CreateTask(Task_DrawTeleporterHousing, 0); + gTasks[taskId].tTimer = 0; + gTasks[taskId].tState = 0; + data = gTasks[taskId].data; + PlayerGetDestCoords(&tX, &tY); + + // Set the coords of whichever teleporter is being animated + // 0 for the right teleporter, 1 for the left teleporter + if (gSpecialVar_0x8004 == 0) + { + gTasks[taskId].tX += 6; + gTasks[taskId].tY -= 5; + } + else + { + gTasks[taskId].tX -= 1; + gTasks[taskId].tY -= 5; + } +} + +static void Task_DrawTeleporterHousing(u8 taskId) +{ + s16 *data = gTasks[taskId].data; + + if (tTimer == 0) + { + // Alternate the teleporter light / brightness of the teleporter door + if ((tState & 1) == 0) + { + MapGridSetMetatileIdAt(tX, tY, METATILE_SeaCottage_Teleporter_Light_Yellow | METATILE_COLLISION_MASK); + MapGridSetMetatileIdAt(tX, tY + 2, METATILE_SeaCottage_Teleporter_Door_HalfGlowing | METATILE_COLLISION_MASK); + } + else + { + MapGridSetMetatileIdAt(tX, tY, METATILE_SeaCottage_Teleporter_Light_Red | METATILE_COLLISION_MASK); + MapGridSetMetatileIdAt(tX, tY + 2, METATILE_SeaCottage_Teleporter_Door_FullGlowing | METATILE_COLLISION_MASK); + } + CurrentMapDrawMetatileAt(tX, tY); + CurrentMapDrawMetatileAt(tX, tY + 2); + } + + tTimer++; + if (tTimer != 16) + return; + + tTimer = 0; + tState++; + if (tState != 13) + return; + + MapGridSetMetatileIdAt(tX, tY, METATILE_SeaCottage_Teleporter_Light_Green | METATILE_COLLISION_MASK); + MapGridSetMetatileIdAt(tX, tY + 2, METATILE_SeaCottage_Teleporter_Door | METATILE_COLLISION_MASK); + CurrentMapDrawMetatileAt(tX, tY); + CurrentMapDrawMetatileAt(tX, tY + 2); + DestroyTask(taskId); +} + +void AnimateTeleporterCable(void) +{ + u8 taskId; + s16 *data; + + taskId = CreateTask(Task_DrawTeleporterCable, 0); + gTasks[taskId].tTimer = 0; + gTasks[taskId].tState = 0; + data = gTasks[taskId].data; + PlayerGetDestCoords(&tX, &tY); + gTasks[taskId].tX += 4; + gTasks[taskId].tY -= 5; +} + +static void Task_DrawTeleporterCable(u8 taskId) +{ + s16 *data = gTasks[taskId].data; + + if (tTimer == 0) + { + if (tState != 0) + { + // Set default cable tiles to clear the ball + MapGridSetMetatileIdAt(tX, tY, METATILE_SeaCottage_Teleporter_Cable_Top | METATILE_COLLISION_MASK); + MapGridSetMetatileIdAt(tX, tY + 1, METATILE_SeaCottage_Teleporter_Cable_Bottom | METATILE_COLLISION_MASK); + CurrentMapDrawMetatileAt(tX, tY); + CurrentMapDrawMetatileAt(tX, tY + 1); + + // End after drawing 4 times (length of the cable) + if (tState == 4) + { + DestroyTask(taskId); + return; + } + + tX--; + } + + // Draw the cable ball + MapGridSetMetatileIdAt(tX, tY, METATILE_SeaCottage_Teleporter_CableBall_Top | METATILE_COLLISION_MASK); + MapGridSetMetatileIdAt(tX, tY + 1, METATILE_SeaCottage_Teleporter_CableBall_Bottom | METATILE_COLLISION_MASK); + CurrentMapDrawMetatileAt(tX, tY); + CurrentMapDrawMetatileAt(tX, tY + 1); + } + + tTimer++; + if (tTimer == 4) + { + tTimer = 0; + tState++; + } +} + +#undef tTimer +#undef tState +#undef tX +#undef tY diff --git a/src/wild_encounter.c b/src/wild_encounter.c index b32eb583a..b3605db47 100644 --- a/src/wild_encounter.c +++ b/src/wild_encounter.c @@ -367,11 +367,11 @@ bool8 StandardWildEncounter(u32 currMetatileBehavior, u16 previousMetatileBehavi headerId = GetCurrentMapWildMonHeaderId(); if (headerId != 0xFFFF) { - if (sub_8058F1C(currMetatileBehavior, 4) == TRUE) + if (GetMetatileAttributeFromRawMetatileBehavior(currMetatileBehavior, 4) == TRUE) { if (gWildMonHeaders[headerId].landMonsInfo == NULL) return FALSE; - else if (previousMetatileBehavior != sub_8058F1C(currMetatileBehavior, 0) && !DoGlobalWildEncounterDiceRoll()) + else if (previousMetatileBehavior != GetMetatileAttributeFromRawMetatileBehavior(currMetatileBehavior, 0) && !DoGlobalWildEncounterDiceRoll()) return FALSE; if (DoWildEncounterRateTest(gWildMonHeaders[headerId].landMonsInfo->encounterRate, FALSE) != TRUE) { @@ -405,12 +405,12 @@ bool8 StandardWildEncounter(u32 currMetatileBehavior, u16 previousMetatileBehavi } } } - else if (sub_8058F1C(currMetatileBehavior, 4) == 2 - || (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_SURFING) && MetatileBehavior_IsBridge(sub_8058F1C(currMetatileBehavior, 0)) == TRUE)) + else if (GetMetatileAttributeFromRawMetatileBehavior(currMetatileBehavior, 4) == 2 + || (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_SURFING) && MetatileBehavior_IsBridge(GetMetatileAttributeFromRawMetatileBehavior(currMetatileBehavior, 0)) == TRUE)) { if (gWildMonHeaders[headerId].waterMonsInfo == NULL) return FALSE; - else if (previousMetatileBehavior != sub_8058F1C(currMetatileBehavior, 0) && !DoGlobalWildEncounterDiceRoll()) + else if (previousMetatileBehavior != GetMetatileAttributeFromRawMetatileBehavior(currMetatileBehavior, 0) && !DoGlobalWildEncounterDiceRoll()) return FALSE; else if (DoWildEncounterRateTest(gWildMonHeaders[headerId].waterMonsInfo->encounterRate, FALSE) != TRUE) { @@ -474,7 +474,7 @@ bool8 SweetScentWildEncounter(void) headerId = GetCurrentMapWildMonHeaderId(); if (headerId != 0xFFFF) { - if (sub_8058F48(x, y, 4) == 1) + if (MapGridGetMetatileAttributeAt(x, y, 4) == 1) { if (TryStartRoamerEncounter() == TRUE) { @@ -490,7 +490,7 @@ bool8 SweetScentWildEncounter(void) BattleSetup_StartWildBattle(); return TRUE; } - else if (sub_8058F48(x, y, 4) == 2) + else if (MapGridGetMetatileAttributeAt(x, y, 4) == 2) { if (TryStartRoamerEncounter() == TRUE) { @@ -711,7 +711,7 @@ void ResetEncounterRateModifiers(void) static bool8 HandleWildEncounterCooldown(u32 currMetatileBehavior) { - u8 unk = sub_8058F1C(currMetatileBehavior, 4); + u8 unk = GetMetatileAttributeFromRawMetatileBehavior(currMetatileBehavior, 4); u32 minSteps; u32 encRate; if (unk == 0) @@ -763,19 +763,19 @@ bool8 TryStandardWildEncounter(u32 currMetatileBehavior) { if (!HandleWildEncounterCooldown(currMetatileBehavior)) { - sWildEncounterData.prevMetatileBehavior = sub_8058F1C(currMetatileBehavior, 0); + sWildEncounterData.prevMetatileBehavior = GetMetatileAttributeFromRawMetatileBehavior(currMetatileBehavior, 0); return FALSE; } else if (StandardWildEncounter(currMetatileBehavior, sWildEncounterData.prevMetatileBehavior) == TRUE) { sWildEncounterData.encounterRateBuff = 0; sWildEncounterData.stepsSinceLastEncounter = 0; - sWildEncounterData.prevMetatileBehavior = sub_8058F1C(currMetatileBehavior, 0); + sWildEncounterData.prevMetatileBehavior = GetMetatileAttributeFromRawMetatileBehavior(currMetatileBehavior, 0); return TRUE; } else { - sWildEncounterData.prevMetatileBehavior = sub_8058F1C(currMetatileBehavior, 0); + sWildEncounterData.prevMetatileBehavior = GetMetatileAttributeFromRawMetatileBehavior(currMetatileBehavior, 0); return FALSE; } } diff --git a/sym_ewram.txt b/sym_ewram.txt index d358929eb..af88aba94 100644 --- a/sym_ewram.txt +++ b/sym_ewram.txt @@ -218,14 +218,8 @@ gUnknown_203982C: @ 203982C .align 2 .include "src/script_movement.o" - .align 2 -gUnknown_2039870: @ 2039870 - .space 0x4 - -gUnknown_2039874: @ 2039874 - .space 0x4 - + .include "src/fldeff_cut.o" .align 2 .include "src/item_menu_icons.o" @@ -235,7 +229,7 @@ gBagPockets: @ 203988C .align 2 .include "src/shop.o" .align 2 - .include "src/sea_cottage_special_anim.o" + .include "src/special_field_anim.o" .align 2 .include "src/script_menu.o" |