thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2025-09-16 18:30:50 +12:00
Code Issues Actions Packages Projects Releases Wiki Activity

Consistent labels for Gym name scripts

Browse source
This commit is contained in:
Rangi 2020-07-18 14:01:13 -04:00
parent 76289dfda0
commit e88eebbc4d
8 changed files with 50 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
scripts/CeladonGym.asm
View file

@ -2,7 +2,7 @@ CeladonGym_Script:
ld hl, wCurrentMapScriptFlags
bit 6, [hl]
res 6, [hl]
call nz, CeladonGymScript_48927
call nz, .LoadNames
call EnableAutoTextBoxDrawing
ld hl, CeladonGymTrainerHeader0
ld de, CeladonGym_ScriptPointers
@ -11,15 +11,15 @@ CeladonGym_Script:
ld [wCeladonGymCurScript], a
ret
CeladonGymScript_48927:
ld hl, Gym4CityName
ld de, Gym4LeaderName
.LoadNames:
ld hl, .CityName
ld de, .LeaderName
jp LoadGymLeaderAndCityName
Gym4CityName:
.CityName:
db "CELADON CITY@"
Gym4LeaderName:
.LeaderName:
db "ERIKA@"
CeladonGymText_48943:

12
scripts/CeruleanGym.asm
View file

@ -2,7 +2,7 @@ CeruleanGym_Script:
ld hl, wCurrentMapScriptFlags
bit 6, [hl]
res 6, [hl]
call nz, CeruleanGymScript_5c6d0
call nz, .LoadNames
call EnableAutoTextBoxDrawing
ld hl, CeruleanGymTrainerHeader0
ld de, CeruleanGym_ScriptPointers
@ -11,15 +11,15 @@ CeruleanGym_Script:
ld [wCeruleanGymCurScript], a
ret
CeruleanGymScript_5c6d0:
ld hl, Gym2CityName
ld de, Gym2LeaderName
.LoadNames:
ld hl, .CityName
ld de, .LeaderName
jp LoadGymLeaderAndCityName
Gym2CityName:
.CityName:
db "CERULEAN CITY@"
Gym2LeaderName:
.LeaderName:
db "MISTY@"
CeruleanGymScript_5c6ed:

14
scripts/CinnabarGym.asm
View file

@ -10,21 +10,23 @@ CinnabarGymScript_75759:
bit 6, [hl]
res 6, [hl]
push hl
call nz, CinnabarGymScript_75772
call nz, .LoadNames
pop hl
bit 5, [hl]
res 5, [hl]
call nz, UpdateCinnabarGymGateTileBlocks
ResetEvent EVENT_2A7
ret
CinnabarGymScript_75772:
ld hl, Gym7CityName
ld de, Gym7LeaderName
.LoadNames:
ld hl, .CityName
ld de, .LeaderName
jp LoadGymLeaderAndCityName
Gym7CityName:
.CityName:
db "CINNABAR ISLAND@"
Gym7LeaderName:
.LeaderName:
db "BLAINE@"
CinnabarGymScript_75792:

13
scripts/FuchsiaGym.asm
View file

@ -1,5 +1,5 @@
FuchsiaGym_Script:
call FuchsiaGymScript_75453
call .LoadNames
call EnableAutoTextBoxDrawing
ld hl, FuchsiaGymTrainerHeader0
ld de, FuchsiaGym_ScriptPointers
@ -8,19 +8,20 @@ FuchsiaGym_Script:
ld [wFuchsiaGymCurScript], a
ret
FuchsiaGymScript_75453:
.LoadNames:
ld hl, wCurrentMapScriptFlags
bit 6, [hl]
res 6, [hl]
ret z
ld hl, Gym5CityName
ld de, Gym5LeaderName
ld hl, .CityName
ld de, .LeaderName
call LoadGymLeaderAndCityName
ret
Gym5CityName:
.CityName:
db "FUCHSIA CITY@"
Gym5LeaderName:
.LeaderName:
db "KOGA@"
FuchsiaGymScript_75477:

12
scripts/PewterGym.asm
View file

@ -2,7 +2,7 @@ PewterGym_Script:
ld hl, wCurrentMapScriptFlags
bit 6, [hl]
res 6, [hl]
call nz, PewterGymScript_5c3a4
call nz, .LoadNames
call EnableAutoTextBoxDrawing
ld hl, PewterGymTrainerHeader0
ld de, PewterGym_ScriptPointers
@ -11,15 +11,15 @@ PewterGym_Script:
ld [wPewterGymCurScript], a
ret
PewterGymScript_5c3a4:
ld hl, Gym1CityName
ld de, Gym1LeaderName
.LoadNames:
ld hl, .CityName
ld de, .LeaderName
jp LoadGymLeaderAndCityName
Gym1CityName:
.CityName:
db "PEWTER CITY@"
Gym1LeaderName:
.LeaderName:
db "BROCK@"
PewterGymScript_5c3bf:

12
scripts/SaffronGym.asm
View file

@ -2,7 +2,7 @@ SaffronGym_Script:
ld hl, wCurrentMapScriptFlags
bit 6, [hl]
res 6, [hl]
call nz, .extra
call nz, .LoadNames
call EnableAutoTextBoxDrawing
ld hl, SaffronGymTrainerHeader0
ld de, SaffronGym_ScriptPointers
@ -11,15 +11,15 @@ SaffronGym_Script:
ld [wSaffronGymCurScript], a
ret
.extra
ld hl, Gym6CityName
ld de, Gym6LeaderName
.LoadNames:
ld hl, .CityName
ld de, .LeaderName
jp LoadGymLeaderAndCityName
Gym6CityName:
.CityName:
db "SAFFRON CITY@"
Gym6LeaderName:
.LeaderName:
db "SABRINA@"
SaffronGymText_5d048:

12
scripts/VermilionGym.asm
View file

@ -3,7 +3,7 @@ VermilionGym_Script:
bit 5, [hl]
res 5, [hl]
push hl
call nz, VermilionGymLoadName
call nz, .LoadNames
pop hl
bit 6, [hl]
res 6, [hl]
@ -16,15 +16,15 @@ VermilionGym_Script:
ld [wVermilionGymCurScript], a
ret
VermilionGymLoadName:
ld hl, Gym3CityName
ld de, Gym3LeaderName
.LoadNames:
ld hl, .CityName
ld de, .LeaderName
jp LoadGymLeaderAndCityName
Gym3CityName:
.CityName:
db "VERMILION CITY@"
Gym3LeaderName:
.LeaderName:
db "LT.SURGE@"
VermilionGymSetDoorTile:

9
scripts/ViridianGym.asm
View file

@ -1,6 +1,6 @@
ViridianGym_Script:
ld hl, Gym8CityName
ld de, Gym8LeaderName
ld hl, .CityName
ld de, .LeaderName
call LoadGymLeaderAndCityName
call EnableAutoTextBoxDrawing
ld hl, ViridianGymTrainerHeader0
@ -10,9 +10,10 @@ ViridianGym_Script:
ld [wViridianGymCurScript], a
ret
Gym8CityName:
.CityName:
db "VIRIDIAN CITY@"
Gym8LeaderName:
.LeaderName:
db "GIOVANNI@"
ViridianGymScript_748d6: