From e8add87bf3ccc3563a3d4fa94e109251f4a06eea Mon Sep 17 00:00:00 2001 From: Fontbane Date: Fri, 22 Mar 2019 12:25:51 -0400 Subject: [PATCH] Document Field Effects and some related text Also VAR_TRICK_HOUSE_LEVEL --- data/event_scripts.s | 12 +-- data/field_effect_scripts.s | 96 +++++++++---------- data/maps/Route110_TrickHouseEnd/scripts.inc | 4 +- .../Route110_TrickHouseEntrance/scripts.inc | 64 ++++++------- data/text/surf.inc | 4 +- include/constants/field_effects.h | 6 +- include/constants/vars.h | 2 +- src/field_effect_helpers.c | 2 +- 8 files changed, 95 insertions(+), 95 deletions(-) diff --git a/data/event_scripts.s b/data/event_scripts.s index 0ed2ec406..5c3c408aa 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1717,20 +1717,20 @@ Route109_EventScript_271E95:: @ 8271E95 EventScript_UseSurf:: @ 8271EA0 checkpartymove MOVE_SURF compare VAR_RESULT, 6 - goto_if_eq EventScript_271ED6 + goto_if_eq EventScript_CantSurf bufferpartymonnick 0, VAR_RESULT setfieldeffectargument 0, VAR_RESULT lockall - msgbox gUnknown_08272FD6, MSGBOX_YESNO + msgbox gText_WantToUseSurf, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if_eq EventScript_271ED5 - msgbox gUnknown_0827300D, MSGBOX_DEFAULT + goto_if_eq EventScript_CancelSurf + msgbox gText_PlayerUsedSurf, MSGBOX_DEFAULT dofieldeffect FLDEFF_USE_SURF -EventScript_271ED5:: @ 8271ED5 +EventScript_CancelSurf:: @ 8271ED5 releaseall -EventScript_271ED6:: @ 8271ED6 +EventScript_CantSurf:: @ 8271ED6 end Common_EventScript_SetupRivalGender:: @ 8271ED7 diff --git a/data/field_effect_scripts.s b/data/field_effect_scripts.s index 291d6abec..4aef859d8 100644 --- a/data/field_effect_scripts.s +++ b/data/field_effect_scripts.s @@ -16,26 +16,26 @@ gFieldEffectScriptPointers:: @ 82DB9D4 .4byte gFieldEffectScript_SurfBlob .4byte gFieldEffectScript_UseSurf .4byte gFieldEffectScript_GroundImpactDust - .4byte gFieldEffectScript_Unknown11 + .4byte gFieldEffectScript_UseSecretPowerCave .4byte gFieldEffectScript_BikeHopTallGrass .4byte gFieldEffectScript_SandFootprints .4byte gFieldEffectScript_BikeHopBigSplash .4byte gFieldEffectScript_Splash .4byte gFieldEffectScript_BikeHopSmallSplash .4byte gFieldEffectScript_LongGrass - .4byte gFieldEffectScript_Unknown18 + .4byte gFieldEffectScript_JumpLongGrass .4byte gFieldEffectScript_Unknown19 .4byte gFieldEffectScript_Unknown20 .4byte gFieldEffectScript_Unknown21 .4byte gFieldEffectScript_Unknown22 .4byte gFieldEffectScript_BerryTreeGrowthSparkle .4byte gFieldEffectScript_DeepSandFootprints - .4byte gFieldEffectScript_Unknown25 - .4byte gFieldEffectScript_Unknown26 - .4byte gFieldEffectScript_Unknown27 + .4byte gFieldEffectScript_PokeCenterHeal + .4byte gFieldEffectScript_UseSecretPowerTree + .4byte gFieldEffectScript_UseSecretPowerShrub .4byte gFieldEffectScript_TreeDisguise .4byte gFieldEffectScript_MountainDisguise - .4byte gFieldEffectScript_Unknown30 + .4byte gFieldEffectScript_NPCUseFly .4byte gFieldEffectScript_UseFly .4byte gFieldEffectScript_FlyIn .4byte gFieldEffectScript_QuestionMarkIcon @@ -43,35 +43,35 @@ gFieldEffectScriptPointers:: @ 82DB9D4 .4byte gFieldEffectScript_BikeTireTracks .4byte gFieldEffectScript_SandDisguisePlaceholder .4byte gFieldEffectScript_UseRockSmash - .4byte gFieldEffectScript_Unknown38 - .4byte gFieldEffectScript_Unknown39 - .4byte gFieldEffectScript_Unknown40 + .4byte gFieldEffectScript_UseDig + .4byte gFieldEffectScript_SandPile + .4byte gFieldEffectScript_UseStrength .4byte gFieldEffectScript_ShortGrass .4byte gFieldEffectScript_HotSpringsWater - .4byte gFieldEffectScript_Unknown43 - .4byte gFieldEffectScript_Unknown44 - .4byte gFieldEffectScript_Unknown45 + .4byte gFieldEffectScript_UseWaterfall + .4byte gFieldEffectScript_UseDive + .4byte gFieldEffectScript_Pokeball .4byte gFieldEffectScript_HeartIcon .4byte gFieldEffectScript_Unknown47 .4byte gFieldEffectScript_Unknown48 .4byte gFieldEffectScript_JumpOutOfAsh - .4byte gFieldEffectScript_Unknown50 - .4byte gFieldEffectScript_Unknown51 - .4byte gFieldEffectScript_Unknown52 + .4byte gFieldEffectScript_LavaridgeGymWarp + .4byte gFieldEffectScript_SweetScent + .4byte gFieldEffectScript_SandPillar .4byte gFieldEffectScript_Bubbles - .4byte gFieldEffectScript_Unknown54 - .4byte gFieldEffectScript_Unknown55 - .4byte gFieldEffectScript_Unknown56 - .4byte gFieldEffectScript_Unknown57 - .4byte gFieldEffectScript_Unknown58 + .4byte gFieldEffectScript_Sparkle + .4byte gFieldEffectScript_ShowSecretPowerCave + .4byte gFieldEffectScript_ShowSecretPowerTree + .4byte gFieldEffectScript_ShowSecretPowerShrub + .4byte gFieldEffectScript_ShowCutGrass .4byte gFieldEffectScript_FieldMoveShowMonInit .4byte gFieldEffectScript_UsePuzzleEffect - .4byte gFieldEffectScript_Unknown61 - .4byte gFieldEffectScript_Unknown62 - .4byte gFieldEffectScript_Unknown63 + .4byte gFieldEffectScript_SecretBaseBootPC + .4byte gFieldEffectScript_HallOfFameRecord + .4byte gFieldEffectScript_UseTeleport .4byte gFieldEffectScript_Rayquaza .4byte gFieldEffectScript_Unknown65 - .4byte gFieldEffectScript_Unknown66 + .4byte gFieldEffectScript_MoveDeoxysRock gFieldEffectScript_ExclamationMarkIcon1:: @ 82DBAE0 field_eff_callnative FldEff_ExclamationMarkIcon @@ -117,7 +117,7 @@ gFieldEffectScript_GroundImpactDust:: @ 82DBB28 field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, FldEff_Dust field_eff_end -gFieldEffectScript_Unknown11:: @ 82DBB32 +gFieldEffectScript_UseSecretPowerCave:: @ 82DBB32 field_eff_callnative FldEff_UseSecretPowerCave field_eff_end @@ -145,7 +145,7 @@ gFieldEffectScript_LongGrass:: @ 82DBB6A field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo1, FldEff_LongGrass field_eff_end -gFieldEffectScript_Unknown18:: @ 82DBB74 +gFieldEffectScript_JumpLongGrass:: @ 82DBB74 field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo1, FldEff_JumpLongGrass field_eff_end @@ -173,16 +173,16 @@ gFieldEffectScript_DeepSandFootprints:: @ 82DBBAC field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, FldEff_DeepSandFootprints field_eff_end -gFieldEffectScript_Unknown25:: @ 82DBBB6 +gFieldEffectScript_PokeCenterHeal:: @ 82DBBB6 field_eff_loadfadedpal gFieldEffectObjectPaletteInfo4 field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, FldEff_PokecenterHeal field_eff_end -gFieldEffectScript_Unknown26:: @ 82DBBC5 +gFieldEffectScript_UseSecretPowerTree:: @ 82DBBC5 field_eff_callnative FldEff_UseSecretPowerTree field_eff_end -gFieldEffectScript_Unknown27:: @ 82DBBCB +gFieldEffectScript_UseSecretPowerShrub:: @ 82DBBCB field_eff_callnative FldEff_UseSecretPowerShrub field_eff_end @@ -194,7 +194,7 @@ gFieldEffectScript_MountainDisguise:: @ 82DBBD7 field_eff_callnative ShowMountainDisguiseFieldEffect field_eff_end -gFieldEffectScript_Unknown30:: @ 82DBBDD +gFieldEffectScript_NPCUseFly:: @ 82DBBDD field_eff_callnative FldEff_NPCFlyOut field_eff_end @@ -226,15 +226,15 @@ gFieldEffectScript_UseRockSmash:: @ 82DBC0F field_eff_callnative FldEff_UseRockSmash field_eff_end -gFieldEffectScript_Unknown40:: @ 82DBC15 +gFieldEffectScript_UseStrength:: @ 82DBC15 field_eff_callnative sub_8145E2C field_eff_end -gFieldEffectScript_Unknown38:: @ 82DBC1B +gFieldEffectScript_UseDig:: @ 82DBC1B field_eff_callnative FldEff_UseDig field_eff_end -gFieldEffectScript_Unknown39:: @ 82DBC21 +gFieldEffectScript_SandPile:: @ 82DBC21 field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, FldEff_SandPile field_eff_end @@ -246,15 +246,15 @@ gFieldEffectScript_HotSpringsWater:: @ 82DBC35 field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo1, FldEff_HotSpringsWater field_eff_end -gFieldEffectScript_Unknown43:: @ 82DBC3F +gFieldEffectScript_UseWaterfall:: @ 82DBC3F field_eff_callnative FldEff_UseWaterfall field_eff_end -gFieldEffectScript_Unknown44:: @ 82DBC45 +gFieldEffectScript_UseDive:: @ 82DBC45 field_eff_callnative FldEff_UseDive field_eff_end -gFieldEffectScript_Unknown45:: @ 82DBC4B +gFieldEffectScript_Pokeball:: @ 82DBC4B field_eff_loadpal gFieldEffectObjectPaletteInfo10 field_eff_callnative FldEff_Pokeball field_eff_end @@ -275,15 +275,15 @@ gFieldEffectScript_JumpOutOfAsh:: @ 82DBC6C field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo2, FldEff_PopOutOfAsh field_eff_end -gFieldEffectScript_Unknown50:: @ 82DBC76 +gFieldEffectScript_LavaridgeGymWarp:: @ 82DBC76 field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo2, FldEff_LavaridgeGymWarp field_eff_end -gFieldEffectScript_Unknown51:: @ 82DBC80 +gFieldEffectScript_SweetScent:: @ 82DBC80 field_eff_callnative FldEff_SweetScent field_eff_end -gFieldEffectScript_Unknown52:: @ 82DBC86 +gFieldEffectScript_SandPillar:: @ 82DBC86 field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo9, FldEff_SandPillar field_eff_end @@ -291,23 +291,23 @@ gFieldEffectScript_Bubbles:: @ 82DBC90 field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, FldEff_Bubbles field_eff_end -gFieldEffectScript_Unknown54:: @ 82DBC9A +gFieldEffectScript_Sparkle:: @ 82DBC9A field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo3, FldEff_Sparkle field_eff_end -gFieldEffectScript_Unknown55:: @ 82DBCA4 +gFieldEffectScript_ShowSecretPowerCave:: @ 82DBCA4 field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo7, FldEff_SecretPowerCave field_eff_end -gFieldEffectScript_Unknown56:: @ 82DBCAE +gFieldEffectScript_ShowSecretPowerTree:: @ 82DBCAE field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo8, FldEff_SecretPowerTree field_eff_end -gFieldEffectScript_Unknown57:: @ 82DBCB8 +gFieldEffectScript_ShowSecretPowerShrub:: @ 82DBCB8 field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo8, FldEff_SecretPowerShrub field_eff_end -gFieldEffectScript_Unknown58:: @ 82DBCC2 +gFieldEffectScript_ShowCutGrass:: @ 82DBCC2 field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo6, FldEff_CutGrass field_eff_end @@ -319,16 +319,16 @@ gFieldEffectScript_UsePuzzleEffect:: @ 82DBCD2 field_eff_callnative FldEff_UsePuzzleEffect field_eff_end -gFieldEffectScript_Unknown61:: @ 82DBCD8 +gFieldEffectScript_SecretBaseBootPC:: @ 82DBCD8 field_eff_callnative FldEff_SecretBasePCTurnOn field_eff_end -gFieldEffectScript_Unknown62:: @ 82DBCDE +gFieldEffectScript_HallOfFameRecord:: @ 82DBCDE field_eff_loadfadedpal gFieldEffectObjectPaletteInfo4 field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo5, FldEff_HallOfFameRecord field_eff_end -gFieldEffectScript_Unknown63:: @ 82DBCED +gFieldEffectScript_UseTeleport:: @ 82DBCED field_eff_callnative FldEff_UseTeleport field_eff_end @@ -340,6 +340,6 @@ gFieldEffectScript_Unknown65:: @ 82DBCF9 field_eff_callnative sub_80B9ADC field_eff_end -gFieldEffectScript_Unknown66:: @ 82DBCFF +gFieldEffectScript_MoveDeoxysRock:: @ 82DBCFF field_eff_callnative Fldeff_MoveDeoxysRock field_eff_end diff --git a/data/maps/Route110_TrickHouseEnd/scripts.inc b/data/maps/Route110_TrickHouseEnd/scripts.inc index 7902cb95d..3ce8cfd5e 100644 --- a/data/maps/Route110_TrickHouseEnd/scripts.inc +++ b/data/maps/Route110_TrickHouseEnd/scripts.inc @@ -45,7 +45,7 @@ Route110_TrickHouseEnd_EventScript_26AD17:: @ 826AD17 faceplayer msgbox Route110_TrickHouseEnd_Text_26B08D, MSGBOX_DEFAULT setvar VAR_TEMP_2, 1 - switch VAR_0x4044 + switch VAR_TRICK_HOUSE_LEVEL case 0, Route110_TrickHouseEnd_EventScript_26AD84 case 1, Route110_TrickHouseEnd_EventScript_26ADC0 case 2, Route110_TrickHouseEnd_EventScript_26ADFC @@ -196,7 +196,7 @@ Route110_TrickHouseEnd_EventScript_26AFCF:: @ 826AFCF applymovement 1, Route110_TrickHouseEnd_Movement_269E3F waitmovement 0 removeobject 1 - addvar VAR_0x4044, 1 + addvar VAR_TRICK_HOUSE_LEVEL, 1 return Route110_TrickHouseEnd_EventScript_26AFEF:: @ 826AFEF diff --git a/data/maps/Route110_TrickHouseEntrance/scripts.inc b/data/maps/Route110_TrickHouseEntrance/scripts.inc index a83d50dc3..e1439d8d4 100644 --- a/data/maps/Route110_TrickHouseEntrance/scripts.inc +++ b/data/maps/Route110_TrickHouseEntrance/scripts.inc @@ -27,7 +27,7 @@ Route110_TrickHouseEntrance_MapScript1_269A60: @ 8269A60 Route110_TrickHouseEntrance_EventScript_269AD7:: @ 8269AD7 setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_1, 1 - compare VAR_0x4044, 8 + compare VAR_TRICK_HOUSE_LEVEL, 8 goto_if_eq Route110_TrickHouseEntrance_EventScript_269AED setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 2 end @@ -44,21 +44,21 @@ Route110_TrickHouseEntrance_EventScript_269AF3:: @ 8269AF3 Route110_TrickHouseEntrance_EventScript_269B03:: @ 8269B03 setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 0 - compare VAR_0x4044, 1 + compare VAR_TRICK_HOUSE_LEVEL, 1 call_if_eq Route110_TrickHouseEntrance_EventScript_269B61 - compare VAR_0x4044, 2 + compare VAR_TRICK_HOUSE_LEVEL, 2 call_if_eq Route110_TrickHouseEntrance_EventScript_269B6B - compare VAR_0x4044, 3 + compare VAR_TRICK_HOUSE_LEVEL, 3 call_if_eq Route110_TrickHouseEntrance_EventScript_269B75 - compare VAR_0x4044, 4 + compare VAR_TRICK_HOUSE_LEVEL, 4 call_if_eq Route110_TrickHouseEntrance_EventScript_269B7F - compare VAR_0x4044, 5 + compare VAR_TRICK_HOUSE_LEVEL, 5 call_if_eq Route110_TrickHouseEntrance_EventScript_269B89 - compare VAR_0x4044, 6 + compare VAR_TRICK_HOUSE_LEVEL, 6 call_if_eq Route110_TrickHouseEntrance_EventScript_269B93 - compare VAR_0x4044, 7 + compare VAR_TRICK_HOUSE_LEVEL, 7 call_if_eq Route110_TrickHouseEntrance_EventScript_269B9D - compare VAR_0x4044, 8 + compare VAR_TRICK_HOUSE_LEVEL, 8 call_if_eq Route110_TrickHouseEntrance_EventScript_269BA7 return @@ -139,7 +139,7 @@ Route110_TrickHouseEntrance_EventScript_269C15:: @ 8269C15 Route110_TrickHouseEntrance_EventScript_269C26:: @ 8269C26 addobject 1 hideobjectat 1, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE - switch VAR_0x4044 + switch VAR_TRICK_HOUSE_LEVEL case 0, Route110_TrickHouseEntrance_EventScript_269C8C case 1, Route110_TrickHouseEntrance_EventScript_269C94 case 2, Route110_TrickHouseEntrance_EventScript_269C9C @@ -205,7 +205,7 @@ Route110_TrickHouseEntrance_MapScript2_269CEE: @ 8269CEE Route110_TrickHouseEntrance_EventScript_269CF8:: @ 8269CF8 lockall delay 20 - compare VAR_0x4044, 0 + compare VAR_TRICK_HOUSE_LEVEL, 0 call_if_eq Route110_TrickHouseEntrance_EventScript_269E48 msgbox Route110_TrickHouseEntrance_Text_26A78C, MSGBOX_DEFAULT closemessage @@ -240,21 +240,21 @@ Route110_TrickHouseEntrance_EventScript_269D6E:: @ 8269D6E waitmovement 0 applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_Delay48 waitmovement 0 - compare VAR_0x4044, 0 + compare VAR_TRICK_HOUSE_LEVEL, 0 call_if_eq Route110_TrickHouseEntrance_EventScript_269DEE - compare VAR_0x4044, 1 + compare VAR_TRICK_HOUSE_LEVEL, 1 call_if_eq Route110_TrickHouseEntrance_EventScript_269DF7 - compare VAR_0x4044, 2 + compare VAR_TRICK_HOUSE_LEVEL, 2 call_if_eq Route110_TrickHouseEntrance_EventScript_269E00 - compare VAR_0x4044, 3 + compare VAR_TRICK_HOUSE_LEVEL, 3 call_if_eq Route110_TrickHouseEntrance_EventScript_269E09 - compare VAR_0x4044, 4 + compare VAR_TRICK_HOUSE_LEVEL, 4 call_if_eq Route110_TrickHouseEntrance_EventScript_269E12 - compare VAR_0x4044, 5 + compare VAR_TRICK_HOUSE_LEVEL, 5 call_if_eq Route110_TrickHouseEntrance_EventScript_269E1B - compare VAR_0x4044, 6 + compare VAR_TRICK_HOUSE_LEVEL, 6 call_if_eq Route110_TrickHouseEntrance_EventScript_269E24 - compare VAR_0x4044, 7 + compare VAR_TRICK_HOUSE_LEVEL, 7 call_if_eq Route110_TrickHouseEntrance_EventScript_269E2D closemessage setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_2, 1 @@ -343,19 +343,19 @@ Route110_TrickHouseEntrance_EventScript_269E8F:: @ 8269E8F applymovement 1, Common_Movement_FacePlayer waitmovement 0 msgbox Route110_TrickHouseEntrance_Text_26AA82, MSGBOX_DEFAULT - compare VAR_0x4044, 1 + compare VAR_TRICK_HOUSE_LEVEL, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_269EEF - compare VAR_0x4044, 2 + compare VAR_TRICK_HOUSE_LEVEL, 2 goto_if_eq Route110_TrickHouseEntrance_EventScript_269F1B - compare VAR_0x4044, 3 + compare VAR_TRICK_HOUSE_LEVEL, 3 goto_if_eq Route110_TrickHouseEntrance_EventScript_269F47 - compare VAR_0x4044, 4 + compare VAR_TRICK_HOUSE_LEVEL, 4 goto_if_eq Route110_TrickHouseEntrance_EventScript_269F73 - compare VAR_0x4044, 5 + compare VAR_TRICK_HOUSE_LEVEL, 5 goto_if_eq Route110_TrickHouseEntrance_EventScript_269F9F - compare VAR_0x4044, 6 + compare VAR_TRICK_HOUSE_LEVEL, 6 goto_if_eq Route110_TrickHouseEntrance_EventScript_269FCB - compare VAR_0x4044, 7 + compare VAR_TRICK_HOUSE_LEVEL, 7 goto_if_eq Route110_TrickHouseEntrance_EventScript_269FF7 end @@ -510,7 +510,7 @@ Route110_TrickHouseEntrance_EventScript_26A126:: @ 826A126 waitmovement 0 applymovement EVENT_OBJ_ID_PLAYER, Route110_TrickHouseEntrance_Movement_26A1A7 waitmovement 0 - switch VAR_0x4044 + switch VAR_TRICK_HOUSE_LEVEL case 0, Route110_TrickHouseEntrance_EventScript_26A1A9 case 1, Route110_TrickHouseEntrance_EventScript_26A1B4 case 2, Route110_TrickHouseEntrance_EventScript_26A1BF @@ -579,7 +579,7 @@ Route110_TrickHouseEntrance_EventScript_26A201:: @ 826A201 end Route110_TrickHouseEntrance_EventScript_26A20B:: @ 826A20B - compare VAR_0x4044, 8 + compare VAR_TRICK_HOUSE_LEVEL, 8 goto_if_eq Route110_TrickHouseEntrance_EventScript_26A220 msgbox Route110_TrickHouseEntrance_Text_26A878, MSGBOX_DEFAULT releaseall @@ -592,7 +592,7 @@ Route110_TrickHouseEntrance_EventScript_26A220:: @ 826A220 Route110_TrickHouseEntrance_EventScript_26A22A:: @ 826A22A lockall - switch VAR_0x4044 + switch VAR_TRICK_HOUSE_LEVEL case 0, Route110_TrickHouseEntrance_EventScript_26A289 case 1, Route110_TrickHouseEntrance_EventScript_26A2B2 case 2, Route110_TrickHouseEntrance_EventScript_26A2DB @@ -727,11 +727,11 @@ Route110_TrickHouseEntrance_EventScript_26A3F8:: @ 826A3F8 lockall msgbox Route110_TrickHouseEntrance_Text_26A474, MSGBOX_DEFAULT releaseall - compare VAR_0x4044, 0 + compare VAR_TRICK_HOUSE_LEVEL, 0 call_if_eq Route110_TrickHouseEntrance_EventScript_26A429 - compare VAR_0x4044, 1 + compare VAR_TRICK_HOUSE_LEVEL, 1 call_if_eq Route110_TrickHouseEntrance_EventScript_26A439 - compare VAR_0x4044, 2 + compare VAR_TRICK_HOUSE_LEVEL, 2 call_if_eq Route110_TrickHouseEntrance_EventScript_26A449 setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_1, 1 end diff --git a/data/text/surf.inc b/data/text/surf.inc index 2751dae7b..31c197222 100644 --- a/data/text/surf.inc +++ b/data/text/surf.inc @@ -1,5 +1,5 @@ -gUnknown_08272FD6:: @ 8272FD6 +gText_WantToUseSurf:: @ 8272FD6 .string "The water is dyed a deep blue…\nWould you like to SURF?$" -gUnknown_0827300D:: @ 827300D +gText_PlayerUsedSurf:: @ 827300D .string "{STR_VAR_1} used SURF!$" diff --git a/include/constants/field_effects.h b/include/constants/field_effects.h index 282f9ce75..00ca60457 100644 --- a/include/constants/field_effects.h +++ b/include/constants/field_effects.h @@ -1,7 +1,7 @@ #ifndef GUARD_FIELD_EFFECT_CONSTANTS_H #define GUARD_FIELD_EFFECT_CONSTANTS_H -#define FLDEFF_EXCLAMATION_MARK_ICON 0 +#define FLDEFF_EXCLAMATION_MARK_ICON 0 #define FLDEFF_USE_CUT_ON_GRASS 1 #define FLDEFF_USE_CUT_ON_TREE 2 #define FLDEFF_SHADOW 3 @@ -61,11 +61,11 @@ #define FLDEFF_SECRET_POWER_SHRUB 57 #define FLDEFF_CUT_GRASS 58 #define FLDEFF_FIELD_MOVE_SHOW_MON_INIT 59 -#define FLDEFF_USE_TOMB_PUZZLE_EFFECT 60 +#define FLDEFF_USE_TOMB_PUZZLE_EFFECT 60 #define FLDEFF_PCTURN_ON 61 #define FLDEFF_HALL_OF_FAME_RECORD 62 #define FLDEFF_USE_TELEPORT 63 -#define FLDEFF_64 64 +#define FLDEFF_RAYQUAZA 64 #define FLDEFF_65 65 #define FLDEFF_MOVE_DEOXYS_ROCK 66 diff --git a/include/constants/vars.h b/include/constants/vars.h index 67a9e6cbd..81ae99e1e 100644 --- a/include/constants/vars.h +++ b/include/constants/vars.h @@ -84,7 +84,7 @@ #define VAR_FANCLUB_UNKNOWN_1 0x4041 #define VAR_FANCLUB_UNKNOWN_2 0x4042 #define VAR_DEPT_STORE_FLOOR 0x4043 -#define VAR_0x4044 0x4044 +#define VAR_TRICK_HOUSE_LEVEL 0x4044 #define VAR_POKELOT_PRIZE_ITEM 0x4045 #define VAR_NATIONAL_DEX 0x4046 #define VAR_SEEDOT_SIZE_RECORD 0x4047 diff --git a/src/field_effect_helpers.c b/src/field_effect_helpers.c index 651b2baca..3f75fbb84 100755 --- a/src/field_effect_helpers.c +++ b/src/field_effect_helpers.c @@ -1508,7 +1508,7 @@ void sub_8155F80(struct Sprite *sprite) } } SetGpuReg(REG_OFFSET_BG0VOFS, 0); - FieldEffectStop(sprite, FLDEFF_64); + FieldEffectStop(sprite, FLDEFF_RAYQUAZA); break; }