thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2026-02-06 15:45:24 +13:00
Code Issues Projects Releases Packages Wiki Activity Actions

Clean up some data, using macros for multiline list entries

Browse source
This commit is contained in:
Rangi 2020-07-14 10:21:18 -04:00
parent aa97e196dd
commit f37cf959c9
298 changed files with 5274 additions and 5646 deletions
Download patch file Download diff file Expand all files Collapse all files

4
scripts/CeladonGym.asm
View file

@ -61,9 +61,9 @@ CeladonGymText_48963:
call DisplayTextID
.gymVictory
ld hl, wObtainedBadges
set 3, [hl]
set BIT_RAINBOWBADGE, [hl]
ld hl, wBeatGymFlags
set 3, [hl]
set BIT_RAINBOWBADGE, [hl]
; deactivate gym trainers
SetEventRange EVENT_BEAT_CELADON_GYM_TRAINER_0, EVENT_BEAT_CELADON_GYM_TRAINER_6

4
scripts/CeruleanGym.asm
View file

@ -61,9 +61,9 @@ CeruleanGymScript_5c70d:
call DisplayTextID
.gymVictory
ld hl, wObtainedBadges
set 1, [hl]
set BIT_CASCADEBADGE, [hl]
ld hl, wBeatGymFlags
set 1, [hl]
set BIT_CASCADEBADGE, [hl]
; deactivate gym trainers
SetEvents EVENT_BEAT_CERULEAN_GYM_TRAINER_0, EVENT_BEAT_CERULEAN_GYM_TRAINER_1

4
scripts/CinnabarGym.asm
View file

@ -158,9 +158,9 @@ CinnabarGymScript3_75857:
call DisplayTextID
.gymVictory
ld hl, wObtainedBadges
set 6, [hl]
set BIT_VOLCANOBADGE, [hl]
ld hl, wBeatGymFlags
set 6, [hl]
set BIT_VOLCANOBADGE, [hl]
; deactivate gym trainers
SetEventRange EVENT_BEAT_CINNABAR_GYM_TRAINER_0, EVENT_BEAT_CINNABAR_GYM_TRAINER_6

4
scripts/FuchsiaGym.asm
View file

@ -61,9 +61,9 @@ FuchsiaGymScript3_75497:
call DisplayTextID
.gymVictory
ld hl, wObtainedBadges
set 4, [hl]
set BIT_SOULBADGE, [hl]
ld hl, wBeatGymFlags
set 4, [hl]
set BIT_SOULBADGE, [hl]
; deactivate gym trainers
SetEventRange EVENT_BEAT_FUCHSIA_GYM_TRAINER_0, EVENT_BEAT_FUCHSIA_GYM_TRAINER_5

6
scripts/PewterGym.asm
View file

@ -61,9 +61,9 @@ PewterGymScript_5c3df:
call DisplayTextID
.gymVictory
ld hl, wObtainedBadges
set 0, [hl]
set BIT_BOULDERBADGE, [hl]
ld hl, wBeatGymFlags
set 0, [hl]
set BIT_BOULDERBADGE, [hl]
ld a, HS_GYM_GUY
ld [wMissableObjectIndex], a
@ -183,7 +183,7 @@ PewterGymAfterBattleText1:
PewterGymText3:
text_asm
ld a, [wBeatGymFlags]
bit 0, a
bit BIT_BOULDERBADGE, a
jr nz, .asm_5c50c
ld hl, PewterGymText_5c515
call PrintText

4
scripts/SaffronGym.asm
View file

@ -61,9 +61,9 @@ SaffronGymText_5d068:
call DisplayTextID
.gymVictory
ld hl, wObtainedBadges
set 5, [hl]
set BIT_MARSHBADGE, [hl]
ld hl, wBeatGymFlags
set 5, [hl]
set BIT_MARSHBADGE, [hl]
; deactivate gym trainers
SetEventRange EVENT_BEAT_SAFFRON_GYM_TRAINER_0, EVENT_BEAT_SAFFRON_GYM_TRAINER_6

6
scripts/VermilionGym.asm
View file

@ -80,9 +80,9 @@ VermilionGymReceiveTM24:
call DisplayTextID
.gymVictory
ld hl, wObtainedBadges
set 2, [hl]
set BIT_THUNDERBADGE, [hl]
ld hl, wBeatGymFlags
set 2, [hl]
set BIT_THUNDERBADGE, [hl]
; deactivate gym trainers
SetEventRange EVENT_BEAT_VERMILION_GYM_TRAINER_0, EVENT_BEAT_VERMILION_GYM_TRAINER_2
@ -247,7 +247,7 @@ VermilionGymAfterBattleText3:
VermilionGymFanText:
text_asm
ld a, [wBeatGymFlags]
bit 2, a
bit BIT_THUNDERBADGE, a
jr nz, .afterBeat
ld hl, VermilionGymFanPreBattleText
call PrintText

4
scripts/ViridianGym.asm
View file

@ -155,9 +155,9 @@ ViridianGymScript3_74995:
call DisplayTextID
.gymVictory
ld hl, wObtainedBadges
set 7, [hl]
set BIT_EARTHBADGE, [hl]
ld hl, wBeatGymFlags
set 7, [hl]
set BIT_EARTHBADGE, [hl]
; deactivate gym trainers
SetEventRange EVENT_BEAT_VIRIDIAN_GYM_TRAINER_0, EVENT_BEAT_VIRIDIAN_GYM_TRAINER_7