From 3cd3efd06002a188cebf37d935411d7d73b153be Mon Sep 17 00:00:00 2001 From: "U-Daniel-PC\\Daniel" Date: Fri, 12 Jun 2015 10:26:00 -0500 Subject: Name the last of unnamed text --- scripts/lorelei.asm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'scripts/lorelei.asm') diff --git a/scripts/lorelei.asm b/scripts/lorelei.asm index ab769d94..e82497ef 100755 --- a/scripts/lorelei.asm +++ b/scripts/lorelei.asm @@ -115,7 +115,7 @@ LoreleiScript2: ; 7623f (1d:623f) LoreleiTextPointers: ; 76251 (1d:6251) dw LoreleiText1 - dw LoreleiText2 + dw LoreleiDontRunAwayText LoreleiTrainerHeaders: ; 76255 (1d:6255) LoreleiTrainerHeader0: ; 76255 (1d:6255) @@ -147,6 +147,6 @@ LoreleiAfterBattleText: ; 76276 (1d:6276) TX_FAR _LoreleiAfterBattleText db "@" -LoreleiText2: ; 7627b (1d:627b) - TX_FAR _LoreleiText2 +LoreleiDontRunAwayText: ; 7627b (1d:627b) + TX_FAR _LoreleiDontRunAwayText db "@" -- cgit v1.2.3 From f4a31b3e0b7ca89e14c4e3836f3d3ad15f38e5ce Mon Sep 17 00:00:00 2001 From: "U-Daniel-PC\\Daniel" Date: Fri, 3 Jul 2015 14:38:12 -0500 Subject: Rename/organize part 2 of 4 rename functions, clean up address/wram comments, other misc only broken up so that all changes are viewable on github --- scripts/lorelei.asm | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) (limited to 'scripts/lorelei.asm') diff --git a/scripts/lorelei.asm b/scripts/lorelei.asm index e82497ef..ee50849b 100755 --- a/scripts/lorelei.asm +++ b/scripts/lorelei.asm @@ -41,7 +41,8 @@ LoreleiScriptPointers: ; 761bb (1d:61bb) LoreleiScript4: ; 761c5 (1d:61c5) ret -asm_761c6: ; 761c6 (1d:61c6) + +LoreleiScript_761c6: ; 761c6 (1d:61c6) ld hl, wSimulatedJoypadStatesEnd ld a, D_UP ld [hli], a @@ -57,6 +58,7 @@ asm_761c6: ; 761c6 (1d:61c6) ld [W_LORELEICURSCRIPT], a ld [W_CURMAPSCRIPT], a ret + LoreleiScript0: ; 761e2 (1d:61e2) ld hl, CoordsData_76223 call ArePlayerCoordsInArray @@ -66,16 +68,16 @@ LoreleiScript0: ; 761e2 (1d:61e2) ld [hJoyHeld], a ld [wSimulatedJoypadStatesEnd], a ld [wSimulatedJoypadStatesIndex], a - ld a, [wWhichTrade] ; wWhichTrade + ld a, [wWhichTrade] cp $3 jr c, .asm_76206 ld hl, wd863 bit 6, [hl] set 6, [hl] - jr z, asm_761c6 + jr z, LoreleiScript_761c6 .asm_76206 ld a, $2 - ld [H_DOWNARROWBLINKCNT2], a ; $ff8c + ld [H_DOWNARROWBLINKCNT2], a call DisplayTextID ld a, D_UP ld [wSimulatedJoypadStatesEnd], a @@ -106,11 +108,11 @@ LoreleiScript3: ; 7622c (1d:622c) ret LoreleiScript2: ; 7623f (1d:623f) call EndTrainerBattle - ld a, [W_ISINBATTLE] ; W_ISINBATTLE + ld a, [W_ISINBATTLE] cp $ff jp z, LoreleiScript_761b6 ld a, $1 - ld [H_DOWNARROWBLINKCNT2], a ; $ff8c + ld [H_DOWNARROWBLINKCNT2], a jp DisplayTextID LoreleiTextPointers: ; 76251 (1d:6251) @@ -122,10 +124,10 @@ LoreleiTrainerHeader0: ; 76255 (1d:6255) db $1 ; flag's bit db ($0 << 4) ; trainer's view range dw wd863 ; flag's byte - dw LoreleiBeforeBattleText ; 0x626c TextBeforeBattle - dw LoreleiAfterBattleText ; 0x6276 TextAfterBattle - dw LoreleiEndBattleText ; 0x6271 TextEndBattle - dw LoreleiEndBattleText ; 0x6271 TextEndBattle + dw LoreleiBeforeBattleText ; TextBeforeBattle + dw LoreleiAfterBattleText ; TextAfterBattle + dw LoreleiEndBattleText ; TextEndBattle + dw LoreleiEndBattleText ; TextEndBattle db $ff -- cgit v1.2.3 From 8431fa7756dace97413f4c35aaa44cd92cf5b6df Mon Sep 17 00:00:00 2001 From: "U-Daniel-PC\\Daniel" Date: Fri, 3 Jul 2015 14:58:50 -0500 Subject: TX_ASM --- scripts/lorelei.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scripts/lorelei.asm') diff --git a/scripts/lorelei.asm b/scripts/lorelei.asm index ee50849b..7e800467 100755 --- a/scripts/lorelei.asm +++ b/scripts/lorelei.asm @@ -132,7 +132,7 @@ LoreleiTrainerHeader0: ; 76255 (1d:6255) db $ff LoreleiText1: ; 76262 (1d:6262) - db $08 ; asm + TX_ASM ld hl, LoreleiTrainerHeader0 call TalkToTrainer jp TextScriptEnd -- cgit v1.2.3 From fc9af362ae65d24c66b39ea7759637cc9c1f9b0a Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Sat, 18 Jul 2015 08:17:29 -0700 Subject: fix variable naming --- scripts/lorelei.asm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'scripts/lorelei.asm') diff --git a/scripts/lorelei.asm b/scripts/lorelei.asm index 7e800467..1f1fcde0 100755 --- a/scripts/lorelei.asm +++ b/scripts/lorelei.asm @@ -77,7 +77,7 @@ LoreleiScript0: ; 761e2 (1d:61e2) jr z, LoreleiScript_761c6 .asm_76206 ld a, $2 - ld [H_DOWNARROWBLINKCNT2], a + ld [hSpriteIndexOrTextID], a call DisplayTextID ld a, D_UP ld [wSimulatedJoypadStatesEnd], a @@ -112,7 +112,7 @@ LoreleiScript2: ; 7623f (1d:623f) cp $ff jp z, LoreleiScript_761b6 ld a, $1 - ld [H_DOWNARROWBLINKCNT2], a + ld [hSpriteIndexOrTextID], a jp DisplayTextID LoreleiTextPointers: ; 76251 (1d:6251) -- cgit v1.2.3 From c169073eed4f0362ef42170098a141a2fcbd71d0 Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Sat, 18 Jul 2015 20:49:52 -0700 Subject: misc --- scripts/lorelei.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scripts/lorelei.asm') diff --git a/scripts/lorelei.asm b/scripts/lorelei.asm index 1f1fcde0..eb6c3e7d 100755 --- a/scripts/lorelei.asm +++ b/scripts/lorelei.asm @@ -68,7 +68,7 @@ LoreleiScript0: ; 761e2 (1d:61e2) ld [hJoyHeld], a ld [wSimulatedJoypadStatesEnd], a ld [wSimulatedJoypadStatesIndex], a - ld a, [wWhichTrade] + ld a, [wCoordIndex] cp $3 jr c, .asm_76206 ld hl, wd863 -- cgit v1.2.3 From fcab935a0f449246380480613ac0896e0b90a0d8 Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Mon, 20 Jul 2015 18:32:02 -0700 Subject: enumerate events --- scripts/lorelei.asm | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'scripts/lorelei.asm') diff --git a/scripts/lorelei.asm b/scripts/lorelei.asm index eb6c3e7d..a8e0cb5b 100755 --- a/scripts/lorelei.asm +++ b/scripts/lorelei.asm @@ -15,8 +15,7 @@ LoreleiScript_76191: ; 76191 (1d:6191) ret z ld hl, wd734 set 1, [hl] - ld a, [wd863] - bit 1, a + CheckEvent EVENT_BEAT_LORELEIS_ROOM_TRAINER_0 jr z, .asm_761a9 ld a, $5 jr .asm_761ab @@ -71,9 +70,7 @@ LoreleiScript0: ; 761e2 (1d:61e2) ld a, [wCoordIndex] cp $3 jr c, .asm_76206 - ld hl, wd863 - bit 6, [hl] - set 6, [hl] + CheckAndSetEvent EVENT_8E6 jr z, LoreleiScript_761c6 .asm_76206 ld a, $2 @@ -121,9 +118,9 @@ LoreleiTextPointers: ; 76251 (1d:6251) LoreleiTrainerHeaders: ; 76255 (1d:6255) LoreleiTrainerHeader0: ; 76255 (1d:6255) - db $1 ; flag's bit + dbEventFlagBit EVENT_BEAT_LORELEIS_ROOM_TRAINER_0 db ($0 << 4) ; trainer's view range - dw wd863 ; flag's byte + dwEventFlagAddress EVENT_BEAT_LORELEIS_ROOM_TRAINER_0 dw LoreleiBeforeBattleText ; TextBeforeBattle dw LoreleiAfterBattleText ; TextAfterBattle dw LoreleiEndBattleText ; TextEndBattle -- cgit v1.2.3 From 73171bfff573fa8900563319c014f3e626db6b3e Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Tue, 21 Jul 2015 10:36:03 -0700 Subject: named most of the used events --- scripts/lorelei.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scripts/lorelei.asm') diff --git a/scripts/lorelei.asm b/scripts/lorelei.asm index a8e0cb5b..fe136784 100755 --- a/scripts/lorelei.asm +++ b/scripts/lorelei.asm @@ -70,7 +70,7 @@ LoreleiScript0: ; 761e2 (1d:61e2) ld a, [wCoordIndex] cp $3 jr c, .asm_76206 - CheckAndSetEvent EVENT_8E6 + CheckAndSetEvent EVENT_AUTOWALKED_INTO_LORELEIS_ROOM jr z, LoreleiScript_761c6 .asm_76206 ld a, $2 -- cgit v1.2.3 From dcc7f3bc9f41f2d5e0f7448b4688c1058da0040b Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Tue, 21 Jul 2015 14:21:14 -0700 Subject: named more constants --- scripts/lorelei.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scripts/lorelei.asm') diff --git a/scripts/lorelei.asm b/scripts/lorelei.asm index fe136784..4a245d93 100755 --- a/scripts/lorelei.asm +++ b/scripts/lorelei.asm @@ -13,7 +13,7 @@ LoreleiScript_76191: ; 76191 (1d:6191) bit 5, [hl] res 5, [hl] ret z - ld hl, wd734 + ld hl, wBeatLorelei set 1, [hl] CheckEvent EVENT_BEAT_LORELEIS_ROOM_TRAINER_0 jr z, .asm_761a9 -- cgit v1.2.3 From 82512e449115aa9d004e24a3d1526dd32570c56d Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Fri, 24 Jul 2015 14:39:45 -0700 Subject: named animation functions/variables --- scripts/lorelei.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scripts/lorelei.asm') diff --git a/scripts/lorelei.asm b/scripts/lorelei.asm index 4a245d93..3c639d1e 100755 --- a/scripts/lorelei.asm +++ b/scripts/lorelei.asm @@ -22,7 +22,7 @@ LoreleiScript_76191: ; 76191 (1d:6191) .asm_761a9 ld a, $24 .asm_761ab - ld [wd09f], a + ld [wNewTileBlockID], a ld bc, $2 predef_jump ReplaceTileBlock -- cgit v1.2.3 From f8a9c37a0019eb085c22c6e3ae53b16ff0cd4f6a Mon Sep 17 00:00:00 2001 From: dannye Date: Wed, 5 Aug 2015 16:20:29 -0500 Subject: Use more lb and other clean up --- scripts/lorelei.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scripts/lorelei.asm') diff --git a/scripts/lorelei.asm b/scripts/lorelei.asm index 3c639d1e..43eee966 100755 --- a/scripts/lorelei.asm +++ b/scripts/lorelei.asm @@ -23,7 +23,7 @@ LoreleiScript_76191: ; 76191 (1d:6191) ld a, $24 .asm_761ab ld [wNewTileBlockID], a - ld bc, $2 + lb bc, 0, 2 predef_jump ReplaceTileBlock LoreleiScript_761b6: ; 761b6 (1d:61b6) -- cgit v1.2.3