diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2015-07-20 03:51:52 -0400 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2015-07-20 03:51:52 -0400 |
| commit | bef792f2d21ccac0127aeffd9e0838aba81f44b6 (patch) | |
| tree | 22185c93e9f9dcc3937a5e96279dd71f3b24c0d8 /maps | |
| parent | 94129b6b451fc7770ea75ffbdcbaab4967f513bd (diff) | |
More label updates, moved predefs to new file
Also named most of the engine and event flag constants.
Diffstat (limited to 'maps')
56 files changed, 387 insertions, 393 deletions
diff --git a/maps/BattleTowerBattleRoom.asm b/maps/BattleTowerBattleRoom.asm index 6c9d46d8e..0dcaa5ae2 100644 --- a/maps/BattleTowerBattleRoom.asm +++ b/maps/BattleTowerBattleRoom.asm @@ -31,7 +31,7 @@ UnknownScript_0x9f425: keeptextopen loadmovesprites special Function170215 - special Function8c084 + special FadeBlackBGMap reloadmap if_not_equal $0, UnknownScript_0x9f4c2 copybytetovar wcf64 @@ -46,10 +46,10 @@ UnknownScript_0x9f425: closetext loadmovesprites playmusic MUSIC_HEAL - special Function8c084 - special Function1047eb + special FadeBlackBGMap + special LoadMapPalettes pause 60 - special Function8c079 + special FadeInBGMap special RestartMapMusic loadfont writetext UnknownText_0x9eebc @@ -73,7 +73,7 @@ UnknownScript_0x9f483: special Function170687 playsound SFX_SAVE waitbutton - special Function8c084 + special FadeBlackBGMap special Reset UnknownScript_0x9f4a3: writetext UnknownText_0x9efbf @@ -84,7 +84,7 @@ UnknownScript_0x9f4a3: writebyte $6 special Function170687 loadmovesprites - special Function8c084 + special FadeBlackBGMap warpfacing $1, GROUP_BATTLE_TOWER_1F, MAP_BATTLE_TOWER_1F, $7, $7 loadfont jump UnknownScript_0x9e4b0 diff --git a/maps/BillsHouse.asm b/maps/BillsHouse.asm index 08c3edd7b..424df7ac0 100644 --- a/maps/BillsHouse.asm +++ b/maps/BillsHouse.asm @@ -8,7 +8,7 @@ BillsHouse_MapScriptHeader: GrampsScript_0x189538: faceplayer loadfont - checkevent EVENT_000 + checkevent EVENT_GAVE_KURT_APRICORNS iftrue UnknownScript_0x1896ba checkevent EVENT_GOT_THUNDERSTONE_FROM_BILLS_GRANDPA iftrue UnknownScript_0x1896c0 @@ -120,7 +120,7 @@ UnknownScript_0x18963b: verbosegiveitem EVERSTONE, 1 iffalse UnknownScript_0x1896cc setevent EVENT_GOT_EVERSTONE_FROM_BILLS_GRANDPA - setevent EVENT_000 + setevent EVENT_GAVE_KURT_APRICORNS loadmovesprites end @@ -131,7 +131,7 @@ UnknownScript_0x189652: verbosegiveitem LEAF_STONE, 1 iffalse UnknownScript_0x1896cc setevent EVENT_GOT_LEAF_STONE_FROM_BILLS_GRANDPA - setevent EVENT_000 + setevent EVENT_GAVE_KURT_APRICORNS loadmovesprites end @@ -142,7 +142,7 @@ UnknownScript_0x189669: verbosegiveitem WATER_STONE, 1 iffalse UnknownScript_0x1896cc setevent EVENT_GOT_WATER_STONE_FROM_BILLS_GRANDPA - setevent EVENT_000 + setevent EVENT_GAVE_KURT_APRICORNS loadmovesprites end @@ -153,7 +153,7 @@ UnknownScript_0x189680: verbosegiveitem FIRE_STONE, 1 iffalse UnknownScript_0x1896cc setevent EVENT_GOT_FIRE_STONE_FROM_BILLS_GRANDPA - setevent EVENT_000 + setevent EVENT_GAVE_KURT_APRICORNS loadmovesprites end diff --git a/maps/BluesHouse.asm b/maps/BluesHouse.asm index 47b1e724b..8a47e0ee4 100644 --- a/maps/BluesHouse.asm +++ b/maps/BluesHouse.asm @@ -30,10 +30,10 @@ UnknownScript_0x19b0de: writetext UnknownText_0x19b266 closetext loadmovesprites - special Function8c084 + special FadeBlackBGMap playmusic MUSIC_HEAL pause 60 - special Function8c079 + special FadeInBGMap special RestartMapMusic loadfont writetext UnknownText_0x19b296 diff --git a/maps/CharcoalKiln.asm b/maps/CharcoalKiln.asm index 8f8435503..dbbdbfbea 100644 --- a/maps/CharcoalKiln.asm +++ b/maps/CharcoalKiln.asm @@ -163,6 +163,6 @@ CharcoalKiln_MapEventHeader: ; people-events db 3 - person_event SPRITE_BLACK_BELT, 7, 6, OW_DOWN | $3, $0, -1, -1, $0, 0, CharcoalKilnBoss, EVENT_6F7 - person_event SPRITE_YOUNGSTER, 7, 9, OW_DOWN | $2, $11, -1, -1, $0, 0, CharcoalKilnApprentice, EVENT_6F6 - person_event SPRITE_MOLTRES, 10, 9, OW_UP | $12, $22, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, CharcoalKilnFarfetchd, EVENT_6F5 + person_event SPRITE_BLACK_BELT, 7, 6, OW_DOWN | $3, $0, -1, -1, $0, 0, CharcoalKilnBoss, EVENT_CHARCOAL_KILN_BOSS + person_event SPRITE_YOUNGSTER, 7, 9, OW_DOWN | $2, $11, -1, -1, $0, 0, CharcoalKilnApprentice, EVENT_CHARCOAL_KILN_APPRENTICE + person_event SPRITE_MOLTRES, 10, 9, OW_UP | $12, $22, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, CharcoalKilnFarfetchd, EVENT_CHARCOAL_KILN_FARFETCH_D diff --git a/maps/Colosseum.asm b/maps/Colosseum.asm index 6585bda84..c3a8f50b0 100644 --- a/maps/Colosseum.asm +++ b/maps/Colosseum.asm @@ -83,5 +83,5 @@ Colosseum_MapEventHeader: ; people-events db 2 - person_event SPRITE_CHRIS, 8, 7, OW_LEFT | $1, $0, -1, -1, $0, 0, ChrisScript_0x193499, EVENT_000 - person_event SPRITE_CHRIS, 8, 10, OW_LEFT | $0, $0, -1, -1, $0, 0, ChrisScript_0x193499, EVENT_001 + person_event SPRITE_CHRIS, 8, 7, OW_LEFT | $1, $0, -1, -1, $0, 0, ChrisScript_0x193499, EVENT_GAVE_KURT_APRICORNS + person_event SPRITE_CHRIS, 8, 10, OW_LEFT | $0, $0, -1, -1, $0, 0, ChrisScript_0x193499, EVENT_RECEIVED_BALLS_FROM_KURT diff --git a/maps/CopycatsHouse2F.asm b/maps/CopycatsHouse2F.asm index 131a39767..fdd621e16 100644 --- a/maps/CopycatsHouse2F.asm +++ b/maps/CopycatsHouse2F.asm @@ -41,7 +41,7 @@ Copycat: faceplayer variablesprite SPRITE_COPYCAT, SPRITE_KRIS .Part2 - special Function14209 + special RunCallback_04 checkevent EVENT_RETURNED_MACHINE_PART iftrue .Part7 loadfont @@ -65,7 +65,7 @@ Copycat: .Part6 faceplayer variablesprite SPRITE_COPYCAT, SPRITE_LASS - special Function14209 + special RunCallback_04 loadfont writetext UnknownText_0x18b028 closetext @@ -94,7 +94,7 @@ Copycat: .Part11 faceplayer variablesprite SPRITE_COPYCAT, SPRITE_LASS - special Function14209 + special RunCallback_04 loadfont writetext UnknownText_0x18b116 closetext @@ -137,7 +137,7 @@ Copycat: faceplayer variablesprite SPRITE_COPYCAT, SPRITE_KRIS .Part17 - special Function14209 + special RunCallback_04 loadfont checkflag ENGINE_PLAYER_IS_FEMALE iftrue .Part18 @@ -159,7 +159,7 @@ Copycat: .Part21 faceplayer variablesprite SPRITE_COPYCAT, SPRITE_LASS - special Function14209 + special RunCallback_04 loadfont writetext UnknownText_0x18b2f5 closetext diff --git a/maps/DragonShrine.asm b/maps/DragonShrine.asm index 7344e6b6d..af1d5ff46 100644 --- a/maps/DragonShrine.asm +++ b/maps/DragonShrine.asm @@ -23,7 +23,7 @@ DragonShrineTestScript: writetext UnknownText_0x18d2ea keeptextopen .Question1: - setevent EVENT_001 + setevent EVENT_RECEIVED_BALLS_FROM_KURT writetext UnknownText_0x18d3bc keeptextopen loadmenudata MenuDataHeader_0x18d215 @@ -35,7 +35,7 @@ DragonShrineTestScript: end .Question2: - setevent EVENT_002 + setevent EVENT_DRAGON_SHRINE_QUESTION_2 writetext UnknownText_0x18d3d3 keeptextopen loadmenudata MenuDataHeader_0x18d234 @@ -45,7 +45,7 @@ DragonShrineTestScript: if_equal $2, .RightAnswer if_equal $3, .WrongAnswer .Question3: - setevent EVENT_003 + setevent EVENT_DRAGON_SHRINE_QUESTION_3 writetext UnknownText_0x18d3f3 keeptextopen loadmenudata MenuDataHeader_0x18d258 @@ -55,7 +55,7 @@ DragonShrineTestScript: if_equal $2, .RightAnswer if_equal $3, .RightAnswer .Question4: - setevent EVENT_004 + setevent EVENT_DRAGON_SHRINE_QUESTION_4 writetext UnknownText_0x18d420 keeptextopen loadmenudata MenuDataHeader_0x18d283 @@ -65,7 +65,7 @@ DragonShrineTestScript: if_equal $2, .WrongAnswer if_equal $3, .RightAnswer .Question5: - setevent EVENT_005 + setevent EVENT_DRAGON_SHRINE_QUESTION_5 writetext UnknownText_0x18d44a keeptextopen loadmenudata MenuDataHeader_0x18d2a5 @@ -75,17 +75,17 @@ DragonShrineTestScript: if_equal $2, .RightAnswer if_equal $3, .WrongAnswer .RightAnswer: - checkevent EVENT_005 + checkevent EVENT_DRAGON_SHRINE_QUESTION_5 iftrue .PassedTheTest writetext UnknownText_0x18d82d keeptextopen - checkevent EVENT_004 + checkevent EVENT_DRAGON_SHRINE_QUESTION_4 iftrue .Question5 - checkevent EVENT_003 + checkevent EVENT_DRAGON_SHRINE_QUESTION_3 iftrue .Question4 - checkevent EVENT_002 + checkevent EVENT_DRAGON_SHRINE_QUESTION_2 iftrue .Question3 - checkevent EVENT_001 + checkevent EVENT_RECEIVED_BALLS_FROM_KURT iftrue .Question2 .WrongAnswer: loadmovesprites @@ -101,15 +101,15 @@ DragonShrineTestScript: loadmovesprites setevent EVENT_ANSWERED_DRAGON_MASTER_QUIZ_WRONG loadfont - checkevent EVENT_005 + checkevent EVENT_DRAGON_SHRINE_QUESTION_5 iftrue .Question5 - checkevent EVENT_004 + checkevent EVENT_DRAGON_SHRINE_QUESTION_4 iftrue .Question4 - checkevent EVENT_003 + checkevent EVENT_DRAGON_SHRINE_QUESTION_3 iftrue .Question3 - checkevent EVENT_002 + checkevent EVENT_DRAGON_SHRINE_QUESTION_2 iftrue .Question2 - checkevent EVENT_001 + checkevent EVENT_RECEIVED_BALLS_FROM_KURT iftrue .Question1 .PassedTheTest: writetext UnknownText_0x18d47c @@ -184,15 +184,15 @@ DragonShrineTestScript: playsound SFX_ENTER_DOOR disappear $5 waitbutton - setevent EVENT_000 + setevent EVENT_GAVE_KURT_APRICORNS end ElderScript_0x18d1a5: faceplayer loadfont - checkevent EVENT_000 + checkevent EVENT_GAVE_KURT_APRICORNS iftrue .DontGiveDratiniYet - checkevent EVENT_006 + checkevent EVENT_JUST_RECEIVED_DRATINI iftrue .ReceivedDratini checkevent EVENT_GOT_DRATINI iffalse .GiveDratini @@ -215,7 +215,7 @@ ElderScript_0x18d1a5: checkevent EVENT_ANSWERED_DRAGON_MASTER_QUIZ_WRONG special SpecialDratini setevent EVENT_GOT_DRATINI - setevent EVENT_006 + setevent EVENT_JUST_RECEIVED_DRATINI writetext UnknownText_0x18d6ca closetext loadmovesprites @@ -681,7 +681,7 @@ DragonShrine_MapEventHeader: ; people-events db 4 - person_event SPRITE_ELDER, 5, 9, OW_UP | $2, $0, -1, -1, $0, 0, ElderScript_0x18d1a5, EVENT_000 - person_event SPRITE_ELDER, 8, 6, OW_LEFT | $1, $0, -1, -1, $0, 0, ElderScript_0x18d205, EVENT_000 - person_event SPRITE_ELDER, 8, 11, OW_LEFT | $0, $0, -1, -1, $0, 0, ElderScript_0x18d20d, EVENT_000 + person_event SPRITE_ELDER, 5, 9, OW_UP | $2, $0, -1, -1, $0, 0, ElderScript_0x18d1a5, EVENT_GAVE_KURT_APRICORNS + person_event SPRITE_ELDER, 8, 6, OW_LEFT | $1, $0, -1, -1, $0, 0, ElderScript_0x18d205, EVENT_GAVE_KURT_APRICORNS + person_event SPRITE_ELDER, 8, 11, OW_LEFT | $0, $0, -1, -1, $0, 0, ElderScript_0x18d20d, EVENT_GAVE_KURT_APRICORNS person_event SPRITE_CLAIR, 12, 8, OW_UP | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ObjectEvent, EVENT_DRAGON_SHRINE_CLAIR diff --git a/maps/DragonsDenB1F.asm b/maps/DragonsDenB1F.asm index 21244b472..c6359ea0c 100644 --- a/maps/DragonsDenB1F.asm +++ b/maps/DragonsDenB1F.asm @@ -148,12 +148,12 @@ SilverScript_0x18c97e: playmusic MUSIC_RIVAL_ENCOUNTER faceplayer loadfont - checkevent EVENT_000 + checkevent EVENT_GAVE_KURT_APRICORNS iftrue UnknownScript_0x18c995 writetext UnknownText_0x18cc83 closetext loadmovesprites - setevent EVENT_000 + setevent EVENT_GAVE_KURT_APRICORNS special RestartMapMusic end diff --git a/maps/EcruteakGym.asm b/maps/EcruteakGym.asm index a2818897c..5da93822e 100644 --- a/maps/EcruteakGym.asm +++ b/maps/EcruteakGym.asm @@ -84,7 +84,7 @@ UnknownScript_0x99dc6: follow $0, $8 applymovement $0, MovementData_0x99e5f stopfollow - special Function8c084 + special FadeBlackBGMap playsound SFX_ENTER_DOOR waitbutton warp GROUP_ECRUTEAK_CITY, MAP_ECRUTEAK_CITY, $6, $1b diff --git a/maps/EcruteakHouse.asm b/maps/EcruteakHouse.asm index 6dc2a9ee7..811e4a0d2 100644 --- a/maps/EcruteakHouse.asm +++ b/maps/EcruteakHouse.asm @@ -86,7 +86,7 @@ SageScript_0x98062: .CheckForClearBell: checkevent EVENT_KOJI_ALLOWS_YOU_PASSAGE_TO_TIN_TOWER iftrue .AllowedThrough - checkevent EVENT_000 + checkevent EVENT_GAVE_KURT_APRICORNS iftrue .Event000 checkitem CLEAR_BELL iftrue .RingClearBell @@ -102,7 +102,7 @@ SageScript_0x98062: dotrigger $1 setevent EVENT_RANG_CLEAR_BELL_2 clearevent EVENT_RANG_CLEAR_BELL_1 - setevent EVENT_000 + setevent EVENT_GAVE_KURT_APRICORNS end .AllowedThrough: diff --git a/maps/FastShip1F.asm b/maps/FastShip1F.asm index 8c4daa9d8..79cb1e35f 100644 --- a/maps/FastShip1F.asm +++ b/maps/FastShip1F.asm @@ -3,24 +3,24 @@ FastShip1F_MapScriptHeader: db 3 ; triggers - dw UnknownScript_0x75135, $0000 - dw UnknownScript_0x75136, $0000 - dw UnknownScript_0x7513a, $0000 + dw .Trigger1, $0000 + dw .Trigger2, $0000 + dw .Trigger3, $0000 ; callback count db 0 -UnknownScript_0x75135: +.Trigger1: end -UnknownScript_0x75136: - priorityjump UnknownScript_0x7513b +.Trigger2: + priorityjump .PriorityJump2 end -UnknownScript_0x7513a: +.Trigger3: end -UnknownScript_0x7513b: +.PriorityJump2: applymovement $2, MovementData_0x7520e applymovement $0, MovementData_0x75217 applymovement $2, MovementData_0x75211 @@ -28,21 +28,21 @@ UnknownScript_0x7513b: playsound SFX_BOAT earthquake 30 blackoutmod GROUP_FAST_SHIP_CABINS_SW_SSW_NW, MAP_FAST_SHIP_CABINS_SW_SSW_NW - clearevent EVENT_031 - checkevent EVENT_030 - iftrue UnknownScript_0x7515d + clearevent EVENT_FAST_SHIP_HAS_ARRIVED + checkevent EVENT_FAST_SHIP_FIRST_TIME + iftrue .Vermilion dotrigger $2 end -UnknownScript_0x7515d: +.Vermilion: dotrigger $0 end SailorScript_0x75160: faceplayer loadfont - checkevent EVENT_031 - iftrue UnknownScript_0x7517a + checkevent EVENT_FAST_SHIP_HAS_ARRIVED + iftrue .Arrived checkevent EVENT_FAST_SHIP_DESTINATION_OLIVINE iftrue .Olivine writetext UnknownText_0x7523b @@ -56,42 +56,42 @@ SailorScript_0x75160: loadmovesprites end -UnknownScript_0x7517a: +.Arrived: checkevent EVENT_FAST_SHIP_DESTINATION_OLIVINE - iftrue .Olivine + iftrue ._Olivine writetext UnknownText_0x754be closetext loadmovesprites - scall UnknownScript_0x751b8 + scall .LetThePlayerOut playsound SFX_EXIT_BUILDING - special Function8c084 + special FadeBlackBGMap waitbutton setevent EVENT_VERMILION_PORT_SAILOR_AT_GANGWAY domaptrigger GROUP_VERMILION_PORT, MAP_VERMILION_PORT, $1 warp GROUP_VERMILION_PORT, MAP_VERMILION_PORT, $7, $11 end -.Olivine +._Olivine writetext UnknownText_0x7548d closetext loadmovesprites - scall UnknownScript_0x751b8 + scall .LetThePlayerOut playsound SFX_EXIT_BUILDING - special Function8c084 + special FadeBlackBGMap waitbutton setevent EVENT_OLIVINE_PORT_SAILOR_AT_GANGWAY domaptrigger GROUP_OLIVINE_PORT, MAP_OLIVINE_PORT, $1 warp GROUP_OLIVINE_PORT, MAP_OLIVINE_PORT, $7, $17 end -UnknownScript_0x751b8: +.LetThePlayerOut: checkcode VAR_FACING - if_equal $3, UnknownScript_0x751c7 + if_equal RIGHT, .YouAreFacingRight applymovement $2, MovementData_0x7520e applymovement $0, MovementData_0x75235 end -UnknownScript_0x751c7: +.YouAreFacingRight: applymovement $2, MovementData_0x75214 applymovement $0, MovementData_0x75238 end @@ -99,14 +99,14 @@ UnknownScript_0x751c7: SailorScript_0x751d0: faceplayer loadfont - checkevent EVENT_030 - iftrue UnknownScript_0x751de + checkevent EVENT_FAST_SHIP_FIRST_TIME + iftrue .Vermilion writetext UnknownText_0x752f9 closetext loadmovesprites end -UnknownScript_0x751de: +.Vermilion: writetext UnknownText_0x7534f closetext loadmovesprites diff --git a/maps/FastShipB1F.asm b/maps/FastShipB1F.asm index 0747b044f..859fc5e3d 100644 --- a/maps/FastShipB1F.asm +++ b/maps/FastShipB1F.asm @@ -41,16 +41,16 @@ UnknownScript_0x76766: SailorScript_0x76767: faceplayer loadfont - checkevent EVENT_030 + checkevent EVENT_FAST_SHIP_FIRST_TIME iftrue UnknownScript_0x767a0 - checkevent EVENT_033 + checkevent EVENT_FAST_SHIP_LAZY_SAILOR iftrue UnknownScript_0x7678d - checkevent EVENT_034 + checkevent EVENT_FAST_SHIP_INFORMED_ABOUT_LAZY_SAILOR iftrue UnknownScript_0x76787 writetext UnknownText_0x7687b closetext loadmovesprites - setevent EVENT_034 + setevent EVENT_FAST_SHIP_INFORMED_ABOUT_LAZY_SAILOR clearevent EVENT_FAST_SHIP_CABINS_NNW_NNE_NE_SAILOR end @@ -62,7 +62,7 @@ UnknownScript_0x76787: UnknownScript_0x7678d: writetext UnknownText_0x7692e - checkevent EVENT_032 + checkevent EVENT_FAST_SHIP_FOUND_GIRL iffalse UnknownScript_0x76799 closetext loadmovesprites diff --git a/maps/FastShipCabins_NNW_NNE_NE.asm b/maps/FastShipCabins_NNW_NNE_NE.asm index 4764545df..c580b69ce 100644 --- a/maps/FastShipCabins_NNW_NNE_NE.asm +++ b/maps/FastShipCabins_NNW_NNE_NE.asm @@ -88,7 +88,7 @@ SailorScript_0x755f1: writetext UnknownText_0x758b1 closetext loadmovesprites - setevent EVENT_033 + setevent EVENT_FAST_SHIP_LAZY_SAILOR domaptrigger GROUP_FAST_SHIP_B1F, MAP_FAST_SHIP_B1F, $1 checkcode VAR_FACING if_equal $3, UnknownScript_0x75629 diff --git a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm index 851bd1c09..ae8aa1132 100644 --- a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm +++ b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm @@ -11,7 +11,7 @@ UnknownScript_0x75ea6: CaptainScript_0x75ea7: faceplayer loadfont - checkevent EVENT_030 + checkevent EVENT_FAST_SHIP_FIRST_TIME iftrue UnknownScript_0x75eb5 writetext UnknownText_0x76012 closetext @@ -98,8 +98,8 @@ UnknownScript_0x75f44: loadfont writetext UnknownText_0x76645 closetext - setevent EVENT_031 - setevent EVENT_032 + setevent EVENT_FAST_SHIP_HAS_ARRIVED + setevent EVENT_FAST_SHIP_FOUND_GIRL loadmovesprites end diff --git a/maps/FastShipCabins_SW_SSW_NW.asm b/maps/FastShipCabins_SW_SSW_NW.asm index 20914d5ab..31d796648 100644 --- a/maps/FastShipCabins_SW_SSW_NW.asm +++ b/maps/FastShipCabins_SW_SSW_NW.asm @@ -75,11 +75,11 @@ FastShipBed: writetext FastShipBedText2 closetext loadmovesprites - checkevent EVENT_031 + checkevent EVENT_FAST_SHIP_HAS_ARRIVED iftrue UnknownScript_0x75ae1 - checkevent EVENT_032 + checkevent EVENT_FAST_SHIP_FOUND_GIRL iftrue UnknownScript_0x75ae2 - checkevent EVENT_030 + checkevent EVENT_FAST_SHIP_FIRST_TIME iftrue UnknownScript_0x75ae2 UnknownScript_0x75ae1: end @@ -93,7 +93,7 @@ UnknownScript_0x75ae2: writetext FastShipArrivedVermilionText closetext loadmovesprites - setevent EVENT_031 + setevent EVENT_FAST_SHIP_HAS_ARRIVED end UnknownScript_0x75af7: @@ -101,7 +101,7 @@ UnknownScript_0x75af7: writetext FastShipArrivedOlivineText closetext loadmovesprites - setevent EVENT_031 + setevent EVENT_FAST_SHIP_HAS_ARRIVED end FastShipCabinsNorthwestCabinTrashcan: diff --git a/maps/FuchsiaGym.asm b/maps/FuchsiaGym.asm index 825974284..52ed08a83 100644 --- a/maps/FuchsiaGym.asm +++ b/maps/FuchsiaGym.asm @@ -27,7 +27,7 @@ JanineScript_0x195db9: variablesprite SPRITE_FUCHSIA_GYM_2, SPRITE_LASS variablesprite SPRITE_FUCHSIA_GYM_3, SPRITE_LASS variablesprite SPRITE_FUCHSIA_GYM_4, SPRITE_YOUNGSTER - special Function14209 + special RunCallback_04 loadfont writetext UnknownText_0x195feb playsound SFX_GET_BADGE @@ -57,7 +57,7 @@ FuschiaGym1Script_0x195e1b: applymovement $3, MovementData_0x195f27 faceplayer variablesprite SPRITE_FUCHSIA_GYM_1, SPRITE_LASS - special Function14209 + special RunCallback_04 UnknownScript_0x195e2c: faceplayer loadfont @@ -91,7 +91,7 @@ FuschiaGym2Script_0x195e55: applymovement $4, MovementData_0x195f27 faceplayer variablesprite SPRITE_FUCHSIA_GYM_2, SPRITE_LASS - special Function14209 + special RunCallback_04 UnknownScript_0x195e66: faceplayer loadfont @@ -125,7 +125,7 @@ FuschiaGym3Script_0x195e8f: applymovement $5, MovementData_0x195f27 faceplayer variablesprite SPRITE_FUCHSIA_GYM_3, SPRITE_LASS - special Function14209 + special RunCallback_04 UnknownScript_0x195ea0: faceplayer loadfont @@ -159,7 +159,7 @@ FuschiaGym4Script_0x195ec9: applymovement $6, MovementData_0x195f27 faceplayer variablesprite SPRITE_FUCHSIA_GYM_4, SPRITE_YOUNGSTER - special Function14209 + special RunCallback_04 UnknownScript_0x195eda: faceplayer loadfont diff --git a/maps/FuchsiaPokeCenter1F.asm b/maps/FuchsiaPokeCenter1F.asm index fd275a45a..cd36c2b9f 100644 --- a/maps/FuchsiaPokeCenter1F.asm +++ b/maps/FuchsiaPokeCenter1F.asm @@ -29,7 +29,7 @@ JanineImpersonatorScript_0x196462: applymovement $5, MovementData_0x196486 faceplayer variablesprite SPRITE_JANINE_IMPERSONATOR, SPRITE_JANINE - special Function14209 + special RunCallback_04 loadfont writetext UnknownText_0x19654e closetext @@ -37,7 +37,7 @@ JanineImpersonatorScript_0x196462: applymovement $5, MovementData_0x196486 faceplayer variablesprite SPRITE_JANINE_IMPERSONATOR, SPRITE_LASS - special Function14209 + special RunCallback_04 end MovementData_0x196486: diff --git a/maps/GoldenrodCity.asm b/maps/GoldenrodCity.asm index 8d5090b1c..0b6282e10 100644 --- a/maps/GoldenrodCity.asm +++ b/maps/GoldenrodCity.asm @@ -11,7 +11,7 @@ GoldenrodCity_MapScriptHeader: .FlyPointAndFloria setflag ENGINE_FLYPOINT_GOLDENROD - setflag ENGINE_16 + setflag ENGINE_FLORIA checkevent EVENT_MET_FLORIA iftrue .FloriaDone clearevent EVENT_FLORIA_AT_SUDOWOODO diff --git a/maps/GoldenrodDeptStoreB1F.asm b/maps/GoldenrodDeptStoreB1F.asm index ed305d57a..be6245e21 100644 --- a/maps/GoldenrodDeptStoreB1F.asm +++ b/maps/GoldenrodDeptStoreB1F.asm @@ -12,7 +12,7 @@ GoldenrodDeptStoreB1F_MapScriptHeader: dbw 5, UnknownScript_0x7d7ac UnknownScript_0x7d781: - checkevent EVENT_04A + checkevent EVENT_RECEIVED_CARD_KEY iftrue UnknownScript_0x7d78a jump UnknownScript_0x7d791 diff --git a/maps/GoldenrodFlowerShop.asm b/maps/GoldenrodFlowerShop.asm index 6df62eeed..3ddfbff0c 100644 --- a/maps/GoldenrodFlowerShop.asm +++ b/maps/GoldenrodFlowerShop.asm @@ -12,7 +12,7 @@ TeacherScript_0x5535d: iftrue UnknownScript_0x55399 checkevent EVENT_MET_FLORIA iffalse UnknownScript_0x5539f - checkevent EVENT_0BA + checkevent EVENT_TALKED_TO_FLORIA_AT_FLOWER_SHOP iffalse UnknownScript_0x5538f checkflag ENGINE_PLAINBADGE iffalse UnknownScript_0x5539c @@ -54,7 +54,7 @@ LassScript_0x553a2: writetext UnknownText_0x55561 closetext loadmovesprites - setevent EVENT_0BA + setevent EVENT_TALKED_TO_FLORIA_AT_FLOWER_SHOP setevent EVENT_FLORIA_AT_FLOWER_SHOP clearevent EVENT_FLORIA_AT_SUDOWOODO end diff --git a/maps/IcePath1F.asm b/maps/IcePath1F.asm index bbea258a1..32ca4960c 100644 --- a/maps/IcePath1F.asm +++ b/maps/IcePath1F.asm @@ -33,6 +33,6 @@ IcePath1F_MapEventHeader: ; people-events db 3 - person_event SPRITE_POKE_BALL, 11, 35, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x7e472, EVENT_ICE_PATH_1F_HM_WATERFALL + person_event SPRITE_POKE_BALL, 11, 35, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x7e472, EVENT_GOT_HM07_WATERFALL person_event SPRITE_POKE_BALL, 27, 36, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x7e474, EVENT_ICE_PATH_1F_PP_UP person_event SPRITE_POKE_BALL, 13, 39, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x7e476, EVENT_ICE_PATH_1F_PROTEIN diff --git a/maps/IlexForest.asm b/maps/IlexForest.asm index 2e4a9d25d..719faec12 100644 --- a/maps/IlexForest.asm +++ b/maps/IlexForest.asm @@ -293,7 +293,7 @@ UnknownScript_0x6ed50: appear $2 loadvar FarfetchdPosition, $a appear $4 - setevent EVENT_6F7 + setevent EVENT_CHARCOAL_KILN_BOSS setevent EVENT_HERDED_FARFETCHD end @@ -347,9 +347,9 @@ BlackBeltScript_0x6edae: setevent EVENT_ILEX_FOREST_FARFETCHD setevent EVENT_ILEX_FOREST_APPRENTICE setevent EVENT_ILEX_FOREST_CHARCOAL_MASTER - clearevent EVENT_6F5 - clearevent EVENT_6F6 - clearevent EVENT_6F7 + clearevent EVENT_CHARCOAL_KILN_FARFETCH_D + clearevent EVENT_CHARCOAL_KILN_APPRENTICE + clearevent EVENT_CHARCOAL_KILN_BOSS end UnknownScript_0x6edd8: diff --git a/maps/IndigoPlateauPokeCenter1F.asm b/maps/IndigoPlateauPokeCenter1F.asm index 012297710..1545d44ec 100644 --- a/maps/IndigoPlateauPokeCenter1F.asm +++ b/maps/IndigoPlateauPokeCenter1F.asm @@ -154,7 +154,7 @@ TeleportGuyScript: closetext loadmovesprites playsound SFX_WARP_TO - special Function8c084 + special FadeBlackBGMap waitbutton warp GROUP_NEW_BARK_TOWN, MAP_NEW_BARK_TOWN, $d, $6 end diff --git a/maps/KrissHouse1F.asm b/maps/KrissHouse1F.asm index 6f423aeab..d387fa154 100644 --- a/maps/KrissHouse1F.asm +++ b/maps/KrissHouse1F.asm @@ -16,13 +16,13 @@ UnknownScript_0x7a4d7: end UnknownScript_0x7a4d8: - setevent EVENT_000 + setevent EVENT_GAVE_KURT_APRICORNS UnknownScript_0x7a4db: playmusic MUSIC_MOM showemote EMOTE_SHOCK, $2, 15 spriteface $0, LEFT - checkevent EVENT_000 + checkevent EVENT_GAVE_KURT_APRICORNS iffalse UnknownScript_0x7a4f2 applymovement $2, MovementData_0x7a5fc jump UnknownScript_0x7a4f6 @@ -77,9 +77,9 @@ UnknownScript_0x7a549: writetext UnknownText_0x7a850 closetext loadmovesprites - checkevent EVENT_000 + checkevent EVENT_GAVE_KURT_APRICORNS iftrue UnknownScript_0x7a55d - checkevent EVENT_001 + checkevent EVENT_RECEIVED_BALLS_FROM_KURT iffalse UnknownScript_0x7a564 jump UnknownScript_0x7a56b @@ -109,11 +109,11 @@ UnknownScript_0x7a57e: MomScript_0x7a582: faceplayer - setevent EVENT_001 + setevent EVENT_RECEIVED_BALLS_FROM_KURT checktriggers iffalse UnknownScript_0x7a572 loadfont - checkevent EVENT_076 + checkevent EVENT_FIRST_TIME_BANKING_WITH_MOM iftrue UnknownScript_0x7a5af checkevent EVENT_TALKED_TO_MOM_AFTER_MYSTERY_EGG_QUEST iftrue UnknownScript_0x7a5b8 @@ -139,7 +139,7 @@ UnknownScript_0x7a5af: end UnknownScript_0x7a5b5: - setevent EVENT_076 + setevent EVENT_FIRST_TIME_BANKING_WITH_MOM UnknownScript_0x7a5b8: setevent EVENT_TALKED_TO_MOM_AFTER_MYSTERY_EGG_QUEST special Function16218 diff --git a/maps/KrissHouse2F.asm b/maps/KrissHouse2F.asm index 6ae9dfd59..84b17ffda 100644 --- a/maps/KrissHouse2F.asm +++ b/maps/KrissHouse2F.asm @@ -16,7 +16,7 @@ KrissHouse2F_MapScriptHeader: .InitializeRoom: special ToggleDecorationsVisibility - setevent EVENT_007 + setevent EVENT_IN_YOUR_ROOM checkevent EVENT_INITIALIZED_EVENTS iftrue .SkipInizialization jumpstd initializeevents diff --git a/maps/KurtsHouse.asm b/maps/KurtsHouse.asm index b336c88e7..81bc54ba6 100644 --- a/maps/KurtsHouse.asm +++ b/maps/KurtsHouse.asm @@ -33,17 +33,17 @@ UnknownScript_0x18e177: KurtScript_0x18e178: faceplayer loadfont - checkevent EVENT_035 - iftrue UnknownScript_0x18e1cc + checkevent EVENT_KURT_GAVE_YOU_LURE_BALL + iftrue .GotLureBall checkevent EVENT_CLEARED_SLOWPOKE_WELL - iftrue UnknownScript_0x18e1bf + iftrue .ClearedSlowpokeWell writetext UnknownText_0x18e473 closetext loadmovesprites special Functionc48f setevent EVENT_AZALEA_TOWN_SLOWPOKETAIL_ROCKET checkcode VAR_FACING - if_equal $1, UnknownScript_0x18e1ab + if_equal UP, .RunAround spriteface $0, DOWN playsound SFX_FLY applymovement $2, MovementData_0x18e466 @@ -53,7 +53,7 @@ KurtScript_0x18e178: special RestartMapMusic end -UnknownScript_0x18e1ab: +.RunAround: spriteface $0, DOWN playsound SFX_FLY applymovement $2, MovementData_0x18e46c @@ -63,211 +63,205 @@ UnknownScript_0x18e1ab: special RestartMapMusic end -UnknownScript_0x18e1bf: +.ClearedSlowpokeWell: writetext UnknownText_0x18e615 keeptextopen verbosegiveitem LURE_BALL, 1 - iffalse UnknownScript_0x18e2b2 - setevent EVENT_035 -UnknownScript_0x18e1cc: - checkevent EVENT_000 - iftrue UnknownScript_0x18e29f - checkevent EVENT_258 - iftrue UnknownScript_0x18e2b4 - checkevent EVENT_259 - iftrue UnknownScript_0x18e2ca - checkevent EVENT_25A - iftrue UnknownScript_0x18e2e0 - checkevent EVENT_25B - iftrue UnknownScript_0x18e2f6 - checkevent EVENT_25C - iftrue UnknownScript_0x18e30c - checkevent EVENT_25D - iftrue UnknownScript_0x18e322 - checkevent EVENT_25E - iftrue UnknownScript_0x18e338 + iffalse .NoRoomForBall + setevent EVENT_KURT_GAVE_YOU_LURE_BALL +.GotLureBall: + checkevent EVENT_GAVE_KURT_APRICORNS + iftrue .WaitForApricorns + checkevent EVENT_GAVE_KURT_RED_APRICORN + iftrue .GiveLevelBall + checkevent EVENT_GAVE_KURT_BLU_APRICORN + iftrue .GiveLureBall + checkevent EVENT_GAVE_KURT_YLW_APRICORN + iftrue .GiveMoonBall + checkevent EVENT_GAVE_KURT_GRN_APRICORN + iftrue .GiveFriendBall + checkevent EVENT_GAVE_KURT_WHT_APRICORN + iftrue .GiveFastBall + checkevent EVENT_GAVE_KURT_BLK_APRICORN + iftrue .GiveHeavyBall + checkevent EVENT_GAVE_KURT_PNK_APRICORN + iftrue .GiveLoveBall checkevent EVENT_CAN_GIVE_GS_BALL_TO_KURT - iftrue UnknownScript_0x18e34e -UnknownScript_0x18e202: - checkevent EVENT_001 - iftrue UnknownScript_0x18e212 - checkevent EVENT_002 - iftrue UnknownScript_0x18e212 + iftrue .CanGiveGSBallToKurt +.NoGSBall: + checkevent EVENT_RECEIVED_BALLS_FROM_KURT + iftrue .CheckApricorns + checkevent EVENT_DRAGON_SHRINE_QUESTION_2 + iftrue .CheckApricorns writetext UnknownText_0x18e6c9 closetext -UnknownScript_0x18e212: +.CheckApricorns: checkitem RED_APRICORN - iftrue UnknownScript_0x18e249 + iftrue .AskApricorn checkitem BLU_APRICORN - iftrue UnknownScript_0x18e249 + iftrue .AskApricorn checkitem YLW_APRICORN - iftrue UnknownScript_0x18e249 + iftrue .AskApricorn checkitem GRN_APRICORN - iftrue UnknownScript_0x18e249 + iftrue .AskApricorn checkitem WHT_APRICORN - iftrue UnknownScript_0x18e249 + iftrue .AskApricorn checkitem BLK_APRICORN - iftrue UnknownScript_0x18e249 + iftrue .AskApricorn checkitem PNK_APRICORN - iftrue UnknownScript_0x18e249 - checkevent EVENT_001 - iftrue UnknownScript_0x18e2ae - checkevent EVENT_002 - iftrue UnknownScript_0x18e243 + iftrue .AskApricorn + checkevent EVENT_RECEIVED_BALLS_FROM_KURT + iftrue .ThatTurnedOutGreat + checkevent EVENT_DRAGON_SHRINE_QUESTION_2 + iftrue .IMakeBallsFromApricorns loadmovesprites end -UnknownScript_0x18e243: +.IMakeBallsFromApricorns: writetext UnknownText_0x18e6c9 closetext loadmovesprites end -UnknownScript_0x18e249: +.AskApricorn: writetext UnknownText_0x18e736 keeptextopen - setevent EVENT_002 + setevent EVENT_DRAGON_SHRINE_QUESTION_2 special Function88018 - if_equal $0, UnknownScript_0x18e2a5 - if_equal $59, UnknownScript_0x18e275 - if_equal $5c, UnknownScript_0x18e27b - if_equal $5d, UnknownScript_0x18e281 - if_equal $61, UnknownScript_0x18e287 - if_equal $63, UnknownScript_0x18e28d - if_equal $65, UnknownScript_0x18e293 - setevent EVENT_258 - jump UnknownScript_0x18e299 - -UnknownScript_0x18e275: - setevent EVENT_259 - jump UnknownScript_0x18e299 - -UnknownScript_0x18e27b: - setevent EVENT_25A - jump UnknownScript_0x18e299 - -UnknownScript_0x18e281: - setevent EVENT_25B - jump UnknownScript_0x18e299 - -UnknownScript_0x18e287: - setevent EVENT_25C - jump UnknownScript_0x18e299 - -UnknownScript_0x18e28d: - setevent EVENT_25D - jump UnknownScript_0x18e299 - -UnknownScript_0x18e293: - setevent EVENT_25E - jump UnknownScript_0x18e299 - -UnknownScript_0x18e299: - setevent EVENT_000 + if_equal $0, .Cancel + if_equal BLU_APRICORN, .Blu + if_equal YLW_APRICORN, .Ylw + if_equal GRN_APRICORN, .Grn + if_equal WHT_APRICORN, .Wht + if_equal BLK_APRICORN, .Blk + if_equal PNK_APRICORN, .Pnk +; .Red + setevent EVENT_GAVE_KURT_RED_APRICORN + jump .GaveKurtApricorns + +.Blu: + setevent EVENT_GAVE_KURT_BLU_APRICORN + jump .GaveKurtApricorns + +.Ylw: + setevent EVENT_GAVE_KURT_YLW_APRICORN + jump .GaveKurtApricorns + +.Grn: + setevent EVENT_GAVE_KURT_GRN_APRICORN + jump .GaveKurtApricorns + +.Wht: + setevent EVENT_GAVE_KURT_WHT_APRICORN + jump .GaveKurtApricorns + +.Blk: + setevent EVENT_GAVE_KURT_BLK_APRICORN + jump .GaveKurtApricorns + +.Pnk: + setevent EVENT_GAVE_KURT_PNK_APRICORN + jump .GaveKurtApricorns + +.GaveKurtApricorns: + setevent EVENT_GAVE_KURT_APRICORNS setflag ENGINE_KURT_MAKING_BALLS -UnknownScript_0x18e29f: +.WaitForApricorns: writetext UnknownText_0x18e779 closetext loadmovesprites end -UnknownScript_0x18e2a5: +.Cancel: writetext UnknownText_0x18e7bc closetext loadmovesprites end -UnknownScript_0x18e2ab: - setevent EVENT_001 -UnknownScript_0x18e2ae: +._ThatTurnedOutGreat: + setevent EVENT_RECEIVED_BALLS_FROM_KURT +.ThatTurnedOutGreat: writetext UnknownText_0x18e82a closetext -UnknownScript_0x18e2b2: +.NoRoomForBall: loadmovesprites end -UnknownScript_0x18e2b4: +.GiveLevelBall: checkflag ENGINE_KURT_MAKING_BALLS - iftrue UnknownScript_0x18e3c5 + iftrue KurtMakingBallsScript writetext UnknownText_0x18e7fb keeptextopen verbosegiveitem2 LEVEL_BALL, $16 - iffalse UnknownScript_0x18e2b2 -UnknownScript_0x18e2c4: - clearevent EVENT_258 - jump UnknownScript_0x18e2ab + iffalse .NoRoomForBall + clearevent EVENT_GAVE_KURT_RED_APRICORN + jump ._ThatTurnedOutGreat -UnknownScript_0x18e2ca: +.GiveLureBall: checkflag ENGINE_KURT_MAKING_BALLS - iftrue UnknownScript_0x18e3c5 + iftrue KurtMakingBallsScript writetext UnknownText_0x18e7fb keeptextopen verbosegiveitem2 LURE_BALL, $16 - iffalse UnknownScript_0x18e2b2 -UnknownScript_0x18e2da: - clearevent EVENT_259 - jump UnknownScript_0x18e2ab + iffalse .NoRoomForBall + clearevent EVENT_GAVE_KURT_BLU_APRICORN + jump ._ThatTurnedOutGreat -UnknownScript_0x18e2e0: +.GiveMoonBall: checkflag ENGINE_KURT_MAKING_BALLS - iftrue UnknownScript_0x18e3c5 + iftrue KurtMakingBallsScript writetext UnknownText_0x18e7fb keeptextopen verbosegiveitem2 MOON_BALL, $16 - iffalse UnknownScript_0x18e2b2 -UnknownScript_0x18e2f0: - clearevent EVENT_25A - jump UnknownScript_0x18e2ab + iffalse .NoRoomForBall + clearevent EVENT_GAVE_KURT_YLW_APRICORN + jump ._ThatTurnedOutGreat -UnknownScript_0x18e2f6: +.GiveFriendBall: checkflag ENGINE_KURT_MAKING_BALLS - iftrue UnknownScript_0x18e3c5 + iftrue KurtMakingBallsScript writetext UnknownText_0x18e7fb keeptextopen verbosegiveitem2 FRIEND_BALL, $16 - iffalse UnknownScript_0x18e2b2 -UnknownScript_0x18e306: - clearevent EVENT_25B - jump UnknownScript_0x18e2ab + iffalse .NoRoomForBall + clearevent EVENT_GAVE_KURT_GRN_APRICORN + jump ._ThatTurnedOutGreat -UnknownScript_0x18e30c: +.GiveFastBall: checkflag ENGINE_KURT_MAKING_BALLS - iftrue UnknownScript_0x18e3c5 + iftrue KurtMakingBallsScript writetext UnknownText_0x18e7fb keeptextopen verbosegiveitem2 FAST_BALL, $16 - iffalse UnknownScript_0x18e2b2 -UnknownScript_0x18e31c: - clearevent EVENT_25C - jump UnknownScript_0x18e2ab + iffalse .NoRoomForBall + clearevent EVENT_GAVE_KURT_WHT_APRICORN + jump ._ThatTurnedOutGreat -UnknownScript_0x18e322: +.GiveHeavyBall: checkflag ENGINE_KURT_MAKING_BALLS - iftrue UnknownScript_0x18e3c5 + iftrue KurtMakingBallsScript writetext UnknownText_0x18e7fb keeptextopen verbosegiveitem2 HEAVY_BALL, $16 - iffalse UnknownScript_0x18e2b2 -UnknownScript_0x18e332: - clearevent EVENT_25D - jump UnknownScript_0x18e2ab + iffalse .NoRoomForBall + clearevent EVENT_GAVE_KURT_BLK_APRICORN + jump ._ThatTurnedOutGreat -UnknownScript_0x18e338: +.GiveLoveBall: checkflag ENGINE_KURT_MAKING_BALLS - iftrue UnknownScript_0x18e3c5 + iftrue KurtMakingBallsScript writetext UnknownText_0x18e7fb keeptextopen verbosegiveitem2 LOVE_BALL, $16 - iffalse UnknownScript_0x18e2b2 -UnknownScript_0x18e348: - clearevent EVENT_25E - jump UnknownScript_0x18e2ab + iffalse .NoRoomForBall + clearevent EVENT_GAVE_KURT_PNK_APRICORN + jump ._ThatTurnedOutGreat -UnknownScript_0x18e34e: +.CanGiveGSBallToKurt: checkevent EVENT_GAVE_GS_BALL_TO_KURT - iftrue UnknownScript_0x18e368 + iftrue .GaveGSBallToKurt checkitem GS_BALL - iffalse UnknownScript_0x18e202 + iffalse .NoGSBall writetext UnknownText_0x18e8ab closetext loadmovesprites @@ -276,9 +270,9 @@ UnknownScript_0x18e34e: setflag ENGINE_KURT_MAKING_BALLS end -UnknownScript_0x18e368: +.GaveGSBallToKurt: checkflag ENGINE_KURT_MAKING_BALLS - iffalse UnknownScript_0x18e378 + iffalse .NotMakingBalls writetext UnknownText_0x18e934 closetext writetext UnknownText_0x18e949 @@ -286,7 +280,7 @@ UnknownScript_0x18e368: loadmovesprites end -UnknownScript_0x18e378: +.NotMakingBalls: writetext UnknownText_0x18e95c closetext loadmovesprites @@ -297,17 +291,17 @@ UnknownScript_0x18e378: pause 20 showemote EMOTE_SHOCK, $2, 30 checkcode VAR_FACING - if_equal $1, UnknownScript_0x18e3a2 + if_equal UP, .GSBallRunAround spriteface $0, DOWN playsound SFX_FLY applymovement $2, MovementData_0x18e466 - jump UnknownScript_0x18e3ac + jump .KurtHasLeftTheBuilding -UnknownScript_0x18e3a2: +.GSBallRunAround: spriteface $0, DOWN playsound SFX_FLY applymovement $2, MovementData_0x18e46c -UnknownScript_0x18e3ac: +.KurtHasLeftTheBuilding: playsound SFX_EXIT_BUILDING disappear $2 clearevent EVENT_AZALEA_TOWN_KURT @@ -320,17 +314,17 @@ KurtScript_0x18e3bd: faceplayer loadfont checkevent EVENT_GAVE_GS_BALL_TO_KURT - iftrue UnknownScript_0x18e3e0 -UnknownScript_0x18e3c5: + iftrue KurtScript_ImCheckingItNow +KurtMakingBallsScript: checkevent EVENT_BUGGING_KURT_TOO_MUCH - iffalse UnknownScript_0x18e3d4 + iffalse Script_FirstTimeBuggingKurt writetext UnknownText_0x18e7d8 closetext loadmovesprites spriteface $5, UP end -UnknownScript_0x18e3d4: +Script_FirstTimeBuggingKurt: writetext UnknownText_0x18e863 closetext loadmovesprites @@ -338,7 +332,7 @@ UnknownScript_0x18e3d4: setevent EVENT_BUGGING_KURT_TOO_MUCH end -UnknownScript_0x18e3e0: +KurtScript_ImCheckingItNow: writetext UnknownText_0x18e934 closetext spriteface $5, UP @@ -349,13 +343,13 @@ UnknownScript_0x18e3e0: KurtsGranddaughter1: faceplayer - checkevent EVENT_000 + checkevent EVENT_GAVE_KURT_APRICORNS iftrue KurtsGranddaughter2Subscript - checkevent EVENT_001 + checkevent EVENT_RECEIVED_BALLS_FROM_KURT iftrue KurtsGranddaughterFunScript checkevent EVENT_FOREST_IS_RESTLESS iftrue .Lonely - checkevent EVENT_030 + checkevent EVENT_FAST_SHIP_FIRST_TIME iftrue .Dad checkevent EVENT_CLEARED_SLOWPOKE_WELL iftrue .SlowpokeBack diff --git a/maps/LakeofRageMagikarpHouse.asm b/maps/LakeofRageMagikarpHouse.asm index 4ed302e46..234ef2842 100644 --- a/maps/LakeofRageMagikarpHouse.asm +++ b/maps/LakeofRageMagikarpHouse.asm @@ -8,18 +8,18 @@ LakeofRageMagikarpHouse_MapScriptHeader: FishingGuruScript_0x19a6ae: faceplayer loadfont - checkevent EVENT_03A + checkevent EVENT_LAKE_OF_RAGE_ELIXIR_ON_STANDBY iftrue UnknownScript_0x19a6fe - checkevent EVENT_039 + checkevent EVENT_LAKE_OF_RAGE_ASKED_FOR_MAGIKARP iftrue UnknownScript_0x19a6e0 checkevent EVENT_CLEARED_ROCKET_HIDEOUT iftrue UnknownScript_0x19a6d7 - checkevent EVENT_038 + checkevent EVENT_LAKE_OF_RAGE_EXPLAINED_WEIRD_MAGIKARP iftrue UnknownScript_0x19a6d1 writetext UnknownText_0x19a72e closetext loadmovesprites - setevent EVENT_038 + setevent EVENT_LAKE_OF_RAGE_EXPLAINED_WEIRD_MAGIKARP end UnknownScript_0x19a6d1: @@ -32,7 +32,7 @@ UnknownScript_0x19a6d7: writetext UnknownText_0x19a890 closetext loadmovesprites - setevent EVENT_039 + setevent EVENT_LAKE_OF_RAGE_ASKED_FOR_MAGIKARP end UnknownScript_0x19a6e0: @@ -55,12 +55,12 @@ UnknownScript_0x19a6fe: writetext UnknownText_0x19a9c3 closetext loadmovesprites - clearevent EVENT_03A + clearevent EVENT_LAKE_OF_RAGE_ELIXIR_ON_STANDBY end UnknownScript_0x19a711: loadmovesprites - setevent EVENT_03A + setevent EVENT_LAKE_OF_RAGE_ELIXIR_ON_STANDBY end UnknownScript_0x19a716: diff --git a/maps/LancesRoom.asm b/maps/LancesRoom.asm index ba0c2805f..59b5f5de7 100644 --- a/maps/LancesRoom.asm +++ b/maps/LancesRoom.asm @@ -125,7 +125,7 @@ LanceScript_0x180e7b: pause 30 loadmovesprites applymovement $3, MovementData_0x180f5b - special Function8c084 + special FadeBlackBGMap pause 15 warpfacing $1, GROUP_HALL_OF_FAME, MAP_HALL_OF_FAME, $4, $d end diff --git a/maps/MobileBattleRoom.asm b/maps/MobileBattleRoom.asm index 451b4f15f..7a312625a 100644 --- a/maps/MobileBattleRoom.asm +++ b/maps/MobileBattleRoom.asm @@ -35,11 +35,11 @@ MapMobileBattleRoomSignpost0Script: writetext MobileBattleRoom_HealText pause 20 loadmovesprites - special Function8c084 + special FadeBlackBGMap playmusic MUSIC_HEAL - special Function1047eb + special LoadMapPalettes pause 60 - special Function8c079 + special FadeInBGMap special RestartMapMusic refreshscreen $0 .two_: diff --git a/maps/NewBarkTown.asm b/maps/NewBarkTown.asm index 440768a2e..8f0952505 100644 --- a/maps/NewBarkTown.asm +++ b/maps/NewBarkTown.asm @@ -20,7 +20,7 @@ NewBarkTown_MapScriptHeader: .FlyPoint setflag ENGINE_FLYPOINT_NEW_BARK - clearevent EVENT_076 + clearevent EVENT_FIRST_TIME_BANKING_WITH_MOM return UnknownScript_0x1a8016: diff --git a/maps/OlivineCity.asm b/maps/OlivineCity.asm index 644cc58c1..df55db57b 100644 --- a/maps/OlivineCity.asm +++ b/maps/OlivineCity.asm @@ -43,7 +43,7 @@ UnknownScript_0x1a8833: disappear $5 special RestartMapMusic variablesprite SPRITE_OLIVINE_RIVAL, SPRITE_SWIMMER_GUY - special Function14209 + special RunCallback_04 end UnknownScript_0x1a886b: @@ -67,7 +67,7 @@ UnknownScript_0x1a886b: dotrigger $1 special RestartMapMusic variablesprite SPRITE_OLIVINE_RIVAL, SPRITE_SWIMMER_GUY - special Function14209 + special RunCallback_04 end SailorScript_0x1a88a3: diff --git a/maps/OlivineLighthouse6F.asm b/maps/OlivineLighthouse6F.asm index fce7f02b7..a86c5c00e 100644 --- a/maps/OlivineLighthouse6F.asm +++ b/maps/OlivineLighthouse6F.asm @@ -42,9 +42,9 @@ UnknownScript_0x60bab: loadmovesprites special RestartMapMusic cry AMPHAROS - special Function8c084 + special FadeBlackBGMap pause 10 - special Function8c079 + special FadeInBGMap loadfont writetext UnknownText_0x60f3d closetext @@ -116,10 +116,10 @@ UnknownScript_0x60c51: cry AMPHAROS closetext loadmovesprites - special Function8c084 - special Function8c079 - special Function8c084 - special Function8c079 + special FadeBlackBGMap + special FadeInBGMap + special FadeBlackBGMap + special FadeInBGMap end ItemFragment_0x60c66: diff --git a/maps/OlivinePort.asm b/maps/OlivinePort.asm index 9e8c5025b..bb8cce9ba 100644 --- a/maps/OlivinePort.asm +++ b/maps/OlivinePort.asm @@ -20,14 +20,14 @@ UnknownScript_0x748b1: applymovement $0, MovementData_0x74a32 appear $2 dotrigger $0 - setevent EVENT_000 + setevent EVENT_GAVE_KURT_APRICORNS blackoutmod GROUP_OLIVINE_CITY, MAP_OLIVINE_CITY end SailorScript_0x748c0: faceplayer loadfont - checkevent EVENT_000 + checkevent EVENT_GAVE_KURT_APRICORNS iftrue UnknownScript_0x74919 writetext UnknownText_0x74a55 closetext @@ -39,9 +39,9 @@ SailorScript_0x748c0: waitbutton applymovement $0, MovementData_0x74a30 playsound SFX_EXIT_BUILDING - special Function8c084 + special FadeBlackBGMap waitbutton - checkevent EVENT_030 + checkevent EVENT_FAST_SHIP_FIRST_TIME iffalse UnknownScript_0x7490a clearevent EVENT_FAST_SHIP_PASSENGERS_EASTBOUND setevent EVENT_FAST_SHIP_PASSENGERS_WESTBOUND @@ -69,13 +69,13 @@ UnknownScript_0x74919: UnknownScript_0x7491f: spriteface $4, RIGHT - checkevent EVENT_000 + checkevent EVENT_GAVE_KURT_APRICORNS iftrue UnknownScript_0x7498b - checkevent EVENT_001 + checkevent EVENT_RECEIVED_BALLS_FROM_KURT iftrue UnknownScript_0x7498b spriteface $0, LEFT loadfont - checkevent EVENT_030 + checkevent EVENT_FAST_SHIP_FIRST_TIME iffalse UnknownScript_0x7494e checkcode VAR_WEEKDAY if_equal SUNDAY, UnknownScript_0x74977 @@ -94,7 +94,7 @@ UnknownScript_0x7494e: writetext UnknownText_0x74b11 closetext loadmovesprites - setevent EVENT_001 + setevent EVENT_RECEIVED_BALLS_FROM_KURT applymovement $0, MovementData_0x74a37 jump SailorScript_0x748c0 @@ -138,9 +138,9 @@ UnknownScript_0x74992: SailorScript_0x7499c: faceplayer loadfont - checkevent EVENT_000 + checkevent EVENT_GAVE_KURT_APRICORNS iftrue UnknownScript_0x74919 - checkevent EVENT_030 + checkevent EVENT_FAST_SHIP_FIRST_TIME iffalse UnknownScript_0x749c0 checkcode VAR_WEEKDAY if_equal SUNDAY, UnknownScript_0x749f2 @@ -159,7 +159,7 @@ UnknownScript_0x749c0: writetext UnknownText_0x74b11 closetext loadmovesprites - setevent EVENT_001 + setevent EVENT_RECEIVED_BALLS_FROM_KURT checkcode VAR_FACING if_equal $3, UnknownScript_0x749e5 applymovement $0, MovementData_0x74a3f diff --git a/maps/PokeCenter2F.asm b/maps/PokeCenter2F.asm index 4e54783aa..60c322f95 100644 --- a/maps/PokeCenter2F.asm +++ b/maps/PokeCenter2F.asm @@ -17,7 +17,7 @@ PokeCenter2F_MapScriptHeader: special Special_CheckMysteryGift if_equal $0, .Trigger1Done clearevent EVENT_MYSTERY_GIFT_DELIVERY_GUY - checkevent EVENT_001 + checkevent EVENT_RECEIVED_BALLS_FROM_KURT iftrue .Trigger1Done priorityjump PokeCenter2F_AppearMysteryGiftDeliveryGuy @@ -46,7 +46,7 @@ PokeCenter2F_MapScriptHeader: PokeCenter2F_AppearMysteryGiftDeliveryGuy: appear $5 - setevent EVENT_001 + setevent EVENT_RECEIVED_BALLS_FROM_KURT end Script_TradeCenterClosed: diff --git a/maps/RadioTower2F.asm b/maps/RadioTower2F.asm index a3cf84aaa..6d24b35c4 100644 --- a/maps/RadioTower2F.asm +++ b/maps/RadioTower2F.asm @@ -92,16 +92,16 @@ Buena: iftrue UnknownScript_0x5d865 checkevent EVENT_MET_BUENA iffalse UnknownScript_0x5d800 - checkflag ENGINE_60 + checkflag ENGINE_BUENAS_PASSWORD_2 iftrue UnknownScript_0x5d82f checkcode VAR_HOUR - if_less_than $12, UnknownScript_0x5d893 - checkflag ENGINE_5F + if_less_than 18, UnknownScript_0x5d893 + checkflag ENGINE_BUENAS_PASSWORD iffalse UnknownScript_0x5d80a checkitem BLUE_CARD iffalse UnknownScript_0x5d86b checkcode VAR_BLUECARDBALANCE - if_equal $1e, UnknownScript_0x5d87f + if_equal 30, UnknownScript_0x5d87f playmusic MUSIC_BUENAS_PASSWORD writetext UnknownText_0x5de35 special Function4ae12 @@ -133,7 +133,7 @@ UnknownScript_0x5d7be: writevarcode VAR_BLUECARDBALANCE waitbutton playsound SFX_TRANSACTION - setflag ENGINE_60 + setflag ENGINE_BUENAS_PASSWORD_2 pause 20 spriteface $b, RIGHT loadfont @@ -188,7 +188,7 @@ UnknownScript_0x5d83f: end UnknownScript_0x5d845: - setflag ENGINE_60 + setflag ENGINE_BUENAS_PASSWORD_2 loadfont writetext UnknownText_0x5e01c closetext diff --git a/maps/RadioTower5F.asm b/maps/RadioTower5F.asm index 43125d67c..9509ed504 100644 --- a/maps/RadioTower5F.asm +++ b/maps/RadioTower5F.asm @@ -124,7 +124,7 @@ UnknownScript_0x6006e: dotrigger $2 domaptrigger GROUP_ECRUTEAK_HOUSE, MAP_ECRUTEAK_HOUSE, $0 setevent EVENT_GOT_CLEAR_BELL - setevent EVENT_761 + setevent EVENT_TEAM_ROCKET_DISBANDED jump UnknownScript_0x600f1 UnknownScript_0x600f1: diff --git a/maps/Route34.asm b/maps/Route34.asm index 632a992e1..a74aaa244 100644 --- a/maps/Route34.asm +++ b/maps/Route34.asm @@ -296,7 +296,7 @@ UnknownScript_0x78213: verbosegiveitem LEAF_STONE, 1 iffalse UnknownScript_0x78225 clearflag ENGINE_GINA_HAS_LEAF_STONE - setevent EVENT_100 + setevent EVENT_GINA_GAVE_LEAF_STONE jump UnknownScript_0x78234 UnknownScript_0x78225: diff --git a/maps/Route35NationalParkgate.asm b/maps/Route35NationalParkgate.asm index ef3dfba89..a604c681b 100644 --- a/maps/Route35NationalParkgate.asm +++ b/maps/Route35NationalParkgate.asm @@ -75,7 +75,7 @@ Route35NationalParkgate_GoBackIn: loadmovesprites scall Route35NationalParkgate_EnterContest playsound SFX_ENTER_DOOR - special Function8c084 + special FadeBlackBGMap waitbutton warpfacing $1, GROUP_NATIONAL_PARK_BUG_CONTEST, MAP_NATIONAL_PARK_BUG_CONTEST, $a, $2f end @@ -112,7 +112,7 @@ Route35NationalParkgate_OkayToProceed: special Special_GiveParkBalls scall Route35NationalParkgate_EnterContest playsound SFX_ENTER_DOOR - special Function8c084 + special FadeBlackBGMap waitbutton special Special_SelectRandomBugContestContestants warpfacing $1, GROUP_NATIONAL_PARK_BUG_CONTEST, MAP_NATIONAL_PARK_BUG_CONTEST, $a, $2f diff --git a/maps/Route36.asm b/maps/Route36.asm index 87d8fc151..2946e873f 100644 --- a/maps/Route36.asm +++ b/maps/Route36.asm @@ -89,14 +89,14 @@ UnknownScript_0x19407b: applymovement $4, MovementData_0x19424b disappear $4 variablesprite SPRITE_WEIRD_TREE, SPRITE_TWIN - special Function14209 + special RunCallback_04 special Function14168 end LassScript_0x19408c: faceplayer loadfont - checkevent EVENT_0BA + checkevent EVENT_TALKED_TO_FLORIA_AT_FLOWER_SHOP iftrue UnknownScript_0x1940b3 setevent EVENT_MET_FLORIA writetext UnknownText_0x1942f1 @@ -257,7 +257,7 @@ UnknownScript_0x1941b4: verbosegiveitem FIRE_STONE, 1 iffalse UnknownScript_0x1941c6 clearflag ENGINE_ALAN_HAS_FIRE_STONE - setevent EVENT_101 + setevent EVENT_ALAN_GAVE_FIRE_STONE jump UnknownScript_0x1941d5 UnknownScript_0x1941c6: diff --git a/maps/Route36NationalParkgate.asm b/maps/Route36NationalParkgate.asm index e6b054d12..23cacb61c 100644 --- a/maps/Route36NationalParkgate.asm +++ b/maps/Route36NationalParkgate.asm @@ -37,7 +37,7 @@ UnknownScript_0x6ab20: return UnknownScript_0x6ab23: - checkevent EVENT_2D2 + checkevent EVENT_WARPED_FROM_ROUTE_35_NATIONAL_PARK_GATE iftrue UnknownScript_0x6ab46 checkcode VAR_WEEKDAY if_equal TUESDAY, UnknownScript_0x6ab42 @@ -83,7 +83,7 @@ UnknownScript_0x6ab76: loadmovesprites spriteface $0, LEFT playsound SFX_EXIT_BUILDING - special Function8c084 + special FadeBlackBGMap waitbutton warpfacing $2, GROUP_NATIONAL_PARK_BUG_CONTEST, MAP_NATIONAL_PARK_BUG_CONTEST, $21, $12 end @@ -166,7 +166,7 @@ UnknownScript_0x6ac10: special Special_GiveParkBalls spriteface $0, LEFT playsound SFX_EXIT_BUILDING - special Function8c084 + special FadeBlackBGMap waitbutton special Special_SelectRandomBugContestContestants warpfacing $2, GROUP_NATIONAL_PARK_BUG_CONTEST, MAP_NATIONAL_PARK_BUG_CONTEST, $21, $12 @@ -300,7 +300,7 @@ UnknownScript_0x6ad02: YoungsterScript_0x6ad06: faceplayer loadfont - checkevent EVENT_000 + checkevent EVENT_GAVE_KURT_APRICORNS iffalse UnknownScript_0x6ad14 writetext UnknownText_0x6b399 closetext @@ -316,7 +316,7 @@ UnknownScript_0x6ad14: YoungsterScript_0x6ad1a: faceplayer loadfont - checkevent EVENT_000 + checkevent EVENT_GAVE_KURT_APRICORNS iffalse UnknownScript_0x6ad28 writetext UnknownText_0x6b40f closetext @@ -332,7 +332,7 @@ UnknownScript_0x6ad28: RockerScript_0x6ad2e: faceplayer loadfont - checkevent EVENT_000 + checkevent EVENT_GAVE_KURT_APRICORNS iffalse UnknownScript_0x6ad3c writetext UnknownText_0x6b462 closetext @@ -348,7 +348,7 @@ UnknownScript_0x6ad3c: PokefanMScript_0x6ad42: faceplayer loadfont - checkevent EVENT_000 + checkevent EVENT_GAVE_KURT_APRICORNS iffalse UnknownScript_0x6ad50 writetext UnknownText_0x6b4da closetext @@ -364,7 +364,7 @@ UnknownScript_0x6ad50: YoungsterScript_0x6ad56: faceplayer loadfont - checkevent EVENT_000 + checkevent EVENT_GAVE_KURT_APRICORNS iffalse UnknownScript_0x6ad64 writetext UnknownText_0x6b54e closetext @@ -380,7 +380,7 @@ UnknownScript_0x6ad64: YoungsterScript_0x6ad6a: faceplayer loadfont - checkevent EVENT_000 + checkevent EVENT_GAVE_KURT_APRICORNS iffalse UnknownScript_0x6ad78 writetext UnknownText_0x6b5b0 closetext @@ -396,7 +396,7 @@ UnknownScript_0x6ad78: LassScript_0x6ad7e: faceplayer loadfont - checkevent EVENT_000 + checkevent EVENT_GAVE_KURT_APRICORNS iffalse UnknownScript_0x6ad8c writetext UnknownText_0x6b64b closetext @@ -412,7 +412,7 @@ UnknownScript_0x6ad8c: YoungsterScript_0x6ad92: faceplayer loadfont - checkevent EVENT_000 + checkevent EVENT_GAVE_KURT_APRICORNS iffalse UnknownScript_0x6ada0 writetext UnknownText_0x6b6b8 closetext @@ -428,7 +428,7 @@ UnknownScript_0x6ada0: YoungsterScript_0x6ada6: faceplayer loadfont - checkevent EVENT_000 + checkevent EVENT_GAVE_KURT_APRICORNS iffalse UnknownScript_0x6adb4 writetext UnknownText_0x6b71b closetext @@ -444,7 +444,7 @@ UnknownScript_0x6adb4: YoungsterScript_0x6adba: faceplayer loadfont - checkevent EVENT_000 + checkevent EVENT_GAVE_KURT_APRICORNS iffalse UnknownScript_0x6adc8 writetext UnknownText_0x6b76f closetext diff --git a/maps/Route38.asm b/maps/Route38.asm index 94d05762d..6bd01280b 100644 --- a/maps/Route38.asm +++ b/maps/Route38.asm @@ -36,7 +36,7 @@ LassDana1Script: loadfont checkflag ENGINE_DANA iftrue UnknownScript_0x1a1d82 - checkflag ENGINE_LIZ_HAS_THUNDERSTONE + checkflag ENGINE_DANA_HAS_THUNDERSTONE iftrue UnknownScript_0x1a1df6 checkcellnum PHONE_LASS_DANA iftrue UnknownScript_0x1a1e17 @@ -122,8 +122,8 @@ UnknownScript_0x1a1df6: scall UnknownScript_0x1a1e27 verbosegiveitem THUNDERSTONE, 1 iffalse UnknownScript_0x1a1e08 - clearflag ENGINE_LIZ_HAS_THUNDERSTONE - setevent EVENT_102 + clearflag ENGINE_DANA_HAS_THUNDERSTONE + setevent EVENT_DANA_GAVE_THUNDERSTONE jump UnknownScript_0x1a1e17 UnknownScript_0x1a1e08: diff --git a/maps/Route42.asm b/maps/Route42.asm index 04bf4dacd..60be219ff 100644 --- a/maps/Route42.asm +++ b/maps/Route42.asm @@ -111,7 +111,7 @@ UnknownScript_0x1a92dc: verbosegiveitem WATER_STONE, 1 iffalse UnknownScript_0x1a92ee clearflag ENGINE_TULLY_HAS_WATER_STONE - setevent EVENT_103 + setevent EVENT_TULLY_GAVE_WATER_STONE jump UnknownScript_0x1a92fd UnknownScript_0x1a92ee: diff --git a/maps/Route43.asm b/maps/Route43.asm index 32c1c12c5..3da26b21a 100644 --- a/maps/Route43.asm +++ b/maps/Route43.asm @@ -254,7 +254,7 @@ UnknownScript_0x19d21e: verbosegiveitem PINK_BOW, 1 iffalse UnknownScript_0x19d230 clearflag ENGINE_TIFFANY_HAS_PINK_BOW - setevent EVENT_104 + setevent EVENT_TIFFANY_GAVE_PINK_BOW jump UnknownScript_0x19d245 UnknownScript_0x19d230: diff --git a/maps/Route45.asm b/maps/Route45.asm index f994de3fc..8cb2fa4aa 100644 --- a/maps/Route45.asm +++ b/maps/Route45.asm @@ -40,12 +40,12 @@ UnknownScript_0x19e0e4: iftrue UnknownScript_0x19e10c checknite iftrue UnknownScript_0x19e112 - checkevent EVENT_26A + checkevent EVENT_KENJI_ON_BREAK iffalse UnknownScript_0x19e127 scall UnknownScript_0x19e137 verbosegiveitem PP_UP, 1 iffalse UnknownScript_0x19e118 - clearevent EVENT_26A + clearevent EVENT_KENJI_ON_BREAK special Function11485 jump UnknownScript_0x19e127 diff --git a/maps/RuinsofAlphAerodactylChamber.asm b/maps/RuinsofAlphAerodactylChamber.asm index 06f0f40f4..e5d9597d7 100644 --- a/maps/RuinsofAlphAerodactylChamber.asm +++ b/maps/RuinsofAlphAerodactylChamber.asm @@ -30,7 +30,7 @@ UnknownScript_0x58db9: iftrue UnknownScript_0x58dc3 changeblock $4, $0, $2e UnknownScript_0x58dc3: - checkevent EVENT_2A3 + checkevent EVENT_SOLVED_AERODACTYL_PUZZLE iffalse UnknownScript_0x58dca return @@ -62,7 +62,7 @@ MapRuinsofAlphAerodactylChamberSignpost2Script: UnknownScript_0x58df7: setevent EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS - setevent EVENT_2A3 + setevent EVENT_SOLVED_AERODACTYL_PUZZLE setflag ENGINE_UNLOCKED_UNOWNS_3 domaptrigger GROUP_RUINS_OF_ALPH_INNER_CHAMBER, MAP_RUINS_OF_ALPH_INNER_CHAMBER, $1 earthquake 30 diff --git a/maps/RuinsofAlphHoOhChamber.asm b/maps/RuinsofAlphHoOhChamber.asm index 6f6d5a3a0..40d5fe4cd 100644 --- a/maps/RuinsofAlphHoOhChamber.asm +++ b/maps/RuinsofAlphHoOhChamber.asm @@ -31,7 +31,7 @@ UnknownScript_0x5857c: iftrue UnknownScript_0x58586 changeblock $4, $0, $2e UnknownScript_0x58586: - checkevent EVENT_2A0 + checkevent EVENT_SOLVED_HO_OH_PUZZLE iffalse UnknownScript_0x5858d return @@ -63,7 +63,7 @@ MapRuinsofAlphHoOhChamberSignpost2Script: UnknownScript_0x585ba: setevent EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS - setevent EVENT_2A0 + setevent EVENT_SOLVED_HO_OH_PUZZLE setflag ENGINE_UNLOCKED_UNOWNS_4 domaptrigger GROUP_RUINS_OF_ALPH_INNER_CHAMBER, MAP_RUINS_OF_ALPH_INNER_CHAMBER, $1 earthquake 30 diff --git a/maps/RuinsofAlphKabutoChamber.asm b/maps/RuinsofAlphKabutoChamber.asm index d59bca336..9fff028f7 100644 --- a/maps/RuinsofAlphKabutoChamber.asm +++ b/maps/RuinsofAlphKabutoChamber.asm @@ -32,7 +32,7 @@ UnknownScript_0x58737: iftrue UnknownScript_0x58741 changeblock $4, $0, $2e UnknownScript_0x58741: - checkevent EVENT_2A1 + checkevent EVENT_SOLVED_KABUTO_PUZZLE iffalse UnknownScript_0x58748 return @@ -67,7 +67,7 @@ MapRuinsofAlphKabutoChamberSignpost2Script: UnknownScript_0x58778: setevent EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS - setevent EVENT_2A1 + setevent EVENT_SOLVED_KABUTO_PUZZLE setflag ENGINE_UNLOCKED_UNOWNS_1 setevent EVENT_RUINS_OF_ALPH_KABUTO_CHAMBER_RECEPTIONIST domaptrigger GROUP_RUINS_OF_ALPH_INNER_CHAMBER, MAP_RUINS_OF_ALPH_INNER_CHAMBER, $1 @@ -92,7 +92,7 @@ ScientistScript_0x587a8: if_equal 26, UnknownScript_0x587cf checkevent EVENT_WALL_OPENED_IN_KABUTO_CHAMBER iftrue UnknownScript_0x587c9 - checkevent EVENT_2A1 + checkevent EVENT_SOLVED_KABUTO_PUZZLE iffalse UnknownScript_0x587c0 writetext UnknownText_0x589b8 keeptextopen diff --git a/maps/RuinsofAlphOmanyteChamber.asm b/maps/RuinsofAlphOmanyteChamber.asm index 56340f81b..669774e35 100644 --- a/maps/RuinsofAlphOmanyteChamber.asm +++ b/maps/RuinsofAlphOmanyteChamber.asm @@ -31,7 +31,7 @@ UnknownScript_0x58bf8: iftrue UnknownScript_0x58c02 changeblock $4, $0, $2e UnknownScript_0x58c02: - checkevent EVENT_2A2 + checkevent EVENT_SOLVED_OMANYTE_PUZZLE iffalse UnknownScript_0x58c09 return @@ -63,7 +63,7 @@ MapRuinsofAlphOmanyteChamberSignpost2Script: UnknownScript_0x58c36: setevent EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS - setevent EVENT_2A2 + setevent EVENT_SOLVED_OMANYTE_PUZZLE setflag ENGINE_UNLOCKED_UNOWNS_2 domaptrigger GROUP_RUINS_OF_ALPH_INNER_CHAMBER, MAP_RUINS_OF_ALPH_INNER_CHAMBER, $1 earthquake 30 diff --git a/maps/SlowpokeWellB1F.asm b/maps/SlowpokeWellB1F.asm index 49876fe2c..a15734af9 100644 --- a/maps/SlowpokeWellB1F.asm +++ b/maps/SlowpokeWellB1F.asm @@ -49,14 +49,14 @@ GruntM1Script: domaptrigger GROUP_AZALEA_TOWN, MAP_AZALEA_TOWN, $1 clearevent EVENT_ILEX_FOREST_APPRENTICE clearevent EVENT_ILEX_FOREST_FARFETCHD - setevent EVENT_6F5 - setevent EVENT_6F6 + setevent EVENT_CHARCOAL_KILN_FARFETCH_D + setevent EVENT_CHARCOAL_KILN_APPRENTICE setevent EVENT_SLOWPOKE_WELL_SLOWPOKES setevent EVENT_SLOWPOKE_WELL_KURT clearevent EVENT_AZALEA_TOWN_SLOWPOKES clearevent EVENT_KURTS_HOUSE_SLOWPOKE clearevent EVENT_KURTS_HOUSE_KURT_1 - special Function8c084 + special FadeBlackBGMap special HealParty pause 15 warp GROUP_KURTS_HOUSE, MAP_KURTS_HOUSE, $3, $3 diff --git a/maps/TeamRocketBaseB1F.asm b/maps/TeamRocketBaseB1F.asm index 635634df0..d2173a859 100644 --- a/maps/TeamRocketBaseB1F.asm +++ b/maps/TeamRocketBaseB1F.asm @@ -445,9 +445,9 @@ ExplodingTrap22: end VoltorbExplodingTrap: - special Function8c084 + special FadeBlackBGMap cry VOLTORB - special Function8c079 + special FadeInBGMap setlasttalked $ff writecode VAR_BATTLETYPE, BATTLETYPE_TRAP loadpokedata VOLTORB, 23 @@ -455,9 +455,9 @@ VoltorbExplodingTrap: end GeodudeExplodingTrap: - special Function8c084 + special FadeBlackBGMap cry GEODUDE - special Function8c079 + special FadeInBGMap setlasttalked $ff writecode VAR_BATTLETYPE, BATTLETYPE_TRAP loadpokedata GEODUDE, 21 @@ -465,9 +465,9 @@ GeodudeExplodingTrap: end KoffingExplodingTrap: - special Function8c084 + special FadeBlackBGMap cry KOFFING - special Function8c079 + special FadeInBGMap setlasttalked $ff writecode VAR_BATTLETYPE, BATTLETYPE_TRAP loadpokedata KOFFING, 21 diff --git a/maps/TeamRocketBaseB2F.asm b/maps/TeamRocketBaseB2F.asm index dc169372d..78df0926d 100644 --- a/maps/TeamRocketBaseB2F.asm +++ b/maps/TeamRocketBaseB2F.asm @@ -155,19 +155,19 @@ UnknownScript_0x6d091: writetext UnknownText_0x6da97 closetext loadmovesprites - special Function8c084 + special FadeBlackBGMap special Mobile_HealParty playsound SFX_FULL_HEAL special HealParty - special Function8c079 + special FadeInBGMap loadfont writetext UnknownText_0x6daf7 closetext loadmovesprites dotrigger $1 - setevent EVENT_04C + setevent EVENT_LANCE_HEALED_YOU_IN_TEAM_ROCKET_BASE checkcode VAR_FACING - if_equal $3, UnknownScript_0x6d0be + if_equal RIGHT, UnknownScript_0x6d0be applymovement $4, MovementData_0x6d212 disappear $4 end diff --git a/maps/TimeCapsule.asm b/maps/TimeCapsule.asm index d51eaa148..4bf81d7eb 100644 --- a/maps/TimeCapsule.asm +++ b/maps/TimeCapsule.asm @@ -73,5 +73,5 @@ TimeCapsule_MapEventHeader: ; people-events db 2 - person_event SPRITE_CHRIS, 8, 7, OW_LEFT | $1, $0, -1, -1, $0, 0, ChrisScript_0x19351a, EVENT_000 - person_event SPRITE_CHRIS, 8, 10, OW_LEFT | $0, $0, -1, -1, $0, 0, ChrisScript_0x19351a, EVENT_001 + person_event SPRITE_CHRIS, 8, 7, OW_LEFT | $1, $0, -1, -1, $0, 0, ChrisScript_0x19351a, EVENT_GAVE_KURT_APRICORNS + person_event SPRITE_CHRIS, 8, 10, OW_LEFT | $0, $0, -1, -1, $0, 0, ChrisScript_0x19351a, EVENT_RECEIVED_BALLS_FROM_KURT diff --git a/maps/TradeCenter.asm b/maps/TradeCenter.asm index db191a080..6467e37bb 100644 --- a/maps/TradeCenter.asm +++ b/maps/TradeCenter.asm @@ -73,5 +73,5 @@ TradeCenter_MapEventHeader: ; people-events db 2 - person_event SPRITE_CHRIS, 8, 7, OW_LEFT | $1, $0, -1, -1, $0, 0, ChrisScript_0x193499, EVENT_000 - person_event SPRITE_CHRIS, 8, 10, OW_LEFT | $0, $0, -1, -1, $0, 0, ChrisScript_0x193499, EVENT_001 + person_event SPRITE_CHRIS, 8, 7, OW_LEFT | $1, $0, -1, -1, $0, 0, ChrisScript_0x193499, EVENT_GAVE_KURT_APRICORNS + person_event SPRITE_CHRIS, 8, 10, OW_LEFT | $0, $0, -1, -1, $0, 0, ChrisScript_0x193499, EVENT_RECEIVED_BALLS_FROM_KURT diff --git a/maps/UndergroundWarehouse.asm b/maps/UndergroundWarehouse.asm index d9733babf..672afeacc 100644 --- a/maps/UndergroundWarehouse.asm +++ b/maps/UndergroundWarehouse.asm @@ -65,12 +65,12 @@ GruntM15Script: GentlemanScript_0x7d9bf: faceplayer loadfont - checkevent EVENT_04A + checkevent EVENT_RECEIVED_CARD_KEY iftrue UnknownScript_0x7d9de writetext UnknownText_0x7dbc6 keeptextopen verbosegiveitem CARD_KEY, 1 - setevent EVENT_04A + setevent EVENT_RECEIVED_CARD_KEY setevent EVENT_WAREHOUSE_LAYOUT_1 clearevent EVENT_WAREHOUSE_LAYOUT_2 clearevent EVENT_WAREHOUSE_LAYOUT_3 diff --git a/maps/VermilionPort.asm b/maps/VermilionPort.asm index be75d77a3..0c6074358 100644 --- a/maps/VermilionPort.asm +++ b/maps/VermilionPort.asm @@ -31,15 +31,15 @@ UnknownScript_0x74da6: setevent EVENT_FAST_SHIP_CABINS_SE_SSE_GENTLEMAN setevent EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP clearevent EVENT_OLIVINE_PORT_PASSAGE_POKEFAN_M - setevent EVENT_030 - setevent EVENT_000 + setevent EVENT_FAST_SHIP_FIRST_TIME + setevent EVENT_GAVE_KURT_APRICORNS blackoutmod GROUP_VERMILION_CITY, MAP_VERMILION_CITY end SailorScript_0x74dc4: faceplayer loadfont - checkevent EVENT_000 + checkevent EVENT_GAVE_KURT_APRICORNS iftrue UnknownScript_0x74e1a writetext UnknownText_0x74f06 closetext @@ -51,7 +51,7 @@ SailorScript_0x74dc4: waitbutton applymovement $0, MovementData_0x74ef1 playsound SFX_EXIT_BUILDING - special Function8c084 + special FadeBlackBGMap waitbutton setevent EVENT_FAST_SHIP_PASSENGERS_EASTBOUND clearevent EVENT_FAST_SHIP_PASSENGERS_WESTBOUND @@ -79,9 +79,9 @@ UnknownScript_0x74e1a: UnknownScript_0x74e20: spriteface $3, RIGHT - checkevent EVENT_000 + checkevent EVENT_GAVE_KURT_APRICORNS iftrue UnknownScript_0x74e86 - checkevent EVENT_001 + checkevent EVENT_RECEIVED_BALLS_FROM_KURT iftrue UnknownScript_0x74e86 spriteface $0, LEFT loadfont @@ -101,7 +101,7 @@ UnknownScript_0x74e20: writetext UnknownText_0x74fc2 closetext loadmovesprites - setevent EVENT_001 + setevent EVENT_RECEIVED_BALLS_FROM_KURT applymovement $0, MovementData_0x74ef8 jump SailorScript_0x74dc4 @@ -145,7 +145,7 @@ UnknownScript_0x74e8d: SailorScript_0x74e97: faceplayer loadfont - checkevent EVENT_000 + checkevent EVENT_GAVE_KURT_APRICORNS iftrue UnknownScript_0x74e1a checkcode VAR_WEEKDAY if_equal MONDAY, UnknownScript_0x74eda @@ -163,7 +163,7 @@ SailorScript_0x74e97: writetext UnknownText_0x74fc2 closetext loadmovesprites - setevent EVENT_001 + setevent EVENT_RECEIVED_BALLS_FROM_KURT applymovement $0, MovementData_0x74efe jump SailorScript_0x74dc4 diff --git a/maps/WarehouseEntrance.asm b/maps/WarehouseEntrance.asm index 1f99f8875..33d2f9a1c 100644 --- a/maps/WarehouseEntrance.asm +++ b/maps/WarehouseEntrance.asm @@ -203,21 +203,21 @@ OlderHaircutBrotherScript: jump .else .two: - setevent EVENT_000 - clearevent EVENT_001 - clearevent EVENT_002 + setevent EVENT_GAVE_KURT_APRICORNS + clearevent EVENT_RECEIVED_BALLS_FROM_KURT + clearevent EVENT_DRAGON_SHRINE_QUESTION_2 jump .then .three: - clearevent EVENT_000 - setevent EVENT_001 - clearevent EVENT_002 + clearevent EVENT_GAVE_KURT_APRICORNS + setevent EVENT_RECEIVED_BALLS_FROM_KURT + clearevent EVENT_DRAGON_SHRINE_QUESTION_2 jump .then .else: - clearevent EVENT_000 - clearevent EVENT_001 - setevent EVENT_002 + clearevent EVENT_GAVE_KURT_APRICORNS + clearevent EVENT_RECEIVED_BALLS_FROM_KURT + setevent EVENT_DRAGON_SHRINE_QUESTION_2 jump .then .then: @@ -226,17 +226,17 @@ OlderHaircutBrotherScript: writetext UnknownText_0x7c6b8 closetext loadmovesprites - special Function8c084 + special FadeBlackBGMap playmusic MUSIC_HEAL pause 60 - special Function8c079 + special FadeInBGMap special RestartMapMusic loadfont writetext UnknownText_0x7c6d8 closetext - checkevent EVENT_000 + checkevent EVENT_GAVE_KURT_APRICORNS iftrue UnknownScript_0x7c2bb - checkevent EVENT_001 + checkevent EVENT_RECEIVED_BALLS_FROM_KURT iftrue UnknownScript_0x7c2c4 jump UnknownScript_0x7c2cd @@ -286,21 +286,21 @@ YoungerHaircutBrotherScript: jump .else .two: - setevent EVENT_000 - clearevent EVENT_001 - clearevent EVENT_002 + setevent EVENT_GAVE_KURT_APRICORNS + clearevent EVENT_RECEIVED_BALLS_FROM_KURT + clearevent EVENT_DRAGON_SHRINE_QUESTION_2 jump .then .three: - clearevent EVENT_000 - setevent EVENT_001 - clearevent EVENT_002 + clearevent EVENT_GAVE_KURT_APRICORNS + setevent EVENT_RECEIVED_BALLS_FROM_KURT + clearevent EVENT_DRAGON_SHRINE_QUESTION_2 jump .then .else: - clearevent EVENT_000 - clearevent EVENT_001 - setevent EVENT_002 + clearevent EVENT_GAVE_KURT_APRICORNS + clearevent EVENT_RECEIVED_BALLS_FROM_KURT + setevent EVENT_DRAGON_SHRINE_QUESTION_2 jump .then .then: @@ -309,17 +309,17 @@ YoungerHaircutBrotherScript: writetext UnknownText_0x7c80e closetext loadmovesprites - special Function8c084 + special FadeBlackBGMap playmusic MUSIC_HEAL pause 60 - special Function8c079 + special FadeInBGMap special RestartMapMusic loadfont writetext UnknownText_0x7c82a closetext - checkevent EVENT_000 + checkevent EVENT_GAVE_KURT_APRICORNS iftrue UnknownScript_0x7c2bb - checkevent EVENT_001 + checkevent EVENT_RECEIVED_BALLS_FROM_KURT iftrue UnknownScript_0x7c2c4 jump UnknownScript_0x7c2cd |