Rename map files, labels, and constants to be consistent and work with Polished Map

This commit is contained in:
Rangi 2019-01-01 15:06:23 -05:00
parent 90430e6dee
commit c779602459
1398 changed files with 6631 additions and 6166 deletions

View file

@ -1,11 +1,11 @@
AgathaScript:
AgathasRoom_Script:
call AgathaShowOrHideExitBlock
call EnableAutoTextBoxDrawing
ld hl, AgathaTrainerHeader0
ld de, AgathaScriptPointers
ld a, [wAgathaCurScript]
ld de, AgathasRoom_ScriptPointers
ld a, [wAgathasRoomCurScript]
call ExecuteCurMapScriptInTable
ld [wAgathaCurScript], a
ld [wAgathasRoomCurScript], a
ret
AgathaShowOrHideExitBlock:
@ -27,10 +27,10 @@ AgathaShowOrHideExitBlock:
ResetAgathaScript:
xor a
ld [wAgathaCurScript], a
ld [wAgathasRoomCurScript], a
ret
AgathaScriptPointers:
AgathasRoom_ScriptPointers:
dw AgathaScript0
dw DisplayEnemyTrainerTextAndStartBattle
dw AgathaScript2
@ -54,7 +54,7 @@ AgathaScriptWalkIntoRoom:
ld [wSimulatedJoypadStatesIndex], a
call StartSimulatingJoypadStates
ld a, $3
ld [wAgathaCurScript], a
ld [wAgathasRoomCurScript], a
ld [wCurMapScript], a
ret
@ -82,7 +82,7 @@ AgathaScript0:
ld [wSimulatedJoypadStatesIndex], a
call StartSimulatingJoypadStates
ld a, $3
ld [wAgathaCurScript], a
ld [wAgathasRoomCurScript], a
ld [wCurMapScript], a
ret
@ -100,7 +100,7 @@ AgathaScript3:
call Delay3
xor a
ld [wJoyIgnore], a
ld [wAgathaCurScript], a
ld [wAgathasRoomCurScript], a
ld [wCurMapScript], a
ret
@ -113,10 +113,10 @@ AgathaScript2:
ld [hSpriteIndexOrTextID], a
call DisplayTextID
ld a, $1
ld [wGaryCurScript], a
ld [wChampionsRoomCurScript], a
ret
AgathaTextPointers:
AgathasRoom_TextPointers:
dw AgathaText1
dw AgathaDontRunAwayText

View file

@ -1,7 +1,7 @@
BikeShopScript:
BikeShop_Script:
jp EnableAutoTextBoxDrawing
BikeShopTextPointers:
BikeShop_TextPointers:
dw BikeShopText1
dw BikeShopText2
dw BikeShopText3

View file

@ -1,10 +1,10 @@
BillsHouseScript:
BillsHouse_Script:
call EnableAutoTextBoxDrawing
ld a, [wBillsHouseCurScript]
ld hl, BillsHouseScriptPointers
ld hl, BillsHouse_ScriptPointers
jp CallFunctionInTable
BillsHouseScriptPointers:
BillsHouse_ScriptPointers:
dw BillsHouseScript0
dw BillsHouseScript1
dw BillsHouseScript2
@ -115,7 +115,7 @@ BillsHouseScript5:
ld [wBillsHouseCurScript], a
ret
BillsHouseTextPointers:
BillsHouse_TextPointers:
dw BillsHouseText1
dw BillsHouseText2
dw BillsHouseText3

View file

@ -1,10 +1,10 @@
BluesHouseScript:
BluesHouse_Script:
call EnableAutoTextBoxDrawing
ld hl, BluesHouseScriptPointers
ld hl, BluesHouse_ScriptPointers
ld a, [wBluesHouseCurScript]
jp CallFunctionInTable
BluesHouseScriptPointers:
BluesHouse_ScriptPointers:
dw BluesHouseScript0
dw BluesHouseScript1
@ -19,7 +19,7 @@ BluesHouseScript0:
BluesHouseScript1:
ret
BluesHouseTextPointers:
BluesHouse_TextPointers:
dw BluesHouseText1
dw BluesHouseText2
dw BluesHouseText3

View file

@ -1,11 +1,11 @@
BrunoScript:
BrunosRoom_Script:
call BrunoShowOrHideExitBlock
call EnableAutoTextBoxDrawing
ld hl, BrunoTrainerHeader0
ld de, BrunoScriptPointers
ld a, [wBrunoCurScript]
ld de, BrunosRoom_ScriptPointers
ld a, [wBrunosRoomCurScript]
call ExecuteCurMapScriptInTable
ld [wBrunoCurScript], a
ld [wBrunosRoomCurScript], a
ret
BrunoShowOrHideExitBlock:
@ -27,10 +27,10 @@ BrunoShowOrHideExitBlock:
ResetBrunoScript:
xor a
ld [wBrunoCurScript], a
ld [wBrunosRoomCurScript], a
ret
BrunoScriptPointers:
BrunosRoom_ScriptPointers:
dw BrunoScript0
dw DisplayEnemyTrainerTextAndStartBattle
dw BrunoScript2
@ -54,7 +54,7 @@ BrunoScriptWalkIntoRoom:
ld [wSimulatedJoypadStatesIndex], a
call StartSimulatingJoypadStates
ld a, $3
ld [wBrunoCurScript], a
ld [wBrunosRoomCurScript], a
ld [wCurMapScript], a
ret
@ -82,7 +82,7 @@ BrunoScript0:
ld [wSimulatedJoypadStatesIndex], a
call StartSimulatingJoypadStates
ld a, $3
ld [wBrunoCurScript], a
ld [wBrunosRoomCurScript], a
ld [wCurMapScript], a
ret
@ -100,7 +100,7 @@ BrunoScript3:
call Delay3
xor a
ld [wJoyIgnore], a
ld [wBrunoCurScript], a
ld [wBrunosRoomCurScript], a
ld [wCurMapScript], a
ret
@ -113,7 +113,7 @@ BrunoScript2:
ld [hSpriteIndexOrTextID], a
jp DisplayTextID
BrunoTextPointers:
BrunosRoom_TextPointers:
dw BrunoText1
dw BrunoDontRunAwayText

View file

@ -1,8 +1,8 @@
CeladonHouseScript:
CeladonChiefHouse_Script:
call EnableAutoTextBoxDrawing
ret
CeladonHouseTextPointers:
CeladonChiefHouse_TextPointers:
dw CeladonHouseText1
dw CeladonHouseText2
dw CeladonHouseText3

View file

@ -1,10 +1,10 @@
CeladonCityScript:
CeladonCity_Script:
call EnableAutoTextBoxDrawing
ResetEvents EVENT_1B8, EVENT_1BF
ResetEvent EVENT_67F
ret
CeladonCityTextPointers:
CeladonCity_TextPointers:
dw CeladonCityText1
dw CeladonCityText2
dw CeladonCityText3

View file

@ -1,8 +1,8 @@
CeladonDinerScript:
CeladonDiner_Script:
call EnableAutoTextBoxDrawing
ret
CeladonDinerTextPointers:
CeladonDiner_TextPointers:
dw CeladonDinerText1
dw CeladonDinerText2
dw CeladonDinerText3

View file

@ -1,11 +1,11 @@
CeladonGymScript:
CeladonGym_Script:
ld hl, wCurrentMapScriptFlags
bit 6, [hl]
res 6, [hl]
call nz, CeladonGymScript_48927
call EnableAutoTextBoxDrawing
ld hl, CeladonGymTrainerHeader0
ld de, CeladonGymScriptPointers
ld de, CeladonGym_ScriptPointers
ld a, [wCeladonGymCurScript]
call ExecuteCurMapScriptInTable
ld [wCeladonGymCurScript], a
@ -29,7 +29,7 @@ CeladonGymText_48943:
ld [wCurMapScript], a
ret
CeladonGymScriptPointers:
CeladonGym_ScriptPointers:
dw CheckFightingMapTrainers
dw DisplayEnemyTrainerTextAndStartBattle
dw EndTrainerBattle
@ -70,7 +70,7 @@ CeladonGymText_48963:
jp CeladonGymText_48943
CeladonGymTextPointers:
CeladonGym_TextPointers:
dw CeladonGymText1
dw CeladonGymText2
dw CeladonGymText3

View file

@ -1,7 +1,7 @@
CeladonHotelScript:
CeladonHotel_Script:
jp EnableAutoTextBoxDrawing
CeladonHotelTextPointers:
CeladonHotel_TextPointers:
dw CeladonHotelText1
dw CeladonHotelText2
dw CeladonHotelText3

View file

@ -1,7 +1,7 @@
CeladonMansion1Script:
CeladonMansion1F_Script:
jp EnableAutoTextBoxDrawing
CeladonMansion1TextPointers:
CeladonMansion1F_TextPointers:
dw CeladonMansion1Text1
dw CeladonMansion1Text2
dw CeladonMansion1Text3

View file

@ -1,8 +1,8 @@
CeladonMansion2Script:
CeladonMansion2F_Script:
call EnableAutoTextBoxDrawing
ret
CeladonMansion2TextPointers:
CeladonMansion2F_TextPointers:
dw CeladonMansion2Text1
CeladonMansion2Text1:

View file

@ -1,7 +1,7 @@
CeladonMansion3Script:
CeladonMansion3F_Script:
jp EnableAutoTextBoxDrawing
CeladonMansion3TextPointers:
CeladonMansion3F_TextPointers:
dw ProgrammerText
dw GraphicArtistText
dw WriterText

View file

@ -1,7 +1,7 @@
CeladonMansion4Script:
CeladonMansionRoof_Script:
jp EnableAutoTextBoxDrawing
CeladonMansion4TextPointers:
CeladonMansionRoof_TextPointers:
dw CeladonMansion4Text1
CeladonMansion4Text1:

View file

@ -1,7 +1,7 @@
CeladonMansion5Script:
CeladonMansionRoofHouse_Script:
jp EnableAutoTextBoxDrawing
CeladonMansion5TextPointers:
CeladonMansionRoofHouse_TextPointers:
dw CeladonMansion5Text1
dw CeladonMansion5Text2
@ -14,7 +14,7 @@ CeladonMansion5Text2:
lb bc, EEVEE, 25
call GivePokemon
jr nc, .asm_24365
ld a, HS_CELADON_MANSION_5_GIFT
ld a, HS_CELADON_MANSION_EEVEE_GIFT
ld [wMissableObjectIndex], a
predef HideObject
.asm_24365

View file

@ -1,7 +1,7 @@
CeladonMart1Script:
CeladonMart1F_Script:
jp EnableAutoTextBoxDrawing
CeladonMart1TextPointers:
CeladonMart1F_TextPointers:
dw CeladonMart1Text1
dw CeladonMart1Text2
dw CeladonMart1Text3

View file

@ -1,7 +1,7 @@
CeladonMart2Script:
CeladonMart2F_Script:
jp EnableAutoTextBoxDrawing
CeladonMart2TextPointers:
CeladonMart2F_TextPointers:
dw CeladonMart2Clerk1Text
dw CeladonMart2Clerk2Text
dw CeladonMart2Text3

View file

@ -1,7 +1,7 @@
CeladonMart3Script:
CeladonMart3F_Script:
jp EnableAutoTextBoxDrawing
CeladonMart3TextPointers:
CeladonMart3F_TextPointers:
dw CeladonMart3Text1
dw CeladonMart3Text2
dw CeladonMart3Text3

View file

@ -1,7 +1,7 @@
CeladonMart4Script:
CeladonMart4F_Script:
jp EnableAutoTextBoxDrawing
CeladonMart4TextPointers:
CeladonMart4F_TextPointers:
dw CeladonMart4ClerkText
dw CeladonMart4Text2
dw CeladonMart4Text3

View file

@ -1,7 +1,7 @@
CeladonMart5Script:
CeladonMart5F_Script:
jp EnableAutoTextBoxDrawing
CeladonMart5TextPointers:
CeladonMart5F_TextPointers:
dw CeladonMart5Text1
dw CeladonMart5Text2
dw CeladonMart5Clerk1Text

View file

@ -1,4 +1,4 @@
CeladonMartElevatorScript:
CeladonMartElevator_Script:
ld hl, wCurrentMapScriptFlags
bit 5, [hl]
res 5, [hl]
@ -52,17 +52,17 @@ CeladonMartElevatorWarpMaps:
; first byte is warp number
; second byte is map number
; These specify where the player goes after getting out of the elevator.
db $05, CELADON_MART_1
db $02, CELADON_MART_2
db $02, CELADON_MART_3
db $02, CELADON_MART_4
db $02, CELADON_MART_5
db $05, CELADON_MART_1F
db $02, CELADON_MART_2F
db $02, CELADON_MART_3F
db $02, CELADON_MART_4F
db $02, CELADON_MART_5F
CeladonMartElevatorWarpMapsEnd:
CeladonMartElevatorScript_48654:
jpba ShakeElevator
CeladonMartElevatorTextPointers:
CeladonMartElevator_TextPointers:
dw CeladonMartElevatorText1
CeladonMartElevatorText1:

View file

@ -1,4 +1,4 @@
CeladonMartRoofScript:
CeladonMartRoof_Script:
jp EnableAutoTextBoxDrawing
CeladonMartRoofScript_GetDrinksInBag:
@ -205,7 +205,7 @@ CeladonMartRoofScript_PrintDrinksInBag:
pop hl
jr .loop
CeladonMartRoofTextPointers:
CeladonMartRoof_TextPointers:
dw CeladonMartRoofText1
dw CeladonMartRoofText2
dw CeladonMartRoofText5

View file

@ -1,8 +1,8 @@
CeladonPokecenterScript:
CeladonPokecenter_Script:
call Serial_TryEstablishingExternallyClockedConnection
jp EnableAutoTextBoxDrawing
CeladonPokecenterTextPointers:
CeladonPokecenter_TextPointers:
dw CeladonHealNurseText
dw CeladonPokecenterText2
dw CeladonPokecenterText3

View file

@ -1,11 +1,11 @@
CeruleanHouse2Script:
CeruleanBadgeHouse_Script:
ld a, $1
ld [wAutoTextBoxDrawingControl], a
dec a
ld [wDoNotWaitForButtonPressAfterDisplayingText], a
ret
CeruleanHouse2TextPointers:
CeruleanBadgeHouse_TextPointers:
dw CeruleanHouse2Text1
CeruleanHouse2Text1:

View file

@ -1,7 +1,7 @@
UnknownDungeon1Script:
CeruleanCave1F_Script:
jp EnableAutoTextBoxDrawing
UnknownDungeon1TextPointers:
CeruleanCave1F_TextPointers:
dw PickUpItemText
dw PickUpItemText
dw PickUpItemText

View file

@ -1,7 +1,7 @@
UnknownDungeon2Script:
CeruleanCave2F_Script:
jp EnableAutoTextBoxDrawing
UnknownDungeon2TextPointers:
CeruleanCave2F_TextPointers:
dw PickUpItemText
dw PickUpItemText
dw PickUpItemText

View file

@ -1,18 +1,18 @@
UnknownDungeon3Script:
CeruleanCaveB1F_Script:
call EnableAutoTextBoxDrawing
ld hl, MewtwoTrainerHeader
ld de, .ScriptPointers
ld a, [wUnknownDungeon3CurScript]
ld de, CeruleanCaveB1F_ScriptPointers
ld a, [wCeruleanCaveB1FCurScript]
call ExecuteCurMapScriptInTable
ld [wUnknownDungeon3CurScript], a
ld [wCeruleanCaveB1FCurScript], a
ret
.ScriptPointers
CeruleanCaveB1F_ScriptPointers
dw CheckFightingMapTrainers
dw DisplayEnemyTrainerTextAndStartBattle
dw EndTrainerBattle
UnknownDungeon3TextPointers:
CeruleanCaveB1F_TextPointers:
dw MewtwoText
dw PickUpItemText
dw PickUpItemText

View file

@ -1,6 +1,6 @@
CeruleanCityScript:
CeruleanCity_Script:
call EnableAutoTextBoxDrawing
ld hl, CeruleanCityScriptPointers
ld hl, CeruleanCity_ScriptPointers
ld a, [wCeruleanCityCurScript]
jp CallFunctionInTable
@ -12,7 +12,7 @@ CeruleanCityScript_1948c:
ld [wMissableObjectIndex], a
predef_jump HideObject
CeruleanCityScriptPointers:
CeruleanCity_ScriptPointers:
dw CeruleanCityScript0
dw CeruleanCityScript1
dw CeruleanCityScript2
@ -227,7 +227,7 @@ CeruleanCityScript3:
ld [wCeruleanCityCurScript], a
ret
CeruleanCityTextPointers:
CeruleanCity_TextPointers:
dw CeruleanCityText1
dw CeruleanCityText2
dw CeruleanCityText3

View file

@ -1,11 +1,11 @@
CeruleanGymScript:
CeruleanGym_Script:
ld hl, wCurrentMapScriptFlags
bit 6, [hl]
res 6, [hl]
call nz, CeruleanGymScript_5c6d0
call EnableAutoTextBoxDrawing
ld hl, CeruleanGymTrainerHeader0
ld de, CeruleanGymScriptPointers
ld de, CeruleanGym_ScriptPointers
ld a, [wCeruleanGymCurScript]
call ExecuteCurMapScriptInTable
ld [wCeruleanGymCurScript], a
@ -29,7 +29,7 @@ CeruleanGymScript_5c6ed:
ld [wCurMapScript], a
ret
CeruleanGymScriptPointers:
CeruleanGym_ScriptPointers:
dw CheckFightingMapTrainers
dw DisplayEnemyTrainerTextAndStartBattle
dw EndTrainerBattle
@ -70,7 +70,7 @@ CeruleanGymScript_5c70d:
jp CeruleanGymScript_5c6ed
CeruleanGymTextPointers:
CeruleanGym_TextPointers:
dw CeruleanGymText1
dw CeruleanGymText2
dw CeruleanGymText3

View file

@ -1,7 +1,7 @@
CeruleanMartScript:
CeruleanMart_Script:
jp EnableAutoTextBoxDrawing
CeruleanMartTextPointers:
CeruleanMart_TextPointers:
dw CeruleanCashierText
dw CeruleanMartText2
dw CeruleanMartText3

View file

@ -1,8 +1,8 @@
CeruleanPokecenterScript:
CeruleanPokecenter_Script:
call Serial_TryEstablishingExternallyClockedConnection
jp EnableAutoTextBoxDrawing
CeruleanPokecenterTextPointers:
CeruleanPokecenter_TextPointers:
dw CeruleanHealNurseText
dw CeruleanPokecenterText2
dw CeruleanPokecenterText3

View file

@ -1,7 +1,7 @@
CeruleanHouse1Script:
CeruleanTradeHouse_Script:
jp EnableAutoTextBoxDrawing
CeruleanHouse1TextPointers:
CeruleanTradeHouse_TextPointers:
dw CeruleanHouse1Text1
dw CeruleanHouse1Text2

View file

@ -1,8 +1,8 @@
CeruleanHouseTrashedScript:
CeruleanTrashedHouse_Script:
call EnableAutoTextBoxDrawing
ret
CeruleanHouseTrashedTextPointers:
CeruleanTrashedHouse_TextPointers:
dw CeruleanHouseTrashedText1
dw CeruleanHouseTrashedText2
dw CeruleanHouseTrashedText3

View file

@ -1,16 +1,16 @@
GaryScript:
ChampionsRoom_Script:
call EnableAutoTextBoxDrawing
ld hl, GaryScriptPointers
ld a, [wGaryCurScript]
ld hl, ChampionsRoom_ScriptPointers
ld a, [wChampionsRoomCurScript]
jp CallFunctionInTable
ResetGaryScript:
xor a
ld [wJoyIgnore], a
ld [wGaryCurScript], a
ld [wChampionsRoomCurScript], a
ret
GaryScriptPointers:
ChampionsRoom_ScriptPointers:
dw GaryScript0
dw GaryScript1
dw GaryScript2
@ -36,7 +36,7 @@ GaryScript1:
ld [wSimulatedJoypadStatesIndex], a
call StartSimulatingJoypadStates
ld a, $2
ld [wGaryCurScript], a
ld [wChampionsRoomCurScript], a
ret
GaryEntrance_RLEMovement:
@ -86,7 +86,7 @@ GaryScript2:
xor a
ld [hJoyHeld], a
ld a, $3
ld [wGaryCurScript], a
ld [wChampionsRoomCurScript], a
ret
GaryScript3:
@ -104,7 +104,7 @@ GaryScript3:
ld [H_SPRITEINDEX], a
call SetSpriteMovementBytesToFF
ld a, $4
ld [wGaryCurScript], a
ld [wChampionsRoomCurScript], a
ret
GaryScript4:
@ -123,7 +123,7 @@ GaryScript4:
ld [wMissableObjectIndex], a
predef ShowObject
ld a, $5
ld [wGaryCurScript], a
ld [wChampionsRoomCurScript], a
ret
OakEntranceAfterVictoryMovement:
@ -154,7 +154,7 @@ GaryScript5:
ld [hSpriteIndexOrTextID], a
call GaryScript_760c8
ld a, $6
ld [wGaryCurScript], a
ld [wChampionsRoomCurScript], a
ret
GaryScript6:
@ -167,7 +167,7 @@ GaryScript6:
ld [hSpriteIndexOrTextID], a
call GaryScript_760c8
ld a, $7
ld [wGaryCurScript], a
ld [wChampionsRoomCurScript], a
ret
GaryScript7:
@ -184,7 +184,7 @@ GaryScript7:
ld [H_SPRITEINDEX], a
call MoveSprite
ld a, $8
ld [wGaryCurScript], a
ld [wChampionsRoomCurScript], a
ret
OakExitGaryRoomMovement:
@ -200,7 +200,7 @@ GaryScript8:
ld [wMissableObjectIndex], a
predef HideObject
ld a, $9
ld [wGaryCurScript], a
ld [wChampionsRoomCurScript], a
ret
GaryScript9:
@ -213,7 +213,7 @@ GaryScript9:
ld [wSimulatedJoypadStatesIndex], a
call StartSimulatingJoypadStates
ld a, $a
ld [wGaryCurScript], a
ld [wChampionsRoomCurScript], a
ret
WalkToHallOfFame_RLEMovment:
@ -228,7 +228,7 @@ GaryScript10:
xor a
ld [wJoyIgnore], a
ld a, $0
ld [wGaryCurScript], a
ld [wChampionsRoomCurScript], a
ret
GaryScript_760c8:
@ -239,7 +239,7 @@ GaryScript_760c8:
ld [wJoyIgnore], a
ret
GaryTextPointers:
ChampionsRoom_TextPointers:
dw GaryText1
dw GaryText2
dw GaryText3

View file

@ -1,7 +1,7 @@
CinnabarGymScript:
CinnabarGym_Script:
call CinnabarGymScript_75759
call EnableAutoTextBoxDrawing
ld hl, CinnabarGymScriptPointers
ld hl, CinnabarGym_ScriptPointers
ld a, [wCinnabarGymCurScript]
jp CallFunctionInTable
@ -40,7 +40,7 @@ CinnabarGymScript_757a0:
ld [wTrainerHeaderFlagBit], a
ret
CinnabarGymScriptPointers:
CinnabarGym_ScriptPointers:
dw CinnabarGymScript0
dw CinnabarGymScript1
dw CinnabarGymScript2
@ -170,7 +170,7 @@ CinnabarGymScript3_75857:
jp CinnabarGymScript_75792
CinnabarGymTextPointers:
CinnabarGym_TextPointers:
dw CinnabarGymText1
dw CinnabarGymText2
dw CinnabarGymText3

View file

@ -1,14 +1,14 @@
CinnabarIslandScript:
CinnabarIsland_Script:
call EnableAutoTextBoxDrawing
ld hl, wCurrentMapScriptFlags
set 5, [hl]
ResetEvent EVENT_MANSION_SWITCH_ON
ResetEvent EVENT_LAB_STILL_REVIVING_FOSSIL
ld hl, CinnabarIslandScriptPointers
ld hl, CinnabarIsland_ScriptPointers
ld a, [wCinnabarIslandCurScript]
jp CallFunctionInTable
CinnabarIslandScriptPointers:
CinnabarIsland_ScriptPointers:
dw CinnabarIslandScript0
dw CinnabarIslandScript1
@ -50,7 +50,7 @@ CinnabarIslandScript1:
ld [wCinnabarIslandCurScript], a
ret
CinnabarIslandTextPointers:
CinnabarIsland_TextPointers:
dw CinnabarIslandText1
dw CinnabarIslandText2
dw CinnabarIslandText3

View file

@ -1,8 +1,8 @@
Lab1Script:
CinnabarLab_Script:
call EnableAutoTextBoxDrawing
ret
Lab1TextPointers:
CinnabarLab_TextPointers:
dw Lab1Text1
dw Lab1Text2
dw Lab1Text3

View file

@ -1,7 +1,7 @@
Lab4Script:
CinnabarLabFossilRoom_Script:
jp EnableAutoTextBoxDrawing
Lab4TextPointers:
CinnabarLabFossilRoom_TextPointers:
dw Lab4Text1
dw Lab4Text2

View file

@ -1,7 +1,7 @@
Lab3Script:
CinnabarLabMetronomeRoom_Script:
jp EnableAutoTextBoxDrawing
Lab3TextPointers:
CinnabarLabMetronomeRoom_TextPointers:
dw Lab3Text1
dw Lab3Text2
dw Lab3Text3

View file

@ -1,7 +1,7 @@
Lab2Script:
CinnabarLabTradeRoom_Script:
jp EnableAutoTextBoxDrawing
Lab2TextPointers:
CinnabarLabTradeRoom_TextPointers:
dw Lab2Text1
dw Lab2Text2
dw Lab2Text3

View file

@ -1,7 +1,7 @@
CinnabarMartScript:
CinnabarMart_Script:
jp EnableAutoTextBoxDrawing
CinnabarMartTextPointers:
CinnabarMart_TextPointers:
dw CinnabarCashierText
dw CinnabarMartText2
dw CinnabarMartText3

View file

@ -1,8 +1,8 @@
CinnabarPokecenterScript:
CinnabarPokecenter_Script:
call Serial_TryEstablishingExternallyClockedConnection
jp EnableAutoTextBoxDrawing
CinnabarPokecenterTextPointers:
CinnabarPokecenter_TextPointers:
dw CinnabarHealNurseText
dw CinnabarPokecenterText2
dw CinnabarPokecenterText3

View file

@ -1,7 +1,7 @@
ColosseumScript:
jp TradeCenterScript
Colosseum_Script:
jp TradeCenter_Script
ColosseumTextPointers:
Colosseum_TextPointers:
dw ColosseumText1
ColosseumText1:

View file

@ -1,7 +1,7 @@
CopycatsHouse1FScript:
CopycatsHouse1F_Script:
jp EnableAutoTextBoxDrawing
CopycatsHouse1FTextPointers:
CopycatsHouse1F_TextPointers:
dw CopycatsHouse1FText1
dw CopycatsHouse1FText2
dw CopycatsHouse1FText3

View file

@ -1,7 +1,7 @@
CopycatsHouse2FScript:
CopycatsHouse2F_Script:
jp EnableAutoTextBoxDrawing
CopycatsHouse2FTextPointers:
CopycatsHouse2F_TextPointers:
dw CopycatsHouse2FText1
dw CopycatsHouse2FText2
dw CopycatsHouse2FText3

View file

@ -1,7 +1,7 @@
DayCareMScript:
Daycare_Script:
jp EnableAutoTextBoxDrawing
DayCareMTextPointers:
Daycare_TextPointers:
dw DayCareMText1
DayCareMText1:

5
scripts/DiglettsCave.asm Executable file
View file

@ -0,0 +1,5 @@
DiglettsCave_Script:
jp EnableAutoTextBoxDrawing
DiglettsCave_TextPointers:
db "@"

View file

@ -1,10 +1,10 @@
DiglettsCaveEntranceRoute11Script:
DiglettsCaveRoute11_Script:
call EnableAutoTextBoxDrawing
ld a, ROUTE_11
ld [wLastMap], a
ret
DiglettsCaveEntranceRoute11TextPointers:
DiglettsCaveRoute11_TextPointers:
dw DiglettsCaveEntranceRoute11Text1
DiglettsCaveEntranceRoute11Text1:

View file

@ -1,9 +1,9 @@
DiglettsCaveRoute2Script:
DiglettsCaveRoute2_Script:
ld a, ROUTE_2
ld [wLastMap], a
jp EnableAutoTextBoxDrawing
DiglettsCaveRoute2TextPointers:
DiglettsCaveRoute2_TextPointers:
dw DiglettsCaveRoute2Text1
DiglettsCaveRoute2Text1:

View file

@ -1,7 +1,7 @@
FightingDojoScript:
FightingDojo_Script:
call EnableAutoTextBoxDrawing
ld hl, FightingDojoTrainerHeader0
ld de, FightingDojoScriptPointers
ld de, FightingDojo_ScriptPointers
ld a, [wFightingDojoCurScript]
call ExecuteCurMapScriptInTable
ld [wFightingDojoCurScript], a
@ -14,7 +14,7 @@ FightingDojoScript_5cd70:
ld [wCurMapScript], a
ret
FightingDojoScriptPointers:
FightingDojo_ScriptPointers:
dw FightingDojoScript1
dw DisplayEnemyTrainerTextAndStartBattle
dw EndTrainerBattle
@ -80,7 +80,7 @@ FightingDojoScript3:
ld [wCurMapScript], a
ret
FightingDojoTextPointers:
FightingDojo_TextPointers:
dw FightingDojoText1
dw FightingDojoText2
dw FightingDojoText3

View file

@ -1,8 +1,8 @@
FuchsiaHouse1Script:
FuchsiaBillsGrandpasHouse_Script:
call EnableAutoTextBoxDrawing
ret
FuchsiaHouse1TextPointers:
FuchsiaBillsGrandpasHouse_TextPointers:
dw FuchsiaHouse1Text1
dw FuchsiaHouse1Text2
dw FuchsiaHouse1Text3

View file

@ -1,7 +1,7 @@
FuchsiaCityScript:
FuchsiaCity_Script:
jp EnableAutoTextBoxDrawing
FuchsiaCityTextPointers:
FuchsiaCity_TextPointers:
dw FuchsiaCityText1
dw FuchsiaCityText2
dw FuchsiaCityText3

View file

@ -1,7 +1,7 @@
FuchsiaHouse3Script:
FuchsiaGoodRodHouse_Script:
jp EnableAutoTextBoxDrawing
FuchsiaHouse3TextPointers:
FuchsiaGoodRodHouse_TextPointers:
dw FuchsiaHouse3Text1
FuchsiaHouse3Text1:

View file

@ -1,8 +1,8 @@
FuchsiaGymScript:
FuchsiaGym_Script:
call FuchsiaGymScript_75453
call EnableAutoTextBoxDrawing
ld hl, FuchsiaGymTrainerHeader0
ld de, FuchsiaGymScriptPointers
ld de, FuchsiaGym_ScriptPointers
ld a, [wFuchsiaGymCurScript]
call ExecuteCurMapScriptInTable
ld [wFuchsiaGymCurScript], a
@ -30,7 +30,7 @@ FuchsiaGymScript_75477:
ld [wCurMapScript], a
ret
FuchsiaGymScriptPointers:
FuchsiaGym_ScriptPointers:
dw CheckFightingMapTrainers
dw DisplayEnemyTrainerTextAndStartBattle
dw EndTrainerBattle
@ -70,7 +70,7 @@ FuchsiaGymScript3_75497:
jp FuchsiaGymScript_75477
FuchsiaGymTextPointers:
FuchsiaGym_TextPointers:
dw FuchsiaGymText1
dw FuchsiaGymText2
dw FuchsiaGymText3

View file

@ -1,7 +1,7 @@
FuchsiaMartScript:
FuchsiaMart_Script:
jp EnableAutoTextBoxDrawing
FuchsiaMartTextPointers:
FuchsiaMart_TextPointers:
dw FuchsiaCashierText
dw FuchsiaMartText2
dw FuchsiaMartText3

View file

@ -1,8 +1,8 @@
FuchsiaMeetingRoomScript:
FuchsiaMeetingRoom_Script:
call EnableAutoTextBoxDrawing
ret
FuchsiaMeetingRoomTextPointers:
FuchsiaMeetingRoom_TextPointers:
dw FuchsiaMeetingRoomText1
dw FuchsiaMeetingRoomText2
dw FuchsiaMeetingRoomText3

View file

@ -1,8 +1,8 @@
FuchsiaPokecenterScript:
FuchsiaPokecenter_Script:
call Serial_TryEstablishingExternallyClockedConnection
jp EnableAutoTextBoxDrawing
FuchsiaPokecenterTextPointers:
FuchsiaPokecenter_TextPointers:
dw FuchsiaHealNurseText
dw FuchsiaPokecenterText2
dw FuchsiaPokecenterText3

View file

@ -1,9 +1,9 @@
CeladonGameCornerScript:
GameCorner_Script:
call CeladonGameCornerScript_48bcf
call CeladonGameCornerScript_48bec
call EnableAutoTextBoxDrawing
ld hl, CeladonGameCornerScriptPointers
ld a, [wCeladonGameCornerCurScript]
ld hl, GameCorner_ScriptPointers
ld a, [wGameCornerCurScript]
jp CallFunctionInTable
CeladonGameCornerScript_48bcf:
@ -38,11 +38,11 @@ CeladonGameCornerScript_48bec:
CeladonGameCornerScript_48c07:
xor a
ld [wJoyIgnore], a
ld [wCeladonGameCornerCurScript], a
ld [wGameCornerCurScript], a
ld [wCurMapScript], a
ret
CeladonGameCornerScriptPointers:
GameCorner_ScriptPointers:
dw CeladonGameCornerScript0
dw CeladonGameCornerScript1
dw CeladonGameCornerScript2
@ -78,7 +78,7 @@ CeladonGameCornerScript1:
ld [H_SPRITEINDEX], a
call MoveSprite
ld a, $2
ld [wCeladonGameCornerCurScript], a
ld [wGameCornerCurScript], a
ret
MovementData_48c5a:
@ -113,10 +113,10 @@ CeladonGameCornerScript2:
set 5, [hl]
set 6, [hl]
ld a, $0
ld [wCeladonGameCornerCurScript], a
ld [wGameCornerCurScript], a
ret
CeladonGameCornerTextPointers:
GameCorner_TextPointers:
dw CeladonGameCornerText1
dw CeladonGameCornerText2
dw CeladonGameCornerText3
@ -427,7 +427,7 @@ CeladonGameCornerText11:
ld [hJoyPressed], a
ld [hJoyReleased], a
ld a, $1
ld [wCeladonGameCornerCurScript], a
ld [wGameCornerCurScript], a
jp TextScriptEnd
CeladonGameCornerText_48ece:

View file

@ -1,7 +1,7 @@
CeladonPrizeRoomScript:
GameCornerPrizeRoom_Script:
jp EnableAutoTextBoxDrawing
CeladonPrizeRoomTextPointers:
GameCornerPrizeRoom_TextPointers:
dw CeladonPrizeRoomText1
dw CeladonPrizeRoomText2
dw CeladonPrizeRoomText3

View file

@ -1,16 +1,16 @@
HallofFameRoomScript:
HallOfFame_Script:
call EnableAutoTextBoxDrawing
ld hl, HallofFameRoomScriptPointers
ld a, [wHallOfFameRoomCurScript]
ld hl, HallOfFame_ScriptPointers
ld a, [wHallOfFameCurScript]
jp CallFunctionInTable
HallofFameRoomScript_5a4aa:
xor a
ld [wJoyIgnore], a
ld [wHallOfFameRoomCurScript], a
ld [wHallOfFameCurScript], a
ret
HallofFameRoomScriptPointers:
HallOfFame_ScriptPointers:
dw HallofFameRoomScript0
dw HallofFameRoomScript1
dw HallofFameRoomScript2
@ -33,16 +33,16 @@ HallofFameRoomScript2:
inc hl
set 0, [hl]
xor a
ld hl, wLoreleiCurScript
ld [hli], a
ld [hli], a
ld [hl], a
ld [wLanceCurScript], a
ld [wHallOfFameRoomCurScript], a
ld hl, wLoreleisRoomCurScript
ld [hli], a ; wLoreleisRoomCurScript
ld [hli], a ; wBrunosRoomCurScript
ld [hl], a ; wAgathasRoomCurScript
ld [wLancesRoomCurScript], a
ld [wHallOfFameCurScript], a
; Elite 4 events
ResetEventRange ELITE4_EVENTS_START, ELITE4_CHAMPION_EVENTS_END, 1
xor a
ld [wHallOfFameRoomCurScript], a
ld [wHallOfFameCurScript], a
ld a, PALLET_TOWN
ld [wLastBlackoutMap], a
callba SaveSAVtoSRAM
@ -65,7 +65,7 @@ HallofFameRoomScript0:
ld [wSimulatedJoypadStatesIndex], a
call StartSimulatingJoypadStates
ld a, $1
ld [wHallOfFameRoomCurScript], a
ld [wHallOfFameCurScript], a
ret
RLEMovement5a528:
@ -98,10 +98,10 @@ HallofFameRoomScript1:
ld [wMissableObjectIndex], a
predef HideObject
ld a, $2
ld [wHallOfFameRoomCurScript], a
ld [wHallOfFameCurScript], a
ret
HallofFameRoomTextPointers:
HallOfFame_TextPointers:
dw HallofFameRoomText1
HallofFameRoomText1:

4
scripts/IndigoPlateau.asm Executable file
View file

@ -0,0 +1,4 @@
IndigoPlateau_Script:
ret
IndigoPlateau_TextPointers:

View file

@ -1,4 +1,4 @@
IndigoPlateauLobbyScript:
IndigoPlateauLobby_Script:
call Serial_TryEstablishingExternallyClockedConnection
call EnableAutoTextBoxDrawing
ld hl, wCurrentMapScriptFlags
@ -14,7 +14,7 @@ IndigoPlateauLobbyScript:
ResetEventRange ELITE4_EVENTS_START, EVENT_LANCES_ROOM_LOCK_DOOR
ret
IndigoPlateauLobbyTextPointers:
IndigoPlateauLobby_TextPointers:
dw IndigoHealNurseText
dw IndigoPlateauLobbyText2
dw IndigoPlateauLobbyText3

View file

@ -1,11 +1,11 @@
LanceScript:
LancesRoom_Script:
call LanceShowOrHideEntranceBlocks
call EnableAutoTextBoxDrawing
ld hl, LanceTrainerHeader0
ld de, LanceScriptPointers
ld a, [wLanceCurScript]
ld de, LancesRoom_ScriptPointers
ld a, [wLancesRoomCurScript]
call ExecuteCurMapScriptInTable
ld [wLanceCurScript], a
ld [wLancesRoomCurScript], a
ret
LanceShowOrHideEntranceBlocks:
@ -39,10 +39,10 @@ LanceSetEntranceBlock:
ResetLanceScript:
xor a
ld [wLanceCurScript], a
ld [wLancesRoomCurScript], a
ret
LanceScriptPointers:
LancesRoom_ScriptPointers:
dw LanceScript0
dw DisplayEnemyTrainerTextAndStartBattle
dw LanceScript2
@ -105,7 +105,7 @@ WalkToLance:
ld [wSimulatedJoypadStatesIndex], a
call StartSimulatingJoypadStates
ld a, $3
ld [wLanceCurScript], a
ld [wLancesRoomCurScript], a
ld [wCurMapScript], a
ret
@ -123,11 +123,11 @@ LanceScript3:
call Delay3
xor a
ld [wJoyIgnore], a
ld [wLanceCurScript], a
ld [wLancesRoomCurScript], a
ld [wCurMapScript], a
ret
LanceTextPointers:
LancesRoom_TextPointers:
dw LanceText1
LanceTrainerHeader0:

View file

@ -1,8 +1,8 @@
LavenderHouse2Script:
LavenderCuboneHouse_Script:
call EnableAutoTextBoxDrawing
ret
LavenderHouse2TextPointers:
LavenderCuboneHouse_TextPointers:
dw LavenderHouse2Text1
dw LavenderHouse2Text2

View file

@ -1,7 +1,7 @@
LavenderMartScript:
LavenderMart_Script:
jp EnableAutoTextBoxDrawing
LavenderMartTextPointers:
LavenderMart_TextPointers:
dw LavenderCashierText
dw LavenderMartText2
dw LavenderMartText3

View file

@ -1,8 +1,8 @@
LavenderPokecenterScript:
LavenderPokecenter_Script:
call Serial_TryEstablishingExternallyClockedConnection
jp EnableAutoTextBoxDrawing
LavenderPokecenterTextPointers:
LavenderPokecenter_TextPointers:
dw LavenderHealNurseText
dw LavenderPokecenterText2
dw LavenderPokecenterText3

View file

@ -1,7 +1,7 @@
LavenderTownScript:
LavenderTown_Script:
jp EnableAutoTextBoxDrawing
LavenderTownTextPointers:
LavenderTown_TextPointers:
dw LavenderTownText1
dw LavenderTownText2
dw LavenderTownText3

View file

@ -1,11 +1,11 @@
LoreleiScript:
LoreleisRoom_Script:
call LoreleiShowOrHideExitBlock
call EnableAutoTextBoxDrawing
ld hl, LoreleiTrainerHeader0
ld de, LoreleiScriptPointers
ld a, [wLoreleiCurScript]
ld de, LoreleisRoom_ScriptPointers
ld a, [wLoreleisRoomCurScript]
call ExecuteCurMapScriptInTable
ld [wLoreleiCurScript], a
ld [wLoreleisRoomCurScript], a
ret
LoreleiShowOrHideExitBlock:
@ -29,10 +29,10 @@ LoreleiShowOrHideExitBlock:
ResetLoreleiScript:
xor a
ld [wLoreleiCurScript], a
ld [wLoreleisRoomCurScript], a
ret
LoreleiScriptPointers:
LoreleisRoom_ScriptPointers:
dw LoreleiScript0
dw DisplayEnemyTrainerTextAndStartBattle
dw LoreleiScript2
@ -56,7 +56,7 @@ LoreleiScriptWalkIntoRoom:
ld [wSimulatedJoypadStatesIndex], a
call StartSimulatingJoypadStates
ld a, $3
ld [wLoreleiCurScript], a
ld [wLoreleisRoomCurScript], a
ld [wCurMapScript], a
ret
@ -84,7 +84,7 @@ LoreleiScript0:
ld [wSimulatedJoypadStatesIndex], a
call StartSimulatingJoypadStates
ld a, $3
ld [wLoreleiCurScript], a
ld [wLoreleisRoomCurScript], a
ld [wCurMapScript], a
ret
@ -102,7 +102,7 @@ LoreleiScript3:
call Delay3
xor a
ld [wJoyIgnore], a
ld [wLoreleiCurScript], a
ld [wLoreleisRoomCurScript], a
ld [wCurMapScript], a
ret
@ -115,7 +115,7 @@ LoreleiScript2:
ld [hSpriteIndexOrTextID], a
jp DisplayTextID
LoreleiTextPointers:
LoreleisRoom_TextPointers:
dw LoreleiText1
dw LoreleiDontRunAwayText

View file

@ -1,8 +1,8 @@
LavenderHouse1Script:
MrFujisHouse_Script:
call EnableAutoTextBoxDrawing
ret
LavenderHouse1TextPointers:
MrFujisHouse_TextPointers:
dw LavenderHouse1Text1
dw LavenderHouse1Text2
dw LavenderHouse1Text3

View file

@ -1,7 +1,7 @@
SaffronHouse2Script:
MrPsychicsHouse_Script:
jp EnableAutoTextBoxDrawing
SaffronHouse2TextPointers:
MrPsychicsHouse_TextPointers:
dw SaffronHouse2Text1
SaffronHouse2Text1:

View file

@ -1,18 +1,18 @@
MtMoon1Script:
MtMoon1F_Script:
call EnableAutoTextBoxDrawing
ld hl, MtMoon1TrainerHeader0
ld de, MtMoon1ScriptPointers
ld a, [wMtMoon1CurScript]
ld de, MtMoon1F_ScriptPointers
ld a, [wMtMoon1FCurScript]
call ExecuteCurMapScriptInTable
ld [wMtMoon1CurScript], a
ld [wMtMoon1FCurScript], a
ret
MtMoon1ScriptPointers:
MtMoon1F_ScriptPointers:
dw CheckFightingMapTrainers
dw DisplayEnemyTrainerTextAndStartBattle
dw EndTrainerBattle
MtMoon1TextPointers:
MtMoon1F_TextPointers:
dw MtMoon1Text1
dw MtMoon1Text2
dw MtMoon1Text3

View file

@ -1,8 +1,8 @@
MtMoon2Script:
MtMoonB1F_Script:
call EnableAutoTextBoxDrawing
ret
MtMoon2TextPointers:
MtMoonB1F_TextPointers:
dw MtMoonText1
MtMoonText1:

View file

@ -1,10 +1,10 @@
MtMoon3Script:
MtMoonB2F_Script:
call EnableAutoTextBoxDrawing
ld hl, MtMoon3TrainerHeader0
ld de, MtMoon3ScriptPointers
ld a, [wMtMoon3CurScript]
ld de, MtMoonB2F_ScriptPointers
ld a, [wMtMoonB2FCurScript]
call ExecuteCurMapScriptInTable
ld [wMtMoon3CurScript], a
ld [wMtMoonB2FCurScript], a
CheckEvent EVENT_BEAT_MT_MOON_EXIT_SUPER_NERD
ret z
ld hl, CoordsData_49d37
@ -40,11 +40,11 @@ CoordsData_49d37:
MtMoon3Script_49d58:
xor a
ld [wJoyIgnore], a
ld [wMtMoon3CurScript], a
ld [wMtMoonB2FCurScript], a
ld [wCurMapScript], a
ret
MtMoon3ScriptPointers:
MtMoonB2F_ScriptPointers:
dw MtMoon3Script0
dw DisplayEnemyTrainerTextAndStartBattle
dw EndTrainerBattle
@ -82,7 +82,7 @@ MtMoon3Script3:
xor a
ld [wJoyIgnore], a
ld a, $0
ld [wMtMoon3CurScript], a
ld [wMtMoonB2FCurScript], a
ld [wCurMapScript], a
ret
@ -105,7 +105,7 @@ MtMoon3Script4:
ld [H_SPRITEINDEX], a
call MoveSprite
ld a, $5
ld [wMtMoon3CurScript], a
ld [wMtMoonB2FCurScript], a
ld [wCurMapScript], a
ret
@ -140,21 +140,21 @@ MtMoon3Script5:
call DisplayTextID
CheckEvent EVENT_GOT_DOME_FOSSIL
jr z, .asm_49e1d
ld a, HS_MT_MOON_3_FOSSIL_2
ld a, HS_MT_MOON_B2F_FOSSIL_2
jr .asm_49e1f
.asm_49e1d
ld a, HS_MT_MOON_3_FOSSIL_1
ld a, HS_MT_MOON_B2F_FOSSIL_1
.asm_49e1f
ld [wMissableObjectIndex], a
predef HideObject
xor a
ld [wJoyIgnore], a
ld a, $0
ld [wMtMoon3CurScript], a
ld [wMtMoonB2FCurScript], a
ld [wCurMapScript], a
ret
MtMoon3TextPointers:
MtMoonB2F_TextPointers:
dw MtMoon3Text1
dw MtMoon3Text2
dw MtMoon3Text3
@ -227,7 +227,7 @@ MtMoon3Text1:
call EngageMapTrainer
call InitBattleEnemyParameters
ld a, $3
ld [wMtMoon3CurScript], a
ld [wMtMoonB2FCurScript], a
ld [wCurMapScript], a
jr .asm_49ebe
.asm_49eb8
@ -274,12 +274,12 @@ MtMoon3Text6:
call GiveItem
jp nc, MtMoon3Script_49f76
call MtMoon3Script_49f69
ld a, HS_MT_MOON_3_FOSSIL_1
ld a, HS_MT_MOON_B2F_FOSSIL_1
ld [wMissableObjectIndex], a
predef HideObject
SetEvent EVENT_GOT_DOME_FOSSIL
ld a, $4
ld [wMtMoon3CurScript], a
ld [wMtMoonB2FCurScript], a
ld [wCurMapScript], a
.asm_49f21
jp TextScriptEnd
@ -302,12 +302,12 @@ MtMoon3Text7:
call GiveItem
jp nc, MtMoon3Script_49f76
call MtMoon3Script_49f69
ld a, HS_MT_MOON_3_FOSSIL_2
ld a, HS_MT_MOON_B2F_FOSSIL_2
ld [wMissableObjectIndex], a
predef HideObject
SetEvent EVENT_GOT_HELIX_FOSSIL
ld a, $4
ld [wMtMoon3CurScript], a
ld [wMtMoonB2FCurScript], a
ld [wCurMapScript], a
.asm_49f61
jp TextScriptEnd

View file

@ -1,8 +1,8 @@
MtMoonPokecenterScript:
MtMoonPokecenter_Script:
call Serial_TryEstablishingExternallyClockedConnection
jp EnableAutoTextBoxDrawing
MtMoonPokecenterTextPointers:
MtMoonPokecenter_TextPointers:
dw MtMoonHealNurseText
dw MtMoonPokecenterText2
dw MtMoonPokecenterText3

View file

@ -1,13 +1,13 @@
Museum1FScript:
Museum1F_Script:
ld a, $1
ld [wAutoTextBoxDrawingControl], a
xor a
ld [wDoNotWaitForButtonPressAfterDisplayingText], a
ld hl, Museum1FScriptPointers
ld a, [wMuseum1fCurScript]
ld hl, Museum1F_ScriptPointers
ld a, [wMuseum1FCurScript]
jp CallFunctionInTable
Museum1FScriptPointers:
Museum1F_ScriptPointers:
dw Museum1FScript0
dw Museum1FScript1
@ -31,7 +31,7 @@ Museum1FScript0:
Museum1FScript1:
ret
Museum1FTextPointers:
Museum1F_TextPointers:
dw Museum1FText1
dw Museum1FText2
dw Museum1FText3
@ -120,7 +120,7 @@ Museum1FText1:
jr Museum1FScriptEnd
.asm_0b094
ld a, $1
ld [wMuseum1fCurScript], a
ld [wMuseum1FCurScript], a
jr Museum1FScriptEnd
Museum1FScript_5c1f9:

View file

@ -1,7 +1,7 @@
Museum2FScript:
Museum2F_Script:
jp EnableAutoTextBoxDrawing
Museum2FTextPointers:
Museum2F_TextPointers:
dw Museum2FText1
dw Museum2FText2
dw Museum2FText3

View file

@ -1,4 +1,4 @@
NameRaterScript:
NameRatersHouse_Script:
jp EnableAutoTextBoxDrawing
NameRaterScript_1da15:
@ -37,7 +37,7 @@ NameRaterScript_1da20:
scf
ret
NameRaterTextPointers:
NameRatersHouse_TextPointers:
dw NameRaterText1
NameRaterText1:

View file

@ -1,15 +1,15 @@
OaksLabScript:
OaksLab_Script:
CheckEvent EVENT_PALLET_AFTER_GETTING_POKEBALLS_2
call nz, OaksLabScript_1d076
ld a, $1
ld [wAutoTextBoxDrawingControl], a
xor a
ld [wDoNotWaitForButtonPressAfterDisplayingText], a
ld hl, OaksLabScriptPointers
ld hl, OaksLab_ScriptPointers
ld a, [wOaksLabCurScript]
jp CallFunctionInTable
OaksLabScriptPointers:
OaksLab_ScriptPointers:
dw OaksLabScript0
dw OaksLabScript1
dw OaksLabScript2
@ -712,14 +712,14 @@ OaksLabScript_1d02b:
ret
OaksLabScript_1d076:
ld hl, OaksLabTextPointers2
ld hl, OaksLab_TextPointers2
ld a, l
ld [wMapTextPtr], a
ld a, h
ld [wMapTextPtr+1], a
ret
OaksLabTextPointers:
OaksLab_TextPointers:
dw OaksLabText1
dw OaksLabText2
dw OaksLabText3
@ -748,7 +748,7 @@ OaksLabTextPointers:
dw OaksLabText26
dw OaksLabText27
OaksLabTextPointers2:
OaksLab_TextPointers2:
dw OaksLabText1
dw OaksLabText2
dw OaksLabText3

View file

@ -1,14 +1,14 @@
PalletTownScript:
PalletTown_Script:
CheckEvent EVENT_GOT_POKEBALLS_FROM_OAK
jr z, .next
SetEvent EVENT_PALLET_AFTER_GETTING_POKEBALLS
.next
call EnableAutoTextBoxDrawing
ld hl, PalletTownScriptPointers
ld hl, PalletTown_ScriptPointers
ld a, [wPalletTownCurScript]
jp CallFunctionInTable
PalletTownScriptPointers:
PalletTown_ScriptPointers:
dw PalletTownScript0
dw PalletTownScript1
dw PalletTownScript2
@ -148,7 +148,7 @@ PalletTownScript5:
PalletTownScript6:
ret
PalletTownTextPointers:
PalletTown_TextPointers:
dw PalletTownText1
dw PalletTownText2
dw PalletTownText3

View file

@ -1,10 +1,10 @@
PewterCityScript:
PewterCity_Script:
call EnableAutoTextBoxDrawing
ld hl, PewterCityScriptPointers
ld hl, PewterCity_ScriptPointers
ld a, [wPewterCityCurScript]
jp CallFunctionInTable
PewterCityScriptPointers:
PewterCity_ScriptPointers:
dw PewterCityScript0
dw PewterCityScript1
dw PewterCityScript2
@ -15,7 +15,7 @@ PewterCityScriptPointers:
PewterCityScript0:
xor a
ld [wMuseum1fCurScript], a
ld [wMuseum1FCurScript], a
ResetEvent EVENT_BOUGHT_MUSEUM_TICKET
call PewterCityScript_1925e
ret
@ -176,7 +176,7 @@ PewterCityScript6:
ld [wPewterCityCurScript], a
ret
PewterCityTextPointers:
PewterCity_TextPointers:
dw PewterCityText1
dw PewterCityText2
dw PewterCityText3

View file

@ -1,11 +1,11 @@
PewterGymScript:
PewterGym_Script:
ld hl, wCurrentMapScriptFlags
bit 6, [hl]
res 6, [hl]
call nz, PewterGymScript_5c3a4
call EnableAutoTextBoxDrawing
ld hl, PewterGymTrainerHeader0
ld de, PewterGymScriptPointers
ld de, PewterGym_ScriptPointers
ld a, [wPewterGymCurScript]
call ExecuteCurMapScriptInTable
ld [wPewterGymCurScript], a
@ -29,7 +29,7 @@ PewterGymScript_5c3bf:
ld [wCurMapScript], a
ret
PewterGymScriptPointers:
PewterGym_ScriptPointers:
dw CheckFightingMapTrainers
dw DisplayEnemyTrainerTextAndStartBattle
dw EndTrainerBattle
@ -79,7 +79,7 @@ PewterGymScript_5c3df:
jp PewterGymScript_5c3bf
PewterGymTextPointers:
PewterGym_TextPointers:
dw PewterGymText1
dw PewterGymText2
dw PewterGymText3

View file

@ -1,10 +1,10 @@
PewterMartScript:
PewterMart_Script:
call EnableAutoTextBoxDrawing
ld a, $1
ld [wAutoTextBoxDrawingControl], a
ret
PewterMartTextPointers:
PewterMart_TextPointers:
dw PewterCashierText
dw PewterMartText2
dw PewterMartText3

View file

@ -1,7 +1,7 @@
PewterHouse1Script:
PewterNidoranHouse_Script:
jp EnableAutoTextBoxDrawing
PewterHouse1TextPointers:
PewterNidoranHouse_TextPointers:
dw PewterHouse1Text1
dw PewterHouse1Text2
dw PewterHouse1Text3

View file

@ -1,8 +1,8 @@
PewterPokecenterScript:
PewterPokecenter_Script:
call Serial_TryEstablishingExternallyClockedConnection
jp EnableAutoTextBoxDrawing
PewterPokecenterTextPointers:
PewterPokecenter_TextPointers:
dw PewterHealNurseText
dw PewterPokecenterText2
dw PewterJigglypuffText

View file

@ -1,7 +1,7 @@
PewterHouse2Script:
PewterSpeechHouse_Script:
jp EnableAutoTextBoxDrawing
PewterHouse2TextPointers:
PewterSpeechHouse_TextPointers:
dw PewterHouse2Text1
dw PewterHouse2Text2

View file

@ -1,4 +1,4 @@
FanClubScript:
PokemonFanClub_Script:
jp EnableAutoTextBoxDrawing
FanClubBikeInBag:
@ -11,7 +11,7 @@ FanClubBikeInBag:
ld b, BIKE_VOUCHER
jp IsItemInBag
FanClubTextPointers:
PokemonFanClub_TextPointers:
dw FanClubText1
dw FanClubText2
dw FanClubText3

View file

@ -1,11 +1,11 @@
Mansion1Script:
PokemonMansion1F_Script:
call Mansion1Subscript1
call EnableAutoTextBoxDrawing
ld hl, Mansion1TrainerHeader0
ld de, Mansion1ScriptPointers
ld a, [wMansion1CurScript]
ld de, PokemonMansion1F_ScriptPointers
ld a, [wPokemonMansion1FCurScript]
call ExecuteCurMapScriptInTable
ld [wMansion1CurScript], a
ld [wPokemonMansion1FCurScript], a
ret
Mansion1Subscript1:
@ -55,12 +55,12 @@ Mansion1Script_Switches:
ld [hSpriteIndexOrTextID], a
jp DisplayTextID
Mansion1ScriptPointers:
PokemonMansion1F_ScriptPointers:
dw CheckFightingMapTrainers
dw DisplayEnemyTrainerTextAndStartBattle
dw EndTrainerBattle
Mansion1TextPointers:
PokemonMansion1F_TextPointers:
dw Mansion1Text1
dw PickUpItemText
dw PickUpItemText

View file

@ -1,11 +1,11 @@
Mansion2Script:
PokemonMansion2F_Script:
call Mansion2Script_51fee
call EnableAutoTextBoxDrawing
ld hl, Mansion2TrainerHeader0
ld de, Mansion2ScriptPointers
ld a, [wMansion2CurScript]
ld de, PokemonMansion2F_ScriptPointers
ld a, [wPokemonMansion2FCurScript]
call ExecuteCurMapScriptInTable
ld [wMansion2CurScript], a
ld [wPokemonMansion2FCurScript], a
ret
Mansion2Script_51fee:
@ -51,12 +51,12 @@ Mansion2Script_Switches:
ld [hSpriteIndexOrTextID], a
jp DisplayTextID
Mansion2ScriptPointers:
PokemonMansion2F_ScriptPointers:
dw CheckFightingMapTrainers
dw DisplayEnemyTrainerTextAndStartBattle
dw EndTrainerBattle
Mansion2TextPointers:
PokemonMansion2F_TextPointers:
dw Mansion2Text1
dw PickUpItemText
dw Mansion2Text3

View file

@ -1,11 +1,11 @@
Mansion3Script:
PokemonMansion3F_Script:
call Mansion3Script_52204
call EnableAutoTextBoxDrawing
ld hl, Mansion3TrainerHeader0
ld de, Mansion3ScriptPointers
ld a, [wMansion3CurScript]
ld de, PokemonMansion3F_ScriptPointers
ld a, [wPokemonMansion3FCurScript]
call ExecuteCurMapScriptInTable
ld [wMansion3CurScript], a
ld [wPokemonMansion3FCurScript], a
ret
Mansion3Script_52204:
@ -31,7 +31,7 @@ Mansion3Script_52204:
call Mansion2Script_5202f
ret
Mansion3ScriptPointers:
PokemonMansion3F_ScriptPointers:
dw Mansion3Script0
dw DisplayEnemyTrainerTextAndStartBattle
dw EndTrainerBattle
@ -82,7 +82,7 @@ Mansion3Script_Switches:
ld [hSpriteIndexOrTextID], a
jp DisplayTextID
Mansion3TextPointers:
PokemonMansion3F_TextPointers:
dw Mansion3Text1
dw Mansion3Text2
dw PickUpItemText

View file

@ -1,11 +1,11 @@
Mansion4Script:
PokemonMansionB1F_Script:
call Mansion4Script_523cf
call EnableAutoTextBoxDrawing
ld hl, Mansion4TrainerHeader0
ld de, Mansion4ScriptPointers
ld a, [wMansion4CurScript]
ld de, PokemonMansionB1F_ScriptPointers
ld a, [wPokemonMansionB1FCurScript]
call ExecuteCurMapScriptInTable
ld [wMansion4CurScript], a
ld [wPokemonMansionB1FCurScript], a
ret
Mansion4Script_523cf:
@ -53,12 +53,12 @@ Mansion4Script_Switches:
ld [hSpriteIndexOrTextID], a
jp DisplayTextID
Mansion4ScriptPointers:
PokemonMansionB1F_ScriptPointers:
dw CheckFightingMapTrainers
dw DisplayEnemyTrainerTextAndStartBattle
dw EndTrainerBattle
Mansion4TextPointers:
PokemonMansionB1F_TextPointers:
dw Mansion4Text1
dw Mansion4Text2
dw PickUpItemText

View file

@ -1,7 +1,7 @@
PokemonTower1Script:
PokemonTower1F_Script:
jp EnableAutoTextBoxDrawing
PokemonTower1TextPointers:
PokemonTower1F_TextPointers:
dw PokemonTower1Text1
dw PokemonTower1Text2
dw PokemonTower1Text3

View file

@ -1,17 +1,17 @@
PokemonTower2Script:
PokemonTower2F_Script:
call EnableAutoTextBoxDrawing
ld hl, PokemonTower2ScriptPointers
ld a, [wPokemonTower2CurScript]
ld hl, PokemonTower2F_ScriptPointers
ld a, [wPokemonTower2FCurScript]
jp CallFunctionInTable
PokemonTower2Script_604fe:
xor a
ld [wJoyIgnore], a
ld [wPokemonTower2CurScript], a
ld [wPokemonTower2FCurScript], a
ld [wCurMapScript], a
ret
PokemonTower2ScriptPointers:
PokemonTower2F_ScriptPointers:
dw PokemonTower2Script0
dw PokemonTower2Script1
dw PokemonTower2Script2
@ -81,7 +81,7 @@ PokemonTower2Script1:
call PlaySound
callba Music_RivalAlternateStart
ld a, $2
ld [wPokemonTower2CurScript], a
ld [wPokemonTower2FCurScript], a
ld [wCurMapScript], a
ret
@ -111,18 +111,18 @@ PokemonTower2Script2:
ld a, [wd730]
bit 0, a
ret nz
ld a, HS_POKEMONTOWER_2_RIVAL
ld a, HS_POKEMON_TOWER_2F_RIVAL
ld [wMissableObjectIndex], a
predef HideObject
xor a
ld [wJoyIgnore], a
call PlayDefaultMusic
ld a, $0
ld [wPokemonTower2CurScript], a
ld [wPokemonTower2FCurScript], a
ld [wCurMapScript], a
ret
PokemonTower2TextPointers:
PokemonTower2F_TextPointers:
dw PokemonTower2Text1
dw PokemonTower2Text2
@ -162,7 +162,7 @@ PokemonTower2Text1:
ld [wTrainerNo], a
ld a, $1
ld [wPokemonTower2CurScript], a
ld [wPokemonTower2FCurScript], a
ld [wCurMapScript], a
.asm_41852
jp TextScriptEnd

View file

@ -1,18 +1,18 @@
PokemonTower3Script:
PokemonTower3F_Script:
call EnableAutoTextBoxDrawing
ld hl, PokemonTower3TrainerHeader0
ld de, PokemonTower3ScriptPointers
ld a, [wPokemonTower3CurScript]
ld de, PokemonTower3F_ScriptPointers
ld a, [wPokemonTower3FCurScript]
call ExecuteCurMapScriptInTable
ld [wPokemonTower3CurScript], a
ld [wPokemonTower3FCurScript], a
ret
PokemonTower3ScriptPointers:
PokemonTower3F_ScriptPointers:
dw CheckFightingMapTrainers
dw DisplayEnemyTrainerTextAndStartBattle
dw EndTrainerBattle
PokemonTower3TextPointers:
PokemonTower3F_TextPointers:
dw PokemonTower3Text1
dw PokemonTower3Text2
dw PokemonTower3Text3

View file

@ -1,18 +1,18 @@
PokemonTower4Script:
PokemonTower4F_Script:
call EnableAutoTextBoxDrawing
ld hl, PokemonTower4TrainerHeader0
ld de, PokemonTower4ScriptPointers
ld a, [wPokemonTower4CurScript]
ld de, PokemonTower4F_ScriptPointers
ld a, [wPokemonTower4FCurScript]
call ExecuteCurMapScriptInTable
ld [wPokemonTower4CurScript], a
ld [wPokemonTower4FCurScript], a
ret
PokemonTower4ScriptPointers:
PokemonTower4F_ScriptPointers:
dw CheckFightingMapTrainers
dw DisplayEnemyTrainerTextAndStartBattle
dw EndTrainerBattle
PokemonTower4TextPointers:
PokemonTower4F_TextPointers:
dw PokemonTower4Text1
dw PokemonTower4Text2
dw PokemonTower4Text3

View file

@ -1,13 +1,13 @@
PokemonTower5Script:
PokemonTower5F_Script:
call EnableAutoTextBoxDrawing
ld hl, PokemonTower5TrainerHeader0
ld de, PokemonTower5ScriptPointers
ld a, [wPokemonTower5CurScript]
ld de, PokemonTower5F_ScriptPointers
ld a, [wPokemonTower5FCurScript]
call ExecuteCurMapScriptInTable
ld [wPokemonTower5CurScript], a
ld [wPokemonTower5FCurScript], a
ret
PokemonTower5ScriptPointers:
PokemonTower5F_ScriptPointers:
dw PokemonTower5Script0
dw DisplayEnemyTrainerTextAndStartBattle
dw EndTrainerBattle
@ -48,7 +48,7 @@ CoordsData_60992:
db $09,$0B
db $FF
PokemonTower5TextPointers:
PokemonTower5F_TextPointers:
dw PokemonTower5Text1
dw PokemonTower5Text2
dw PokemonTower5Text3

View file

@ -1,20 +1,20 @@
PokemonTower6Script:
PokemonTower6F_Script:
call EnableAutoTextBoxDrawing
ld hl, PokemonTower6TrainerHeader0
ld de, PokemonTower6ScriptPointers
ld a, [wPokemonTower6CurScript]
ld de, PokemonTower6F_ScriptPointers
ld a, [wPokemonTower6FCurScript]
call ExecuteCurMapScriptInTable
ld [wPokemonTower6CurScript], a
ld [wPokemonTower6FCurScript], a
ret
PokemonTower6Script_60b02:
xor a
ld [wJoyIgnore], a
ld [wPokemonTower6CurScript], a
ld [wPokemonTower6FCurScript], a
ld [wCurMapScript], a
ret
PokemonTower6ScriptPointers:
PokemonTower6F_ScriptPointers:
dw PokemonTower6Script0
dw DisplayEnemyTrainerTextAndStartBattle
dw EndTrainerBattle
@ -37,7 +37,7 @@ PokemonTower6Script0:
ld a, 30
ld [wCurEnemyLVL], a
ld a, $4
ld [wPokemonTower6CurScript], a
ld [wPokemonTower6FCurScript], a
ld [wCurMapScript], a
ret
@ -66,7 +66,7 @@ PokemonTower6Script4:
xor a
ld [wJoyIgnore], a
ld a, $0
ld [wPokemonTower6CurScript], a
ld [wPokemonTower6FCurScript], a
ld [wCurMapScript], a
ret
.asm_60b82
@ -80,7 +80,7 @@ PokemonTower6Script4:
ld hl, wd730
set 7, [hl]
ld a, $3
ld [wPokemonTower6CurScript], a
ld [wPokemonTower6FCurScript], a
ld [wCurMapScript], a
ret
@ -90,11 +90,11 @@ PokemonTower6Script3:
ret nz
call Delay3
xor a
ld [wPokemonTower6CurScript], a
ld [wPokemonTower6FCurScript], a
ld [wCurMapScript], a
ret
PokemonTower6TextPointers:
PokemonTower6F_TextPointers:
dw PokemonTower6Text1
dw PokemonTower6Text2
dw PokemonTower6Text3

View file

@ -1,20 +1,20 @@
PokemonTower7Script:
PokemonTower7F_Script:
call EnableAutoTextBoxDrawing
ld hl, PokemonTower7TrainerHeader0
ld de, PokemonTower7ScriptPointers
ld a, [wPokemonTower7CurScript]
ld de, PokemonTower7F_ScriptPointers
ld a, [wPokemonTower7FCurScript]
call ExecuteCurMapScriptInTable
ld [wPokemonTower7CurScript], a
ld [wPokemonTower7FCurScript], a
ret
PokemonTower7Script_60d18:
xor a
ld [wJoyIgnore], a
ld [wPokemonTower7CurScript], a
ld [wPokemonTower7FCurScript], a
ld [wCurMapScript], a
ret
PokemonTower7ScriptPointers:
PokemonTower7F_ScriptPointers:
dw CheckFightingMapTrainers
dw DisplayEnemyTrainerTextAndStartBattle
dw PokemonTower7Script2
@ -35,7 +35,7 @@ PokemonTower7Script2:
call DisplayTextID
call PokemonTower7Script_60db6
ld a, $3
ld [wPokemonTower7CurScript], a
ld [wPokemonTower7FCurScript], a
ld [wCurMapScript], a
ret
@ -59,19 +59,19 @@ PokemonTower7Script3:
ld [wTrainerHeaderFlagBit], a
ld [wUnusedDA38], a
ld a, $0
ld [wPokemonTower7CurScript], a
ld [wPokemonTower7FCurScript], a
ld [wCurMapScript], a
ret
PokemonTower7Script4:
ld a, $ff
ld [wJoyIgnore], a
ld a, HS_POKEMONTOWER_7_MR_FUJI
ld a, HS_POKEMON_TOWER_7F_MR_FUJI
ld [wMissableObjectIndex], a
predef HideObject
ld a, SPRITE_FACING_UP
ld [wSpriteStateData1 + 9], a
ld a, LAVENDER_HOUSE_1
ld a, MR_FUJIS_HOUSE
ld [hWarpDestinationMap], a
ld a, $1
ld [wDestinationWarpID], a
@ -80,7 +80,7 @@ PokemonTower7Script4:
ld hl, wd72d
set 3, [hl]
ld a, $0
ld [wPokemonTower7CurScript], a
ld [wPokemonTower7FCurScript], a
ld [wCurMapScript], a
ret
@ -198,7 +198,7 @@ MovementData_60e37:
db NPC_MOVEMENT_DOWN
db $FF
PokemonTower7TextPointers:
PokemonTower7F_TextPointers:
dw PokemonTower7Text1
dw PokemonTower7Text2
dw PokemonTower7Text3
@ -257,7 +257,7 @@ PokemonTower7FujiText:
call PrintText
SetEvent EVENT_RESCUED_MR_FUJI
SetEvent EVENT_RESCUED_MR_FUJI_2
ld a, HS_LAVENDER_HOUSE_1_MR_FUJI
ld a, HS_MR_FUJIS_HOUSE_MR_FUJI
ld [wMissableObjectIndex], a
predef ShowObject
ld a, HS_SAFFRON_CITY_E
@ -267,7 +267,7 @@ PokemonTower7FujiText:
ld [wMissableObjectIndex], a
predef ShowObject
ld a, $4
ld [wPokemonTower7CurScript], a
ld [wPokemonTower7FCurScript], a
ld [wCurMapScript], a
jp TextScriptEnd

View file

@ -1,18 +1,18 @@
PowerPlantScript:
PowerPlant_Script:
call EnableAutoTextBoxDrawing
ld hl, Voltorb0TrainerHeader
ld de, .ScriptPointers
ld de, PowerPlant_ScriptPointers
ld a, [wPowerPlantCurScript]
call ExecuteCurMapScriptInTable
ld [wPowerPlantCurScript], a
ret
.ScriptPointers
PowerPlant_ScriptPointers
dw CheckFightingMapTrainers
dw DisplayEnemyTrainerTextAndStartBattle
dw EndTrainerBattle
PowerPlantTextPointers:
PowerPlant_TextPointers:
dw Voltorb0Text
dw Voltorb1Text
dw Voltorb2Text

View file

@ -1,7 +1,7 @@
RedsHouse1FScript:
RedsHouse1F_Script:
jp EnableAutoTextBoxDrawing
RedsHouse1FTextPointers:
RedsHouse1F_TextPointers:
dw RedsHouse1FText1
dw RedsHouse1FText2

Some files were not shown because too many files have changed in this diff Show more