diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/constants/npc_constants.asm | 12 | ||||
| -rw-r--r-- | src/constants/script_constants.asm | 2 | ||||
| -rw-r--r-- | src/data/npc_map_data.asm | 12 | ||||
| -rw-r--r-- | src/data/npcs.asm | 12 | ||||
| -rw-r--r-- | src/engine/bank03.asm | 22 | ||||
| -rw-r--r-- | src/engine/home.asm | 2 |
6 files changed, 31 insertions, 31 deletions
diff --git a/src/constants/npc_constants.asm b/src/constants/npc_constants.asm index 113d790..eb7b75b 100644 --- a/src/constants/npc_constants.asm +++ b/src/constants/npc_constants.asm @@ -180,12 +180,12 @@ const_value = const_value+1 ; DRMASON duplicate const NPC_TECH7 ; $65 const NPC_TECH8 ; $66 const NPC_TORCH ; $67 - const NPC_LEGEND_CARDS_TOP_LEFT ; $68 - const NPC_LEGEND_CARDS_TOP_RIGHT ; $69 - const NPC_LEGEND_CARDS_LEFT_SPARK ; $6a - const NPC_LEGEND_CARDS_BOTTOM_LEFT ; $6b - const NPC_LEGEND_CARDS_BOTTOM_RIGHT ; $6c - const NPC_LEGEND_CARDS_RIGHT_SPARK ; $6d + const NPC_LEGENDARY_CARD_TOP_LEFT ; $68 + const NPC_LEGENDARY_CARD_TOP_RIGHT ; $69 + const NPC_LEGENDARY_CARD_LEFT_SPARK ; $6a + const NPC_LEGENDARY_CARD_BOTTOM_LEFT ; $6b + const NPC_LEGENDARY_CARD_BOTTOM_RIGHT ; $6c + const NPC_LEGENDARY_CARD_RIGHT_SPARK ; $6d const NPC_11F49 ; $6e const_value = const_value+1 ; NPC_11F49 duplicate const NPC_MURRAY2 ; $70 diff --git a/src/constants/script_constants.asm b/src/constants/script_constants.asm index 05aaf57..9607ba0 100644 --- a/src/constants/script_constants.asm +++ b/src/constants/script_constants.asm @@ -33,7 +33,7 @@ const EVENT_FLAG_1F ; $1f const EVENT_FLAG_20 ; $20 const EVENT_FLAG_21 ; $21 - const EVENT_RECEIVED_LEGEND_CARDS ; $22 + const EVENT_RECEIVED_LEGENDARY_CARD ; $22 const EVENT_FLAG_23 ; $23 const EVENT_FLAG_24 ; $24 const EVENT_FLAG_25 ; $25 diff --git a/src/data/npc_map_data.asm b/src/data/npc_map_data.asm index 701171e..bc09d07 100644 --- a/src/data/npc_map_data.asm +++ b/src/data/npc_map_data.asm @@ -403,17 +403,17 @@ PokemonDomeNPCS: ; 7ac0 (4:13ac0) db $00 HallOfHonorNPCS: ; 7adf (4:13adf) - db NPC_LEGEND_CARDS_TOP_LEFT, $0a, $08, SOUTH + db NPC_LEGENDARY_CARD_TOP_LEFT, $0a, $08, SOUTH dw $0000 - db NPC_LEGEND_CARDS_TOP_RIGHT, $0c, $08, SOUTH + db NPC_LEGENDARY_CARD_TOP_RIGHT, $0c, $08, SOUTH dw $0000 - db NPC_LEGEND_CARDS_LEFT_SPARK, $08, $0a, SOUTH + db NPC_LEGENDARY_CARD_LEFT_SPARK, $08, $0a, SOUTH dw $0000 - db NPC_LEGEND_CARDS_BOTTOM_LEFT, $0a, $0a, SOUTH + db NPC_LEGENDARY_CARD_BOTTOM_LEFT, $0a, $0a, SOUTH dw $0000 - db NPC_LEGEND_CARDS_BOTTOM_RIGHT, $0c, $0a, SOUTH + db NPC_LEGENDARY_CARD_BOTTOM_RIGHT, $0c, $0a, SOUTH dw $0000 - db NPC_LEGEND_CARDS_RIGHT_SPARK, $0e, $0a, SOUTH + db NPC_LEGENDARY_CARD_RIGHT_SPARK, $0e, $0a, SOUTH dw $0000 db $00 diff --git a/src/data/npcs.asm b/src/data/npcs.asm index 1db22ef..0c184ea 100644 --- a/src/data/npcs.asm +++ b/src/data/npcs.asm @@ -1362,42 +1362,42 @@ Data_11f18: db $10 dw NoOverworldSequence ; Pointer to OWScript Data_11f1f: - db NPC_LEGEND_CARDS_TOP_LEFT + db NPC_LEGENDARY_CARD_TOP_LEFT db $27 db $3b db $41 db $50 dw NoOverworldSequence ; Pointer to OWScript Data_11f26: - db NPC_LEGEND_CARDS_TOP_RIGHT + db NPC_LEGENDARY_CARD_TOP_RIGHT db $27 db $3c db $42 db $50 dw NoOverworldSequence ; Pointer to OWScript Data_11f2d: - db NPC_LEGEND_CARDS_LEFT_SPARK + db NPC_LEGENDARY_CARD_LEFT_SPARK db $27 db $3d db $43 db $50 dw NoOverworldSequence ; Pointer to OWScript Data_11f34: - db NPC_LEGEND_CARDS_BOTTOM_LEFT + db NPC_LEGENDARY_CARD_BOTTOM_LEFT db $27 db $3e db $44 db $50 dw NoOverworldSequence ; Pointer to OWScript Data_11f3b: - db NPC_LEGEND_CARDS_BOTTOM_RIGHT + db NPC_LEGENDARY_CARD_BOTTOM_RIGHT db $27 db $3f db $45 db $50 dw NoOverworldSequence ; Pointer to OWScript Data_11f42: - db NPC_LEGEND_CARDS_RIGHT_SPARK + db NPC_LEGENDARY_CARD_RIGHT_SPARK db $27 db $40 db $46 diff --git a/src/engine/bank03.asm b/src/engine/bank03.asm index eef0d46..80722f7 100644 --- a/src/engine/bank03.asm +++ b/src/engine/bank03.asm @@ -1366,7 +1366,7 @@ Func_ca0e: ; ca0e (3:4a0e) ld a, [wd32e] cp $b jr z, .asm_ca68 - get_flag_value EVENT_RECEIVED_LEGEND_CARDS + get_flag_value EVENT_RECEIVED_LEGENDARY_CARD or a jr nz, .asm_ca4a get_flag_value EVENT_FLAG_40 @@ -1626,7 +1626,7 @@ EventFlagMods: ; cb37 (3:4b37) flag_def $05, %00001111 ; EVENT_FLAG_1F flag_def $06, %11110000 ; EVENT_FLAG_20 flag_def $06, %00001100 ; EVENT_FLAG_21 - flag_def $06, %00000010 ; EVENT_RECEIVED_LEGEND_CARDS + flag_def $06, %00000010 ; EVENT_RECEIVED_LEGENDARY_CARD flag_def $06, %00000001 ; EVENT_FLAG_23 flag_def $07, %11000000 ; EVENT_FLAG_24 flag_def $07, %00100000 ; EVENT_FLAG_25 @@ -2683,11 +2683,11 @@ Func_d209: ; d209 (3:5209) ld a, [hl] call MaxOutEventFlag pop bc - ld hl, LegendCards + ld hl, LegendaryCards ld a, c jr asm_d1c6 -LegendCards: ; d234 (3:5234) +LegendaryCards: ; d234 (3:5234) db ZAPDOS3 tx Text03f0 db MOLTRES2 @@ -3187,7 +3187,7 @@ MasonLabCloseTextBox: ; d55e (3:555e) ; Lets you access the Challenge Machine if available MasonLabPressedA: ; d565 (3:5565) - get_flag_value EVENT_RECEIVED_LEGEND_CARDS + get_flag_value EVENT_RECEIVED_LEGENDARY_CARD or a ret z ld hl, ChallengeMachineObjectTable @@ -3500,7 +3500,7 @@ OWSequence_Ishihara: ; db4a (3:5b4a) db EVENT_FLAG_39 dw .ows_db5a run_script OWScript_JumpIfFlagNonzero2 - db EVENT_RECEIVED_LEGEND_CARDS + db EVENT_RECEIVED_LEGENDARY_CARD dw .ows_dc3e .ows_db5a run_script OWScript_JumpIfFlagNonzero2 @@ -3542,7 +3542,7 @@ OWSequence_Ishihara: ; db4a (3:5b4a) run_script OWScript_ZeroOutFlagValue db EVENT_FLAG_38 run_script OWScript_JumpIfFlagZero2 - db EVENT_RECEIVED_LEGEND_CARDS + db EVENT_RECEIVED_LEGENDARY_CARD dw .ows_db8d run_script OWScript_MaxOutFlagValue db EVENT_FLAG_39 @@ -3717,7 +3717,7 @@ OWSequence_Ishihara: ; db4a (3:5b4a) tx Text073e Preload_Ronald1InIshiharasHouse: ; dc43 (3:5c43) - get_flag_value EVENT_RECEIVED_LEGEND_CARDS + get_flag_value EVENT_RECEIVED_LEGENDARY_CARD cp $01 ccf ret @@ -5389,7 +5389,7 @@ OWSequence_Chap5: ; f0b0 (3:70b0) Preload_ChallengeHallLobbyRonald1: ; f0b4 (3:70b4) zero_flag_value2 EVENT_FLAG_58 - get_flag_value EVENT_RECEIVED_LEGEND_CARDS + get_flag_value EVENT_RECEIVED_LEGENDARY_CARD or a jr nz, .asm_f0ff get_flag_value EVENT_FLAG_59 @@ -6310,10 +6310,10 @@ HallOfHonorLoadMap: ; fbdb (3:7bdb) OWSequence_fbf1: ; fbf1 (3:7bf1) start_script run_script OWScript_JumpIfFlagNonzero2 - db EVENT_RECEIVED_LEGEND_CARDS + db EVENT_RECEIVED_LEGENDARY_CARD dw .ows_fc10 run_script OWScript_MaxOutFlagValue - db EVENT_RECEIVED_LEGEND_CARDS + db EVENT_RECEIVED_LEGENDARY_CARD run_script Func_ccdc tx Text05b8 run_script OWScript_GiveCard diff --git a/src/engine/home.asm b/src/engine/home.asm index 094127e..24cb61d 100644 --- a/src/engine/home.asm +++ b/src/engine/home.asm @@ -10800,7 +10800,7 @@ GameEvent_Credits: ; 3911 (0:3911) ret Func_3917: ; 3917 (0:3917) - ld a, EVENT_RECEIVED_LEGEND_CARDS + ld a, EVENT_RECEIVED_LEGENDARY_CARD farcall GetEventFlagValue call EnableSRAM ld [s0a00a], a |