diff options
| author | dannye <33dannye@gmail.com> | 2020-05-20 19:40:33 -0500 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2020-05-20 20:02:53 -0500 |
| commit | 10f9559eab8c93b94abb8ae8d1083704ad4e169a (patch) | |
| tree | 7dbe7b152dde8a6e9b56664b5b8cdfc0d6be1253 /scripts/ceruleangym.asm | |
| parent | Merge pull request #39 from TiKevin83/master (diff) | |
| download | pokeyellow-10f9559eab8c93b94abb8ae8d1083704ad4e169a.tar.gz pokeyellow-10f9559eab8c93b94abb8ae8d1083704ad4e169a.tar.xz pokeyellow-10f9559eab8c93b94abb8ae8d1083704ad4e169a.zip | |
Sync with pokered
Diffstat (limited to '')
| -rwxr-xr-x | scripts/CeruleanGym.asm (renamed from scripts/ceruleangym.asm) | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/scripts/ceruleangym.asm b/scripts/CeruleanGym.asm index 78ed1fed..d1dd66e4 100755 --- a/scripts/ceruleangym.asm +++ b/scripts/CeruleanGym.asm @@ -1,11 +1,11 @@ -CeruleanGymScript: +CeruleanGym_Script: ld hl, wCurrentMapScriptFlags bit 6, [hl] res 6, [hl] call nz, CeruleanGymScript_5c6d0 call EnableAutoTextBoxDrawing - ld hl, CeruleanGymTrainerHeaders - ld de, CeruleanGymScriptPointers + ld hl, CeruleanGymTrainerHeader0 + 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 @@ -55,7 +55,6 @@ CeruleanGymScript_5c70d: call DisplayTextID SetEvent EVENT_GOT_TM11 jr .gymVictory - .BagFull ld a, $7 ld [hSpriteIndexOrTextID], a @@ -71,7 +70,7 @@ CeruleanGymScript_5c70d: jp CeruleanGymScript_5c6ed -CeruleanGymTextPointers: +CeruleanGym_TextPointers: dw CeruleanGymText1 dw CeruleanGymText2 dw CeruleanGymText3 @@ -80,7 +79,6 @@ CeruleanGymTextPointers: dw CeruleanGymText6 dw CeruleanGymText7 -CeruleanGymTrainerHeaders: CeruleanGymTrainerHeader0: dbEventFlagBit EVENT_BEAT_CERULEAN_GYM_TRAINER_0 db ($3 << 4) ; trainer's view range @@ -149,9 +147,9 @@ CeruleanGymText5: db "@" CeruleanGymText6: -ReceivedTM11Text: TX_FAR _ReceivedTM11Text - db $0B, "@" + TX_SFX_ITEM_1 + db "@" CeruleanGymText7: TX_FAR _CeruleanGymText_5c7d3 |