diff --git a/data/pokemon/dex_entries/donmarin.asm b/data/pokemon/dex_entries/donmarin.asm index b6dfd40..ed7b660 100644 --- a/data/pokemon/dex_entries/donmarin.asm +++ b/data/pokemon/dex_entries/donmarin.asm @@ -1,4 +1,4 @@ - db "POWERFUL@" ; species name + db "LOCHKEEPER@" ; species name dw 802, 4850 ; height, weight db "Every PALSSIO pod" diff --git a/maps/LakeOfRagePrycesHouse.asm b/maps/LakeOfRagePrycesHouse.asm index abd4126..efa32d3 100644 --- a/maps/LakeOfRagePrycesHouse.asm +++ b/maps/LakeOfRagePrycesHouse.asm @@ -3,6 +3,22 @@ LakeOfRagePrycesHouse_MapScripts: def_scene_scripts + + def_callbacks + callback MAPCALLBACK_OBJECTS, LakeOfRagePrycesHousePryce + +LakeOfRagePrycesHousePryce: + checkevent EVENT_LAKE_OF_RAGE_RED_GYARADOS + iffalse .NoAppear + sjump .Appear + +.Appear: + appear LAKEOFRAGEPRYCESHOUSE_PRYCE + endcallback + +.NoAppear: + disappear LAKEOFRAGEPRYCESHOUSE_PRYCE + endcallback ; For some reason these crash the game. Ok. ;PrycesHouseBookshelf1: @@ -12,9 +28,7 @@ LakeOfRagePrycesHouse_MapScripts: ; jumpstd MagazineBookshelfScript PrycesHousePryce: - faceplayer - opentext - writetext PrycesHousePryceText + jumptextfaceplayer PrycesHousePryceText waitbutton closetext end @@ -22,7 +36,7 @@ PrycesHousePryce: PrycesHousePryceText: text "Thank you for" line "saving my" - cont "beloved town." + cont "beloved home." para "My middle name" line "is WILLOW." @@ -81,22 +95,6 @@ LakeOfRagePrycesHouseSwinubText: ; text "Seel! Seel!" ; done - def_callbacks - callback MAPCALLBACK_OBJECTS, LakeOfRagePrycesHousePryce - -LakeOfRagePrycesHousePryce: - checkevent EVENT_LAKE_OF_RAGE_RED_GYARADOS - iffalse .NoAppear - sjump .Appear - -.Appear: - appear LAKEOFRAGEPRYCESHOUSE_PRYCE - endcallback - -.NoAppear: - disappear LAKEOFRAGEPRYCESHOUSE_PRYCE - endcallback - LakeOfRagePrycesHouse_MapEvents: db 0, 0 ; filler