Merge pull request #5 from AtmaTek/1_0_2

1 0 2

Author: AtmaTek

args/espers.py

@@ -147,6 +147,8 @@ def menu(args):
     for index, entry in enumerate(entries):
         key, value = entry
         try:
+            value = value.replace("Original (Random Rates)", "Random Rates")
+            value = value.replace("Shuffle (Random Rates)", "Shuffle R Rates")
             value = value.replace("Random Value", "")
             value = value.replace("Random Percent", "")
             value = value.replace("Balanced Random", "Balanced")

battle/check_dragon_boss.py

@@ -29,55 +29,61 @@ def __init__(self):
 
             "DRAGON_CHECK_LOOP_START",
             asm.CMP(f0.dragon_formations, asm.LNG_X),
-            asm.BEQ("INCREMENT_DRAGON_COUNT"),      # branch if formation in dragon formations
+            asm.BEQ("CHECK_DRAGON_DEFEATED_BIT"),   # branch if formation in dragon formations
             asm.INX(),
             asm.INX(),
             asm.CPX(f0.dragon_formations_size, asm.IMM16),
             asm.BLT("DRAGON_CHECK_LOOP_START"),     # branch if not checked all dragon formations
             asm.BRA("CHECK_BOSS_FORMATIONS"),
 
-            "INCREMENT_DRAGON_COUNT",
-            asm.INC(dragons_defeated_address, asm.ABS),
+            "CHECK_DRAGON_DEFEATED_BIT",
             asm.TXA(),                              # a = formation index * 2
             asm.LSR(),                              # a = formation index
             asm.CLC(),
             asm.ADC(battle_bit.bit(battle_bit.DRAGON_DEFEATED_START), asm.IMM16),
             asm.LDX(0x0008, asm.IMM16),
             asm.JSR(f0.divide, asm.ABS),            # a = byte, x = bit
-            asm.PHY(),
-            asm.TAY(),                              # y = dragon battle byte
+            asm.PHA(),
             asm.JSR(f0.set_bit_x, asm.ABS),         # set bit #x in a
-            asm.ORA(dragon_bits_start, asm.ABS_Y),
-            asm.STA(dragon_bits_start, asm.ABS_Y),  # set dragon defeated battle bit
-            asm.PLY(),
+            asm.PLX(),                              # x = byte (pushed from a)
+            asm.BIT(dragon_bits_start, asm.ABS_X),  # is dragon defeated bit set?
+            asm.BNE("RETURN"),
+
+            "SET_DRAGON_DEFEATED",
+            asm.ORA(dragon_bits_start, asm.ABS_X),
+            asm.STA(dragon_bits_start, asm.ABS_X),  # set dragon defeated bit
+            asm.INC(dragons_defeated_address, asm.ABS), # increment dragons defeated count
             asm.BRA("RETURN"),
 
             "CHECK_BOSS_FORMATIONS",
             asm.LDX(0x0000, asm.IMM16),             # formation table index = 0
 
             "BOSS_CHECK_LOOP_START",
             asm.CMP(f0.boss_formations, asm.LNG_X),
-            asm.BEQ("INCREMENT_BOSS_COUNT"),        # branch if formation in boss formations
+            asm.BEQ("CHECK_BOSS_DEFEATED_BIT"),     # branch if formation in boss formations
             asm.INX(),
             asm.INX(),
             asm.CPX(f0.boss_formations_size, asm.IMM16),
             asm.BLT("BOSS_CHECK_LOOP_START"),       # branch if not checked all boss formations
             asm.BRA("RETURN"),
 
-            "INCREMENT_BOSS_COUNT",
-            asm.INC(bosses_defeated_address, asm.ABS),
+            "CHECK_BOSS_DEFEATED_BIT",
             asm.TXA(),                              # a = formation index * 2
             asm.LSR(),                              # a = formation index
             asm.CLC(),
             asm.ADC(battle_bit.bit(battle_bit.BOSS_DEFEATED_START), asm.IMM16),
             asm.LDX(0x0008, asm.IMM16),
             asm.JSR(f0.divide, asm.ABS),            # a = byte, x = bit
-            asm.PHY(),
-            asm.TAY(),                              # y = boss battle byte
+            asm.PHA(),
             asm.JSR(f0.set_bit_x, asm.ABS),         # set bit #x in a
-            asm.ORA(boss_bits_start, asm.ABS_Y),
-            asm.STA(boss_bits_start, asm.ABS_Y),    # set boss defeated battle bit
-            asm.PLY(),
+            asm.PLX(),                              # x = byte (pushed from a)
+            asm.BIT(boss_bits_start, asm.ABS_X),    # is boss defeated bit set?
+            asm.BNE("RETURN"),
+
+            "SET_BOSS_DEFEATED",
+            asm.ORA(boss_bits_start, asm.ABS_X),
+            asm.STA(boss_bits_start, asm.ABS_X),    # set boss defeated bit
+            asm.INC(bosses_defeated_address, asm.ABS),  # increment bosses defeated count
 
             "RETURN",
             asm.PLP(),

event/veldt.py

@@ -387,7 +387,7 @@ def battle_events_mod(self):
 
             battle_event.OpenMultiLineDialogWindow(),
             battle_event.DisplayMultiLineDialog(gau_char_arrives_dialog_id), # Gau: Uwaoo~!!
-            battle_event.FinishCheck(),
+            battle_event.IncrementChecksComplete(),
             battle_event.CloseMultiLineDialogWindow(),
             battle_event.End(),
         )

instruction/battle_event.py

@@ -86,50 +86,20 @@ class DisplayMultiLineDialog(_Instruction):
     def __init__(self, dialog_id):
         super().__init__(0x01, dialog_id)
 
-class FinishCheck(_Instruction):
+class IncrementChecksComplete(_Instruction):
     def __init__(self):
-        import objectives
-        import data.dialogs as dialogs
-
         import data.event_word as event_word
         checks_complete_address = event_word.address(event_word.CHECKS_COMPLETE)
 
         src = [
             asm.INC(checks_complete_address, asm.ABS),
-        ]
-        for objective in objectives:
-            src += [
-                asm.XY8(),
-                objective.check_complete.battle(),
-                asm.XY16(),
-                asm.CMP(0x00, asm.IMM8),
-                asm.BEQ("AFTER_DIALOG" + str(objective.id)),    # if not complete, go to next objective
-
-                asm.LDA(dialogs.get_multi_line_battle_objective(objective.id), asm.IMM8),
-                asm.A16(),
-                asm.ASL(),  # a = dialog id * 2 (2 bytes per pointer)
-                asm.TAX(),  # x = dialog id * 2
-                asm.A8(),
-                asm.JSL(START_ADDRESS_SNES + c1.display_multi_line_dialog), # display objective complete dialog
-
-                "AFTER_DIALOG" + str(objective.id),
-            ]
-        src += [
-            "RETURN",
-            asm.RTL(),
-        ]
-        space = Write(Bank.F0, src, "battle event finish check")
-        finish_check = space.start_address
-
-        src = [
-            asm.JSL(START_ADDRESS_SNES + finish_check),
             asm.RTS(),
         ]
-        space = Write(Bank.C1, src, "battle event finish check command")
+        space = Write(Bank.C1, src, "battle event increment checks complete command")
         address = space.start_address
 
         opcode = 0x15
         _set_opcode_address(opcode, address)
 
-        FinishCheck.__init__ = lambda self : super().__init__(opcode)
+        IncrementChecksComplete.__init__ = lambda self : super().__init__(opcode)
         self.__init__()

instruction/field/y_npc/functions.py

@@ -124,8 +124,8 @@ def imperial():
 
 def main_character():
     from data.characters import Characters
-    from args.custom import DEFAULT_CHARACTER_SPRITES
-    from args.custom import DEFAULT_CHARACTER_SPRITE_PALETTES
+    from data.character_sprites import DEFAULT_CHARACTER_SPRITES
+    from data.character_palettes import DEFAULT_CHARACTER_SPRITE_PALETTES
 
     sprites = DEFAULT_CHARACTER_SPRITES[:Characters.CHARACTER_COUNT]
     palettes = args.sprite_palettes

version.py

@@ -1 +1 @@
-__version__ = "1.0.1"
+__version__ = "1.0.2"