diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2019-01-01 15:06:23 -0500 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2019-01-01 23:33:10 -0500 |
| commit | c7796024590fec48ac79756793c1a6e3b54daf8f (patch) | |
| tree | 0d61caa7ebe429995a61e800d1d78c3a82aec886 /scripts/mtmoon3.asm | |
| parent | Merge pull request #193 from luckytyphlosion/master (diff) | |
| download | pokeyellow-c7796024590fec48ac79756793c1a6e3b54daf8f.tar.gz pokeyellow-c7796024590fec48ac79756793c1a6e3b54daf8f.tar.xz pokeyellow-c7796024590fec48ac79756793c1a6e3b54daf8f.zip | |
Rename map files, labels, and constants to be consistent and work with Polished Map
Diffstat (limited to '')
| -rwxr-xr-x | scripts/MtMoonB2F.asm (renamed from scripts/mtmoon3.asm) | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/scripts/mtmoon3.asm b/scripts/MtMoonB2F.asm index 60cd1ab8..863d9d22 100755 --- a/scripts/mtmoon3.asm +++ b/scripts/MtMoonB2F.asm @@ -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 |