summaryrefslogtreecommitdiff
path: root/scripts/celadongym.asm
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/celadongym.asm')
-rwxr-xr-xscripts/celadongym.asm104
1 files changed, 52 insertions, 52 deletions
diff --git a/scripts/celadongym.asm b/scripts/celadongym.asm
index a9c017d0..903ef508 100755
--- a/scripts/celadongym.asm
+++ b/scripts/celadongym.asm
@@ -1,4 +1,4 @@
-CeladonGymScript: ; 4890a (12:490a)
+CeladonGymScript:
ld hl, wCurrentMapScriptFlags
bit 6, [hl]
res 6, [hl]
@@ -11,38 +11,38 @@ CeladonGymScript: ; 4890a (12:490a)
ld [wCeladonGymCurScript], a
ret
-CeladonGymScript_48927: ; 48927 (12:4927)
+CeladonGymScript_48927:
ld hl, Gym4CityName
ld de, Gym4LeaderName
jp LoadGymLeaderAndCityName
-Gym4CityName: ; 48930 (12:4930)
+Gym4CityName:
db "CELADON CITY@"
-Gym4LeaderName: ; 4893d (12:493d)
+Gym4LeaderName:
db "ERIKA@"
-CeladonGymText_48943: ; 48943 (12:4943)
+CeladonGymText_48943:
xor a
ld [wJoyIgnore], a
ld [wCeladonGymCurScript], a
ld [wCurMapScript], a
ret
-CeladonGymScriptPointers: ; 4894e (12:494e)
+CeladonGymScriptPointers:
dw CheckFightingMapTrainers
dw DisplayEnemyTrainerTextAndStartBattle
dw EndTrainerBattle
dw CeladonGymScript3
-CeladonGymScript3: ; 48956 (12:4956)
+CeladonGymScript3:
ld a, [wIsInBattle]
cp $ff
jp z, CeladonGymText_48943
ld a, $f0
ld [wJoyIgnore], a
-CeladonGymText_48963: ; 48963 (12:4963)
+CeladonGymText_48963:
ld a, $9
ld [hSpriteIndexOrTextID], a
call DisplayTextID
@@ -70,7 +70,7 @@ CeladonGymText_48963: ; 48963 (12:4963)
jp CeladonGymText_48943
-CeladonGymTextPointers: ; 489a6 (12:49a6)
+CeladonGymTextPointers:
dw CeladonGymText1
dw CeladonGymText2
dw CeladonGymText3
@@ -83,8 +83,8 @@ CeladonGymTextPointers: ; 489a6 (12:49a6)
dw TM21Text
dw TM21NoRoomText
-CeladonGymTrainerHeaders: ; 489bc (12:49bc)
-CeladonGymTrainerHeader0: ; 489bc (12:49bc)
+CeladonGymTrainerHeaders:
+CeladonGymTrainerHeader0:
dbEventFlagBit EVENT_BEAT_CELADON_GYM_TRAINER_0
db ($2 << 4) ; trainer's view range
dwEventFlagAddress EVENT_BEAT_CELADON_GYM_TRAINER_0
@@ -93,7 +93,7 @@ CeladonGymTrainerHeader0: ; 489bc (12:49bc)
dw CeladonGymEndBattleText2 ; TextEndBattle
dw CeladonGymEndBattleText2 ; TextEndBattle
-CeladonGymTrainerHeader2: ; 489c8 (12:49c8)
+CeladonGymTrainerHeader2:
dbEventFlagBit EVENT_BEAT_CELADON_GYM_TRAINER_2
db ($2 << 4) ; trainer's view range
dwEventFlagAddress EVENT_BEAT_CELADON_GYM_TRAINER_2
@@ -102,7 +102,7 @@ CeladonGymTrainerHeader2: ; 489c8 (12:49c8)
dw CeladonGymEndBattleText3 ; TextEndBattle
dw CeladonGymEndBattleText3 ; TextEndBattle
-CeladonGymTrainerHeader3: ; 489d4 (12:49d4)
+CeladonGymTrainerHeader3:
dbEventFlagBit EVENT_BEAT_CELADON_GYM_TRAINER_3
db ($4 << 4) ; trainer's view range
dwEventFlagAddress EVENT_BEAT_CELADON_GYM_TRAINER_3
@@ -111,7 +111,7 @@ CeladonGymTrainerHeader3: ; 489d4 (12:49d4)
dw CeladonGymEndBattleText4 ; TextEndBattle
dw CeladonGymEndBattleText4 ; TextEndBattle
-CeladonGymTrainerHeader4: ; 489e0 (12:49e0)
+CeladonGymTrainerHeader4:
dbEventFlagBit EVENT_BEAT_CELADON_GYM_TRAINER_4
db ($4 << 4) ; trainer's view range
dwEventFlagAddress EVENT_BEAT_CELADON_GYM_TRAINER_4
@@ -120,7 +120,7 @@ CeladonGymTrainerHeader4: ; 489e0 (12:49e0)
dw CeladonGymEndBattleText5 ; TextEndBattle
dw CeladonGymEndBattleText5 ; TextEndBattle
-CeladonGymTrainerHeader5: ; 489ec (12:49ec)
+CeladonGymTrainerHeader5:
dbEventFlagBit EVENT_BEAT_CELADON_GYM_TRAINER_5
db ($2 << 4) ; trainer's view range
dwEventFlagAddress EVENT_BEAT_CELADON_GYM_TRAINER_5
@@ -129,7 +129,7 @@ CeladonGymTrainerHeader5: ; 489ec (12:49ec)
dw CeladonGymEndBattleText6 ; TextEndBattle
dw CeladonGymEndBattleText6 ; TextEndBattle
-CeladonGymTrainerHeader6: ; 489f8 (12:49f8)
+CeladonGymTrainerHeader6:
dbEventFlagBit EVENT_BEAT_CELADON_GYM_TRAINER_6
db ($2 << 4) ; trainer's view range
dwEventFlagAddress EVENT_BEAT_CELADON_GYM_TRAINER_6
@@ -138,7 +138,7 @@ CeladonGymTrainerHeader6: ; 489f8 (12:49f8)
dw CeladonGymEndBattleText7 ; TextEndBattle
dw CeladonGymEndBattleText7 ; TextEndBattle
-CeladonGymTrainerHeader7: ; 48a04 (12:4a04)
+CeladonGymTrainerHeader7:
dbEventFlagBit EVENT_BEAT_CELADON_GYM_TRAINER_7, 1
db ($3 << 4) ; trainer's view range
dwEventFlagAddress EVENT_BEAT_CELADON_GYM_TRAINER_7, 1
@@ -149,7 +149,7 @@ CeladonGymTrainerHeader7: ; 48a04 (12:4a04)
db $ff
-CeladonGymText1: ; 48a11 (12:4a11)
+CeladonGymText1:
TX_ASM
CheckEvent EVENT_BEAT_ERIKA
jr z, .asm_48a2d
@@ -183,154 +183,154 @@ CeladonGymText1: ; 48a11 (12:4a11)
.asm_48a5b
jp TextScriptEnd
-CeladonGymText_48a5e: ; 48a5e (12:4a5e)
+CeladonGymText_48a5e:
TX_FAR _CeladonGymText_48a5e
db "@"
-CeladonGymText_48a63: ; 48a63 (12:4a63)
+CeladonGymText_48a63:
TX_FAR _CeladonGymText_48a63
db "@"
-CeladonGymText_48a68: ; 48a68 (12:4a68)
+CeladonGymText_48a68:
TX_FAR _CeladonGymText_48a68
db "@"
-CeladonGymText9: ; 48a6d (12:4a6d)
+CeladonGymText9:
TX_FAR _CeladonGymText9
db "@"
-TM21Text: ; 48a72 (12:4a72)
+TM21Text:
TX_FAR _ReceivedTM21Text
db $0B
TX_FAR _TM21ExplanationText
db "@"
-TM21NoRoomText: ; 48a7c (12:4a7c)
+TM21NoRoomText:
TX_FAR _TM21NoRoomText
db "@"
-CeladonGymText2: ; 48a81 (12:4a81)
+CeladonGymText2:
TX_ASM
ld hl, CeladonGymTrainerHeader0
call TalkToTrainer
jp TextScriptEnd
-CeladonGymBattleText2: ; 48a8b (12:4a8b)
+CeladonGymBattleText2:
TX_FAR _CeladonGymBattleText2
db "@"
-CeladonGymEndBattleText2: ; 48a90 (12:4a90)
+CeladonGymEndBattleText2:
TX_FAR _CeladonGymEndBattleText2
db "@"
-CeladonGymAfterBattleText2: ; 48a95 (12:4a95)
+CeladonGymAfterBattleText2:
TX_FAR _CeladonGymAfterBattleText2
db "@"
-CeladonGymText3: ; 48a9a (12:4a9a)
+CeladonGymText3:
TX_ASM
ld hl, CeladonGymTrainerHeader2
call TalkToTrainer
jp TextScriptEnd
-CeladonGymBattleText3: ; 48aa4 (12:4aa4)
+CeladonGymBattleText3:
TX_FAR _CeladonGymBattleText3
db "@"
-CeladonGymEndBattleText3: ; 48aa9 (12:4aa9)
+CeladonGymEndBattleText3:
TX_FAR _CeladonGymEndBattleText3
db "@"
-CeladonGymAfterBattleText3: ; 48aae (12:4aae)
+CeladonGymAfterBattleText3:
TX_FAR _CeladonGymAfterBattleText3
db "@"
-CeladonGymText4: ; 48ab3 (12:4ab3)
+CeladonGymText4:
TX_ASM
ld hl, CeladonGymTrainerHeader3
call TalkToTrainer
jp TextScriptEnd
-CeladonGymBattleText4: ; 48abd (12:4abd)
+CeladonGymBattleText4:
TX_FAR _CeladonGymBattleText4
db "@"
-CeladonGymEndBattleText4: ; 48ac2 (12:4ac2)
+CeladonGymEndBattleText4:
TX_FAR _CeladonGymEndBattleText4
db "@"
-CeladonGymAfterBattleText4: ; 48ac7 (12:4ac7)
+CeladonGymAfterBattleText4:
TX_FAR _CeladonGymAfterBattleText4
db "@"
-CeladonGymText5: ; 48acc (12:4acc)
+CeladonGymText5:
TX_ASM
ld hl, CeladonGymTrainerHeader4
call TalkToTrainer
jp TextScriptEnd
-CeladonGymBattleText5: ; 48ad6 (12:4ad6)
+CeladonGymBattleText5:
TX_FAR _CeladonGymBattleText5
db "@"
-CeladonGymEndBattleText5: ; 48adb (12:4adb)
+CeladonGymEndBattleText5:
TX_FAR _CeladonGymEndBattleText5
db "@"
-CeladonGymAfterBattleText5: ; 48ae0 (12:4ae0)
+CeladonGymAfterBattleText5:
TX_FAR _CeladonGymAfterBattleText5
db "@"
-CeladonGymText6: ; 48ae5 (12:4ae5)
+CeladonGymText6:
TX_ASM
ld hl, CeladonGymTrainerHeader5
call TalkToTrainer
jp TextScriptEnd
-CeladonGymBattleText6: ; 48aef (12:4aef)
+CeladonGymBattleText6:
TX_FAR _CeladonGymBattleText6
db "@"
-CeladonGymEndBattleText6: ; 48af4 (12:4af4)
+CeladonGymEndBattleText6:
TX_FAR _CeladonGymEndBattleText6
db "@"
-CeladonGymAfterBattleText6: ; 48af9 (12:4af9)
+CeladonGymAfterBattleText6:
TX_FAR _CeladonGymAfterBattleText6
db "@"
-CeladonGymText7: ; 48afe (12:4afe)
+CeladonGymText7:
TX_ASM
ld hl, CeladonGymTrainerHeader6
call TalkToTrainer
jp TextScriptEnd
-CeladonGymBattleText7: ; 48b08 (12:4b08)
+CeladonGymBattleText7:
TX_FAR _CeladonGymBattleText7
db "@"
-CeladonGymEndBattleText7: ; 48b0d (12:4b0d)
+CeladonGymEndBattleText7:
TX_FAR _CeladonGymEndBattleText7
db "@"
-CeladonGymAfterBattleText7: ; 48b12 (12:4b12)
+CeladonGymAfterBattleText7:
TX_FAR _CeladonGymAfterBattleText7
db "@"
-CeladonGymText8: ; 48b17 (12:4b17)
+CeladonGymText8:
TX_ASM
ld hl, CeladonGymTrainerHeader7
call TalkToTrainer
jp TextScriptEnd
-CeladonGymBattleText8: ; 48b21 (12:4b21)
+CeladonGymBattleText8:
TX_FAR _CeladonGymBattleText8
db "@"
-CeladonGymEndBattleText8: ; 48b26 (12:4b26)
+CeladonGymEndBattleText8:
TX_FAR _CeladonGymEndBattleText8
db "@"
-CeladonGymAfterBattleText8: ; 48b2b (12:4b2b)
+CeladonGymAfterBattleText8:
TX_FAR _CeladonGymAfterBattleText8
db "@"
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-05 23:21:01 +0000