From 5fef0da5ab7e001aab3f082380898144b5e90122 Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Thu, 18 Aug 2016 11:47:42 -0400 Subject: remerge local work --- data/contest_ai_scripts.s | 50 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 49 insertions(+), 1 deletion(-) (limited to 'data') diff --git a/data/contest_ai_scripts.s b/data/contest_ai_scripts.s index 82b7a2255..0dadd457e 100644 --- a/data/contest_ai_scripts.s +++ b/data/contest_ai_scripts.s @@ -5,4 +5,52 @@ .align 2 gUnknown_081DC118:: @ 81DC118 - .incbin "baserom.gba", 0x001dc118, 0x9dc + .4byte Unknown_081DC7FB + .4byte Unknown_081DC348 + .4byte Unknown_081DC27F + .4byte Unknown_081DC2AB + .4byte Unknown_081DCA4C + .4byte Unknown_081DC3C7 + .4byte Unknown_081DC7DE + .4byte Unknown_081DCAF3 + .4byte Unknown_081DCAF3 + .4byte Unknown_081DCAF3 + .4byte Unknown_081DCAF3 + .4byte Unknown_081DCAF3 + .4byte Unknown_081DCAF3 + .4byte Unknown_081DCAF3 + .4byte Unknown_081DCAF3 + .4byte Unknown_081DCAF3 + .4byte Unknown_081DCAF3 + .4byte Unknown_081DCAF3 + .4byte Unknown_081DCAF3 + .4byte Unknown_081DCAF3 + .4byte Unknown_081DCAF3 + .4byte Unknown_081DCAF3 + .4byte Unknown_081DCAF3 + .4byte Unknown_081DCAF3 + .4byte Unknown_081DCAF3 + .4byte Unknown_081DCAF3 + .4byte Unknown_081DCAF3 + .4byte Unknown_081DCAF3 + .4byte Unknown_081DCAF3 + .4byte Unknown_081DCAF3 + .4byte Unknown_081DCAF3 + .4byte Unknown_081DCAF3 + .incbin "baserom.gba", 0x001dc198, 0xE7 @ unreferenced? +Unknown_081DC27F: + .incbin "baserom.gba", 0x001dc27f, 0x2C @ figured out +Unknown_081DC2AB: + .incbin "baserom.gba", 0x001dc2ab, 0x9D +Unknown_081DC348: + .incbin "baserom.gba", 0x001dc348, 0x7F @ figured out +Unknown_081DC3C7: + .incbin "baserom.gba", 0x001dc3c7, 0x417 +Unknown_081DC7DE: + .incbin "baserom.gba", 0x001dc7de, 0x1D @ figured out +Unknown_081DC7FB: + .incbin "baserom.gba", 0x001dc7fb, 0x251 +Unknown_081DCA4C: + .incbin "baserom.gba", 0x001dca4c, 0xA7 +Unknown_081DCAF3: + .incbin "baserom.gba", 0x001dcaf3, 0x1 @ figured out -- cgit v1.2.3 From 4926608100eb07801876c0a53bfc1ee41d010ec0 Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Thu, 18 Aug 2016 12:07:30 -0400 Subject: begin dissassembling contest AI bins and adding macros --- data/contest_ai_scripts.s | 37 +++++++++++++++++++++++++++++++++---- 1 file changed, 33 insertions(+), 4 deletions(-) (limited to 'data') diff --git a/data/contest_ai_scripts.s b/data/contest_ai_scripts.s index 0dadd457e..6ef4b3377 100644 --- a/data/contest_ai_scripts.s +++ b/data/contest_ai_scripts.s @@ -1,4 +1,5 @@ .include "asm/macros.s" + .include "asm/macros/contest_ai_script.s" .include "constants/constants.s" .section script_data, "aw", %progbits @@ -39,18 +40,46 @@ gUnknown_081DC118:: @ 81DC118 .4byte Unknown_081DCAF3 .incbin "baserom.gba", 0x001dc198, 0xE7 @ unreferenced? Unknown_081DC27F: - .incbin "baserom.gba", 0x001dc27f, 0x2C @ figured out + contest_28 0x03 AI_end_081DC27F + contest_3E 0x01 AI_score1_081DC27F + contest_3E 0x02 AI_score2_081DC27F + contest_3E 0x03 AI_score3_081DC27F + contest_3E 0x04 AI_score4_081DC27F + end +AI_score1_081DC27F: + score 0xFB + end +AI_score2_081DC27F: + score 0xF1 + end +AI_score3_081DC27F: + score 0xEC + end +AI_score4_081DC27F: + score 0xE7 + end +AI_end_081DC27F: + end Unknown_081DC2AB: .incbin "baserom.gba", 0x001dc2ab, 0x9D Unknown_081DC348: - .incbin "baserom.gba", 0x001dc348, 0x7F @ figured out + .incbin "baserom.gba", 0x001dc348, 0x7F Unknown_081DC3C7: .incbin "baserom.gba", 0x001dc3c7, 0x417 Unknown_081DC7DE: - .incbin "baserom.gba", 0x001dc7de, 0x1D @ figured out + contest_20 0x02 AI_contest7D_081DC7DE + contest_20 0x03 AI_contest7D_081DC7DE + contest_20 0x04 AI_contest7D_081DC7DE + end +AI_contest7D_081DC7DE: + contest_7D 0x7D AI_end_081DC7DE + score 0x0A + end +AI_end_081DC7DE: + end Unknown_081DC7FB: .incbin "baserom.gba", 0x001dc7fb, 0x251 Unknown_081DCA4C: .incbin "baserom.gba", 0x001dca4c, 0xA7 Unknown_081DCAF3: - .incbin "baserom.gba", 0x001dcaf3, 0x1 @ figured out + end -- cgit v1.2.3 From 776ca47287ae5944bfe94568fa27907c052e310c Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Thu, 18 Aug 2016 12:26:49 -0400 Subject: dissassemble 7F contest AI bin --- data/contest_ai_scripts.s | 45 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 44 insertions(+), 1 deletion(-) (limited to 'data') diff --git a/data/contest_ai_scripts.s b/data/contest_ai_scripts.s index 6ef4b3377..560a43b7c 100644 --- a/data/contest_ai_scripts.s +++ b/data/contest_ai_scripts.s @@ -63,7 +63,50 @@ AI_end_081DC27F: Unknown_081DC2AB: .incbin "baserom.gba", 0x001dc2ab, 0x9D Unknown_081DC348: - .incbin "baserom.gba", 0x001dc348, 0x7F + contest_47 AI_score_081DC348 + contest_80 AI_contest3F_081DC348 + contest_80 AI_contest45_081DC348 + end +AI_contest3F_081DC348: + contest_3F 0x00 AI_end_081DC348 + contest_42 AI_end_081DC348 + contest_0E 0x00 AI_contest04_1_081DC348 + contest_0E 0x01 AI_contest04_2_081DC348 + contest_0E 0x02 AI_contest04_3_081DC348 + contest_0E 0x03 AI_contest04_4_081DC348 + end +AI_contest45_081DC348: + contest_45 AI_end_081DC348 + score 0xF6 + end +AI_score_081DC348: + score 0x19 + end +AI_contest04_1_081DC348: + contest_04 0x04 AI_contest7D_081DC348 + contest_7D 0x96 AI_end_081DC348 + score 0x0A + end +AI_contest04_2_081DC348: + contest_04 0x04 AI_contest7D_081DC348 + contest_7D 0x7D AI_end_081DC348 + score 0x0A + end +AI_contest04_3_081DC348: + contest_04 0x04 AI_contest7D_081DC348 + contest_7D 0x32 AI_end_081DC348 + score 0x0A + end +AI_contest04_4_081DC348: + contest_04 0x04 AI_contest7D_081DC348 + score 0x0A + end +AI_contest7D_081DC348: + contest_7D 0x7D AI_end_081DC348 + score 0xF1 + end +AI_end_081DC348: + end Unknown_081DC3C7: .incbin "baserom.gba", 0x001dc3c7, 0x417 Unknown_081DC7DE: -- cgit v1.2.3 From d18c1d4fab8f2c73a82ff2d162ac9f3a1e00ddc4 Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Thu, 18 Aug 2016 13:59:41 -0400 Subject: dissassemble 9D contest AI bin --- data/contest_ai_scripts.s | 56 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 55 insertions(+), 1 deletion(-) (limited to 'data') diff --git a/data/contest_ai_scripts.s b/data/contest_ai_scripts.s index 560a43b7c..d4acbaab8 100644 --- a/data/contest_ai_scripts.s +++ b/data/contest_ai_scripts.s @@ -61,7 +61,61 @@ AI_score4_081DC27F: AI_end_081DC27F: end Unknown_081DC2AB: - .incbin "baserom.gba", 0x001dc2ab, 0x9D + contest_23 0x00 AI_contest09_081DC2AB + contest_25 0x00 AI_contest7D_4_081DC2AB + contest_25 0x01 AI_contest3D_081DC2AB + end +AI_contest09_081DC2AB: + contest_09 0x04 AI_contest0F_1_081DC2AB + contest_09 0x03 AI_contest0F_2_081DC2AB + contest_83 AI_end_081DC2AB + score 0x0F + end +AI_contest0F_1_081DC2AB: + contest_0F 0x00 AI_contest7D_1_081DC2AB + contest_7D 0x33 AI_end_081DC2AB + score 0x14 + end +AI_contest7D_1_081DC2AB: + contest_7D 0x7F AI_end_081DC2AB + score 0xF6 + end +AI_contest0F_2_081DC2AB: + contest_0F 0x00 AI_contest7D_3_081DC2AB + contest_04 0x04 AI_score_081DC2AB +AI_contest7D_2_081DC2AB: + contest_7D 0x33 AI_end_081DC2AB + score 0x0A + end +AI_score_081DC2AB: + score 0x0F + end +AI_contest7D_3_081DC2AB: + contest_7D 0x7F AI_end_081DC2AB + score 0x0A + end +AI_contest7D_4_081DC2AB: + contest_7D 0x7F AI_end_081DC2AB + score 0x0A + end +AI_contest3D_081DC2AB: + contest_3D 0x00 AI_contest29_081DC2AB + contest_0F 0x00 AI_contest7D_5_081DC2AB + contest_0A 0x04 AI_contest7D_5_081DC2AB + score 0x1E + end +AI_contest7D_5_081DC2AB: + contest_7D 0x64 AI_end_081DC2AB + score 0x0A + end +AI_contest29_081DC2AB: + contest_29 0x03 AI_end_081DC2AB + contest_0F 0x00 AI_contest7D_5_081DC2AB + contest_0A 0x04 AI_contest7D_5_081DC2AB + score 0x1E + end +AI_end_081DC2AB: + end Unknown_081DC348: contest_47 AI_score_081DC348 contest_80 AI_contest3F_081DC348 -- cgit v1.2.3 From 1c85f2b06dc0e695070db5f3edc4490ac3ce016e Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Thu, 18 Aug 2016 14:35:13 -0400 Subject: split 417 contest AI incbin --- data/contest_ai_scripts.s | 52 +++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 50 insertions(+), 2 deletions(-) (limited to 'data') diff --git a/data/contest_ai_scripts.s b/data/contest_ai_scripts.s index d4acbaab8..4a3a9be04 100644 --- a/data/contest_ai_scripts.s +++ b/data/contest_ai_scripts.s @@ -39,8 +39,9 @@ gUnknown_081DC118:: @ 81DC118 .4byte Unknown_081DCAF3 .4byte Unknown_081DCAF3 .incbin "baserom.gba", 0x001dc198, 0xE7 @ unreferenced? + Unknown_081DC27F: - contest_28 0x03 AI_end_081DC27F + if_effect 3, AI_end_081DC27F contest_3E 0x01 AI_score1_081DC27F contest_3E 0x02 AI_score2_081DC27F contest_3E 0x03 AI_score3_081DC27F @@ -60,6 +61,7 @@ AI_score4_081DC27F: end AI_end_081DC27F: end + Unknown_081DC2AB: contest_23 0x00 AI_contest09_081DC2AB contest_25 0x00 AI_contest7D_4_081DC2AB @@ -116,6 +118,7 @@ AI_contest29_081DC2AB: end AI_end_081DC2AB: end + Unknown_081DC348: contest_47 AI_score_081DC348 contest_80 AI_contest3F_081DC348 @@ -161,8 +164,50 @@ AI_contest7D_081DC348: end AI_end_081DC348: end + Unknown_081DC3C7: - .incbin "baserom.gba", 0x001dc3c7, 0x417 + if_effect 39, ContestEffect39 + if_effect 40, ContestEffect40 + if_effect 41, ContestEffect41 + if_effect 3, ContestEffect3 + if_effect 38, ContestEffect38 + if_effect 47, ContestEffect47 + if_effect 31, ContestEffect31 + if_effect 32, ContestEffect32 + if_effect 46, ContestEffect46 + if_effect 27, ContestEffect27 + if_effect 16, ContestEffect16or17 + if_effect 17, ContestEffect16or17 + if_effect 26, ContestEffect26 + if_effect 18, ContestEffect18 + end +ContestEffect39: + .incbin "baserom.gba", 0x001dc41c, 0x31 +ContestEffect40: + .incbin "baserom.gba", 0x001dc44d, 0x10 +ContestEffect41: + .incbin "baserom.gba", 0x001dc45d, 0x10 +ContestEffect3: + .incbin "baserom.gba", 0x001dc46d, 0x2A +ContestEffect38: + .incbin "baserom.gba", 0x001dc497, 0x40 +ContestEffect47: + .incbin "baserom.gba", 0x001dc4d7, 0x2F +ContestEffect31: + .incbin "baserom.gba", 0x001dc506, 0x1C +ContestEffect32: + .incbin "baserom.gba", 0x001dc522, 0x61 +ContestEffect46: + .incbin "baserom.gba", 0x001dc583, 0x44 +ContestEffect27: + .incbin "baserom.gba", 0x001dc5c7, 0xF9 +ContestEffect16or17: + .incbin "baserom.gba", 0x001dc6c0, 0x72 +ContestEffect26: + .incbin "baserom.gba", 0x001dc732, 0x60 +ContestEffect18: + .incbin "baserom.gba", 0x001dc792, 0x4C + Unknown_081DC7DE: contest_20 0x02 AI_contest7D_081DC7DE contest_20 0x03 AI_contest7D_081DC7DE @@ -174,9 +219,12 @@ AI_contest7D_081DC7DE: end AI_end_081DC7DE: end + Unknown_081DC7FB: .incbin "baserom.gba", 0x001dc7fb, 0x251 + Unknown_081DCA4C: .incbin "baserom.gba", 0x001dca4c, 0xA7 + Unknown_081DCAF3: end -- cgit v1.2.3 From 885faf807b3cad840afedc9a87605f2ba2bba6d4 Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Thu, 18 Aug 2016 15:18:30 -0400 Subject: dissassemble some contest move bins --- data/contest_ai_scripts.s | 64 +++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 59 insertions(+), 5 deletions(-) (limited to 'data') diff --git a/data/contest_ai_scripts.s b/data/contest_ai_scripts.s index 4a3a9be04..285a030ec 100644 --- a/data/contest_ai_scripts.s +++ b/data/contest_ai_scripts.s @@ -181,32 +181,86 @@ Unknown_081DC3C7: if_effect 26, ContestEffect26 if_effect 18, ContestEffect18 end + ContestEffect39: - .incbin "baserom.gba", 0x001dc41c, 0x31 + contest_13 0x03 ContestEffect39_score1 + contest_13 0x02 ContestEffect39_score2 + contest_13 0x01 ContestEffect39_score3 + contest_13 0x00 ContestEffect39_score4 + end +ContestEffect39_score1: + score 0x14 + end +ContestEffect39_score2: + contest_7D 0x7D ContestEffectEnd + score 0x0F + end +ContestEffect39_score3: + contest_7D 0x7D ContestEffectEnd + score 0x05 + end +ContestEffect39_score4: + score 0xEC + end + ContestEffect40: - .incbin "baserom.gba", 0x001dc44d, 0x10 + contest_87 0x1D ContestEffectEnd + contest_7D 0x32 ContestEffectEnd + score 0x14 + end + ContestEffect41: - .incbin "baserom.gba", 0x001dc45d, 0x10 + contest_87 0x1E ContestEffectEnd + contest_7D 0x32 ContestEffectEnd + score 0x14 + end + ContestEffect3: - .incbin "baserom.gba", 0x001dc46d, 0x2A + contest_0F 0x03 ContestEffectEnd + contest_7D 0x32 ContestEffectEnd + score 0x0F + end + contest_04 0x04 ContestEffect3_7D + contest_7D 0xDC ContestEffect3_score + score 0x0A + end +ContestEffect3_7D: + contest_7D 0x14 ContestEffectEnd + score 0x0F + end +ContestEffect3_score: + score 0xEC + end + ContestEffect38: .incbin "baserom.gba", 0x001dc497, 0x40 + ContestEffect47: .incbin "baserom.gba", 0x001dc4d7, 0x2F + ContestEffect31: .incbin "baserom.gba", 0x001dc506, 0x1C + ContestEffect32: .incbin "baserom.gba", 0x001dc522, 0x61 + ContestEffect46: .incbin "baserom.gba", 0x001dc583, 0x44 + ContestEffect27: .incbin "baserom.gba", 0x001dc5c7, 0xF9 + ContestEffect16or17: .incbin "baserom.gba", 0x001dc6c0, 0x72 + ContestEffect26: .incbin "baserom.gba", 0x001dc732, 0x60 + ContestEffect18: - .incbin "baserom.gba", 0x001dc792, 0x4C + .incbin "baserom.gba", 0x001dc792, 0x4B + +ContestEffectEnd: + end Unknown_081DC7DE: contest_20 0x02 AI_contest7D_081DC7DE -- cgit v1.2.3 From 00c507450704014347f7f30081ef901795ea9a62 Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Thu, 18 Aug 2016 15:41:19 -0400 Subject: dissassemble 2F contest AI bin --- data/contest_ai_scripts.s | 67 +++++++++++++++++++++++++++++++---------------- 1 file changed, 44 insertions(+), 23 deletions(-) (limited to 'data') diff --git a/data/contest_ai_scripts.s b/data/contest_ai_scripts.s index 285a030ec..3947b5cb2 100644 --- a/data/contest_ai_scripts.s +++ b/data/contest_ai_scripts.s @@ -75,29 +75,29 @@ AI_contest09_081DC2AB: end AI_contest0F_1_081DC2AB: contest_0F 0x00 AI_contest7D_1_081DC2AB - contest_7D 0x33 AI_end_081DC2AB + if_random 0x33 AI_end_081DC2AB score 0x14 end AI_contest7D_1_081DC2AB: - contest_7D 0x7F AI_end_081DC2AB + if_random 0x7F AI_end_081DC2AB score 0xF6 end AI_contest0F_2_081DC2AB: contest_0F 0x00 AI_contest7D_3_081DC2AB contest_04 0x04 AI_score_081DC2AB AI_contest7D_2_081DC2AB: - contest_7D 0x33 AI_end_081DC2AB + if_random 0x33 AI_end_081DC2AB score 0x0A end AI_score_081DC2AB: score 0x0F end AI_contest7D_3_081DC2AB: - contest_7D 0x7F AI_end_081DC2AB + if_random 0x7F AI_end_081DC2AB score 0x0A end AI_contest7D_4_081DC2AB: - contest_7D 0x7F AI_end_081DC2AB + if_random 0x7F AI_end_081DC2AB score 0x0A end AI_contest3D_081DC2AB: @@ -107,7 +107,7 @@ AI_contest3D_081DC2AB: score 0x1E end AI_contest7D_5_081DC2AB: - contest_7D 0x64 AI_end_081DC2AB + if_random 0x64 AI_end_081DC2AB score 0x0A end AI_contest29_081DC2AB: @@ -141,17 +141,17 @@ AI_score_081DC348: end AI_contest04_1_081DC348: contest_04 0x04 AI_contest7D_081DC348 - contest_7D 0x96 AI_end_081DC348 + if_random 0x96 AI_end_081DC348 score 0x0A end AI_contest04_2_081DC348: contest_04 0x04 AI_contest7D_081DC348 - contest_7D 0x7D AI_end_081DC348 + if_random 0x7D AI_end_081DC348 score 0x0A end AI_contest04_3_081DC348: contest_04 0x04 AI_contest7D_081DC348 - contest_7D 0x32 AI_end_081DC348 + if_random 0x32 AI_end_081DC348 score 0x0A end AI_contest04_4_081DC348: @@ -159,7 +159,7 @@ AI_contest04_4_081DC348: score 0x0A end AI_contest7D_081DC348: - contest_7D 0x7D AI_end_081DC348 + if_random 0x7D AI_end_081DC348 score 0xF1 end AI_end_081DC348: @@ -183,20 +183,20 @@ Unknown_081DC3C7: end ContestEffect39: - contest_13 0x03 ContestEffect39_score1 - contest_13 0x02 ContestEffect39_score2 - contest_13 0x01 ContestEffect39_score3 - contest_13 0x00 ContestEffect39_score4 + if_user_condition 0x03 ContestEffect39_score1 + if_user_condition 0x02 ContestEffect39_score2 + if_user_condition 0x01 ContestEffect39_score3 + if_user_condition 0x00 ContestEffect39_score4 end ContestEffect39_score1: score 0x14 end ContestEffect39_score2: - contest_7D 0x7D ContestEffectEnd + if_random 0x7D ContestEffectEnd score 0x0F end ContestEffect39_score3: - contest_7D 0x7D ContestEffectEnd + if_random 0x7D ContestEffectEnd score 0x05 end ContestEffect39_score4: @@ -205,27 +205,27 @@ ContestEffect39_score4: ContestEffect40: contest_87 0x1D ContestEffectEnd - contest_7D 0x32 ContestEffectEnd + if_random 0x32 ContestEffectEnd score 0x14 end ContestEffect41: contest_87 0x1E ContestEffectEnd - contest_7D 0x32 ContestEffectEnd + if_random 0x32 ContestEffectEnd score 0x14 end ContestEffect3: contest_0F 0x03 ContestEffectEnd - contest_7D 0x32 ContestEffectEnd + if_random 0x32 ContestEffectEnd score 0x0F end contest_04 0x04 ContestEffect3_7D - contest_7D 0xDC ContestEffect3_score + if_random 0xDC ContestEffect3_score score 0x0A end ContestEffect3_7D: - contest_7D 0x14 ContestEffectEnd + if_random 0x14 ContestEffectEnd score 0x0F end ContestEffect3_score: @@ -233,7 +233,28 @@ ContestEffect3_score: end ContestEffect38: - .incbin "baserom.gba", 0x001dc497, 0x40 + contest_87 0x27 ContestEffect38_contest04 + if_user_condition 0x03 ContestEffect38_score1 + if_random 0x32 ContestEffectEnd + score 0x0F + end +ContestEffect38_score1: + score 0xF6 + end +ContestEffect38_contest04: + contest_04 0x04 ContestEffect38_score2 + contest_04 0x00 ContestEffect38_random + contest_3E 0x01 ContestEffectEnd + if_random 0x7D ContestEffectEnd + score 0x0A + end +ContestEffect38_random: + if_random 0x64 ContestEffectEnd + score 0x0A + end +ContestEffect38_score2: + score 0xF6 + end ContestEffect47: .incbin "baserom.gba", 0x001dc4d7, 0x2F @@ -268,7 +289,7 @@ Unknown_081DC7DE: contest_20 0x04 AI_contest7D_081DC7DE end AI_contest7D_081DC7DE: - contest_7D 0x7D AI_end_081DC7DE + if_random 0x7D AI_end_081DC7DE score 0x0A end AI_end_081DC7DE: -- cgit v1.2.3 From a4252cf0c009751e29d676d4234b9968592069be Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Thu, 18 Aug 2016 15:59:17 -0400 Subject: more labeling and split x251 bin partially --- data/contest_ai_scripts.s | 46 ++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 40 insertions(+), 6 deletions(-) (limited to 'data') diff --git a/data/contest_ai_scripts.s b/data/contest_ai_scripts.s index 3947b5cb2..79fa3e4e5 100644 --- a/data/contest_ai_scripts.s +++ b/data/contest_ai_scripts.s @@ -42,10 +42,10 @@ gUnknown_081DC118:: @ 81DC118 Unknown_081DC27F: if_effect 3, AI_end_081DC27F - contest_3E 0x01 AI_score1_081DC27F - contest_3E 0x02 AI_score2_081DC27F - contest_3E 0x03 AI_score3_081DC27F - contest_3E 0x04 AI_score4_081DC27F + if_move_used_count_eq 1 AI_score1_081DC27F + if_move_used_count_eq 2 AI_score2_081DC27F + if_move_used_count_eq 3 AI_score3_081DC27F + if_move_used_count_eq 4 AI_score4_081DC27F end AI_score1_081DC27F: score 0xFB @@ -244,7 +244,7 @@ ContestEffect38_score1: ContestEffect38_contest04: contest_04 0x04 ContestEffect38_score2 contest_04 0x00 ContestEffect38_random - contest_3E 0x01 ContestEffectEnd + if_move_used_count_eq 1 ContestEffectEnd if_random 0x7D ContestEffectEnd score 0x0A end @@ -296,7 +296,41 @@ AI_end_081DC7DE: end Unknown_081DC7FB: - .incbin "baserom.gba", 0x001dc7fb, 0x251 + if_effect 8, 0x081dc8c2 + if_effect 10, 0x081dc8c2 + if_effect 12, 0x081dc8c2 + if_effect 14, 0x081dc8c2 + if_effect 32, 0x081dc8c2 + if_effect 35, 0x081dc8c2 + if_effect 36, 0x081dc8c2 + if_effect 37, 0x081dc8c2 + if_effect 9, 0x081dc8f9 + if_effect 11, 0x081dc8f9 + if_effect 13, 0x081dc8f9 + if_effect 15, 0x081dc8f9 + if_effect 17, 0x081dc8f9 + if_effect 16, 0x081dc8f9 + if_effect 18, 0x081dc8f9 + if_effect 19, 0x081dc8f9 + if_effect 45, 0x081dc8f9 + if_effect 20, 0x081dc8f9 + if_effect 21, 0x081dc8f9 + if_effect 22, 0x081dc8f9 + if_effect 23, 0x081dc8f9 + if_effect 24, 0x081dc8f9 + if_effect 28, 0x081dc8f9 + if_effect 27, 0x081dc8f9 + if_effect 31, 0x081dc8f9 + if_effect 25, 0x081dc942 + if_effect 26, 0x081dc972 + if_effect 47, 0x081dc972 + if_effect 38, 0x081dc9b4 + if_effect 4, 0x081dc9bd + if_effect 5, 0x081dc9bd + if_effect 6, 0x081dc9bd + if_effect 2, 0x081dc9ff + end + .incbin "baserom.gba", 0x001dc8c2, 0x18A Unknown_081DCA4C: .incbin "baserom.gba", 0x001dca4c, 0xA7 -- cgit v1.2.3 From f321d4576f0fbc89abbfaac5a63ee018e806c808 Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Thu, 18 Aug 2016 16:45:36 -0400 Subject: actually dissassemble 2F contest AI bin --- data/contest_ai_scripts.s | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'data') diff --git a/data/contest_ai_scripts.s b/data/contest_ai_scripts.s index 79fa3e4e5..ac2263965 100644 --- a/data/contest_ai_scripts.s +++ b/data/contest_ai_scripts.s @@ -257,7 +257,18 @@ ContestEffect38_score2: end ContestEffect47: - .incbin "baserom.gba", 0x001dc4d7, 0x2F + if_move_used_count_eq 1 ContestEffectEnd + contest_0E 0x00 ContestEffect47_random + contest_0E 0x01 ContestEffect47_random + contest_05 0x04 ContestEffectEnd + contest_83 ContestEffectEnd + contest_07 0x01 ContestEffectEnd + score 0x0A + end +ContestEffect47_random: + if_random 0x7F ContestEffectEnd + score 0x0A + end ContestEffect31: .incbin "baserom.gba", 0x001dc506, 0x1C -- cgit v1.2.3 From 30871487fea3fa41bc25a806d0c4f7648649114b Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 18 Aug 2016 19:54:40 -0400 Subject: Why in Arceus' name is this a 4-byte incbin? --- data/text/battle_strings.s | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'data') diff --git a/data/text/battle_strings.s b/data/text/battle_strings.s index e8baa88ab..e9195e261 100644 --- a/data/text/battle_strings.s +++ b/data/text/battle_strings.s @@ -1860,8 +1860,7 @@ gUnknown_0840164C:: @ 840164C .2byte BATTLE_TEXT_SubTookDamage .2byte BATTLE_TEXT_CoinScatter .2byte BATTLE_TEXT_SandTombTrapped - - .incbin "baserom.gba", 0x401658, 0x4 + .2byte 0xFFFF .align 2 gUnknown_0840165C:: @ 840165C -- cgit v1.2.3 From 1fa7a88497e949d01c8a8cb7577c30c397b367c1 Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Thu, 18 Aug 2016 20:51:03 -0400 Subject: forgot to commit current work i guess --- data/contest_ai_scripts.s | 50 +++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 48 insertions(+), 2 deletions(-) (limited to 'data') diff --git a/data/contest_ai_scripts.s b/data/contest_ai_scripts.s index ac2263965..6933056f0 100644 --- a/data/contest_ai_scripts.s +++ b/data/contest_ai_scripts.s @@ -271,10 +271,56 @@ ContestEffect47_random: end ContestEffect31: - .incbin "baserom.gba", 0x001dc506, 0x1C + contest_0E 0x01 ContestEffect31_score1 + contest_0E 0x02 ContestEffect31_score2 + contest_0E 0x03 ContestEffect31_score3 + end +ContestEffect31_score1: + score 0x05 + end +ContestEffect31_score2: + score 0x0F + end +ContestEffect31_score3: + score 0x14 + end ContestEffect32: - .incbin "baserom.gba", 0x001dc522, 0x61 + contest_0E 0x00 ContestEffect32_score1 + contest_0E 0x01 ContestEffect32_score2 + contest_0E 0x02 ContestEffect32_score3 + contest_0E 0x03 ContestEffect32_score5 + end +ContestEffect32_score1: + score 0xF6 + end +ContestEffect32_score2: + contest_55 0x00 ContestEffectEnd + score 0x05 + end +ContestEffect32_score3: + contest_55 0x00 ContestEffect32_score4 + score 0x05 + contest_7F ContestEffect32_score4 + end +ContestEffect32_score4: + contest_55 0x01 ContestEffectEnd + score 0x05 + end +ContestEffect32_score5: + contest_55 0x00 ContestEffect32_score6 + score 0x05 + contest_7F ContestEffect32_score6 + end +ContestEffect32_score6: + contest_55 0x01 ContestEffect32_score7 + score 0x05 + contest_7F ContestEffect32_score7 + end +ContestEffect32_score7: + contest_55 0x02 ContestEffectEnd + score 0x05 + end ContestEffect46: .incbin "baserom.gba", 0x001dc583, 0x44 -- cgit v1.2.3 From 6154331167c8c059e4ed50b718f33599ba70a2c0 Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Thu, 18 Aug 2016 23:13:07 -0400 Subject: finish dissassembling x417 contest AI bin --- data/contest_ai_scripts.s | 190 ++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 183 insertions(+), 7 deletions(-) (limited to 'data') diff --git a/data/contest_ai_scripts.s b/data/contest_ai_scripts.s index 6933056f0..c33c8808d 100644 --- a/data/contest_ai_scripts.s +++ b/data/contest_ai_scripts.s @@ -70,7 +70,7 @@ Unknown_081DC2AB: AI_contest09_081DC2AB: contest_09 0x04 AI_contest0F_1_081DC2AB contest_09 0x03 AI_contest0F_2_081DC2AB - contest_83 AI_end_081DC2AB + if_user_has_exciting_move AI_end_081DC2AB score 0x0F end AI_contest0F_1_081DC2AB: @@ -261,7 +261,7 @@ ContestEffect47: contest_0E 0x00 ContestEffect47_random contest_0E 0x01 ContestEffect47_random contest_05 0x04 ContestEffectEnd - contest_83 ContestEffectEnd + if_user_has_exciting_move ContestEffectEnd contest_07 0x01 ContestEffectEnd score 0x0A end @@ -323,19 +323,195 @@ ContestEffect32_score7: end ContestEffect46: - .incbin "baserom.gba", 0x001dc583, 0x44 + contest_0E 0x00 ContestEffect46_05 + contest_0D 0x00 ContestEffect46_score4 + end +ContestEffect46_05: + contest_05 0x00 ContestEffect46_score1 + contest_09 0x04 ContestEffect46_score2 + contest_09 0x03 ContestEffect46_score3 + end +ContestEffect46_score1: + if_random 0x7D ContestEffectEnd + score 0xF1 + end +ContestEffect46_score2: + if_random 0x7D ContestEffectEnd + score 0x14 + end +ContestEffect46_score3: + if_random 0x7D ContestEffectEnd + score 0x0F + end +ContestEffect46_score4: + if_random 0xB2 ContestEffectEnd + score 0x0A + end ContestEffect27: - .incbin "baserom.gba", 0x001dc5c7, 0xF9 + contest_0E 0x00 ContestEffectEnd + contest_7F ContestEffect27_55_1 + end +ContestEffect27_55_1: + contest_55 0x00 ContestEffect27_noscore + contest_4C 0x00 0x00 ContestEffect27_noscore + contest_4C 0x00 0x01 ContestEffect27_score1 + contest_4C 0x00 0x02 ContestEffect27_score2 + contest_4C 0x00 0x03 ContestEffect27_score3 + end +ContestEffect27_score1: + if_random 0x7D ContestEffect27_55_2 + score 0x05 + contest_0D 0x01 ContestEffect27_55_2 + end +ContestEffect27_score2: + if_random 0x7D ContestEffect27_55_2 + score 0x0A + contest_0D 0x01 ContestEffect27_55_2 + end +ContestEffect27_score3: + if_random 0x7D ContestEffect27_55_2 + score 0x0F + contest_0D 0x01 ContestEffect27_55_2 + end +ContestEffect27_noscore: + contest_0D 0x01 ContestEffect27_55_2 + end +ContestEffect27_55_2: + contest_55 0x01 ContestEffect27_noscore2 + contest_4C 0x01 0x00 ContestEffect27_noscore2 + contest_4C 0x01 0x01 ContestEffect27_score4 + contest_4C 0x01 0x02 ContestEffect27_score5 + contest_4C 0x01 0x03 ContestEffect27_score6 + end +ContestEffect27_score4: + if_random 0x7D ContestEffect27_55_3 + score 0x05 + contest_0D 0x02 ContestEffect27_55_3 + end +ContestEffect27_score5: + if_random 0x7D ContestEffect27_55_3 + score 0x0A + contest_0D 0x02 ContestEffect27_55_3 + end +ContestEffect27_score6: + if_random 0x7D ContestEffect27_55_3 + score 0x0F + contest_0D 0x02 ContestEffect27_55_3 + end +ContestEffect27_noscore2: + contest_0D 0x02 ContestEffect27_55_3 + end +ContestEffect27_55_3: + contest_55 0x02 ContestEffect27_end + contest_4C 0x02 0x00 ContestEffect27_end + contest_4C 0x02 0x01 ContestEffect27_score7 + contest_4C 0x02 0x02 ContestEffect27_score8 + contest_4C 0x02 0x03 ContestEffect27_score9 + end +ContestEffect27_score7: + if_random 0x7D ContestEffectEnd + score 0x05 + end +ContestEffect27_score8: + if_random 0x7D ContestEffectEnd + score 0x0A + end +ContestEffect27_score9: + if_random 0x7D ContestEffectEnd + score 0x0F + end +ContestEffect27_end: + end ContestEffect16or17: - .incbin "baserom.gba", 0x001dc6c0, 0x72 + contest_0E 0x00 ContestEffectEnd + contest_7F ContestEffect16or17_55 + end +ContestEffect16or17_55: + contest_55 0x00 ContestEffect16or17_0E_1 + contest_51 0x00 0x01 ContestEffect16or17_0E_1 + if_random 0x7D ContestEffect16or17_0E_1 + score 0x02 + contest_58 0x00 ContestEffect16or17_0E_1 + score 0x08 + end +ContestEffect16or17_0E_1: + contest_0E 0x01 ContestEffectEnd + contest_55 0x01 ContestEffect16or17_0E_2 + contest_51 0x01 0x01 ContestEffect16or17_0E_2 + if_random 0x7D ContestEffect16or17_0E_2 + score 0x02 + contest_58 0x01 ContestEffect16or17_0E_2 + score 0x08 + end +ContestEffect16or17_0E_2: + contest_0E 0x02 ContestEffectEnd + contest_55 0x02 ContestEffectEnd + contest_51 0x02 0x01 ContestEffectEnd + if_random 0x7D ContestEffectEnd + score 0x02 + contest_58 0x02 ContestEffectEnd + score 0x08 + end ContestEffect26: - .incbin "baserom.gba", 0x001dc732, 0x60 + contest_0E 0x03 ContestEffectEnd + contest_7F ContestEffect26_55 + end +ContestEffect26_55: + contest_55 0x03 ContestEffect26_0E_1 + contest_51 0x03 0x00 ContestEffect26_0E_1 + score 0x05 + if_random 0x7D ContestEffect16or17_0E_1 + score 0x05 + end +ContestEffect26_0E_1: + contest_0E 0x02 ContestEffectEnd + contest_55 0x02 ContestEffect26_0E_2 + contest_51 0x02 0x00 ContestEffect26_0E_2 + score 0x05 + if_random 0x7D ContestEffect16or17_0E_2 + score 0x05 + end +ContestEffect26_0E_2: + contest_0E 0x01 ContestEffectEnd + contest_55 0x01 ContestEffectEnd + contest_51 0x01 0x00 ContestEffectEnd + score 0x05 + if_random 0x7D ContestEffectEnd + score 0x05 + end ContestEffect18: - .incbin "baserom.gba", 0x001dc792, 0x4B + contest_04 0x04 ContestEffect18_score1 + contest_7F ContestEffect18_0E + end +ContestEffect18_score1: + score 0x05 + contest_7F ContestEffect18_0E + end +ContestEffect18_0E: + contest_0E 0x00 ContestEffect18_score2 + contest_0E 0x01 ContestEffect18_random1 + contest_0E 0x02 ContestEffect18_random2 + contest_0E 0x03 ContestEffect18_random3 + end +ContestEffect18_score2: + score 0xF1 + end +ContestEffect18_random1: + if_random 0x7D ContestEffectEnd + score 0xF6 + end +ContestEffect18_random2: + if_random 0x7D ContestEffectEnd + score 0x05 + end +ContestEffect18_random3: + if_random 0x7D ContestEffectEnd + score 0x0F + end ContestEffectEnd: end -- cgit v1.2.3 From e04fccf80df96d7c63df6ca84d96d11783a9c4e0 Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Thu, 18 Aug 2016 23:42:22 -0400 Subject: dissassemble unused contest AI function --- data/contest_ai_scripts.s | 69 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 68 insertions(+), 1 deletion(-) (limited to 'data') diff --git a/data/contest_ai_scripts.s b/data/contest_ai_scripts.s index c33c8808d..23d232b47 100644 --- a/data/contest_ai_scripts.s +++ b/data/contest_ai_scripts.s @@ -38,7 +38,74 @@ gUnknown_081DC118:: @ 81DC118 .4byte Unknown_081DCAF3 .4byte Unknown_081DCAF3 .4byte Unknown_081DCAF3 - .incbin "baserom.gba", 0x001dc198, 0xE7 @ unreferenced? + + @ unreferenced + contest_05 0x00 ContestUnreferenced_80 + contest_29 0x26 ContestUnreferenced_80 + score 0x0A +ContestUnreferenced_80: + contest_80 ContestUnreferenced_0D + end +ContestUnreferenced_0D: + contest_0D 0x01 ContestUnreferenced_end + contest_2C 0x02 ContestUnreferenced_end + contest_2C 0x03 ContestUnreferenced_end + score 0x0A +ContestUnreferenced_end: + end + contest_04 0x00 ContestUnreferenced_0F_1 + contest_04 0x01 ContestUnreferenced_0F_2 + contest_04 0x02 ContestUnreferenced_0F_3 + contest_04 0x03 ContestUnreferenced_0F_4 + contest_04 0x04 ContestUnreferenced_0F_5 + end +ContestUnreferenced_0F_1: + contest_0F 0x00 ContestUnreferenced_2B_1 + contest_0F 0x01 ContestUnreferenced_2B_2 + contest_0F 0x02 ContestUnreferenced_2B_1 + contest_0F 0x03 ContestUnreferenced_2B_1 + end +ContestUnreferenced_2B_1: + contest_2B 0x01 ContestUnreferenced_score + end +ContestUnreferenced_2B_2: + contest_2B 0x01 ContestUnreferenced_score + end + contest_2B 0x01 ContestUnreferenced_score + end +ContestUnreferenced_0F_2: + contest_0F 0x00 ContestUnreferenced_2B_1 + contest_0F 0x01 ContestUnreferenced_2B_1 + contest_0F 0x02 ContestUnreferenced_2B_1 + contest_0F 0x03 ContestUnreferenced_2B_1 + end +ContestUnreferenced_0F_3: + contest_0F 0x00 ContestUnreferenced_2B_1 + contest_0F 0x01 ContestUnreferenced_2B_1 + contest_0F 0x02 ContestUnreferenced_2B_1 + contest_0F 0x03 ContestUnreferenced_2B_1 + end +ContestUnreferenced_0F_4: + contest_0F 0x00 ContestUnreferenced_2B_1 + contest_0F 0x01 ContestUnreferenced_2B_1 + contest_0F 0x02 ContestUnreferenced_2B_1 + contest_0F 0x03 ContestUnreferenced_2B_1 + end +ContestUnreferenced_0F_5: + contest_0F 0x00 ContestUnreferenced_2B_1 + contest_0F 0x01 ContestUnreferenced_2B_1 + contest_0F 0x02 ContestUnreferenced_2B_1 + contest_0F 0x03 ContestUnreferenced_2B_1 + end +ContestUnreferenced_score: + score 0x0A + end + end + contest_2E ContestUnreferenced_score2 + end +ContestUnreferenced_score2: + score 0x0A + end Unknown_081DC27F: if_effect 3, AI_end_081DC27F -- cgit v1.2.3 From 4cecd7174af83a6901e25451231d8801e57246b7 Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Fri, 19 Aug 2016 00:14:00 -0400 Subject: dump xA7 contest AI bin --- data/contest_ai_scripts.s | 67 +++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 65 insertions(+), 2 deletions(-) (limited to 'data') diff --git a/data/contest_ai_scripts.s b/data/contest_ai_scripts.s index 23d232b47..06403524b 100644 --- a/data/contest_ai_scripts.s +++ b/data/contest_ai_scripts.s @@ -630,10 +630,73 @@ Unknown_081DC7FB: if_effect 6, 0x081dc9bd if_effect 2, 0x081dc9ff end - .incbin "baserom.gba", 0x001dc8c2, 0x18A + .incbin "baserom.gba", 0x001dc8c2, 0x189 + +ContestEffectEnd2: + end Unknown_081DCA4C: - .incbin "baserom.gba", 0x001dca4c, 0xA7 + contest_0E 0x00 AI_effectcheck1_081DCA4C + contest_0E 0x01 AI_effectcheck2_081DCA4C + contest_0E 0x02 AI_effectcheck3_081DCA4C + contest_0E 0x03 AI_effectcheck4_081DCA4C + end +AI_effectcheck1_081DCA4C: + if_effect 0x1D AI_score1_081DCA4C + if_effect 0x21 AI_score2_081DCA4C + contest_2B 0x01 AI_random1_081DCA4C + end +AI_score1_081DCA4C: + score 0x0F + end +AI_score2_081DCA4C: + score 0xF1 + end +AI_random1_081DCA4C: + if_random 0x64 ContestEffectEnd2 + score 0x0A + end +AI_effectcheck2_081DCA4C: + if_effect 0x21 AI_score3_081DCA4C + contest_2B 0x01 AI_random2_081DCA4C + end +AI_score3_081DCA4C: + score 0xFB + end +AI_random2_081DCA4C: + if_random 0x7D ContestEffectEnd2 + score 0x0A + end +AI_effectcheck3_081DCA4C: + if_effect 0x21 AI_score4_081DCA4C + if_effect 0x1F AI_score4_081DCA4C + if_effect 0x01 AI_score4_081DCA4C + end +AI_score4_081DCA4C: + score 0x05 + end +AI_effectcheck4_081DCA4C: + if_effect 0x21 AI_score5_081DCA4C + if_effect 0x1E AI_score5_081DCA4C + if_effect 0x1F AI_score5_081DCA4C + if_effect 0x01 AI_score5_081DCA4C + if_effect 0x12 AI_score7_081DCA4C + contest_2B 0x01 AI_score6_081DCA4C + contest_2B 0x03 AI_random3_081DCA4C + end +AI_score5_081DCA4C: + score 0x0F + end +AI_score6_081DCA4C: + score 0xF6 + end +AI_random3_081DCA4C: + if_random 0x7D ContestEffectEnd2 + score 0x0A + end +AI_score7_081DCA4C: + score 0x05 + end Unknown_081DCAF3: end -- cgit v1.2.3 From d4dca2c3a55338cf8bdea03f3bc048d552963893 Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Fri, 19 Aug 2016 00:20:07 -0400 Subject: split second effect table bin --- data/contest_ai_scripts.s | 90 +++++++++++++++++++++++++++++------------------ 1 file changed, 55 insertions(+), 35 deletions(-) (limited to 'data') diff --git a/data/contest_ai_scripts.s b/data/contest_ai_scripts.s index 06403524b..015a00476 100644 --- a/data/contest_ai_scripts.s +++ b/data/contest_ai_scripts.s @@ -596,41 +596,61 @@ AI_end_081DC7DE: end Unknown_081DC7FB: - if_effect 8, 0x081dc8c2 - if_effect 10, 0x081dc8c2 - if_effect 12, 0x081dc8c2 - if_effect 14, 0x081dc8c2 - if_effect 32, 0x081dc8c2 - if_effect 35, 0x081dc8c2 - if_effect 36, 0x081dc8c2 - if_effect 37, 0x081dc8c2 - if_effect 9, 0x081dc8f9 - if_effect 11, 0x081dc8f9 - if_effect 13, 0x081dc8f9 - if_effect 15, 0x081dc8f9 - if_effect 17, 0x081dc8f9 - if_effect 16, 0x081dc8f9 - if_effect 18, 0x081dc8f9 - if_effect 19, 0x081dc8f9 - if_effect 45, 0x081dc8f9 - if_effect 20, 0x081dc8f9 - if_effect 21, 0x081dc8f9 - if_effect 22, 0x081dc8f9 - if_effect 23, 0x081dc8f9 - if_effect 24, 0x081dc8f9 - if_effect 28, 0x081dc8f9 - if_effect 27, 0x081dc8f9 - if_effect 31, 0x081dc8f9 - if_effect 25, 0x081dc942 - if_effect 26, 0x081dc972 - if_effect 47, 0x081dc972 - if_effect 38, 0x081dc9b4 - if_effect 4, 0x081dc9bd - if_effect 5, 0x081dc9bd - if_effect 6, 0x081dc9bd - if_effect 2, 0x081dc9ff - end - .incbin "baserom.gba", 0x001dc8c2, 0x189 + if_effect 8, ContestEffect2_8 + if_effect 10, ContestEffect2_8 + if_effect 12, ContestEffect2_8 + if_effect 14, ContestEffect2_8 + if_effect 32, ContestEffect2_8 + if_effect 35, ContestEffect2_8 + if_effect 36, ContestEffect2_8 + if_effect 37, ContestEffect2_8 + if_effect 9, ContestEffect2_9 + if_effect 11, ContestEffect2_9 + if_effect 13, ContestEffect2_9 + if_effect 15, ContestEffect2_9 + if_effect 17, ContestEffect2_9 + if_effect 16, ContestEffect2_9 + if_effect 18, ContestEffect2_9 + if_effect 19, ContestEffect2_9 + if_effect 45, ContestEffect2_9 + if_effect 20, ContestEffect2_9 + if_effect 21, ContestEffect2_9 + if_effect 22, ContestEffect2_9 + if_effect 23, ContestEffect2_9 + if_effect 24, ContestEffect2_9 + if_effect 28, ContestEffect2_9 + if_effect 27, ContestEffect2_9 + if_effect 31, ContestEffect2_9 + if_effect 25, ContestEffect2_25 + if_effect 26, ContestEffect2_26 + if_effect 47, ContestEffect2_26 + if_effect 38, ContestEffect2_38 + if_effect 4, ContestEffect2_4 + if_effect 5, ContestEffect2_4 + if_effect 6, ContestEffect2_4 + if_effect 2, ContestEffect2_2 + end + +ContestEffect2_8: + .incbin "baserom.gba", 0x001dc8c2, 0x37 + +ContestEffect2_9: + .incbin "baserom.gba", 0x001dc8f9, 0x49 + +ContestEffect2_25: + .incbin "baserom.gba", 0x001dc942, 0x30 + +ContestEffect2_26: + .incbin "baserom.gba", 0x001dc972, 0x42 + +ContestEffect2_38: + .incbin "baserom.gba", 0x001dc9b4, 0x9 + +ContestEffect2_4: + .incbin "baserom.gba", 0x001dc9bd, 0x42 + +ContestEffect2_2: + .incbin "baserom.gba", 0x001dc9ff, 0x4C ContestEffectEnd2: end -- cgit v1.2.3 From 1765f2d59b29b63fd9d56c81fe4751338aa51df2 Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Fri, 19 Aug 2016 00:50:28 -0400 Subject: finish dissassembling contest AI --- data/contest_ai_scripts.s | 136 +++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 129 insertions(+), 7 deletions(-) (limited to 'data') diff --git a/data/contest_ai_scripts.s b/data/contest_ai_scripts.s index 015a00476..fa2cf49b9 100644 --- a/data/contest_ai_scripts.s +++ b/data/contest_ai_scripts.s @@ -632,25 +632,147 @@ Unknown_081DC7FB: end ContestEffect2_8: - .incbin "baserom.gba", 0x001dc8c2, 0x37 + contest_0E 0x00 ContestEffect2_8_score1 + contest_0E 0x01 ContestEffect2_8_score2 + contest_0E 0x02 ContestEffect2_8_score3 + contest_0E 0x03 ContestEffect2_8_score4 + end +ContestEffect2_8_score1: + score 0xF6 + end +ContestEffect2_8_score2: + contest_54 0x00 ContestEffectEnd2 + score 0xF6 + end +ContestEffect2_8_score3: + contest_54 0x01 ContestEffectEnd2 + score 0xF6 + end +ContestEffect2_8_score4: + contest_54 0x02 ContestEffectEnd2 + score 0xF6 + end ContestEffect2_9: - .incbin "baserom.gba", 0x001dc8f9, 0x49 + contest_0E 0x00 ContestEffect2_9_score1 + contest_0E 0x01 ContestEffect2_9_score2 + contest_0E 0x02 ContestEffect2_9_score3 + contest_0E 0x03 ContestEffect2_9_score4 + end +ContestEffect2_9_score1: + score 0xEC + end +ContestEffect2_9_score2: + contest_54 0x00 ContestEffectEnd2 + score 0xF1 + end +ContestEffect2_9_score3: + contest_54 0x00 ContestEffectEnd2 + contest_54 0x01 ContestEffectEnd2 + score 0xF1 + end +ContestEffect2_9_score4: + contest_54 0x00 ContestEffectEnd2 + contest_54 0x01 ContestEffectEnd2 + contest_54 0x02 ContestEffectEnd2 + score 0xF1 + end ContestEffect2_25: - .incbin "baserom.gba", 0x001dc942, 0x30 + contest_0E 0x00 ContestEffect2_25_score1 + contest_0E 0x01 ContestEffect2_25_score2 + contest_0E 0x02 ContestEffect2_25_score3 + score 0xF6 + end +ContestEffect2_25_score1: + contest_54 0x01 ContestEffectEnd2 + score 0xF6 + end +ContestEffect2_25_score2: + contest_54 0x02 ContestEffectEnd2 + score 0xF6 + end +ContestEffect2_25_score3: + contest_54 0x03 ContestEffectEnd2 + score 0xF6 + end ContestEffect2_26: - .incbin "baserom.gba", 0x001dc972, 0x42 + contest_0E 0x00 ContestEffect2_26_score1 + contest_0E 0x01 ContestEffect2_26_score2 + contest_0E 0x02 ContestEffect2_26_score3 + score 0xF6 + end +ContestEffect2_26_score1: + contest_54 0x01 ContestEffectEnd2 + contest_54 0x02 ContestEffectEnd2 + contest_54 0x03 ContestEffectEnd2 + score 0xF6 + end +ContestEffect2_26_score2: + contest_54 0x02 ContestEffectEnd2 + contest_54 0x03 ContestEffectEnd2 + score 0xF6 + end +ContestEffect2_26_score3: + contest_54 0x03 ContestEffectEnd2 + score 0xF6 + end ContestEffect2_38: - .incbin "baserom.gba", 0x001dc9b4, 0x9 + if_user_condition_less_than 0x03 ContestEffectEnd2 + score 0xEC + end ContestEffect2_4: - .incbin "baserom.gba", 0x001dc9bd, 0x42 + contest_0E 0x00 ContestEffect2_4_score1 + contest_0E 0x01 ContestEffect2_4_score2 + contest_0E 0x02 ContestEffect2_4_score3 + score 0xF6 + end +ContestEffect2_4_score1: + contest_54 0x01 ContestEffectEnd2 + contest_54 0x02 ContestEffectEnd2 + contest_54 0x03 ContestEffectEnd2 + score 0xF6 + end +ContestEffect2_4_score2: + contest_54 0x02 ContestEffectEnd2 + contest_54 0x03 ContestEffectEnd2 + score 0xF6 + end +ContestEffect2_4_score3: + contest_54 0x03 ContestEffectEnd2 + score 0xF6 + end ContestEffect2_2: - .incbin "baserom.gba", 0x001dc9ff, 0x4C + contest_04 0x00 ContestEffect2_2_score1 + contest_04 0x01 ContestEffect2_2_score2 + contest_04 0x02 ContestEffect2_2_score3 + contest_04 0x03 ContestEffect2_2_score4 + contest_04 0x04 ContestEffect2_2_score5 + end +ContestEffect2_2_score1: + if_random 0x14 ContestEffectEnd2 + score 0xF1 + end +ContestEffect2_2_score2: + if_random 0x28 ContestEffectEnd2 + score 0xF1 + end +ContestEffect2_2_score3: + if_random 0x3C ContestEffectEnd2 + score 0xF1 + end +ContestEffect2_2_score4: + if_random 0x50 ContestEffectEnd2 + score 0xF1 + end +ContestEffect2_2_score5: + if_random 0x14 ContestEffectEnd2 + score 0x14 + end ContestEffectEnd2: end -- cgit v1.2.3 From e7ee00a73e359bd7b12071422ccc52283ceadd37 Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Fri, 19 Aug 2016 01:12:05 -0400 Subject: get rid of unnecessary comments after last contest macro --- data/contest_ai_scripts.s | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'data') diff --git a/data/contest_ai_scripts.s b/data/contest_ai_scripts.s index fa2cf49b9..aa88bb787 100644 --- a/data/contest_ai_scripts.s +++ b/data/contest_ai_scripts.s @@ -271,13 +271,13 @@ ContestEffect39_score4: end ContestEffect40: - contest_87 0x1D ContestEffectEnd + if_effect_in_user_moveset 0x1D ContestEffectEnd if_random 0x32 ContestEffectEnd score 0x14 end ContestEffect41: - contest_87 0x1E ContestEffectEnd + if_effect_in_user_moveset 0x1E ContestEffectEnd if_random 0x32 ContestEffectEnd score 0x14 end @@ -300,7 +300,7 @@ ContestEffect3_score: end ContestEffect38: - contest_87 0x27 ContestEffect38_contest04 + if_effect_in_user_moveset 0x27 ContestEffect38_contest04 if_user_condition 0x03 ContestEffect38_score1 if_random 0x32 ContestEffectEnd score 0x0F -- cgit v1.2.3 From 9cd8ced73a54c2cf481a7b1a03bbe1504f51a866 Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Fri, 19 Aug 2016 01:45:54 -0400 Subject: more labels --- data/contest_ai_scripts.s | 162 +++++++++++++++++++++++----------------------- 1 file changed, 81 insertions(+), 81 deletions(-) (limited to 'data') diff --git a/data/contest_ai_scripts.s b/data/contest_ai_scripts.s index aa88bb787..55bef540d 100644 --- a/data/contest_ai_scripts.s +++ b/data/contest_ai_scripts.s @@ -47,7 +47,7 @@ ContestUnreferenced_80: contest_80 ContestUnreferenced_0D end ContestUnreferenced_0D: - contest_0D 0x01 ContestUnreferenced_end + if_user_order_more_than 0x01 ContestUnreferenced_end contest_2C 0x02 ContestUnreferenced_end contest_2C 0x03 ContestUnreferenced_end score 0x0A @@ -60,10 +60,10 @@ ContestUnreferenced_end: contest_04 0x04 ContestUnreferenced_0F_5 end ContestUnreferenced_0F_1: - contest_0F 0x00 ContestUnreferenced_2B_1 - contest_0F 0x01 ContestUnreferenced_2B_2 - contest_0F 0x02 ContestUnreferenced_2B_1 - contest_0F 0x03 ContestUnreferenced_2B_1 + if_user_order_not_eq 0x00 ContestUnreferenced_2B_1 + if_user_order_not_eq 0x01 ContestUnreferenced_2B_2 + if_user_order_not_eq 0x02 ContestUnreferenced_2B_1 + if_user_order_not_eq 0x03 ContestUnreferenced_2B_1 end ContestUnreferenced_2B_1: contest_2B 0x01 ContestUnreferenced_score @@ -74,28 +74,28 @@ ContestUnreferenced_2B_2: contest_2B 0x01 ContestUnreferenced_score end ContestUnreferenced_0F_2: - contest_0F 0x00 ContestUnreferenced_2B_1 - contest_0F 0x01 ContestUnreferenced_2B_1 - contest_0F 0x02 ContestUnreferenced_2B_1 - contest_0F 0x03 ContestUnreferenced_2B_1 + if_user_order_not_eq 0x00 ContestUnreferenced_2B_1 + if_user_order_not_eq 0x01 ContestUnreferenced_2B_1 + if_user_order_not_eq 0x02 ContestUnreferenced_2B_1 + if_user_order_not_eq 0x03 ContestUnreferenced_2B_1 end ContestUnreferenced_0F_3: - contest_0F 0x00 ContestUnreferenced_2B_1 - contest_0F 0x01 ContestUnreferenced_2B_1 - contest_0F 0x02 ContestUnreferenced_2B_1 - contest_0F 0x03 ContestUnreferenced_2B_1 + if_user_order_not_eq 0x00 ContestUnreferenced_2B_1 + if_user_order_not_eq 0x01 ContestUnreferenced_2B_1 + if_user_order_not_eq 0x02 ContestUnreferenced_2B_1 + if_user_order_not_eq 0x03 ContestUnreferenced_2B_1 end ContestUnreferenced_0F_4: - contest_0F 0x00 ContestUnreferenced_2B_1 - contest_0F 0x01 ContestUnreferenced_2B_1 - contest_0F 0x02 ContestUnreferenced_2B_1 - contest_0F 0x03 ContestUnreferenced_2B_1 + if_user_order_not_eq 0x00 ContestUnreferenced_2B_1 + if_user_order_not_eq 0x01 ContestUnreferenced_2B_1 + if_user_order_not_eq 0x02 ContestUnreferenced_2B_1 + if_user_order_not_eq 0x03 ContestUnreferenced_2B_1 end ContestUnreferenced_0F_5: - contest_0F 0x00 ContestUnreferenced_2B_1 - contest_0F 0x01 ContestUnreferenced_2B_1 - contest_0F 0x02 ContestUnreferenced_2B_1 - contest_0F 0x03 ContestUnreferenced_2B_1 + if_user_order_not_eq 0x00 ContestUnreferenced_2B_1 + if_user_order_not_eq 0x01 ContestUnreferenced_2B_1 + if_user_order_not_eq 0x02 ContestUnreferenced_2B_1 + if_user_order_not_eq 0x03 ContestUnreferenced_2B_1 end ContestUnreferenced_score: score 0x0A @@ -141,7 +141,7 @@ AI_contest09_081DC2AB: score 0x0F end AI_contest0F_1_081DC2AB: - contest_0F 0x00 AI_contest7D_1_081DC2AB + if_user_order_not_eq 0x00 AI_contest7D_1_081DC2AB if_random 0x33 AI_end_081DC2AB score 0x14 end @@ -150,7 +150,7 @@ AI_contest7D_1_081DC2AB: score 0xF6 end AI_contest0F_2_081DC2AB: - contest_0F 0x00 AI_contest7D_3_081DC2AB + if_user_order_not_eq 0x00 AI_contest7D_3_081DC2AB contest_04 0x04 AI_score_081DC2AB AI_contest7D_2_081DC2AB: if_random 0x33 AI_end_081DC2AB @@ -169,7 +169,7 @@ AI_contest7D_4_081DC2AB: end AI_contest3D_081DC2AB: contest_3D 0x00 AI_contest29_081DC2AB - contest_0F 0x00 AI_contest7D_5_081DC2AB + if_user_order_not_eq 0x00 AI_contest7D_5_081DC2AB contest_0A 0x04 AI_contest7D_5_081DC2AB score 0x1E end @@ -179,7 +179,7 @@ AI_contest7D_5_081DC2AB: end AI_contest29_081DC2AB: contest_29 0x03 AI_end_081DC2AB - contest_0F 0x00 AI_contest7D_5_081DC2AB + if_user_order_not_eq 0x00 AI_contest7D_5_081DC2AB contest_0A 0x04 AI_contest7D_5_081DC2AB score 0x1E end @@ -194,10 +194,10 @@ Unknown_081DC348: AI_contest3F_081DC348: contest_3F 0x00 AI_end_081DC348 contest_42 AI_end_081DC348 - contest_0E 0x00 AI_contest04_1_081DC348 - contest_0E 0x01 AI_contest04_2_081DC348 - contest_0E 0x02 AI_contest04_3_081DC348 - contest_0E 0x03 AI_contest04_4_081DC348 + if_user_order_eq 0x00 AI_contest04_1_081DC348 + if_user_order_eq 0x01 AI_contest04_2_081DC348 + if_user_order_eq 0x02 AI_contest04_3_081DC348 + if_user_order_eq 0x03 AI_contest04_4_081DC348 end AI_contest45_081DC348: contest_45 AI_end_081DC348 @@ -283,7 +283,7 @@ ContestEffect41: end ContestEffect3: - contest_0F 0x03 ContestEffectEnd + if_user_order_not_eq 0x03 ContestEffectEnd if_random 0x32 ContestEffectEnd score 0x0F end @@ -325,8 +325,8 @@ ContestEffect38_score2: ContestEffect47: if_move_used_count_eq 1 ContestEffectEnd - contest_0E 0x00 ContestEffect47_random - contest_0E 0x01 ContestEffect47_random + if_user_order_eq 0x00 ContestEffect47_random + if_user_order_eq 0x01 ContestEffect47_random contest_05 0x04 ContestEffectEnd if_user_has_exciting_move ContestEffectEnd contest_07 0x01 ContestEffectEnd @@ -338,9 +338,9 @@ ContestEffect47_random: end ContestEffect31: - contest_0E 0x01 ContestEffect31_score1 - contest_0E 0x02 ContestEffect31_score2 - contest_0E 0x03 ContestEffect31_score3 + if_user_order_eq 0x01 ContestEffect31_score1 + if_user_order_eq 0x02 ContestEffect31_score2 + if_user_order_eq 0x03 ContestEffect31_score3 end ContestEffect31_score1: score 0x05 @@ -353,10 +353,10 @@ ContestEffect31_score3: end ContestEffect32: - contest_0E 0x00 ContestEffect32_score1 - contest_0E 0x01 ContestEffect32_score2 - contest_0E 0x02 ContestEffect32_score3 - contest_0E 0x03 ContestEffect32_score5 + if_user_order_eq 0x00 ContestEffect32_score1 + if_user_order_eq 0x01 ContestEffect32_score2 + if_user_order_eq 0x02 ContestEffect32_score3 + if_user_order_eq 0x03 ContestEffect32_score5 end ContestEffect32_score1: score 0xF6 @@ -390,8 +390,8 @@ ContestEffect32_score7: end ContestEffect46: - contest_0E 0x00 ContestEffect46_05 - contest_0D 0x00 ContestEffect46_score4 + if_user_order_eq 0x00 ContestEffect46_05 + if_user_order_more_than 0x00 ContestEffect46_score4 end ContestEffect46_05: contest_05 0x00 ContestEffect46_score1 @@ -416,7 +416,7 @@ ContestEffect46_score4: end ContestEffect27: - contest_0E 0x00 ContestEffectEnd + if_user_order_eq 0x00 ContestEffectEnd contest_7F ContestEffect27_55_1 end ContestEffect27_55_1: @@ -429,20 +429,20 @@ ContestEffect27_55_1: ContestEffect27_score1: if_random 0x7D ContestEffect27_55_2 score 0x05 - contest_0D 0x01 ContestEffect27_55_2 + if_user_order_more_than 0x01 ContestEffect27_55_2 end ContestEffect27_score2: if_random 0x7D ContestEffect27_55_2 score 0x0A - contest_0D 0x01 ContestEffect27_55_2 + if_user_order_more_than 0x01 ContestEffect27_55_2 end ContestEffect27_score3: if_random 0x7D ContestEffect27_55_2 score 0x0F - contest_0D 0x01 ContestEffect27_55_2 + if_user_order_more_than 0x01 ContestEffect27_55_2 end ContestEffect27_noscore: - contest_0D 0x01 ContestEffect27_55_2 + if_user_order_more_than 0x01 ContestEffect27_55_2 end ContestEffect27_55_2: contest_55 0x01 ContestEffect27_noscore2 @@ -454,20 +454,20 @@ ContestEffect27_55_2: ContestEffect27_score4: if_random 0x7D ContestEffect27_55_3 score 0x05 - contest_0D 0x02 ContestEffect27_55_3 + if_user_order_more_than 0x02 ContestEffect27_55_3 end ContestEffect27_score5: if_random 0x7D ContestEffect27_55_3 score 0x0A - contest_0D 0x02 ContestEffect27_55_3 + if_user_order_more_than 0x02 ContestEffect27_55_3 end ContestEffect27_score6: if_random 0x7D ContestEffect27_55_3 score 0x0F - contest_0D 0x02 ContestEffect27_55_3 + if_user_order_more_than 0x02 ContestEffect27_55_3 end ContestEffect27_noscore2: - contest_0D 0x02 ContestEffect27_55_3 + if_user_order_more_than 0x02 ContestEffect27_55_3 end ContestEffect27_55_3: contest_55 0x02 ContestEffect27_end @@ -492,7 +492,7 @@ ContestEffect27_end: end ContestEffect16or17: - contest_0E 0x00 ContestEffectEnd + if_user_order_eq 0x00 ContestEffectEnd contest_7F ContestEffect16or17_55 end ContestEffect16or17_55: @@ -504,7 +504,7 @@ ContestEffect16or17_55: score 0x08 end ContestEffect16or17_0E_1: - contest_0E 0x01 ContestEffectEnd + if_user_order_eq 0x01 ContestEffectEnd contest_55 0x01 ContestEffect16or17_0E_2 contest_51 0x01 0x01 ContestEffect16or17_0E_2 if_random 0x7D ContestEffect16or17_0E_2 @@ -513,7 +513,7 @@ ContestEffect16or17_0E_1: score 0x08 end ContestEffect16or17_0E_2: - contest_0E 0x02 ContestEffectEnd + if_user_order_eq 0x02 ContestEffectEnd contest_55 0x02 ContestEffectEnd contest_51 0x02 0x01 ContestEffectEnd if_random 0x7D ContestEffectEnd @@ -523,7 +523,7 @@ ContestEffect16or17_0E_2: end ContestEffect26: - contest_0E 0x03 ContestEffectEnd + if_user_order_eq 0x03 ContestEffectEnd contest_7F ContestEffect26_55 end ContestEffect26_55: @@ -534,7 +534,7 @@ ContestEffect26_55: score 0x05 end ContestEffect26_0E_1: - contest_0E 0x02 ContestEffectEnd + if_user_order_eq 0x02 ContestEffectEnd contest_55 0x02 ContestEffect26_0E_2 contest_51 0x02 0x00 ContestEffect26_0E_2 score 0x05 @@ -542,7 +542,7 @@ ContestEffect26_0E_1: score 0x05 end ContestEffect26_0E_2: - contest_0E 0x01 ContestEffectEnd + if_user_order_eq 0x01 ContestEffectEnd contest_55 0x01 ContestEffectEnd contest_51 0x01 0x00 ContestEffectEnd score 0x05 @@ -559,10 +559,10 @@ ContestEffect18_score1: contest_7F ContestEffect18_0E end ContestEffect18_0E: - contest_0E 0x00 ContestEffect18_score2 - contest_0E 0x01 ContestEffect18_random1 - contest_0E 0x02 ContestEffect18_random2 - contest_0E 0x03 ContestEffect18_random3 + if_user_order_eq 0x00 ContestEffect18_score2 + if_user_order_eq 0x01 ContestEffect18_random1 + if_user_order_eq 0x02 ContestEffect18_random2 + if_user_order_eq 0x03 ContestEffect18_random3 end ContestEffect18_score2: score 0xF1 @@ -632,10 +632,10 @@ Unknown_081DC7FB: end ContestEffect2_8: - contest_0E 0x00 ContestEffect2_8_score1 - contest_0E 0x01 ContestEffect2_8_score2 - contest_0E 0x02 ContestEffect2_8_score3 - contest_0E 0x03 ContestEffect2_8_score4 + if_user_order_eq 0x00 ContestEffect2_8_score1 + if_user_order_eq 0x01 ContestEffect2_8_score2 + if_user_order_eq 0x02 ContestEffect2_8_score3 + if_user_order_eq 0x03 ContestEffect2_8_score4 end ContestEffect2_8_score1: score 0xF6 @@ -654,10 +654,10 @@ ContestEffect2_8_score4: end ContestEffect2_9: - contest_0E 0x00 ContestEffect2_9_score1 - contest_0E 0x01 ContestEffect2_9_score2 - contest_0E 0x02 ContestEffect2_9_score3 - contest_0E 0x03 ContestEffect2_9_score4 + if_user_order_eq 0x00 ContestEffect2_9_score1 + if_user_order_eq 0x01 ContestEffect2_9_score2 + if_user_order_eq 0x02 ContestEffect2_9_score3 + if_user_order_eq 0x03 ContestEffect2_9_score4 end ContestEffect2_9_score1: score 0xEC @@ -679,9 +679,9 @@ ContestEffect2_9_score4: end ContestEffect2_25: - contest_0E 0x00 ContestEffect2_25_score1 - contest_0E 0x01 ContestEffect2_25_score2 - contest_0E 0x02 ContestEffect2_25_score3 + if_user_order_eq 0x00 ContestEffect2_25_score1 + if_user_order_eq 0x01 ContestEffect2_25_score2 + if_user_order_eq 0x02 ContestEffect2_25_score3 score 0xF6 end ContestEffect2_25_score1: @@ -698,9 +698,9 @@ ContestEffect2_25_score3: end ContestEffect2_26: - contest_0E 0x00 ContestEffect2_26_score1 - contest_0E 0x01 ContestEffect2_26_score2 - contest_0E 0x02 ContestEffect2_26_score3 + if_user_order_eq 0x00 ContestEffect2_26_score1 + if_user_order_eq 0x01 ContestEffect2_26_score2 + if_user_order_eq 0x02 ContestEffect2_26_score3 score 0xF6 end ContestEffect2_26_score1: @@ -725,9 +725,9 @@ ContestEffect2_38: end ContestEffect2_4: - contest_0E 0x00 ContestEffect2_4_score1 - contest_0E 0x01 ContestEffect2_4_score2 - contest_0E 0x02 ContestEffect2_4_score3 + if_user_order_eq 0x00 ContestEffect2_4_score1 + if_user_order_eq 0x01 ContestEffect2_4_score2 + if_user_order_eq 0x02 ContestEffect2_4_score3 score 0xF6 end ContestEffect2_4_score1: @@ -778,10 +778,10 @@ ContestEffectEnd2: end Unknown_081DCA4C: - contest_0E 0x00 AI_effectcheck1_081DCA4C - contest_0E 0x01 AI_effectcheck2_081DCA4C - contest_0E 0x02 AI_effectcheck3_081DCA4C - contest_0E 0x03 AI_effectcheck4_081DCA4C + if_user_order_eq 0x00 AI_effectcheck1_081DCA4C + if_user_order_eq 0x01 AI_effectcheck2_081DCA4C + if_user_order_eq 0x02 AI_effectcheck3_081DCA4C + if_user_order_eq 0x03 AI_effectcheck4_081DCA4C end AI_effectcheck1_081DCA4C: if_effect 0x1D AI_score1_081DCA4C -- cgit v1.2.3 From ae8f46b87eb3c096bdf36ec978f2c971fa8de01e Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Fri, 19 Aug 2016 00:06:15 -0700 Subject: name more macros --- data/contest_ai_scripts.s | 58 +++++++++++++++++++++++------------------------ 1 file changed, 29 insertions(+), 29 deletions(-) (limited to 'data') diff --git a/data/contest_ai_scripts.s b/data/contest_ai_scripts.s index 55bef540d..0bbed095b 100644 --- a/data/contest_ai_scripts.s +++ b/data/contest_ai_scripts.s @@ -40,7 +40,7 @@ gUnknown_081DC118:: @ 81DC118 .4byte Unknown_081DCAF3 @ unreferenced - contest_05 0x00 ContestUnreferenced_80 + if_turn_not_eq 0x00 ContestUnreferenced_80 contest_29 0x26 ContestUnreferenced_80 score 0x0A ContestUnreferenced_80: @@ -53,11 +53,11 @@ ContestUnreferenced_0D: score 0x0A ContestUnreferenced_end: end - contest_04 0x00 ContestUnreferenced_0F_1 - contest_04 0x01 ContestUnreferenced_0F_2 - contest_04 0x02 ContestUnreferenced_0F_3 - contest_04 0x03 ContestUnreferenced_0F_4 - contest_04 0x04 ContestUnreferenced_0F_5 + if_turn_eq 0x00 ContestUnreferenced_0F_1 + if_turn_eq 0x01 ContestUnreferenced_0F_2 + if_turn_eq 0x02 ContestUnreferenced_0F_3 + if_turn_eq 0x03 ContestUnreferenced_0F_4 + if_turn_eq 0x04 ContestUnreferenced_0F_5 end ContestUnreferenced_0F_1: if_user_order_not_eq 0x00 ContestUnreferenced_2B_1 @@ -135,8 +135,8 @@ Unknown_081DC2AB: contest_25 0x01 AI_contest3D_081DC2AB end AI_contest09_081DC2AB: - contest_09 0x04 AI_contest0F_1_081DC2AB - contest_09 0x03 AI_contest0F_2_081DC2AB + if_excitement_eq 0x04 AI_contest0F_1_081DC2AB + if_excitement_eq 0x03 AI_contest0F_2_081DC2AB if_user_has_exciting_move AI_end_081DC2AB score 0x0F end @@ -151,7 +151,7 @@ AI_contest7D_1_081DC2AB: end AI_contest0F_2_081DC2AB: if_user_order_not_eq 0x00 AI_contest7D_3_081DC2AB - contest_04 0x04 AI_score_081DC2AB + if_turn_eq 0x04 AI_score_081DC2AB AI_contest7D_2_081DC2AB: if_random 0x33 AI_end_081DC2AB score 0x0A @@ -170,7 +170,7 @@ AI_contest7D_4_081DC2AB: AI_contest3D_081DC2AB: contest_3D 0x00 AI_contest29_081DC2AB if_user_order_not_eq 0x00 AI_contest7D_5_081DC2AB - contest_0A 0x04 AI_contest7D_5_081DC2AB + if_excitement_not_eq 0x04 AI_contest7D_5_081DC2AB score 0x1E end AI_contest7D_5_081DC2AB: @@ -180,7 +180,7 @@ AI_contest7D_5_081DC2AB: AI_contest29_081DC2AB: contest_29 0x03 AI_end_081DC2AB if_user_order_not_eq 0x00 AI_contest7D_5_081DC2AB - contest_0A 0x04 AI_contest7D_5_081DC2AB + if_excitement_not_eq 0x04 AI_contest7D_5_081DC2AB score 0x1E end AI_end_081DC2AB: @@ -207,22 +207,22 @@ AI_score_081DC348: score 0x19 end AI_contest04_1_081DC348: - contest_04 0x04 AI_contest7D_081DC348 + if_turn_eq 0x04 AI_contest7D_081DC348 if_random 0x96 AI_end_081DC348 score 0x0A end AI_contest04_2_081DC348: - contest_04 0x04 AI_contest7D_081DC348 + if_turn_eq 0x04 AI_contest7D_081DC348 if_random 0x7D AI_end_081DC348 score 0x0A end AI_contest04_3_081DC348: - contest_04 0x04 AI_contest7D_081DC348 + if_turn_eq 0x04 AI_contest7D_081DC348 if_random 0x32 AI_end_081DC348 score 0x0A end AI_contest04_4_081DC348: - contest_04 0x04 AI_contest7D_081DC348 + if_turn_eq 0x04 AI_contest7D_081DC348 score 0x0A end AI_contest7D_081DC348: @@ -287,7 +287,7 @@ ContestEffect3: if_random 0x32 ContestEffectEnd score 0x0F end - contest_04 0x04 ContestEffect3_7D + if_turn_eq 0x04 ContestEffect3_7D if_random 0xDC ContestEffect3_score score 0x0A end @@ -309,8 +309,8 @@ ContestEffect38_score1: score 0xF6 end ContestEffect38_contest04: - contest_04 0x04 ContestEffect38_score2 - contest_04 0x00 ContestEffect38_random + if_turn_eq 0x04 ContestEffect38_score2 + if_turn_eq 0x00 ContestEffect38_random if_move_used_count_eq 1 ContestEffectEnd if_random 0x7D ContestEffectEnd score 0x0A @@ -327,9 +327,9 @@ ContestEffect47: if_move_used_count_eq 1 ContestEffectEnd if_user_order_eq 0x00 ContestEffect47_random if_user_order_eq 0x01 ContestEffect47_random - contest_05 0x04 ContestEffectEnd + if_turn_not_eq 0x04 ContestEffectEnd if_user_has_exciting_move ContestEffectEnd - contest_07 0x01 ContestEffectEnd + if_excitement_less_than 0x01 ContestEffectEnd score 0x0A end ContestEffect47_random: @@ -394,9 +394,9 @@ ContestEffect46: if_user_order_more_than 0x00 ContestEffect46_score4 end ContestEffect46_05: - contest_05 0x00 ContestEffect46_score1 - contest_09 0x04 ContestEffect46_score2 - contest_09 0x03 ContestEffect46_score3 + if_turn_not_eq 0x00 ContestEffect46_score1 + if_excitement_eq 0x04 ContestEffect46_score2 + if_excitement_eq 0x03 ContestEffect46_score3 end ContestEffect46_score1: if_random 0x7D ContestEffectEnd @@ -551,7 +551,7 @@ ContestEffect26_0E_2: end ContestEffect18: - contest_04 0x04 ContestEffect18_score1 + if_turn_eq 0x04 ContestEffect18_score1 contest_7F ContestEffect18_0E end ContestEffect18_score1: @@ -747,11 +747,11 @@ ContestEffect2_4_score3: end ContestEffect2_2: - contest_04 0x00 ContestEffect2_2_score1 - contest_04 0x01 ContestEffect2_2_score2 - contest_04 0x02 ContestEffect2_2_score3 - contest_04 0x03 ContestEffect2_2_score4 - contest_04 0x04 ContestEffect2_2_score5 + if_turn_eq 0x00 ContestEffect2_2_score1 + if_turn_eq 0x01 ContestEffect2_2_score2 + if_turn_eq 0x02 ContestEffect2_2_score3 + if_turn_eq 0x03 ContestEffect2_2_score4 + if_turn_eq 0x04 ContestEffect2_2_score5 end ContestEffect2_2_score1: if_random 0x14 ContestEffectEnd2 -- cgit v1.2.3 From 6489eacfc617d8e2fe8a5d36a2a67c0daf998244 Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Fri, 19 Aug 2016 00:22:56 -0700 Subject: name contest type and effect macros --- data/contest_ai_scripts.s | 134 +++++++++++++++++++++++----------------------- 1 file changed, 67 insertions(+), 67 deletions(-) (limited to 'data') diff --git a/data/contest_ai_scripts.s b/data/contest_ai_scripts.s index 0bbed095b..4de2b5193 100644 --- a/data/contest_ai_scripts.s +++ b/data/contest_ai_scripts.s @@ -41,7 +41,7 @@ gUnknown_081DC118:: @ 81DC118 @ unreferenced if_turn_not_eq 0x00 ContestUnreferenced_80 - contest_29 0x26 ContestUnreferenced_80 + if_effect_not_eq 0x26 ContestUnreferenced_80 score 0x0A ContestUnreferenced_80: contest_80 ContestUnreferenced_0D @@ -108,7 +108,7 @@ ContestUnreferenced_score2: end Unknown_081DC27F: - if_effect 3, AI_end_081DC27F + if_effect_eq 3, AI_end_081DC27F if_move_used_count_eq 1 AI_score1_081DC27F if_move_used_count_eq 2 AI_score2_081DC27F if_move_used_count_eq 3 AI_score3_081DC27F @@ -130,9 +130,9 @@ AI_end_081DC27F: end Unknown_081DC2AB: - contest_23 0x00 AI_contest09_081DC2AB - contest_25 0x00 AI_contest7D_4_081DC2AB - contest_25 0x01 AI_contest3D_081DC2AB + if_move_excitement_less_than 0x00 AI_contest09_081DC2AB + if_move_excitement_eq 0x00 AI_contest7D_4_081DC2AB + if_move_excitement_eq 0x01 AI_contest3D_081DC2AB end AI_contest09_081DC2AB: if_excitement_eq 0x04 AI_contest0F_1_081DC2AB @@ -178,7 +178,7 @@ AI_contest7D_5_081DC2AB: score 0x0A end AI_contest29_081DC2AB: - contest_29 0x03 AI_end_081DC2AB + if_effect_not_eq 0x03 AI_end_081DC2AB if_user_order_not_eq 0x00 AI_contest7D_5_081DC2AB if_excitement_not_eq 0x04 AI_contest7D_5_081DC2AB score 0x1E @@ -233,20 +233,20 @@ AI_end_081DC348: end Unknown_081DC3C7: - if_effect 39, ContestEffect39 - if_effect 40, ContestEffect40 - if_effect 41, ContestEffect41 - if_effect 3, ContestEffect3 - if_effect 38, ContestEffect38 - if_effect 47, ContestEffect47 - if_effect 31, ContestEffect31 - if_effect 32, ContestEffect32 - if_effect 46, ContestEffect46 - if_effect 27, ContestEffect27 - if_effect 16, ContestEffect16or17 - if_effect 17, ContestEffect16or17 - if_effect 26, ContestEffect26 - if_effect 18, ContestEffect18 + if_effect_eq 39, ContestEffect39 + if_effect_eq 40, ContestEffect40 + if_effect_eq 41, ContestEffect41 + if_effect_eq 3, ContestEffect3 + if_effect_eq 38, ContestEffect38 + if_effect_eq 47, ContestEffect47 + if_effect_eq 31, ContestEffect31 + if_effect_eq 32, ContestEffect32 + if_effect_eq 46, ContestEffect46 + if_effect_eq 27, ContestEffect27 + if_effect_eq 16, ContestEffect16or17 + if_effect_eq 17, ContestEffect16or17 + if_effect_eq 26, ContestEffect26 + if_effect_eq 18, ContestEffect18 end ContestEffect39: @@ -584,9 +584,9 @@ ContestEffectEnd: end Unknown_081DC7DE: - contest_20 0x02 AI_contest7D_081DC7DE - contest_20 0x03 AI_contest7D_081DC7DE - contest_20 0x04 AI_contest7D_081DC7DE + if_contest_type_eq CONTEST_CUTE, AI_contest7D_081DC7DE + if_contest_type_eq CONTEST_SMART, AI_contest7D_081DC7DE + if_contest_type_eq CONTEST_TOUGH, AI_contest7D_081DC7DE end AI_contest7D_081DC7DE: if_random 0x7D AI_end_081DC7DE @@ -596,39 +596,39 @@ AI_end_081DC7DE: end Unknown_081DC7FB: - if_effect 8, ContestEffect2_8 - if_effect 10, ContestEffect2_8 - if_effect 12, ContestEffect2_8 - if_effect 14, ContestEffect2_8 - if_effect 32, ContestEffect2_8 - if_effect 35, ContestEffect2_8 - if_effect 36, ContestEffect2_8 - if_effect 37, ContestEffect2_8 - if_effect 9, ContestEffect2_9 - if_effect 11, ContestEffect2_9 - if_effect 13, ContestEffect2_9 - if_effect 15, ContestEffect2_9 - if_effect 17, ContestEffect2_9 - if_effect 16, ContestEffect2_9 - if_effect 18, ContestEffect2_9 - if_effect 19, ContestEffect2_9 - if_effect 45, ContestEffect2_9 - if_effect 20, ContestEffect2_9 - if_effect 21, ContestEffect2_9 - if_effect 22, ContestEffect2_9 - if_effect 23, ContestEffect2_9 - if_effect 24, ContestEffect2_9 - if_effect 28, ContestEffect2_9 - if_effect 27, ContestEffect2_9 - if_effect 31, ContestEffect2_9 - if_effect 25, ContestEffect2_25 - if_effect 26, ContestEffect2_26 - if_effect 47, ContestEffect2_26 - if_effect 38, ContestEffect2_38 - if_effect 4, ContestEffect2_4 - if_effect 5, ContestEffect2_4 - if_effect 6, ContestEffect2_4 - if_effect 2, ContestEffect2_2 + if_effect_eq 8, ContestEffect2_8 + if_effect_eq 10, ContestEffect2_8 + if_effect_eq 12, ContestEffect2_8 + if_effect_eq 14, ContestEffect2_8 + if_effect_eq 32, ContestEffect2_8 + if_effect_eq 35, ContestEffect2_8 + if_effect_eq 36, ContestEffect2_8 + if_effect_eq 37, ContestEffect2_8 + if_effect_eq 9, ContestEffect2_9 + if_effect_eq 11, ContestEffect2_9 + if_effect_eq 13, ContestEffect2_9 + if_effect_eq 15, ContestEffect2_9 + if_effect_eq 17, ContestEffect2_9 + if_effect_eq 16, ContestEffect2_9 + if_effect_eq 18, ContestEffect2_9 + if_effect_eq 19, ContestEffect2_9 + if_effect_eq 45, ContestEffect2_9 + if_effect_eq 20, ContestEffect2_9 + if_effect_eq 21, ContestEffect2_9 + if_effect_eq 22, ContestEffect2_9 + if_effect_eq 23, ContestEffect2_9 + if_effect_eq 24, ContestEffect2_9 + if_effect_eq 28, ContestEffect2_9 + if_effect_eq 27, ContestEffect2_9 + if_effect_eq 31, ContestEffect2_9 + if_effect_eq 25, ContestEffect2_25 + if_effect_eq 26, ContestEffect2_26 + if_effect_eq 47, ContestEffect2_26 + if_effect_eq 38, ContestEffect2_38 + if_effect_eq 4, ContestEffect2_4 + if_effect_eq 5, ContestEffect2_4 + if_effect_eq 6, ContestEffect2_4 + if_effect_eq 2, ContestEffect2_2 end ContestEffect2_8: @@ -784,8 +784,8 @@ Unknown_081DCA4C: if_user_order_eq 0x03 AI_effectcheck4_081DCA4C end AI_effectcheck1_081DCA4C: - if_effect 0x1D AI_score1_081DCA4C - if_effect 0x21 AI_score2_081DCA4C + if_effect_eq 0x1D AI_score1_081DCA4C + if_effect_eq 0x21 AI_score2_081DCA4C contest_2B 0x01 AI_random1_081DCA4C end AI_score1_081DCA4C: @@ -799,7 +799,7 @@ AI_random1_081DCA4C: score 0x0A end AI_effectcheck2_081DCA4C: - if_effect 0x21 AI_score3_081DCA4C + if_effect_eq 0x21 AI_score3_081DCA4C contest_2B 0x01 AI_random2_081DCA4C end AI_score3_081DCA4C: @@ -810,19 +810,19 @@ AI_random2_081DCA4C: score 0x0A end AI_effectcheck3_081DCA4C: - if_effect 0x21 AI_score4_081DCA4C - if_effect 0x1F AI_score4_081DCA4C - if_effect 0x01 AI_score4_081DCA4C + if_effect_eq 0x21 AI_score4_081DCA4C + if_effect_eq 0x1F AI_score4_081DCA4C + if_effect_eq 0x01 AI_score4_081DCA4C end AI_score4_081DCA4C: score 0x05 end AI_effectcheck4_081DCA4C: - if_effect 0x21 AI_score5_081DCA4C - if_effect 0x1E AI_score5_081DCA4C - if_effect 0x1F AI_score5_081DCA4C - if_effect 0x01 AI_score5_081DCA4C - if_effect 0x12 AI_score7_081DCA4C + if_effect_eq 0x21 AI_score5_081DCA4C + if_effect_eq 0x1E AI_score5_081DCA4C + if_effect_eq 0x1F AI_score5_081DCA4C + if_effect_eq 0x01 AI_score5_081DCA4C + if_effect_eq 0x12 AI_score7_081DCA4C contest_2B 0x01 AI_score6_081DCA4C contest_2B 0x03 AI_random3_081DCA4C end -- cgit v1.2.3 From 056a9ae1fa0fdfb68af541e3f7ccfe3e99104058 Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Fri, 19 Aug 2016 00:24:56 -0700 Subject: trim space --- data/contest_ai_scripts.s | 154 +++++++++++++++++++++++----------------------- 1 file changed, 77 insertions(+), 77 deletions(-) (limited to 'data') diff --git a/data/contest_ai_scripts.s b/data/contest_ai_scripts.s index 4de2b5193..b5601c3d0 100644 --- a/data/contest_ai_scripts.s +++ b/data/contest_ai_scripts.s @@ -38,11 +38,11 @@ gUnknown_081DC118:: @ 81DC118 .4byte Unknown_081DCAF3 .4byte Unknown_081DCAF3 .4byte Unknown_081DCAF3 - + @ unreferenced if_turn_not_eq 0x00 ContestUnreferenced_80 if_effect_not_eq 0x26 ContestUnreferenced_80 - score 0x0A + score 0x0A ContestUnreferenced_80: contest_80 ContestUnreferenced_0D end @@ -50,7 +50,7 @@ ContestUnreferenced_0D: if_user_order_more_than 0x01 ContestUnreferenced_end contest_2C 0x02 ContestUnreferenced_end contest_2C 0x03 ContestUnreferenced_end - score 0x0A + score 0x0A ContestUnreferenced_end: end if_turn_eq 0x00 ContestUnreferenced_0F_1 @@ -63,7 +63,7 @@ ContestUnreferenced_0F_1: if_user_order_not_eq 0x00 ContestUnreferenced_2B_1 if_user_order_not_eq 0x01 ContestUnreferenced_2B_2 if_user_order_not_eq 0x02 ContestUnreferenced_2B_1 - if_user_order_not_eq 0x03 ContestUnreferenced_2B_1 + if_user_order_not_eq 0x03 ContestUnreferenced_2B_1 end ContestUnreferenced_2B_1: contest_2B 0x01 ContestUnreferenced_score @@ -98,13 +98,13 @@ ContestUnreferenced_0F_5: if_user_order_not_eq 0x03 ContestUnreferenced_2B_1 end ContestUnreferenced_score: - score 0x0A + score 0x0A end end contest_2E ContestUnreferenced_score2 end ContestUnreferenced_score2: - score 0x0A + score 0x0A end Unknown_081DC27F: @@ -138,50 +138,50 @@ AI_contest09_081DC2AB: if_excitement_eq 0x04 AI_contest0F_1_081DC2AB if_excitement_eq 0x03 AI_contest0F_2_081DC2AB if_user_has_exciting_move AI_end_081DC2AB - score 0x0F + score 0x0F end AI_contest0F_1_081DC2AB: if_user_order_not_eq 0x00 AI_contest7D_1_081DC2AB if_random 0x33 AI_end_081DC2AB - score 0x14 + score 0x14 end AI_contest7D_1_081DC2AB: if_random 0x7F AI_end_081DC2AB - score 0xF6 + score 0xF6 end AI_contest0F_2_081DC2AB: if_user_order_not_eq 0x00 AI_contest7D_3_081DC2AB if_turn_eq 0x04 AI_score_081DC2AB AI_contest7D_2_081DC2AB: if_random 0x33 AI_end_081DC2AB - score 0x0A + score 0x0A end AI_score_081DC2AB: - score 0x0F + score 0x0F end AI_contest7D_3_081DC2AB: if_random 0x7F AI_end_081DC2AB - score 0x0A + score 0x0A end AI_contest7D_4_081DC2AB: if_random 0x7F AI_end_081DC2AB - score 0x0A + score 0x0A end AI_contest3D_081DC2AB: contest_3D 0x00 AI_contest29_081DC2AB if_user_order_not_eq 0x00 AI_contest7D_5_081DC2AB if_excitement_not_eq 0x04 AI_contest7D_5_081DC2AB - score 0x1E + score 0x1E end AI_contest7D_5_081DC2AB: if_random 0x64 AI_end_081DC2AB - score 0x0A + score 0x0A end AI_contest29_081DC2AB: if_effect_not_eq 0x03 AI_end_081DC2AB if_user_order_not_eq 0x00 AI_contest7D_5_081DC2AB if_excitement_not_eq 0x04 AI_contest7D_5_081DC2AB - score 0x1E + score 0x1E end AI_end_081DC2AB: end @@ -270,7 +270,7 @@ ContestEffect39_score4: score 0xEC end -ContestEffect40: +ContestEffect40: if_effect_in_user_moveset 0x1D ContestEffectEnd if_random 0x32 ContestEffectEnd score 0x14 @@ -428,17 +428,17 @@ ContestEffect27_55_1: end ContestEffect27_score1: if_random 0x7D ContestEffect27_55_2 - score 0x05 + score 0x05 if_user_order_more_than 0x01 ContestEffect27_55_2 end ContestEffect27_score2: if_random 0x7D ContestEffect27_55_2 - score 0x0A + score 0x0A if_user_order_more_than 0x01 ContestEffect27_55_2 end ContestEffect27_score3: if_random 0x7D ContestEffect27_55_2 - score 0x0F + score 0x0F if_user_order_more_than 0x01 ContestEffect27_55_2 end ContestEffect27_noscore: @@ -453,17 +453,17 @@ ContestEffect27_55_2: end ContestEffect27_score4: if_random 0x7D ContestEffect27_55_3 - score 0x05 + score 0x05 if_user_order_more_than 0x02 ContestEffect27_55_3 end ContestEffect27_score5: if_random 0x7D ContestEffect27_55_3 - score 0x0A + score 0x0A if_user_order_more_than 0x02 ContestEffect27_55_3 end ContestEffect27_score6: if_random 0x7D ContestEffect27_55_3 - score 0x0F + score 0x0F if_user_order_more_than 0x02 ContestEffect27_55_3 end ContestEffect27_noscore2: @@ -477,16 +477,16 @@ ContestEffect27_55_3: contest_4C 0x02 0x03 ContestEffect27_score9 end ContestEffect27_score7: - if_random 0x7D ContestEffectEnd - score 0x05 + if_random 0x7D ContestEffectEnd + score 0x05 end ContestEffect27_score8: - if_random 0x7D ContestEffectEnd - score 0x0A + if_random 0x7D ContestEffectEnd + score 0x0A end ContestEffect27_score9: - if_random 0x7D ContestEffectEnd - score 0x0F + if_random 0x7D ContestEffectEnd + score 0x0F end ContestEffect27_end: end @@ -499,27 +499,27 @@ ContestEffect16or17_55: contest_55 0x00 ContestEffect16or17_0E_1 contest_51 0x00 0x01 ContestEffect16or17_0E_1 if_random 0x7D ContestEffect16or17_0E_1 - score 0x02 + score 0x02 contest_58 0x00 ContestEffect16or17_0E_1 - score 0x08 + score 0x08 end ContestEffect16or17_0E_1: if_user_order_eq 0x01 ContestEffectEnd contest_55 0x01 ContestEffect16or17_0E_2 contest_51 0x01 0x01 ContestEffect16or17_0E_2 if_random 0x7D ContestEffect16or17_0E_2 - score 0x02 + score 0x02 contest_58 0x01 ContestEffect16or17_0E_2 - score 0x08 + score 0x08 end ContestEffect16or17_0E_2: if_user_order_eq 0x02 ContestEffectEnd contest_55 0x02 ContestEffectEnd contest_51 0x02 0x01 ContestEffectEnd if_random 0x7D ContestEffectEnd - score 0x02 + score 0x02 contest_58 0x02 ContestEffectEnd - score 0x08 + score 0x08 end ContestEffect26: @@ -529,15 +529,15 @@ ContestEffect26: ContestEffect26_55: contest_55 0x03 ContestEffect26_0E_1 contest_51 0x03 0x00 ContestEffect26_0E_1 - score 0x05 + score 0x05 if_random 0x7D ContestEffect16or17_0E_1 - score 0x05 + score 0x05 end ContestEffect26_0E_1: if_user_order_eq 0x02 ContestEffectEnd contest_55 0x02 ContestEffect26_0E_2 contest_51 0x02 0x00 ContestEffect26_0E_2 - score 0x05 + score 0x05 if_random 0x7D ContestEffect16or17_0E_2 score 0x05 end @@ -545,7 +545,7 @@ ContestEffect26_0E_2: if_user_order_eq 0x01 ContestEffectEnd contest_55 0x01 ContestEffectEnd contest_51 0x01 0x00 ContestEffectEnd - score 0x05 + score 0x05 if_random 0x7D ContestEffectEnd score 0x05 end @@ -555,7 +555,7 @@ ContestEffect18: contest_7F ContestEffect18_0E end ContestEffect18_score1: - score 0x05 + score 0x05 contest_7F ContestEffect18_0E end ContestEffect18_0E: @@ -565,19 +565,19 @@ ContestEffect18_0E: if_user_order_eq 0x03 ContestEffect18_random3 end ContestEffect18_score2: - score 0xF1 + score 0xF1 end ContestEffect18_random1: if_random 0x7D ContestEffectEnd - score 0xF6 + score 0xF6 end ContestEffect18_random2: if_random 0x7D ContestEffectEnd - score 0x05 + score 0x05 end ContestEffect18_random3: if_random 0x7D ContestEffectEnd - score 0x0F + score 0x0F end ContestEffectEnd: @@ -660,63 +660,63 @@ ContestEffect2_9: if_user_order_eq 0x03 ContestEffect2_9_score4 end ContestEffect2_9_score1: - score 0xEC + score 0xEC end ContestEffect2_9_score2: contest_54 0x00 ContestEffectEnd2 - score 0xF1 + score 0xF1 end ContestEffect2_9_score3: contest_54 0x00 ContestEffectEnd2 contest_54 0x01 ContestEffectEnd2 - score 0xF1 + score 0xF1 end ContestEffect2_9_score4: contest_54 0x00 ContestEffectEnd2 contest_54 0x01 ContestEffectEnd2 contest_54 0x02 ContestEffectEnd2 - score 0xF1 + score 0xF1 end ContestEffect2_25: if_user_order_eq 0x00 ContestEffect2_25_score1 if_user_order_eq 0x01 ContestEffect2_25_score2 if_user_order_eq 0x02 ContestEffect2_25_score3 - score 0xF6 + score 0xF6 end ContestEffect2_25_score1: contest_54 0x01 ContestEffectEnd2 - score 0xF6 + score 0xF6 end ContestEffect2_25_score2: contest_54 0x02 ContestEffectEnd2 - score 0xF6 + score 0xF6 end ContestEffect2_25_score3: contest_54 0x03 ContestEffectEnd2 - score 0xF6 + score 0xF6 end ContestEffect2_26: if_user_order_eq 0x00 ContestEffect2_26_score1 if_user_order_eq 0x01 ContestEffect2_26_score2 if_user_order_eq 0x02 ContestEffect2_26_score3 - score 0xF6 + score 0xF6 end ContestEffect2_26_score1: contest_54 0x01 ContestEffectEnd2 contest_54 0x02 ContestEffectEnd2 contest_54 0x03 ContestEffectEnd2 - score 0xF6 + score 0xF6 end ContestEffect2_26_score2: contest_54 0x02 ContestEffectEnd2 contest_54 0x03 ContestEffectEnd2 - score 0xF6 + score 0xF6 end ContestEffect2_26_score3: contest_54 0x03 ContestEffectEnd2 - score 0xF6 + score 0xF6 end ContestEffect2_38: @@ -728,22 +728,22 @@ ContestEffect2_4: if_user_order_eq 0x00 ContestEffect2_4_score1 if_user_order_eq 0x01 ContestEffect2_4_score2 if_user_order_eq 0x02 ContestEffect2_4_score3 - score 0xF6 + score 0xF6 end ContestEffect2_4_score1: contest_54 0x01 ContestEffectEnd2 contest_54 0x02 ContestEffectEnd2 contest_54 0x03 ContestEffectEnd2 - score 0xF6 + score 0xF6 end ContestEffect2_4_score2: contest_54 0x02 ContestEffectEnd2 contest_54 0x03 ContestEffectEnd2 - score 0xF6 + score 0xF6 end ContestEffect2_4_score3: contest_54 0x03 ContestEffectEnd2 - score 0xF6 + score 0xF6 end ContestEffect2_2: @@ -755,25 +755,25 @@ ContestEffect2_2: end ContestEffect2_2_score1: if_random 0x14 ContestEffectEnd2 - score 0xF1 + score 0xF1 end ContestEffect2_2_score2: if_random 0x28 ContestEffectEnd2 - score 0xF1 + score 0xF1 end ContestEffect2_2_score3: if_random 0x3C ContestEffectEnd2 - score 0xF1 + score 0xF1 end ContestEffect2_2_score4: if_random 0x50 ContestEffectEnd2 - score 0xF1 + score 0xF1 end ContestEffect2_2_score5: if_random 0x14 ContestEffectEnd2 - score 0x14 + score 0x14 end - + ContestEffectEnd2: end @@ -789,33 +789,33 @@ AI_effectcheck1_081DCA4C: contest_2B 0x01 AI_random1_081DCA4C end AI_score1_081DCA4C: - score 0x0F + score 0x0F end AI_score2_081DCA4C: - score 0xF1 + score 0xF1 end AI_random1_081DCA4C: if_random 0x64 ContestEffectEnd2 - score 0x0A + score 0x0A end AI_effectcheck2_081DCA4C: if_effect_eq 0x21 AI_score3_081DCA4C contest_2B 0x01 AI_random2_081DCA4C end AI_score3_081DCA4C: - score 0xFB + score 0xFB end AI_random2_081DCA4C: if_random 0x7D ContestEffectEnd2 - score 0x0A + score 0x0A end AI_effectcheck3_081DCA4C: if_effect_eq 0x21 AI_score4_081DCA4C - if_effect_eq 0x1F AI_score4_081DCA4C + if_effect_eq 0x1F AI_score4_081DCA4C if_effect_eq 0x01 AI_score4_081DCA4C end AI_score4_081DCA4C: - score 0x05 + score 0x05 end AI_effectcheck4_081DCA4C: if_effect_eq 0x21 AI_score5_081DCA4C @@ -827,17 +827,17 @@ AI_effectcheck4_081DCA4C: contest_2B 0x03 AI_random3_081DCA4C end AI_score5_081DCA4C: - score 0x0F + score 0x0F end AI_score6_081DCA4C: - score 0xF6 + score 0xF6 end AI_random3_081DCA4C: if_random 0x7D ContestEffectEnd2 - score 0x0A + score 0x0A end AI_score7_081DCA4C: - score 0x05 + score 0x05 end Unknown_081DCAF3: -- cgit v1.2.3 From 6cb1bbe3c971fcc4c612a3ab68c39edafb710cf7 Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Fri, 19 Aug 2016 00:29:25 -0700 Subject: make user condition macro consistent --- data/contest_ai_scripts.s | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'data') diff --git a/data/contest_ai_scripts.s b/data/contest_ai_scripts.s index b5601c3d0..c6825039c 100644 --- a/data/contest_ai_scripts.s +++ b/data/contest_ai_scripts.s @@ -250,10 +250,10 @@ Unknown_081DC3C7: end ContestEffect39: - if_user_condition 0x03 ContestEffect39_score1 - if_user_condition 0x02 ContestEffect39_score2 - if_user_condition 0x01 ContestEffect39_score3 - if_user_condition 0x00 ContestEffect39_score4 + if_user_condition_eq 0x03 ContestEffect39_score1 + if_user_condition_eq 0x02 ContestEffect39_score2 + if_user_condition_eq 0x01 ContestEffect39_score3 + if_user_condition_eq 0x00 ContestEffect39_score4 end ContestEffect39_score1: score 0x14 @@ -301,7 +301,7 @@ ContestEffect3_score: ContestEffect38: if_effect_in_user_moveset 0x27 ContestEffect38_contest04 - if_user_condition 0x03 ContestEffect38_score1 + if_user_condition_eq 0x03 ContestEffect38_score1 if_random 0x32 ContestEffectEnd score 0x0F end -- cgit v1.2.3 From 26e4104dbf5f37bb67c21dadd50351f77dcf6321 Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Fri, 19 Aug 2016 00:40:46 -0700 Subject: effect type macros --- data/contest_ai_scripts.s | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'data') diff --git a/data/contest_ai_scripts.s b/data/contest_ai_scripts.s index c6825039c..efb2d79e9 100644 --- a/data/contest_ai_scripts.s +++ b/data/contest_ai_scripts.s @@ -48,8 +48,8 @@ ContestUnreferenced_80: end ContestUnreferenced_0D: if_user_order_more_than 0x01 ContestUnreferenced_end - contest_2C 0x02 ContestUnreferenced_end - contest_2C 0x03 ContestUnreferenced_end + if_effect_type_not_eq 0x02 ContestUnreferenced_end + if_effect_type_not_eq 0x03 ContestUnreferenced_end score 0x0A ContestUnreferenced_end: end @@ -66,12 +66,12 @@ ContestUnreferenced_0F_1: if_user_order_not_eq 0x03 ContestUnreferenced_2B_1 end ContestUnreferenced_2B_1: - contest_2B 0x01 ContestUnreferenced_score + if_effect_type_eq 0x01 ContestUnreferenced_score end ContestUnreferenced_2B_2: - contest_2B 0x01 ContestUnreferenced_score + if_effect_type_eq 0x01 ContestUnreferenced_score end - contest_2B 0x01 ContestUnreferenced_score + if_effect_type_eq 0x01 ContestUnreferenced_score end ContestUnreferenced_0F_2: if_user_order_not_eq 0x00 ContestUnreferenced_2B_1 @@ -786,7 +786,7 @@ Unknown_081DCA4C: AI_effectcheck1_081DCA4C: if_effect_eq 0x1D AI_score1_081DCA4C if_effect_eq 0x21 AI_score2_081DCA4C - contest_2B 0x01 AI_random1_081DCA4C + if_effect_type_eq 0x01 AI_random1_081DCA4C end AI_score1_081DCA4C: score 0x0F @@ -800,7 +800,7 @@ AI_random1_081DCA4C: end AI_effectcheck2_081DCA4C: if_effect_eq 0x21 AI_score3_081DCA4C - contest_2B 0x01 AI_random2_081DCA4C + if_effect_type_eq 0x01 AI_random2_081DCA4C end AI_score3_081DCA4C: score 0xFB @@ -823,8 +823,8 @@ AI_effectcheck4_081DCA4C: if_effect_eq 0x1F AI_score5_081DCA4C if_effect_eq 0x01 AI_score5_081DCA4C if_effect_eq 0x12 AI_score7_081DCA4C - contest_2B 0x01 AI_score6_081DCA4C - contest_2B 0x03 AI_random3_081DCA4C + if_effect_type_eq 0x01 AI_score6_081DCA4C + if_effect_type_eq 0x03 AI_random3_081DCA4C end AI_score5_081DCA4C: score 0x0F -- cgit v1.2.3 From c11e508e0507aba63e15bd43820baea98814bcde Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Fri, 19 Aug 2016 01:10:21 -0700 Subject: most appealing move macros --- data/contest_ai_scripts.s | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data') diff --git a/data/contest_ai_scripts.s b/data/contest_ai_scripts.s index efb2d79e9..4c22cdd5b 100644 --- a/data/contest_ai_scripts.s +++ b/data/contest_ai_scripts.s @@ -101,7 +101,7 @@ ContestUnreferenced_score: score 0x0A end end - contest_2E ContestUnreferenced_score2 + if_most_appealing_move ContestUnreferenced_score2 end ContestUnreferenced_score2: score 0x0A -- cgit v1.2.3 From 755f765cf36eba612b1773a0fd5d815e6abc40df Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Fri, 19 Aug 2016 01:17:15 -0700 Subject: move used count macros --- data/contest_ai_scripts.s | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'data') diff --git a/data/contest_ai_scripts.s b/data/contest_ai_scripts.s index 4c22cdd5b..02ecb28ba 100644 --- a/data/contest_ai_scripts.s +++ b/data/contest_ai_scripts.s @@ -168,7 +168,7 @@ AI_contest7D_4_081DC2AB: score 0x0A end AI_contest3D_081DC2AB: - contest_3D 0x00 AI_contest29_081DC2AB + if_move_used_count_more_than 0x00 AI_contest29_081DC2AB if_user_order_not_eq 0x00 AI_contest7D_5_081DC2AB if_excitement_not_eq 0x04 AI_contest7D_5_081DC2AB score 0x1E @@ -192,7 +192,7 @@ Unknown_081DC348: contest_80 AI_contest45_081DC348 end AI_contest3F_081DC348: - contest_3F 0x00 AI_end_081DC348 + if_move_used_count_not_eq 0x00 AI_end_081DC348 contest_42 AI_end_081DC348 if_user_order_eq 0x00 AI_contest04_1_081DC348 if_user_order_eq 0x01 AI_contest04_2_081DC348 -- cgit v1.2.3 From 7a8900ad5230b313964590b28c1a2813225052c1 Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Fri, 19 Aug 2016 01:26:10 -0700 Subject: combo starter macros --- data/contest_ai_scripts.s | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data') diff --git a/data/contest_ai_scripts.s b/data/contest_ai_scripts.s index 02ecb28ba..0e2cb14b0 100644 --- a/data/contest_ai_scripts.s +++ b/data/contest_ai_scripts.s @@ -193,7 +193,7 @@ Unknown_081DC348: end AI_contest3F_081DC348: if_move_used_count_not_eq 0x00 AI_end_081DC348 - contest_42 AI_end_081DC348 + if_not_combo_starter AI_end_081DC348 if_user_order_eq 0x00 AI_contest04_1_081DC348 if_user_order_eq 0x01 AI_contest04_2_081DC348 if_user_order_eq 0x02 AI_contest04_3_081DC348 -- cgit v1.2.3 From 3a33e298a40d3b34a2682009f1198d339b729270 Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Fri, 19 Aug 2016 01:33:28 -0700 Subject: combo finisher macros --- data/contest_ai_scripts.s | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data') diff --git a/data/contest_ai_scripts.s b/data/contest_ai_scripts.s index 0e2cb14b0..bc325aa07 100644 --- a/data/contest_ai_scripts.s +++ b/data/contest_ai_scripts.s @@ -200,7 +200,7 @@ AI_contest3F_081DC348: if_user_order_eq 0x03 AI_contest04_4_081DC348 end AI_contest45_081DC348: - contest_45 AI_end_081DC348 + if_not_combo_finisher AI_end_081DC348 score 0xF6 end AI_score_081DC348: -- cgit v1.2.3 From 73223372bdd201258099ade7f18273447d4a1201 Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Fri, 19 Aug 2016 01:40:18 -0700 Subject: would finish combo macros --- data/contest_ai_scripts.s | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data') diff --git a/data/contest_ai_scripts.s b/data/contest_ai_scripts.s index bc325aa07..3275c5985 100644 --- a/data/contest_ai_scripts.s +++ b/data/contest_ai_scripts.s @@ -187,7 +187,7 @@ AI_end_081DC2AB: end Unknown_081DC348: - contest_47 AI_score_081DC348 + if_would_finish_combo AI_score_081DC348 contest_80 AI_contest3F_081DC348 contest_80 AI_contest45_081DC348 end -- cgit v1.2.3 From 9662ef87325dcd6e7fa56796f422b98c33efa5b1 Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Fri, 19 Aug 2016 01:45:58 -0700 Subject: call macro --- data/contest_ai_scripts.s | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'data') diff --git a/data/contest_ai_scripts.s b/data/contest_ai_scripts.s index 3275c5985..308950679 100644 --- a/data/contest_ai_scripts.s +++ b/data/contest_ai_scripts.s @@ -44,7 +44,7 @@ gUnknown_081DC118:: @ 81DC118 if_effect_not_eq 0x26 ContestUnreferenced_80 score 0x0A ContestUnreferenced_80: - contest_80 ContestUnreferenced_0D + call ContestUnreferenced_0D end ContestUnreferenced_0D: if_user_order_more_than 0x01 ContestUnreferenced_end @@ -188,8 +188,8 @@ AI_end_081DC2AB: Unknown_081DC348: if_would_finish_combo AI_score_081DC348 - contest_80 AI_contest3F_081DC348 - contest_80 AI_contest45_081DC348 + call AI_contest3F_081DC348 + call AI_contest45_081DC348 end AI_contest3F_081DC348: if_move_used_count_not_eq 0x00 AI_end_081DC348 -- cgit v1.2.3 From 0b36c3d3f2f4c295146b47b64487b7cf60d30619 Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Fri, 19 Aug 2016 01:56:12 -0700 Subject: jump and condition macros --- data/contest_ai_scripts.s | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) (limited to 'data') diff --git a/data/contest_ai_scripts.s b/data/contest_ai_scripts.s index 308950679..dc38113e8 100644 --- a/data/contest_ai_scripts.s +++ b/data/contest_ai_scripts.s @@ -368,7 +368,7 @@ ContestEffect32_score2: ContestEffect32_score3: contest_55 0x00 ContestEffect32_score4 score 0x05 - contest_7F ContestEffect32_score4 + jump ContestEffect32_score4 end ContestEffect32_score4: contest_55 0x01 ContestEffectEnd @@ -377,12 +377,12 @@ ContestEffect32_score4: ContestEffect32_score5: contest_55 0x00 ContestEffect32_score6 score 0x05 - contest_7F ContestEffect32_score6 + jump ContestEffect32_score6 end ContestEffect32_score6: contest_55 0x01 ContestEffect32_score7 score 0x05 - contest_7F ContestEffect32_score7 + jump ContestEffect32_score7 end ContestEffect32_score7: contest_55 0x02 ContestEffectEnd @@ -417,14 +417,14 @@ ContestEffect46_score4: ContestEffect27: if_user_order_eq 0x00 ContestEffectEnd - contest_7F ContestEffect27_55_1 + jump ContestEffect27_55_1 end ContestEffect27_55_1: contest_55 0x00 ContestEffect27_noscore - contest_4C 0x00 0x00 ContestEffect27_noscore - contest_4C 0x00 0x01 ContestEffect27_score1 - contest_4C 0x00 0x02 ContestEffect27_score2 - contest_4C 0x00 0x03 ContestEffect27_score3 + if_condition_eq 0x00 0x00 ContestEffect27_noscore + if_condition_eq 0x00 0x01 ContestEffect27_score1 + if_condition_eq 0x00 0x02 ContestEffect27_score2 + if_condition_eq 0x00 0x03 ContestEffect27_score3 end ContestEffect27_score1: if_random 0x7D ContestEffect27_55_2 @@ -446,10 +446,10 @@ ContestEffect27_noscore: end ContestEffect27_55_2: contest_55 0x01 ContestEffect27_noscore2 - contest_4C 0x01 0x00 ContestEffect27_noscore2 - contest_4C 0x01 0x01 ContestEffect27_score4 - contest_4C 0x01 0x02 ContestEffect27_score5 - contest_4C 0x01 0x03 ContestEffect27_score6 + if_condition_eq 0x01 0x00 ContestEffect27_noscore2 + if_condition_eq 0x01 0x01 ContestEffect27_score4 + if_condition_eq 0x01 0x02 ContestEffect27_score5 + if_condition_eq 0x01 0x03 ContestEffect27_score6 end ContestEffect27_score4: if_random 0x7D ContestEffect27_55_3 @@ -471,10 +471,10 @@ ContestEffect27_noscore2: end ContestEffect27_55_3: contest_55 0x02 ContestEffect27_end - contest_4C 0x02 0x00 ContestEffect27_end - contest_4C 0x02 0x01 ContestEffect27_score7 - contest_4C 0x02 0x02 ContestEffect27_score8 - contest_4C 0x02 0x03 ContestEffect27_score9 + if_condition_eq 0x02 0x00 ContestEffect27_end + if_condition_eq 0x02 0x01 ContestEffect27_score7 + if_condition_eq 0x02 0x02 ContestEffect27_score8 + if_condition_eq 0x02 0x03 ContestEffect27_score9 end ContestEffect27_score7: if_random 0x7D ContestEffectEnd @@ -493,7 +493,7 @@ ContestEffect27_end: ContestEffect16or17: if_user_order_eq 0x00 ContestEffectEnd - contest_7F ContestEffect16or17_55 + jump ContestEffect16or17_55 end ContestEffect16or17_55: contest_55 0x00 ContestEffect16or17_0E_1 @@ -524,7 +524,7 @@ ContestEffect16or17_0E_2: ContestEffect26: if_user_order_eq 0x03 ContestEffectEnd - contest_7F ContestEffect26_55 + jump ContestEffect26_55 end ContestEffect26_55: contest_55 0x03 ContestEffect26_0E_1 @@ -552,11 +552,11 @@ ContestEffect26_0E_2: ContestEffect18: if_turn_eq 0x04 ContestEffect18_score1 - contest_7F ContestEffect18_0E + jump ContestEffect18_0E end ContestEffect18_score1: score 0x05 - contest_7F ContestEffect18_0E + jump ContestEffect18_0E end ContestEffect18_0E: if_user_order_eq 0x00 ContestEffect18_score2 -- cgit v1.2.3 From 9a2f328dfc68110da2483bf08e3648f4b8b63220 Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Fri, 19 Aug 2016 02:17:39 -0700 Subject: notes concerning contest_51 and contest_55 --- data/contest_ai_scripts.s | 57 +++++++++++++++++++++++++---------------------- 1 file changed, 30 insertions(+), 27 deletions(-) (limited to 'data') diff --git a/data/contest_ai_scripts.s b/data/contest_ai_scripts.s index dc38113e8..1dd43d959 100644 --- a/data/contest_ai_scripts.s +++ b/data/contest_ai_scripts.s @@ -245,7 +245,7 @@ Unknown_081DC3C7: if_effect_eq 27, ContestEffect27 if_effect_eq 16, ContestEffect16or17 if_effect_eq 17, ContestEffect16or17 - if_effect_eq 26, ContestEffect26 + if_effect_eq 26, ContestEffect_FollowingMonsNervous if_effect_eq 18, ContestEffect18 end @@ -522,32 +522,35 @@ ContestEffect16or17_0E_2: score 0x08 end -ContestEffect26: - if_user_order_eq 0x03 ContestEffectEnd - jump ContestEffect26_55 - end -ContestEffect26_55: - contest_55 0x03 ContestEffect26_0E_1 - contest_51 0x03 0x00 ContestEffect26_0E_1 - score 0x05 - if_random 0x7D ContestEffect16or17_0E_1 - score 0x05 - end -ContestEffect26_0E_1: - if_user_order_eq 0x02 ContestEffectEnd - contest_55 0x02 ContestEffect26_0E_2 - contest_51 0x02 0x00 ContestEffect26_0E_2 - score 0x05 - if_random 0x7D ContestEffect16or17_0E_2 - score 0x05 - end -ContestEffect26_0E_2: - if_user_order_eq 0x01 ContestEffectEnd - contest_55 0x01 ContestEffectEnd - contest_51 0x01 0x00 ContestEffectEnd - score 0x05 - if_random 0x7D ContestEffectEnd - score 0x05 +@ This routine checks the following mons using contest_51 and contest_55 +@ in order to decide if moves that make the following mons nervous should +@ be encouraged. +ContestEffect_FollowingMonsNervous: + if_user_order_eq 3, ContestEffectEnd + jump ContestEffect_FollowingMonsNervous_CheckMon3 + end +ContestEffect_FollowingMonsNervous_CheckMon3: + contest_55 0x03, ContestEffect_FollowingMonsNervous_CheckMon2 + contest_51 0x03, 0x00, ContestEffect_FollowingMonsNervous_CheckMon2 + score +5 + if_random 125, ContestEffect16or17_0E_1 + score +5 + end +ContestEffect_FollowingMonsNervous_CheckMon2: + if_user_order_eq 2, ContestEffectEnd + contest_55 0x02, ContestEffect_FollowingMonsNervous_CheckMon1 + contest_51 0x02, 0x00, ContestEffect_FollowingMonsNervous_CheckMon1 + score +5 + if_random 125, ContestEffect16or17_0E_2 + score +5 + end +ContestEffect_FollowingMonsNervous_CheckMon1: + if_user_order_eq 1, ContestEffectEnd + contest_55 0x01, ContestEffectEnd + contest_51 0x01, 0x00 ContestEffectEnd + score +5 + if_random 125, ContestEffectEnd + score +5 end ContestEffect18: -- cgit v1.2.3 From 8924b285aa0047be80e038af88828009f39d92dd Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Fri, 19 Aug 2016 02:19:26 -0700 Subject: clean up more --- data/contest_ai_scripts.s | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'data') diff --git a/data/contest_ai_scripts.s b/data/contest_ai_scripts.s index 1dd43d959..0e7780319 100644 --- a/data/contest_ai_scripts.s +++ b/data/contest_ai_scripts.s @@ -530,24 +530,24 @@ ContestEffect_FollowingMonsNervous: jump ContestEffect_FollowingMonsNervous_CheckMon3 end ContestEffect_FollowingMonsNervous_CheckMon3: - contest_55 0x03, ContestEffect_FollowingMonsNervous_CheckMon2 - contest_51 0x03, 0x00, ContestEffect_FollowingMonsNervous_CheckMon2 + contest_55 3, ContestEffect_FollowingMonsNervous_CheckMon2 + contest_51 3, 0, ContestEffect_FollowingMonsNervous_CheckMon2 score +5 if_random 125, ContestEffect16or17_0E_1 score +5 end ContestEffect_FollowingMonsNervous_CheckMon2: if_user_order_eq 2, ContestEffectEnd - contest_55 0x02, ContestEffect_FollowingMonsNervous_CheckMon1 - contest_51 0x02, 0x00, ContestEffect_FollowingMonsNervous_CheckMon1 + contest_55 2, ContestEffect_FollowingMonsNervous_CheckMon1 + contest_51 2, 0, ContestEffect_FollowingMonsNervous_CheckMon1 score +5 if_random 125, ContestEffect16or17_0E_2 score +5 end ContestEffect_FollowingMonsNervous_CheckMon1: if_user_order_eq 1, ContestEffectEnd - contest_55 0x01, ContestEffectEnd - contest_51 0x01, 0x00 ContestEffectEnd + contest_55 1, ContestEffectEnd + contest_51 1, 0, ContestEffectEnd score +5 if_random 125, ContestEffectEnd score +5 -- cgit v1.2.3 From d22c73c4942039c72d8a46441380557fa34a2923 Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Fri, 19 Aug 2016 12:39:16 -0400 Subject: label some constants --- data/contest_ai_scripts.s | 146 +++++++++++++++++++++++----------------------- 1 file changed, 73 insertions(+), 73 deletions(-) (limited to 'data') diff --git a/data/contest_ai_scripts.s b/data/contest_ai_scripts.s index 0e7780319..ca16d1459 100644 --- a/data/contest_ai_scripts.s +++ b/data/contest_ai_scripts.s @@ -41,15 +41,15 @@ gUnknown_081DC118:: @ 81DC118 @ unreferenced if_turn_not_eq 0x00 ContestUnreferenced_80 - if_effect_not_eq 0x26 ContestUnreferenced_80 + if_effect_not_eq CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS ContestUnreferenced_80 score 0x0A ContestUnreferenced_80: call ContestUnreferenced_0D end ContestUnreferenced_0D: if_user_order_more_than 0x01 ContestUnreferenced_end - if_effect_type_not_eq 0x02 ContestUnreferenced_end - if_effect_type_not_eq 0x03 ContestUnreferenced_end + if_effect_type_not_eq CONTEST_CUTE ContestUnreferenced_end + if_effect_type_not_eq CONTEST_SMART ContestUnreferenced_end score 0x0A ContestUnreferenced_end: end @@ -66,12 +66,12 @@ ContestUnreferenced_0F_1: if_user_order_not_eq 0x03 ContestUnreferenced_2B_1 end ContestUnreferenced_2B_1: - if_effect_type_eq 0x01 ContestUnreferenced_score + if_effect_type_eq CONTEST_BEAUTY ContestUnreferenced_score end ContestUnreferenced_2B_2: - if_effect_type_eq 0x01 ContestUnreferenced_score + if_effect_type_eq CONTEST_BEAUTY ContestUnreferenced_score end - if_effect_type_eq 0x01 ContestUnreferenced_score + if_effect_type_eq CONTEST_BEAUTY ContestUnreferenced_score end ContestUnreferenced_0F_2: if_user_order_not_eq 0x00 ContestUnreferenced_2B_1 @@ -108,7 +108,7 @@ ContestUnreferenced_score2: end Unknown_081DC27F: - if_effect_eq 3, AI_end_081DC27F + if_effect_eq CONTEST_EFFECT_REPETITION_NOT_BORING, AI_end_081DC27F if_move_used_count_eq 1 AI_score1_081DC27F if_move_used_count_eq 2 AI_score2_081DC27F if_move_used_count_eq 3 AI_score3_081DC27F @@ -178,7 +178,7 @@ AI_contest7D_5_081DC2AB: score 0x0A end AI_contest29_081DC2AB: - if_effect_not_eq 0x03 AI_end_081DC2AB + if_effect_not_eq CONTEST_EFFECT_REPETITION_NOT_BORING AI_end_081DC2AB if_user_order_not_eq 0x00 AI_contest7D_5_081DC2AB if_excitement_not_eq 0x04 AI_contest7D_5_081DC2AB score 0x1E @@ -233,20 +233,20 @@ AI_end_081DC348: end Unknown_081DC3C7: - if_effect_eq 39, ContestEffect39 - if_effect_eq 40, ContestEffect40 - if_effect_eq 41, ContestEffect41 - if_effect_eq 3, ContestEffect3 - if_effect_eq 38, ContestEffect38 - if_effect_eq 47, ContestEffect47 - if_effect_eq 31, ContestEffect31 - if_effect_eq 32, ContestEffect32 - if_effect_eq 46, ContestEffect46 - if_effect_eq 27, ContestEffect27 - if_effect_eq 16, ContestEffect16or17 - if_effect_eq 17, ContestEffect16or17 - if_effect_eq 26, ContestEffect_FollowingMonsNervous - if_effect_eq 18, ContestEffect18 + if_effect_eq CONTEST_EFFECT_BETTER_WITH_GOOD_CONDITION, ContestEffect39 + if_effect_eq CONTEST_EFFECT_NEXT_APPEAL_EARLIER, ContestEffect40 + if_effect_eq CONTEST_EFFECT_NEXT_APPEAL_LATER, ContestEffect41 + if_effect_eq CONTEST_EFFECT_REPETITION_NOT_BORING, ContestEffect3 + if_effect_eq CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, ContestEffect38 + if_effect_eq CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, ContestEffect47 + if_effect_eq CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONES, ContestEffect31 + if_effect_eq CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONE, ContestEffect32 + if_effect_eq CONTEST_EFFECT_BETTER_WHEN_AUDIENCE_EXCITED, ContestEffect46 + if_effect_eq CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, ContestEffect27 + if_effect_eq CONTEST_EFFECT_SHIFT_JUDGE_ATTENTION, ContestEffect16or17 + if_effect_eq CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, ContestEffect16or17 + if_effect_eq CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, ContestEffect_FollowingMonsNervous + if_effect_eq CONTEST_EFFECT_JAMS_OTHERS_BUT_MISS_ONE_TURN, ContestEffect18 end ContestEffect39: @@ -271,13 +271,13 @@ ContestEffect39_score4: end ContestEffect40: - if_effect_in_user_moveset 0x1D ContestEffectEnd + if_effect_in_user_moveset CONTEST_EFFECT_BETTER_IF_FIRST ContestEffectEnd if_random 0x32 ContestEffectEnd score 0x14 end ContestEffect41: - if_effect_in_user_moveset 0x1E ContestEffectEnd + if_effect_in_user_moveset CONTEST_EFFECT_BETTER_IF_LAST ContestEffectEnd if_random 0x32 ContestEffectEnd score 0x14 end @@ -300,7 +300,7 @@ ContestEffect3_score: end ContestEffect38: - if_effect_in_user_moveset 0x27 ContestEffect38_contest04 + if_effect_in_user_moveset CONTEST_EFFECT_BETTER_WITH_GOOD_CONDITION ContestEffect38_contest04 if_user_condition_eq 0x03 ContestEffect38_score1 if_random 0x32 ContestEffectEnd score 0x0F @@ -599,39 +599,39 @@ AI_end_081DC7DE: end Unknown_081DC7FB: - if_effect_eq 8, ContestEffect2_8 - if_effect_eq 10, ContestEffect2_8 - if_effect_eq 12, ContestEffect2_8 - if_effect_eq 14, ContestEffect2_8 - if_effect_eq 32, ContestEffect2_8 - if_effect_eq 35, ContestEffect2_8 - if_effect_eq 36, ContestEffect2_8 - if_effect_eq 37, ContestEffect2_8 - if_effect_eq 9, ContestEffect2_9 - if_effect_eq 11, ContestEffect2_9 - if_effect_eq 13, ContestEffect2_9 - if_effect_eq 15, ContestEffect2_9 - if_effect_eq 17, ContestEffect2_9 - if_effect_eq 16, ContestEffect2_9 - if_effect_eq 18, ContestEffect2_9 - if_effect_eq 19, ContestEffect2_9 - if_effect_eq 45, ContestEffect2_9 - if_effect_eq 20, ContestEffect2_9 - if_effect_eq 21, ContestEffect2_9 - if_effect_eq 22, ContestEffect2_9 - if_effect_eq 23, ContestEffect2_9 - if_effect_eq 24, ContestEffect2_9 - if_effect_eq 28, ContestEffect2_9 - if_effect_eq 27, ContestEffect2_9 - if_effect_eq 31, ContestEffect2_9 - if_effect_eq 25, ContestEffect2_25 - if_effect_eq 26, ContestEffect2_26 - if_effect_eq 47, ContestEffect2_26 - if_effect_eq 38, ContestEffect2_38 - if_effect_eq 4, ContestEffect2_4 - if_effect_eq 5, ContestEffect2_4 - if_effect_eq 6, ContestEffect2_4 - if_effect_eq 2, ContestEffect2_2 + if_effect_eq CONTEST_EFFECT_STARTLE_FRONT_MON, ContestEffect2_8 + if_effect_eq CONTEST_EFFECT_STARTLE_PREV_MON, ContestEffect2_8 + if_effect_eq CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, ContestEffect2_8 + if_effect_eq CONTEST_EFFECT_STARTLE_PREV_MON_2, ContestEffect2_8 + if_effect_eq CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONE, ContestEffect2_8 + if_effect_eq CONTEST_EFFECT_BETTER_IF_SAME_TYPE, ContestEffect2_8 + if_effect_eq CONTEST_EFFECT_BETTER_IF_DIFF_TYPE, ContestEffect2_8 + if_effect_eq CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, ContestEffect2_8 + if_effect_eq CONTEST_EFFECT_SLIGHTLY_STARTLE_PREV_MONS, ContestEffect2_9 + if_effect_eq CONTEST_EFFECT_STARTLE_PREV_MONS, ContestEffect2_9 + if_effect_eq CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, ContestEffect2_9 + if_effect_eq CONTEST_EFFECT_STARTLE_PREV_MONS_2, ContestEffect2_9 + if_effect_eq CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, ContestEffect2_9 + if_effect_eq CONTEST_EFFECT_SHIFT_JUDGE_ATTENTION, ContestEffect2_9 + if_effect_eq CONTEST_EFFECT_JAMS_OTHERS_BUT_MISS_ONE_TURN, ContestEffect2_9 + if_effect_eq CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, ContestEffect2_9 + if_effect_eq CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, ContestEffect2_9 + if_effect_eq CONTEST_EFFECT_STARTLE_MONS_COOL_APPEAL, ContestEffect2_9 + if_effect_eq CONTEST_EFFECT_STARTLE_MONS_BEAUTY_APPEAL, ContestEffect2_9 + if_effect_eq CONTEST_EFFECT_STARTLE_MONS_CUTE_APPEAL, ContestEffect2_9 + if_effect_eq CONTEST_EFFECT_STARTLE_MONS_SMART_APPEAL, ContestEffect2_9 + if_effect_eq CONTEST_EFFECT_STARTLE_MONS_TOUGH_APPEAL, ContestEffect2_9 + if_effect_eq CONTEST_EFFECT_BADLY_STARTLES_MONS_IN_GOOD_CONDITION, ContestEffect2_9 + if_effect_eq CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, ContestEffect2_9 + if_effect_eq CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONES, ContestEffect2_9 + if_effect_eq CONTEST_EFFECT_MAKE_FOLLOWING_MON_NERVOUS, ContestEffect2_25 + if_effect_eq CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, ContestEffect2_26 + if_effect_eq CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, ContestEffect2_26 + if_effect_eq CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, ContestEffect2_38 + if_effect_eq CONTEST_EFFECT_AVOID_STARTLE_ONCE, ContestEffect2_4 + if_effect_eq CONTEST_EFFECT_AVOID_STARTLE, ContestEffect2_4 + if_effect_eq CONTEST_EFFECT_AVOID_STARTLE_SLIGHTLY, ContestEffect2_4 + if_effect_eq CONTEST_EFFECT_GREAT_APPEAL_BUT_NO_MORE_MOVES, ContestEffect2_2 end ContestEffect2_8: @@ -787,9 +787,9 @@ Unknown_081DCA4C: if_user_order_eq 0x03 AI_effectcheck4_081DCA4C end AI_effectcheck1_081DCA4C: - if_effect_eq 0x1D AI_score1_081DCA4C - if_effect_eq 0x21 AI_score2_081DCA4C - if_effect_type_eq 0x01 AI_random1_081DCA4C + if_effect_eq CONTEST_EFFECT_BETTER_IF_FIRST AI_score1_081DCA4C + if_effect_eq CONTEST_EFFECT_BETTER_WHEN_LATER AI_score2_081DCA4C + if_effect_type_eq CONTEST_BEAUTY AI_random1_081DCA4C end AI_score1_081DCA4C: score 0x0F @@ -802,8 +802,8 @@ AI_random1_081DCA4C: score 0x0A end AI_effectcheck2_081DCA4C: - if_effect_eq 0x21 AI_score3_081DCA4C - if_effect_type_eq 0x01 AI_random2_081DCA4C + if_effect_eq CONTEST_EFFECT_BETTER_WHEN_LATER AI_score3_081DCA4C + if_effect_type_eq CONTEST_BEAUTY AI_random2_081DCA4C end AI_score3_081DCA4C: score 0xFB @@ -813,21 +813,21 @@ AI_random2_081DCA4C: score 0x0A end AI_effectcheck3_081DCA4C: - if_effect_eq 0x21 AI_score4_081DCA4C - if_effect_eq 0x1F AI_score4_081DCA4C - if_effect_eq 0x01 AI_score4_081DCA4C + if_effect_eq CONTEST_EFFECT_BETTER_WHEN_LATER AI_score4_081DCA4C + if_effect_eq CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONES AI_score4_081DCA4C + if_effect_eq CONTEST_EFFECT_USER_MORE_EASILY_STARTLED AI_score4_081DCA4C end AI_score4_081DCA4C: score 0x05 end AI_effectcheck4_081DCA4C: - if_effect_eq 0x21 AI_score5_081DCA4C - if_effect_eq 0x1E AI_score5_081DCA4C - if_effect_eq 0x1F AI_score5_081DCA4C - if_effect_eq 0x01 AI_score5_081DCA4C - if_effect_eq 0x12 AI_score7_081DCA4C - if_effect_type_eq 0x01 AI_score6_081DCA4C - if_effect_type_eq 0x03 AI_random3_081DCA4C + if_effect_eq CONTEST_EFFECT_BETTER_WHEN_LATER AI_score5_081DCA4C + if_effect_eq CONTEST_EFFECT_BETTER_IF_LAST AI_score5_081DCA4C + if_effect_eq CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONES AI_score5_081DCA4C + if_effect_eq CONTEST_EFFECT_USER_MORE_EASILY_STARTLED AI_score5_081DCA4C + if_effect_eq CONTEST_EFFECT_JAMS_OTHERS_BUT_MISS_ONE_TURN AI_score7_081DCA4C + if_effect_type_eq CONTEST_BEAUTY AI_score6_081DCA4C + if_effect_type_eq CONTEST_SMART AI_random3_081DCA4C end AI_score5_081DCA4C: score 0x0F -- cgit v1.2.3 From fc966fcd83f0e69ab7e5ee02ca828f123f7ebdb5 Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Fri, 19 Aug 2016 13:03:43 -0400 Subject: make score decimals --- data/contest_ai_scripts.s | 226 +++++++++++++++++++++++----------------------- 1 file changed, 113 insertions(+), 113 deletions(-) (limited to 'data') diff --git a/data/contest_ai_scripts.s b/data/contest_ai_scripts.s index ca16d1459..9cf168bfa 100644 --- a/data/contest_ai_scripts.s +++ b/data/contest_ai_scripts.s @@ -42,7 +42,7 @@ gUnknown_081DC118:: @ 81DC118 @ unreferenced if_turn_not_eq 0x00 ContestUnreferenced_80 if_effect_not_eq CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS ContestUnreferenced_80 - score 0x0A + score +10 ContestUnreferenced_80: call ContestUnreferenced_0D end @@ -50,7 +50,7 @@ ContestUnreferenced_0D: if_user_order_more_than 0x01 ContestUnreferenced_end if_effect_type_not_eq CONTEST_CUTE ContestUnreferenced_end if_effect_type_not_eq CONTEST_SMART ContestUnreferenced_end - score 0x0A + score +10 ContestUnreferenced_end: end if_turn_eq 0x00 ContestUnreferenced_0F_1 @@ -98,13 +98,13 @@ ContestUnreferenced_0F_5: if_user_order_not_eq 0x03 ContestUnreferenced_2B_1 end ContestUnreferenced_score: - score 0x0A + score +10 end end if_most_appealing_move ContestUnreferenced_score2 end ContestUnreferenced_score2: - score 0x0A + score +10 end Unknown_081DC27F: @@ -115,16 +115,16 @@ Unknown_081DC27F: if_move_used_count_eq 4 AI_score4_081DC27F end AI_score1_081DC27F: - score 0xFB + score -5 end AI_score2_081DC27F: - score 0xF1 + score -15 end AI_score3_081DC27F: - score 0xEC + score -20 end AI_score4_081DC27F: - score 0xE7 + score -25 end AI_end_081DC27F: end @@ -138,50 +138,50 @@ AI_contest09_081DC2AB: if_excitement_eq 0x04 AI_contest0F_1_081DC2AB if_excitement_eq 0x03 AI_contest0F_2_081DC2AB if_user_has_exciting_move AI_end_081DC2AB - score 0x0F + score +15 end AI_contest0F_1_081DC2AB: if_user_order_not_eq 0x00 AI_contest7D_1_081DC2AB if_random 0x33 AI_end_081DC2AB - score 0x14 + score +20 end AI_contest7D_1_081DC2AB: if_random 0x7F AI_end_081DC2AB - score 0xF6 + score -10 end AI_contest0F_2_081DC2AB: if_user_order_not_eq 0x00 AI_contest7D_3_081DC2AB if_turn_eq 0x04 AI_score_081DC2AB AI_contest7D_2_081DC2AB: if_random 0x33 AI_end_081DC2AB - score 0x0A + score +10 end AI_score_081DC2AB: - score 0x0F + score +15 end AI_contest7D_3_081DC2AB: if_random 0x7F AI_end_081DC2AB - score 0x0A + score +10 end AI_contest7D_4_081DC2AB: if_random 0x7F AI_end_081DC2AB - score 0x0A + score +10 end AI_contest3D_081DC2AB: if_move_used_count_more_than 0x00 AI_contest29_081DC2AB if_user_order_not_eq 0x00 AI_contest7D_5_081DC2AB if_excitement_not_eq 0x04 AI_contest7D_5_081DC2AB - score 0x1E + score +30 end AI_contest7D_5_081DC2AB: if_random 0x64 AI_end_081DC2AB - score 0x0A + score +10 end AI_contest29_081DC2AB: if_effect_not_eq CONTEST_EFFECT_REPETITION_NOT_BORING AI_end_081DC2AB if_user_order_not_eq 0x00 AI_contest7D_5_081DC2AB if_excitement_not_eq 0x04 AI_contest7D_5_081DC2AB - score 0x1E + score +30 end AI_end_081DC2AB: end @@ -201,33 +201,33 @@ AI_contest3F_081DC348: end AI_contest45_081DC348: if_not_combo_finisher AI_end_081DC348 - score 0xF6 + score -10 end AI_score_081DC348: - score 0x19 + score +25 end AI_contest04_1_081DC348: if_turn_eq 0x04 AI_contest7D_081DC348 if_random 0x96 AI_end_081DC348 - score 0x0A + score +10 end AI_contest04_2_081DC348: if_turn_eq 0x04 AI_contest7D_081DC348 if_random 0x7D AI_end_081DC348 - score 0x0A + score +10 end AI_contest04_3_081DC348: if_turn_eq 0x04 AI_contest7D_081DC348 if_random 0x32 AI_end_081DC348 - score 0x0A + score +10 end AI_contest04_4_081DC348: if_turn_eq 0x04 AI_contest7D_081DC348 - score 0x0A + score +10 end AI_contest7D_081DC348: if_random 0x7D AI_end_081DC348 - score 0xF1 + score -15 end AI_end_081DC348: end @@ -256,71 +256,71 @@ ContestEffect39: if_user_condition_eq 0x00 ContestEffect39_score4 end ContestEffect39_score1: - score 0x14 + score +20 end ContestEffect39_score2: if_random 0x7D ContestEffectEnd - score 0x0F + score +15 end ContestEffect39_score3: if_random 0x7D ContestEffectEnd - score 0x05 + score +5 end ContestEffect39_score4: - score 0xEC + score -20 end ContestEffect40: if_effect_in_user_moveset CONTEST_EFFECT_BETTER_IF_FIRST ContestEffectEnd if_random 0x32 ContestEffectEnd - score 0x14 + score +20 end ContestEffect41: if_effect_in_user_moveset CONTEST_EFFECT_BETTER_IF_LAST ContestEffectEnd if_random 0x32 ContestEffectEnd - score 0x14 + score +20 end ContestEffect3: if_user_order_not_eq 0x03 ContestEffectEnd if_random 0x32 ContestEffectEnd - score 0x0F + score +15 end if_turn_eq 0x04 ContestEffect3_7D if_random 0xDC ContestEffect3_score - score 0x0A + score +10 end ContestEffect3_7D: if_random 0x14 ContestEffectEnd - score 0x0F + score +15 end ContestEffect3_score: - score 0xEC + score -20 end ContestEffect38: if_effect_in_user_moveset CONTEST_EFFECT_BETTER_WITH_GOOD_CONDITION ContestEffect38_contest04 if_user_condition_eq 0x03 ContestEffect38_score1 if_random 0x32 ContestEffectEnd - score 0x0F + score +15 end ContestEffect38_score1: - score 0xF6 + score -10 end ContestEffect38_contest04: if_turn_eq 0x04 ContestEffect38_score2 if_turn_eq 0x00 ContestEffect38_random if_move_used_count_eq 1 ContestEffectEnd if_random 0x7D ContestEffectEnd - score 0x0A + score +10 end ContestEffect38_random: if_random 0x64 ContestEffectEnd - score 0x0A + score +10 end ContestEffect38_score2: - score 0xF6 + score -10 end ContestEffect47: @@ -330,11 +330,11 @@ ContestEffect47: if_turn_not_eq 0x04 ContestEffectEnd if_user_has_exciting_move ContestEffectEnd if_excitement_less_than 0x01 ContestEffectEnd - score 0x0A + score +10 end ContestEffect47_random: if_random 0x7F ContestEffectEnd - score 0x0A + score +10 end ContestEffect31: @@ -343,13 +343,13 @@ ContestEffect31: if_user_order_eq 0x03 ContestEffect31_score3 end ContestEffect31_score1: - score 0x05 + score +5 end ContestEffect31_score2: - score 0x0F + score +15 end ContestEffect31_score3: - score 0x14 + score +20 end ContestEffect32: @@ -359,34 +359,34 @@ ContestEffect32: if_user_order_eq 0x03 ContestEffect32_score5 end ContestEffect32_score1: - score 0xF6 + score -10 end ContestEffect32_score2: contest_55 0x00 ContestEffectEnd - score 0x05 + score +5 end ContestEffect32_score3: contest_55 0x00 ContestEffect32_score4 - score 0x05 + score +5 jump ContestEffect32_score4 end ContestEffect32_score4: contest_55 0x01 ContestEffectEnd - score 0x05 + score +5 end ContestEffect32_score5: contest_55 0x00 ContestEffect32_score6 - score 0x05 + score +5 jump ContestEffect32_score6 end ContestEffect32_score6: contest_55 0x01 ContestEffect32_score7 - score 0x05 + score +5 jump ContestEffect32_score7 end ContestEffect32_score7: contest_55 0x02 ContestEffectEnd - score 0x05 + score +5 end ContestEffect46: @@ -400,19 +400,19 @@ ContestEffect46_05: end ContestEffect46_score1: if_random 0x7D ContestEffectEnd - score 0xF1 + score -15 end ContestEffect46_score2: if_random 0x7D ContestEffectEnd - score 0x14 + score +20 end ContestEffect46_score3: if_random 0x7D ContestEffectEnd - score 0x0F + score +15 end ContestEffect46_score4: if_random 0xB2 ContestEffectEnd - score 0x0A + score +10 end ContestEffect27: @@ -428,17 +428,17 @@ ContestEffect27_55_1: end ContestEffect27_score1: if_random 0x7D ContestEffect27_55_2 - score 0x05 + score +5 if_user_order_more_than 0x01 ContestEffect27_55_2 end ContestEffect27_score2: if_random 0x7D ContestEffect27_55_2 - score 0x0A + score +10 if_user_order_more_than 0x01 ContestEffect27_55_2 end ContestEffect27_score3: if_random 0x7D ContestEffect27_55_2 - score 0x0F + score +15 if_user_order_more_than 0x01 ContestEffect27_55_2 end ContestEffect27_noscore: @@ -453,17 +453,17 @@ ContestEffect27_55_2: end ContestEffect27_score4: if_random 0x7D ContestEffect27_55_3 - score 0x05 + score +5 if_user_order_more_than 0x02 ContestEffect27_55_3 end ContestEffect27_score5: if_random 0x7D ContestEffect27_55_3 - score 0x0A + score +10 if_user_order_more_than 0x02 ContestEffect27_55_3 end ContestEffect27_score6: if_random 0x7D ContestEffect27_55_3 - score 0x0F + score +15 if_user_order_more_than 0x02 ContestEffect27_55_3 end ContestEffect27_noscore2: @@ -478,15 +478,15 @@ ContestEffect27_55_3: end ContestEffect27_score7: if_random 0x7D ContestEffectEnd - score 0x05 + score +5 end ContestEffect27_score8: if_random 0x7D ContestEffectEnd - score 0x0A + score +10 end ContestEffect27_score9: if_random 0x7D ContestEffectEnd - score 0x0F + score +15 end ContestEffect27_end: end @@ -499,27 +499,27 @@ ContestEffect16or17_55: contest_55 0x00 ContestEffect16or17_0E_1 contest_51 0x00 0x01 ContestEffect16or17_0E_1 if_random 0x7D ContestEffect16or17_0E_1 - score 0x02 + score +2 contest_58 0x00 ContestEffect16or17_0E_1 - score 0x08 + score +8 end ContestEffect16or17_0E_1: if_user_order_eq 0x01 ContestEffectEnd contest_55 0x01 ContestEffect16or17_0E_2 contest_51 0x01 0x01 ContestEffect16or17_0E_2 if_random 0x7D ContestEffect16or17_0E_2 - score 0x02 + score +2 contest_58 0x01 ContestEffect16or17_0E_2 - score 0x08 + score +8 end ContestEffect16or17_0E_2: if_user_order_eq 0x02 ContestEffectEnd contest_55 0x02 ContestEffectEnd contest_51 0x02 0x01 ContestEffectEnd if_random 0x7D ContestEffectEnd - score 0x02 + score +2 contest_58 0x02 ContestEffectEnd - score 0x08 + score +8 end @ This routine checks the following mons using contest_51 and contest_55 @@ -558,7 +558,7 @@ ContestEffect18: jump ContestEffect18_0E end ContestEffect18_score1: - score 0x05 + score +5 jump ContestEffect18_0E end ContestEffect18_0E: @@ -568,19 +568,19 @@ ContestEffect18_0E: if_user_order_eq 0x03 ContestEffect18_random3 end ContestEffect18_score2: - score 0xF1 + score -15 end ContestEffect18_random1: if_random 0x7D ContestEffectEnd - score 0xF6 + score -10 end ContestEffect18_random2: if_random 0x7D ContestEffectEnd - score 0x05 + score +5 end ContestEffect18_random3: if_random 0x7D ContestEffectEnd - score 0x0F + score +15 end ContestEffectEnd: @@ -593,7 +593,7 @@ Unknown_081DC7DE: end AI_contest7D_081DC7DE: if_random 0x7D AI_end_081DC7DE - score 0x0A + score +10 end AI_end_081DC7DE: end @@ -641,19 +641,19 @@ ContestEffect2_8: if_user_order_eq 0x03 ContestEffect2_8_score4 end ContestEffect2_8_score1: - score 0xF6 + score -10 end ContestEffect2_8_score2: contest_54 0x00 ContestEffectEnd2 - score 0xF6 + score -10 end ContestEffect2_8_score3: contest_54 0x01 ContestEffectEnd2 - score 0xF6 + score -10 end ContestEffect2_8_score4: contest_54 0x02 ContestEffectEnd2 - score 0xF6 + score -10 end ContestEffect2_9: @@ -663,90 +663,90 @@ ContestEffect2_9: if_user_order_eq 0x03 ContestEffect2_9_score4 end ContestEffect2_9_score1: - score 0xEC + score -20 end ContestEffect2_9_score2: contest_54 0x00 ContestEffectEnd2 - score 0xF1 + score -15 end ContestEffect2_9_score3: contest_54 0x00 ContestEffectEnd2 contest_54 0x01 ContestEffectEnd2 - score 0xF1 + score -15 end ContestEffect2_9_score4: contest_54 0x00 ContestEffectEnd2 contest_54 0x01 ContestEffectEnd2 contest_54 0x02 ContestEffectEnd2 - score 0xF1 + score -15 end ContestEffect2_25: if_user_order_eq 0x00 ContestEffect2_25_score1 if_user_order_eq 0x01 ContestEffect2_25_score2 if_user_order_eq 0x02 ContestEffect2_25_score3 - score 0xF6 + score -10 end ContestEffect2_25_score1: contest_54 0x01 ContestEffectEnd2 - score 0xF6 + score -10 end ContestEffect2_25_score2: contest_54 0x02 ContestEffectEnd2 - score 0xF6 + score -10 end ContestEffect2_25_score3: contest_54 0x03 ContestEffectEnd2 - score 0xF6 + score -10 end ContestEffect2_26: if_user_order_eq 0x00 ContestEffect2_26_score1 if_user_order_eq 0x01 ContestEffect2_26_score2 if_user_order_eq 0x02 ContestEffect2_26_score3 - score 0xF6 + score -10 end ContestEffect2_26_score1: contest_54 0x01 ContestEffectEnd2 contest_54 0x02 ContestEffectEnd2 contest_54 0x03 ContestEffectEnd2 - score 0xF6 + score -10 end ContestEffect2_26_score2: contest_54 0x02 ContestEffectEnd2 contest_54 0x03 ContestEffectEnd2 - score 0xF6 + score -10 end ContestEffect2_26_score3: contest_54 0x03 ContestEffectEnd2 - score 0xF6 + score -10 end ContestEffect2_38: if_user_condition_less_than 0x03 ContestEffectEnd2 - score 0xEC + score -20 end ContestEffect2_4: if_user_order_eq 0x00 ContestEffect2_4_score1 if_user_order_eq 0x01 ContestEffect2_4_score2 if_user_order_eq 0x02 ContestEffect2_4_score3 - score 0xF6 + score -10 end ContestEffect2_4_score1: contest_54 0x01 ContestEffectEnd2 contest_54 0x02 ContestEffectEnd2 contest_54 0x03 ContestEffectEnd2 - score 0xF6 + score -10 end ContestEffect2_4_score2: contest_54 0x02 ContestEffectEnd2 contest_54 0x03 ContestEffectEnd2 - score 0xF6 + score -10 end ContestEffect2_4_score3: contest_54 0x03 ContestEffectEnd2 - score 0xF6 + score -10 end ContestEffect2_2: @@ -758,23 +758,23 @@ ContestEffect2_2: end ContestEffect2_2_score1: if_random 0x14 ContestEffectEnd2 - score 0xF1 + score -15 end ContestEffect2_2_score2: if_random 0x28 ContestEffectEnd2 - score 0xF1 + score -15 end ContestEffect2_2_score3: if_random 0x3C ContestEffectEnd2 - score 0xF1 + score -15 end ContestEffect2_2_score4: if_random 0x50 ContestEffectEnd2 - score 0xF1 + score -15 end ContestEffect2_2_score5: if_random 0x14 ContestEffectEnd2 - score 0x14 + score +20 end ContestEffectEnd2: @@ -792,25 +792,25 @@ AI_effectcheck1_081DCA4C: if_effect_type_eq CONTEST_BEAUTY AI_random1_081DCA4C end AI_score1_081DCA4C: - score 0x0F + score +15 end AI_score2_081DCA4C: - score 0xF1 + score -15 end AI_random1_081DCA4C: if_random 0x64 ContestEffectEnd2 - score 0x0A + score +10 end AI_effectcheck2_081DCA4C: if_effect_eq CONTEST_EFFECT_BETTER_WHEN_LATER AI_score3_081DCA4C if_effect_type_eq CONTEST_BEAUTY AI_random2_081DCA4C end AI_score3_081DCA4C: - score 0xFB + score -5 end AI_random2_081DCA4C: if_random 0x7D ContestEffectEnd2 - score 0x0A + score +10 end AI_effectcheck3_081DCA4C: if_effect_eq CONTEST_EFFECT_BETTER_WHEN_LATER AI_score4_081DCA4C @@ -818,7 +818,7 @@ AI_effectcheck3_081DCA4C: if_effect_eq CONTEST_EFFECT_USER_MORE_EASILY_STARTLED AI_score4_081DCA4C end AI_score4_081DCA4C: - score 0x05 + score +5 end AI_effectcheck4_081DCA4C: if_effect_eq CONTEST_EFFECT_BETTER_WHEN_LATER AI_score5_081DCA4C @@ -830,17 +830,17 @@ AI_effectcheck4_081DCA4C: if_effect_type_eq CONTEST_SMART AI_random3_081DCA4C end AI_score5_081DCA4C: - score 0x0F + score +15 end AI_score6_081DCA4C: - score 0xF6 + score -10 end AI_random3_081DCA4C: if_random 0x7D ContestEffectEnd2 - score 0x0A + score +10 end AI_score7_081DCA4C: - score 0x05 + score +5 end Unknown_081DCAF3: -- cgit v1.2.3 From 56bddd62135497e96942624538bd3e1eaa208f2f Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Fri, 19 Aug 2016 13:24:19 -0400 Subject: revert effect type to decimals --- data/contest_ai_scripts.s | 60 +++++++++++++++++++++++------------------------ 1 file changed, 30 insertions(+), 30 deletions(-) (limited to 'data') diff --git a/data/contest_ai_scripts.s b/data/contest_ai_scripts.s index 9cf168bfa..5f0de602c 100644 --- a/data/contest_ai_scripts.s +++ b/data/contest_ai_scripts.s @@ -47,9 +47,9 @@ ContestUnreferenced_80: call ContestUnreferenced_0D end ContestUnreferenced_0D: - if_user_order_more_than 0x01 ContestUnreferenced_end - if_effect_type_not_eq CONTEST_CUTE ContestUnreferenced_end - if_effect_type_not_eq CONTEST_SMART ContestUnreferenced_end + if_user_order_more_than 1 ContestUnreferenced_end + if_effect_type_not_eq 2 ContestUnreferenced_end + if_effect_type_not_eq 3 ContestUnreferenced_end score +10 ContestUnreferenced_end: end @@ -60,42 +60,42 @@ ContestUnreferenced_end: if_turn_eq 0x04 ContestUnreferenced_0F_5 end ContestUnreferenced_0F_1: - if_user_order_not_eq 0x00 ContestUnreferenced_2B_1 - if_user_order_not_eq 0x01 ContestUnreferenced_2B_2 - if_user_order_not_eq 0x02 ContestUnreferenced_2B_1 - if_user_order_not_eq 0x03 ContestUnreferenced_2B_1 + if_user_order_not_eq 0 ContestUnreferenced_2B_1 + if_user_order_not_eq 1 ContestUnreferenced_2B_2 + if_user_order_not_eq 2 ContestUnreferenced_2B_1 + if_user_order_not_eq 3 ContestUnreferenced_2B_1 end ContestUnreferenced_2B_1: - if_effect_type_eq CONTEST_BEAUTY ContestUnreferenced_score + if_effect_type_eq 1 ContestUnreferenced_score end ContestUnreferenced_2B_2: - if_effect_type_eq CONTEST_BEAUTY ContestUnreferenced_score + if_effect_type_eq 1 ContestUnreferenced_score end - if_effect_type_eq CONTEST_BEAUTY ContestUnreferenced_score + if_effect_type_eq 1 ContestUnreferenced_score end ContestUnreferenced_0F_2: - if_user_order_not_eq 0x00 ContestUnreferenced_2B_1 - if_user_order_not_eq 0x01 ContestUnreferenced_2B_1 - if_user_order_not_eq 0x02 ContestUnreferenced_2B_1 - if_user_order_not_eq 0x03 ContestUnreferenced_2B_1 + if_user_order_not_eq 0 ContestUnreferenced_2B_1 + if_user_order_not_eq 1 ContestUnreferenced_2B_1 + if_user_order_not_eq 2 ContestUnreferenced_2B_1 + if_user_order_not_eq 3 ContestUnreferenced_2B_1 end ContestUnreferenced_0F_3: - if_user_order_not_eq 0x00 ContestUnreferenced_2B_1 - if_user_order_not_eq 0x01 ContestUnreferenced_2B_1 - if_user_order_not_eq 0x02 ContestUnreferenced_2B_1 - if_user_order_not_eq 0x03 ContestUnreferenced_2B_1 + if_user_order_not_eq 0 ContestUnreferenced_2B_1 + if_user_order_not_eq 1 ContestUnreferenced_2B_1 + if_user_order_not_eq 2 ContestUnreferenced_2B_1 + if_user_order_not_eq 3 ContestUnreferenced_2B_1 end ContestUnreferenced_0F_4: - if_user_order_not_eq 0x00 ContestUnreferenced_2B_1 - if_user_order_not_eq 0x01 ContestUnreferenced_2B_1 - if_user_order_not_eq 0x02 ContestUnreferenced_2B_1 - if_user_order_not_eq 0x03 ContestUnreferenced_2B_1 + if_user_order_not_eq 0 ContestUnreferenced_2B_1 + if_user_order_not_eq 1 ContestUnreferenced_2B_1 + if_user_order_not_eq 2 ContestUnreferenced_2B_1 + if_user_order_not_eq 3 ContestUnreferenced_2B_1 end ContestUnreferenced_0F_5: - if_user_order_not_eq 0x00 ContestUnreferenced_2B_1 - if_user_order_not_eq 0x01 ContestUnreferenced_2B_1 - if_user_order_not_eq 0x02 ContestUnreferenced_2B_1 - if_user_order_not_eq 0x03 ContestUnreferenced_2B_1 + if_user_order_not_eq 0 ContestUnreferenced_2B_1 + if_user_order_not_eq 1 ContestUnreferenced_2B_1 + if_user_order_not_eq 2 ContestUnreferenced_2B_1 + if_user_order_not_eq 3 ContestUnreferenced_2B_1 end ContestUnreferenced_score: score +10 @@ -789,7 +789,7 @@ Unknown_081DCA4C: AI_effectcheck1_081DCA4C: if_effect_eq CONTEST_EFFECT_BETTER_IF_FIRST AI_score1_081DCA4C if_effect_eq CONTEST_EFFECT_BETTER_WHEN_LATER AI_score2_081DCA4C - if_effect_type_eq CONTEST_BEAUTY AI_random1_081DCA4C + if_effect_type_eq 1 AI_random1_081DCA4C end AI_score1_081DCA4C: score +15 @@ -803,7 +803,7 @@ AI_random1_081DCA4C: end AI_effectcheck2_081DCA4C: if_effect_eq CONTEST_EFFECT_BETTER_WHEN_LATER AI_score3_081DCA4C - if_effect_type_eq CONTEST_BEAUTY AI_random2_081DCA4C + if_effect_type_eq 1 AI_random2_081DCA4C end AI_score3_081DCA4C: score -5 @@ -826,8 +826,8 @@ AI_effectcheck4_081DCA4C: if_effect_eq CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONES AI_score5_081DCA4C if_effect_eq CONTEST_EFFECT_USER_MORE_EASILY_STARTLED AI_score5_081DCA4C if_effect_eq CONTEST_EFFECT_JAMS_OTHERS_BUT_MISS_ONE_TURN AI_score7_081DCA4C - if_effect_type_eq CONTEST_BEAUTY AI_score6_081DCA4C - if_effect_type_eq CONTEST_SMART AI_random3_081DCA4C + if_effect_type_eq 1 AI_score6_081DCA4C + if_effect_type_eq 3 AI_random3_081DCA4C end AI_score5_081DCA4C: score +15 -- cgit v1.2.3 From 72a90f2754173a962a9b409a9c8592dc14982a2e Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Fri, 19 Aug 2016 13:42:26 -0400 Subject: labels for contest AI functions --- data/contest_ai_scripts.s | 80 +++++++++++++++++++++++------------------------ 1 file changed, 40 insertions(+), 40 deletions(-) (limited to 'data') diff --git a/data/contest_ai_scripts.s b/data/contest_ai_scripts.s index 5f0de602c..2d534d0e2 100644 --- a/data/contest_ai_scripts.s +++ b/data/contest_ai_scripts.s @@ -6,38 +6,38 @@ .align 2 gUnknown_081DC118:: @ 81DC118 - .4byte Unknown_081DC7FB - .4byte Unknown_081DC348 - .4byte Unknown_081DC27F - .4byte Unknown_081DC2AB - .4byte Unknown_081DCA4C - .4byte Unknown_081DC3C7 - .4byte Unknown_081DC7DE - .4byte Unknown_081DCAF3 - .4byte Unknown_081DCAF3 - .4byte Unknown_081DCAF3 - .4byte Unknown_081DCAF3 - .4byte Unknown_081DCAF3 - .4byte Unknown_081DCAF3 - .4byte Unknown_081DCAF3 - .4byte Unknown_081DCAF3 - .4byte Unknown_081DCAF3 - .4byte Unknown_081DCAF3 - .4byte Unknown_081DCAF3 - .4byte Unknown_081DCAF3 - .4byte Unknown_081DCAF3 - .4byte Unknown_081DCAF3 - .4byte Unknown_081DCAF3 - .4byte Unknown_081DCAF3 - .4byte Unknown_081DCAF3 - .4byte Unknown_081DCAF3 - .4byte Unknown_081DCAF3 - .4byte Unknown_081DCAF3 - .4byte Unknown_081DCAF3 - .4byte Unknown_081DCAF3 - .4byte Unknown_081DCAF3 - .4byte Unknown_081DCAF3 - .4byte Unknown_081DCAF3 + .4byte CheckForBadMove + .4byte CheckForCombo + .4byte CheckBoring + .4byte CheckExcitement + .4byte CheckOrder + .4byte CheckForGoodMove + .4byte TryErraticInCuteSmartTough + .4byte AI_nothing + .4byte AI_nothing + .4byte AI_nothing + .4byte AI_nothing + .4byte AI_nothing + .4byte AI_nothing + .4byte AI_nothing + .4byte AI_nothing + .4byte AI_nothing + .4byte AI_nothing + .4byte AI_nothing + .4byte AI_nothing + .4byte AI_nothing + .4byte AI_nothing + .4byte AI_nothing + .4byte AI_nothing + .4byte AI_nothing + .4byte AI_nothing + .4byte AI_nothing + .4byte AI_nothing + .4byte AI_nothing + .4byte AI_nothing + .4byte AI_nothing + .4byte AI_nothing + .4byte AI_nothing @ unreferenced if_turn_not_eq 0x00 ContestUnreferenced_80 @@ -107,7 +107,7 @@ ContestUnreferenced_score2: score +10 end -Unknown_081DC27F: +CheckBoring: if_effect_eq CONTEST_EFFECT_REPETITION_NOT_BORING, AI_end_081DC27F if_move_used_count_eq 1 AI_score1_081DC27F if_move_used_count_eq 2 AI_score2_081DC27F @@ -129,7 +129,7 @@ AI_score4_081DC27F: AI_end_081DC27F: end -Unknown_081DC2AB: +CheckExcitement: if_move_excitement_less_than 0x00 AI_contest09_081DC2AB if_move_excitement_eq 0x00 AI_contest7D_4_081DC2AB if_move_excitement_eq 0x01 AI_contest3D_081DC2AB @@ -186,7 +186,7 @@ AI_contest29_081DC2AB: AI_end_081DC2AB: end -Unknown_081DC348: +CheckForCombo: if_would_finish_combo AI_score_081DC348 call AI_contest3F_081DC348 call AI_contest45_081DC348 @@ -232,7 +232,7 @@ AI_contest7D_081DC348: AI_end_081DC348: end -Unknown_081DC3C7: +CheckForGoodMove: if_effect_eq CONTEST_EFFECT_BETTER_WITH_GOOD_CONDITION, ContestEffect39 if_effect_eq CONTEST_EFFECT_NEXT_APPEAL_EARLIER, ContestEffect40 if_effect_eq CONTEST_EFFECT_NEXT_APPEAL_LATER, ContestEffect41 @@ -586,7 +586,7 @@ ContestEffect18_random3: ContestEffectEnd: end -Unknown_081DC7DE: +TryErraticInCuteSmartTough: if_contest_type_eq CONTEST_CUTE, AI_contest7D_081DC7DE if_contest_type_eq CONTEST_SMART, AI_contest7D_081DC7DE if_contest_type_eq CONTEST_TOUGH, AI_contest7D_081DC7DE @@ -598,7 +598,7 @@ AI_contest7D_081DC7DE: AI_end_081DC7DE: end -Unknown_081DC7FB: +CheckForBadMove: if_effect_eq CONTEST_EFFECT_STARTLE_FRONT_MON, ContestEffect2_8 if_effect_eq CONTEST_EFFECT_STARTLE_PREV_MON, ContestEffect2_8 if_effect_eq CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, ContestEffect2_8 @@ -780,7 +780,7 @@ ContestEffect2_2_score5: ContestEffectEnd2: end -Unknown_081DCA4C: +CheckOrder: if_user_order_eq 0x00 AI_effectcheck1_081DCA4C if_user_order_eq 0x01 AI_effectcheck2_081DCA4C if_user_order_eq 0x02 AI_effectcheck3_081DCA4C @@ -843,5 +843,5 @@ AI_score7_081DCA4C: score +5 end -Unknown_081DCAF3: +AI_nothing: end -- cgit v1.2.3 From 94f6f47e59d0dffd4daa76864904af41f4b9cc50 Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Fri, 19 Aug 2016 13:52:04 -0400 Subject: more cleanup --- data/contest_ai_scripts.s | 165 +++++++++++++++++++++++----------------------- 1 file changed, 83 insertions(+), 82 deletions(-) (limited to 'data') diff --git a/data/contest_ai_scripts.s b/data/contest_ai_scripts.s index 2d534d0e2..dad5cb1cf 100644 --- a/data/contest_ai_scripts.s +++ b/data/contest_ai_scripts.s @@ -40,7 +40,7 @@ gUnknown_081DC118:: @ 81DC118 .4byte AI_nothing @ unreferenced - if_turn_not_eq 0x00 ContestUnreferenced_80 + if_turn_not_eq 0 ContestUnreferenced_80 if_effect_not_eq CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS ContestUnreferenced_80 score +10 ContestUnreferenced_80: @@ -53,11 +53,11 @@ ContestUnreferenced_0D: score +10 ContestUnreferenced_end: end - if_turn_eq 0x00 ContestUnreferenced_0F_1 - if_turn_eq 0x01 ContestUnreferenced_0F_2 - if_turn_eq 0x02 ContestUnreferenced_0F_3 - if_turn_eq 0x03 ContestUnreferenced_0F_4 - if_turn_eq 0x04 ContestUnreferenced_0F_5 + if_turn_eq 0 ContestUnreferenced_0F_1 + if_turn_eq 1 ContestUnreferenced_0F_2 + if_turn_eq 2 ContestUnreferenced_0F_3 + if_turn_eq 3 ContestUnreferenced_0F_4 + if_turn_eq 4 ContestUnreferenced_0F_5 end ContestUnreferenced_0F_1: if_user_order_not_eq 0 ContestUnreferenced_2B_1 @@ -141,7 +141,7 @@ AI_contest09_081DC2AB: score +15 end AI_contest0F_1_081DC2AB: - if_user_order_not_eq 0x00 AI_contest7D_1_081DC2AB + if_user_order_not_eq 0 AI_contest7D_1_081DC2AB if_random 0x33 AI_end_081DC2AB score +20 end @@ -150,8 +150,8 @@ AI_contest7D_1_081DC2AB: score -10 end AI_contest0F_2_081DC2AB: - if_user_order_not_eq 0x00 AI_contest7D_3_081DC2AB - if_turn_eq 0x04 AI_score_081DC2AB + if_user_order_not_eq 0 AI_contest7D_3_081DC2AB + if_turn_eq 4 AI_score_081DC2AB AI_contest7D_2_081DC2AB: if_random 0x33 AI_end_081DC2AB score +10 @@ -169,7 +169,7 @@ AI_contest7D_4_081DC2AB: end AI_contest3D_081DC2AB: if_move_used_count_more_than 0x00 AI_contest29_081DC2AB - if_user_order_not_eq 0x00 AI_contest7D_5_081DC2AB + if_user_order_not_eq 0 AI_contest7D_5_081DC2AB if_excitement_not_eq 0x04 AI_contest7D_5_081DC2AB score +30 end @@ -179,7 +179,7 @@ AI_contest7D_5_081DC2AB: end AI_contest29_081DC2AB: if_effect_not_eq CONTEST_EFFECT_REPETITION_NOT_BORING AI_end_081DC2AB - if_user_order_not_eq 0x00 AI_contest7D_5_081DC2AB + if_user_order_not_eq 0 AI_contest7D_5_081DC2AB if_excitement_not_eq 0x04 AI_contest7D_5_081DC2AB score +30 end @@ -194,10 +194,10 @@ CheckForCombo: AI_contest3F_081DC348: if_move_used_count_not_eq 0x00 AI_end_081DC348 if_not_combo_starter AI_end_081DC348 - if_user_order_eq 0x00 AI_contest04_1_081DC348 - if_user_order_eq 0x01 AI_contest04_2_081DC348 - if_user_order_eq 0x02 AI_contest04_3_081DC348 - if_user_order_eq 0x03 AI_contest04_4_081DC348 + if_user_order_eq 0 AI_contest04_1_081DC348 + if_user_order_eq 1 AI_contest04_2_081DC348 + if_user_order_eq 2 AI_contest04_3_081DC348 + if_user_order_eq 3 AI_contest04_4_081DC348 end AI_contest45_081DC348: if_not_combo_finisher AI_end_081DC348 @@ -207,22 +207,22 @@ AI_score_081DC348: score +25 end AI_contest04_1_081DC348: - if_turn_eq 0x04 AI_contest7D_081DC348 + if_turn_eq 4 AI_contest7D_081DC348 if_random 0x96 AI_end_081DC348 score +10 end AI_contest04_2_081DC348: - if_turn_eq 0x04 AI_contest7D_081DC348 + if_turn_eq 4 AI_contest7D_081DC348 if_random 0x7D AI_end_081DC348 score +10 end AI_contest04_3_081DC348: - if_turn_eq 0x04 AI_contest7D_081DC348 + if_turn_eq 4 AI_contest7D_081DC348 if_random 0x32 AI_end_081DC348 score +10 end AI_contest04_4_081DC348: - if_turn_eq 0x04 AI_contest7D_081DC348 + if_turn_eq 4 AI_contest7D_081DC348 score +10 end AI_contest7D_081DC348: @@ -283,11 +283,11 @@ ContestEffect41: end ContestEffect3: - if_user_order_not_eq 0x03 ContestEffectEnd + if_user_order_not_eq 3 ContestEffectEnd if_random 0x32 ContestEffectEnd score +15 end - if_turn_eq 0x04 ContestEffect3_7D + if_turn_eq 4 ContestEffect3_7D if_random 0xDC ContestEffect3_score score +10 end @@ -309,8 +309,8 @@ ContestEffect38_score1: score -10 end ContestEffect38_contest04: - if_turn_eq 0x04 ContestEffect38_score2 - if_turn_eq 0x00 ContestEffect38_random + if_turn_eq 4 ContestEffect38_score2 + if_turn_eq 0 ContestEffect38_random if_move_used_count_eq 1 ContestEffectEnd if_random 0x7D ContestEffectEnd score +10 @@ -325,9 +325,9 @@ ContestEffect38_score2: ContestEffect47: if_move_used_count_eq 1 ContestEffectEnd - if_user_order_eq 0x00 ContestEffect47_random - if_user_order_eq 0x01 ContestEffect47_random - if_turn_not_eq 0x04 ContestEffectEnd + if_user_order_eq 0 ContestEffect47_random + if_user_order_eq 1 ContestEffect47_random + if_turn_not_eq 4 ContestEffectEnd if_user_has_exciting_move ContestEffectEnd if_excitement_less_than 0x01 ContestEffectEnd score +10 @@ -338,9 +338,9 @@ ContestEffect47_random: end ContestEffect31: - if_user_order_eq 0x01 ContestEffect31_score1 - if_user_order_eq 0x02 ContestEffect31_score2 - if_user_order_eq 0x03 ContestEffect31_score3 + if_user_order_eq 1 ContestEffect31_score1 + if_user_order_eq 2 ContestEffect31_score2 + if_user_order_eq 3 ContestEffect31_score3 end ContestEffect31_score1: score +5 @@ -353,10 +353,10 @@ ContestEffect31_score3: end ContestEffect32: - if_user_order_eq 0x00 ContestEffect32_score1 - if_user_order_eq 0x01 ContestEffect32_score2 - if_user_order_eq 0x02 ContestEffect32_score3 - if_user_order_eq 0x03 ContestEffect32_score5 + if_user_order_eq 0 ContestEffect32_score1 + if_user_order_eq 1 ContestEffect32_score2 + if_user_order_eq 2 ContestEffect32_score3 + if_user_order_eq 3 ContestEffect32_score5 end ContestEffect32_score1: score -10 @@ -390,11 +390,11 @@ ContestEffect32_score7: end ContestEffect46: - if_user_order_eq 0x00 ContestEffect46_05 - if_user_order_more_than 0x00 ContestEffect46_score4 + if_user_order_eq 0 ContestEffect46_05 + if_user_order_more_than 0 ContestEffect46_score4 end ContestEffect46_05: - if_turn_not_eq 0x00 ContestEffect46_score1 + if_turn_not_eq 0 ContestEffect46_score1 if_excitement_eq 0x04 ContestEffect46_score2 if_excitement_eq 0x03 ContestEffect46_score3 end @@ -416,7 +416,7 @@ ContestEffect46_score4: end ContestEffect27: - if_user_order_eq 0x00 ContestEffectEnd + if_user_order_eq 0 ContestEffectEnd jump ContestEffect27_55_1 end ContestEffect27_55_1: @@ -429,20 +429,20 @@ ContestEffect27_55_1: ContestEffect27_score1: if_random 0x7D ContestEffect27_55_2 score +5 - if_user_order_more_than 0x01 ContestEffect27_55_2 + if_user_order_more_than 1 ContestEffect27_55_2 end ContestEffect27_score2: if_random 0x7D ContestEffect27_55_2 score +10 - if_user_order_more_than 0x01 ContestEffect27_55_2 + if_user_order_more_than 1 ContestEffect27_55_2 end ContestEffect27_score3: if_random 0x7D ContestEffect27_55_2 score +15 - if_user_order_more_than 0x01 ContestEffect27_55_2 + if_user_order_more_than 1 ContestEffect27_55_2 end ContestEffect27_noscore: - if_user_order_more_than 0x01 ContestEffect27_55_2 + if_user_order_more_than 1 ContestEffect27_55_2 end ContestEffect27_55_2: contest_55 0x01 ContestEffect27_noscore2 @@ -454,20 +454,20 @@ ContestEffect27_55_2: ContestEffect27_score4: if_random 0x7D ContestEffect27_55_3 score +5 - if_user_order_more_than 0x02 ContestEffect27_55_3 + if_user_order_more_than 2 ContestEffect27_55_3 end ContestEffect27_score5: if_random 0x7D ContestEffect27_55_3 score +10 - if_user_order_more_than 0x02 ContestEffect27_55_3 + if_user_order_more_than 2 ContestEffect27_55_3 end ContestEffect27_score6: if_random 0x7D ContestEffect27_55_3 score +15 - if_user_order_more_than 0x02 ContestEffect27_55_3 + if_user_order_more_than 2 ContestEffect27_55_3 end ContestEffect27_noscore2: - if_user_order_more_than 0x02 ContestEffect27_55_3 + if_user_order_more_than 2 ContestEffect27_55_3 end ContestEffect27_55_3: contest_55 0x02 ContestEffect27_end @@ -492,7 +492,7 @@ ContestEffect27_end: end ContestEffect16or17: - if_user_order_eq 0x00 ContestEffectEnd + if_user_order_eq 0 ContestEffectEnd jump ContestEffect16or17_55 end ContestEffect16or17_55: @@ -504,7 +504,7 @@ ContestEffect16or17_55: score +8 end ContestEffect16or17_0E_1: - if_user_order_eq 0x01 ContestEffectEnd + if_user_order_eq 1 ContestEffectEnd contest_55 0x01 ContestEffect16or17_0E_2 contest_51 0x01 0x01 ContestEffect16or17_0E_2 if_random 0x7D ContestEffect16or17_0E_2 @@ -513,7 +513,7 @@ ContestEffect16or17_0E_1: score +8 end ContestEffect16or17_0E_2: - if_user_order_eq 0x02 ContestEffectEnd + if_user_order_eq 2 ContestEffectEnd contest_55 0x02 ContestEffectEnd contest_51 0x02 0x01 ContestEffectEnd if_random 0x7D ContestEffectEnd @@ -522,9 +522,10 @@ ContestEffect16or17_0E_2: score +8 end -@ This routine checks the following mons using contest_51 and contest_55 -@ in order to decide if moves that make the following mons nervous should -@ be encouraged. + @ This routine checks the following mons using contest_51 and contest_55 + @ in order to decide if moves that make the following mons nervous should + @ be encouraged. + ContestEffect_FollowingMonsNervous: if_user_order_eq 3, ContestEffectEnd jump ContestEffect_FollowingMonsNervous_CheckMon3 @@ -554,7 +555,7 @@ ContestEffect_FollowingMonsNervous_CheckMon1: end ContestEffect18: - if_turn_eq 0x04 ContestEffect18_score1 + if_turn_eq 4 ContestEffect18_score1 jump ContestEffect18_0E end ContestEffect18_score1: @@ -562,10 +563,10 @@ ContestEffect18_score1: jump ContestEffect18_0E end ContestEffect18_0E: - if_user_order_eq 0x00 ContestEffect18_score2 - if_user_order_eq 0x01 ContestEffect18_random1 - if_user_order_eq 0x02 ContestEffect18_random2 - if_user_order_eq 0x03 ContestEffect18_random3 + if_user_order_eq 0 ContestEffect18_score2 + if_user_order_eq 1 ContestEffect18_random1 + if_user_order_eq 2 ContestEffect18_random2 + if_user_order_eq 3 ContestEffect18_random3 end ContestEffect18_score2: score -15 @@ -635,10 +636,10 @@ CheckForBadMove: end ContestEffect2_8: - if_user_order_eq 0x00 ContestEffect2_8_score1 - if_user_order_eq 0x01 ContestEffect2_8_score2 - if_user_order_eq 0x02 ContestEffect2_8_score3 - if_user_order_eq 0x03 ContestEffect2_8_score4 + if_user_order_eq 0 ContestEffect2_8_score1 + if_user_order_eq 1 ContestEffect2_8_score2 + if_user_order_eq 2 ContestEffect2_8_score3 + if_user_order_eq 3 ContestEffect2_8_score4 end ContestEffect2_8_score1: score -10 @@ -657,10 +658,10 @@ ContestEffect2_8_score4: end ContestEffect2_9: - if_user_order_eq 0x00 ContestEffect2_9_score1 - if_user_order_eq 0x01 ContestEffect2_9_score2 - if_user_order_eq 0x02 ContestEffect2_9_score3 - if_user_order_eq 0x03 ContestEffect2_9_score4 + if_user_order_eq 0 ContestEffect2_9_score1 + if_user_order_eq 1 ContestEffect2_9_score2 + if_user_order_eq 2 ContestEffect2_9_score3 + if_user_order_eq 3 ContestEffect2_9_score4 end ContestEffect2_9_score1: score -20 @@ -682,9 +683,9 @@ ContestEffect2_9_score4: end ContestEffect2_25: - if_user_order_eq 0x00 ContestEffect2_25_score1 - if_user_order_eq 0x01 ContestEffect2_25_score2 - if_user_order_eq 0x02 ContestEffect2_25_score3 + if_user_order_eq 0 ContestEffect2_25_score1 + if_user_order_eq 1 ContestEffect2_25_score2 + if_user_order_eq 2 ContestEffect2_25_score3 score -10 end ContestEffect2_25_score1: @@ -701,9 +702,9 @@ ContestEffect2_25_score3: end ContestEffect2_26: - if_user_order_eq 0x00 ContestEffect2_26_score1 - if_user_order_eq 0x01 ContestEffect2_26_score2 - if_user_order_eq 0x02 ContestEffect2_26_score3 + if_user_order_eq 0 ContestEffect2_26_score1 + if_user_order_eq 1 ContestEffect2_26_score2 + if_user_order_eq 2 ContestEffect2_26_score3 score -10 end ContestEffect2_26_score1: @@ -728,9 +729,9 @@ ContestEffect2_38: end ContestEffect2_4: - if_user_order_eq 0x00 ContestEffect2_4_score1 - if_user_order_eq 0x01 ContestEffect2_4_score2 - if_user_order_eq 0x02 ContestEffect2_4_score3 + if_user_order_eq 0 ContestEffect2_4_score1 + if_user_order_eq 1 ContestEffect2_4_score2 + if_user_order_eq 2 ContestEffect2_4_score3 score -10 end ContestEffect2_4_score1: @@ -750,11 +751,11 @@ ContestEffect2_4_score3: end ContestEffect2_2: - if_turn_eq 0x00 ContestEffect2_2_score1 - if_turn_eq 0x01 ContestEffect2_2_score2 - if_turn_eq 0x02 ContestEffect2_2_score3 - if_turn_eq 0x03 ContestEffect2_2_score4 - if_turn_eq 0x04 ContestEffect2_2_score5 + if_turn_eq 0 ContestEffect2_2_score1 + if_turn_eq 1 ContestEffect2_2_score2 + if_turn_eq 2 ContestEffect2_2_score3 + if_turn_eq 3 ContestEffect2_2_score4 + if_turn_eq 4 ContestEffect2_2_score5 end ContestEffect2_2_score1: if_random 0x14 ContestEffectEnd2 @@ -781,10 +782,10 @@ ContestEffectEnd2: end CheckOrder: - if_user_order_eq 0x00 AI_effectcheck1_081DCA4C - if_user_order_eq 0x01 AI_effectcheck2_081DCA4C - if_user_order_eq 0x02 AI_effectcheck3_081DCA4C - if_user_order_eq 0x03 AI_effectcheck4_081DCA4C + if_user_order_eq 0 AI_effectcheck1_081DCA4C + if_user_order_eq 1 AI_effectcheck2_081DCA4C + if_user_order_eq 2 AI_effectcheck3_081DCA4C + if_user_order_eq 3 AI_effectcheck4_081DCA4C end AI_effectcheck1_081DCA4C: if_effect_eq CONTEST_EFFECT_BETTER_IF_FIRST AI_score1_081DCA4C -- cgit v1.2.3 From 09f336bf643e28534759fe0822b2a1c4b0c6fc35 Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Fri, 19 Aug 2016 15:06:09 -0400 Subject: more labeling and change if random params to decimal --- data/contest_ai_scripts.s | 148 ++++++++++++++++++++++++---------------------- 1 file changed, 77 insertions(+), 71 deletions(-) (limited to 'data') diff --git a/data/contest_ai_scripts.s b/data/contest_ai_scripts.s index dad5cb1cf..76c8db491 100644 --- a/data/contest_ai_scripts.s +++ b/data/contest_ai_scripts.s @@ -3,6 +3,12 @@ .include "constants/constants.s" .section script_data, "aw", %progbits + + enum_start + enum MON_1 + enum MON_2 + enum MON_3 + enum MON_4 .align 2 gUnknown_081DC118:: @ 81DC118 @@ -130,57 +136,57 @@ AI_end_081DC27F: end CheckExcitement: - if_move_excitement_less_than 0x00 AI_contest09_081DC2AB - if_move_excitement_eq 0x00 AI_contest7D_4_081DC2AB - if_move_excitement_eq 0x01 AI_contest3D_081DC2AB + if_move_excitement_less_than 0 AI_contest09_081DC2AB + if_move_excitement_eq 0 AI_contest7D_4_081DC2AB + if_move_excitement_eq 1 AI_contest3D_081DC2AB end AI_contest09_081DC2AB: - if_excitement_eq 0x04 AI_contest0F_1_081DC2AB - if_excitement_eq 0x03 AI_contest0F_2_081DC2AB + if_excitement_eq 4 AI_contest0F_1_081DC2AB + if_excitement_eq 3 AI_contest0F_2_081DC2AB if_user_has_exciting_move AI_end_081DC2AB score +15 end AI_contest0F_1_081DC2AB: if_user_order_not_eq 0 AI_contest7D_1_081DC2AB - if_random 0x33 AI_end_081DC2AB + if_random 51 AI_end_081DC2AB score +20 end AI_contest7D_1_081DC2AB: - if_random 0x7F AI_end_081DC2AB + if_random 127 AI_end_081DC2AB score -10 end AI_contest0F_2_081DC2AB: if_user_order_not_eq 0 AI_contest7D_3_081DC2AB if_turn_eq 4 AI_score_081DC2AB AI_contest7D_2_081DC2AB: - if_random 0x33 AI_end_081DC2AB + if_random 51 AI_end_081DC2AB score +10 end AI_score_081DC2AB: score +15 end AI_contest7D_3_081DC2AB: - if_random 0x7F AI_end_081DC2AB + if_random 127 AI_end_081DC2AB score +10 end AI_contest7D_4_081DC2AB: - if_random 0x7F AI_end_081DC2AB + if_random 127 AI_end_081DC2AB score +10 end AI_contest3D_081DC2AB: if_move_used_count_more_than 0x00 AI_contest29_081DC2AB if_user_order_not_eq 0 AI_contest7D_5_081DC2AB - if_excitement_not_eq 0x04 AI_contest7D_5_081DC2AB + if_excitement_not_eq 4 AI_contest7D_5_081DC2AB score +30 end AI_contest7D_5_081DC2AB: - if_random 0x64 AI_end_081DC2AB + if_random 100 AI_end_081DC2AB score +10 end AI_contest29_081DC2AB: if_effect_not_eq CONTEST_EFFECT_REPETITION_NOT_BORING AI_end_081DC2AB if_user_order_not_eq 0 AI_contest7D_5_081DC2AB - if_excitement_not_eq 0x04 AI_contest7D_5_081DC2AB + if_excitement_not_eq 4 AI_contest7D_5_081DC2AB score +30 end AI_end_081DC2AB: @@ -208,17 +214,17 @@ AI_score_081DC348: end AI_contest04_1_081DC348: if_turn_eq 4 AI_contest7D_081DC348 - if_random 0x96 AI_end_081DC348 + if_random 150 AI_end_081DC348 score +10 end AI_contest04_2_081DC348: if_turn_eq 4 AI_contest7D_081DC348 - if_random 0x7D AI_end_081DC348 + if_random 125 AI_end_081DC348 score +10 end AI_contest04_3_081DC348: if_turn_eq 4 AI_contest7D_081DC348 - if_random 0x32 AI_end_081DC348 + if_random 50 AI_end_081DC348 score +10 end AI_contest04_4_081DC348: @@ -226,7 +232,7 @@ AI_contest04_4_081DC348: score +10 end AI_contest7D_081DC348: - if_random 0x7D AI_end_081DC348 + if_random 125 AI_end_081DC348 score -15 end AI_end_081DC348: @@ -259,11 +265,11 @@ ContestEffect39_score1: score +20 end ContestEffect39_score2: - if_random 0x7D ContestEffectEnd + if_random 125 ContestEffectEnd score +15 end ContestEffect39_score3: - if_random 0x7D ContestEffectEnd + if_random 125 ContestEffectEnd score +5 end ContestEffect39_score4: @@ -272,27 +278,27 @@ ContestEffect39_score4: ContestEffect40: if_effect_in_user_moveset CONTEST_EFFECT_BETTER_IF_FIRST ContestEffectEnd - if_random 0x32 ContestEffectEnd + if_random 50 ContestEffectEnd score +20 end ContestEffect41: if_effect_in_user_moveset CONTEST_EFFECT_BETTER_IF_LAST ContestEffectEnd - if_random 0x32 ContestEffectEnd + if_random 50 ContestEffectEnd score +20 end ContestEffect3: if_user_order_not_eq 3 ContestEffectEnd - if_random 0x32 ContestEffectEnd + if_random 50 ContestEffectEnd score +15 end if_turn_eq 4 ContestEffect3_7D - if_random 0xDC ContestEffect3_score + if_random 220 ContestEffect3_score score +10 end ContestEffect3_7D: - if_random 0x14 ContestEffectEnd + if_random 20 ContestEffectEnd score +15 end ContestEffect3_score: @@ -302,7 +308,7 @@ ContestEffect3_score: ContestEffect38: if_effect_in_user_moveset CONTEST_EFFECT_BETTER_WITH_GOOD_CONDITION ContestEffect38_contest04 if_user_condition_eq 0x03 ContestEffect38_score1 - if_random 0x32 ContestEffectEnd + if_random 50 ContestEffectEnd score +15 end ContestEffect38_score1: @@ -312,11 +318,11 @@ ContestEffect38_contest04: if_turn_eq 4 ContestEffect38_score2 if_turn_eq 0 ContestEffect38_random if_move_used_count_eq 1 ContestEffectEnd - if_random 0x7D ContestEffectEnd + if_random 125 ContestEffectEnd score +10 end ContestEffect38_random: - if_random 0x64 ContestEffectEnd + if_random 100 ContestEffectEnd score +10 end ContestEffect38_score2: @@ -329,11 +335,11 @@ ContestEffect47: if_user_order_eq 1 ContestEffect47_random if_turn_not_eq 4 ContestEffectEnd if_user_has_exciting_move ContestEffectEnd - if_excitement_less_than 0x01 ContestEffectEnd + if_excitement_less_than 1 ContestEffectEnd score +10 end ContestEffect47_random: - if_random 0x7F ContestEffectEnd + if_random 127 ContestEffectEnd score +10 end @@ -395,23 +401,23 @@ ContestEffect46: end ContestEffect46_05: if_turn_not_eq 0 ContestEffect46_score1 - if_excitement_eq 0x04 ContestEffect46_score2 - if_excitement_eq 0x03 ContestEffect46_score3 + if_excitement_eq 4 ContestEffect46_score2 + if_excitement_eq 3 ContestEffect46_score3 end ContestEffect46_score1: - if_random 0x7D ContestEffectEnd + if_random 125 ContestEffectEnd score -15 end ContestEffect46_score2: - if_random 0x7D ContestEffectEnd + if_random 125 ContestEffectEnd score +20 end ContestEffect46_score3: - if_random 0x7D ContestEffectEnd + if_random 125 ContestEffectEnd score +15 end ContestEffect46_score4: - if_random 0xB2 ContestEffectEnd + if_random 178 ContestEffectEnd score +10 end @@ -421,23 +427,23 @@ ContestEffect27: end ContestEffect27_55_1: contest_55 0x00 ContestEffect27_noscore - if_condition_eq 0x00 0x00 ContestEffect27_noscore - if_condition_eq 0x00 0x01 ContestEffect27_score1 - if_condition_eq 0x00 0x02 ContestEffect27_score2 - if_condition_eq 0x00 0x03 ContestEffect27_score3 + if_condition_eq MON_1 0x00 ContestEffect27_noscore + if_condition_eq MON_1 0x01 ContestEffect27_score1 + if_condition_eq MON_1 0x02 ContestEffect27_score2 + if_condition_eq MON_1 0x03 ContestEffect27_score3 end ContestEffect27_score1: - if_random 0x7D ContestEffect27_55_2 + if_random 125 ContestEffect27_55_2 score +5 if_user_order_more_than 1 ContestEffect27_55_2 end ContestEffect27_score2: - if_random 0x7D ContestEffect27_55_2 + if_random 125 ContestEffect27_55_2 score +10 if_user_order_more_than 1 ContestEffect27_55_2 end ContestEffect27_score3: - if_random 0x7D ContestEffect27_55_2 + if_random 125 ContestEffect27_55_2 score +15 if_user_order_more_than 1 ContestEffect27_55_2 end @@ -446,23 +452,23 @@ ContestEffect27_noscore: end ContestEffect27_55_2: contest_55 0x01 ContestEffect27_noscore2 - if_condition_eq 0x01 0x00 ContestEffect27_noscore2 - if_condition_eq 0x01 0x01 ContestEffect27_score4 - if_condition_eq 0x01 0x02 ContestEffect27_score5 - if_condition_eq 0x01 0x03 ContestEffect27_score6 + if_condition_eq MON_2 0x00 ContestEffect27_noscore2 + if_condition_eq MON_2 0x01 ContestEffect27_score4 + if_condition_eq MON_2 0x02 ContestEffect27_score5 + if_condition_eq MON_2 0x03 ContestEffect27_score6 end ContestEffect27_score4: - if_random 0x7D ContestEffect27_55_3 + if_random 125 ContestEffect27_55_3 score +5 if_user_order_more_than 2 ContestEffect27_55_3 end ContestEffect27_score5: - if_random 0x7D ContestEffect27_55_3 + if_random 125 ContestEffect27_55_3 score +10 if_user_order_more_than 2 ContestEffect27_55_3 end ContestEffect27_score6: - if_random 0x7D ContestEffect27_55_3 + if_random 125 ContestEffect27_55_3 score +15 if_user_order_more_than 2 ContestEffect27_55_3 end @@ -471,21 +477,21 @@ ContestEffect27_noscore2: end ContestEffect27_55_3: contest_55 0x02 ContestEffect27_end - if_condition_eq 0x02 0x00 ContestEffect27_end - if_condition_eq 0x02 0x01 ContestEffect27_score7 - if_condition_eq 0x02 0x02 ContestEffect27_score8 - if_condition_eq 0x02 0x03 ContestEffect27_score9 + if_condition_eq MON_3 0x00 ContestEffect27_end + if_condition_eq MON_3 0x01 ContestEffect27_score7 + if_condition_eq MON_3 0x02 ContestEffect27_score8 + if_condition_eq MON_3 0x03 ContestEffect27_score9 end ContestEffect27_score7: - if_random 0x7D ContestEffectEnd + if_random 125 ContestEffectEnd score +5 end ContestEffect27_score8: - if_random 0x7D ContestEffectEnd + if_random 125 ContestEffectEnd score +10 end ContestEffect27_score9: - if_random 0x7D ContestEffectEnd + if_random 125 ContestEffectEnd score +15 end ContestEffect27_end: @@ -498,7 +504,7 @@ ContestEffect16or17: ContestEffect16or17_55: contest_55 0x00 ContestEffect16or17_0E_1 contest_51 0x00 0x01 ContestEffect16or17_0E_1 - if_random 0x7D ContestEffect16or17_0E_1 + if_random 125 ContestEffect16or17_0E_1 score +2 contest_58 0x00 ContestEffect16or17_0E_1 score +8 @@ -507,7 +513,7 @@ ContestEffect16or17_0E_1: if_user_order_eq 1 ContestEffectEnd contest_55 0x01 ContestEffect16or17_0E_2 contest_51 0x01 0x01 ContestEffect16or17_0E_2 - if_random 0x7D ContestEffect16or17_0E_2 + if_random 125 ContestEffect16or17_0E_2 score +2 contest_58 0x01 ContestEffect16or17_0E_2 score +8 @@ -516,7 +522,7 @@ ContestEffect16or17_0E_2: if_user_order_eq 2 ContestEffectEnd contest_55 0x02 ContestEffectEnd contest_51 0x02 0x01 ContestEffectEnd - if_random 0x7D ContestEffectEnd + if_random 125 ContestEffectEnd score +2 contest_58 0x02 ContestEffectEnd score +8 @@ -572,15 +578,15 @@ ContestEffect18_score2: score -15 end ContestEffect18_random1: - if_random 0x7D ContestEffectEnd + if_random 125 ContestEffectEnd score -10 end ContestEffect18_random2: - if_random 0x7D ContestEffectEnd + if_random 125 ContestEffectEnd score +5 end ContestEffect18_random3: - if_random 0x7D ContestEffectEnd + if_random 125 ContestEffectEnd score +15 end @@ -593,7 +599,7 @@ TryErraticInCuteSmartTough: if_contest_type_eq CONTEST_TOUGH, AI_contest7D_081DC7DE end AI_contest7D_081DC7DE: - if_random 0x7D AI_end_081DC7DE + if_random 125 AI_end_081DC7DE score +10 end AI_end_081DC7DE: @@ -758,23 +764,23 @@ ContestEffect2_2: if_turn_eq 4 ContestEffect2_2_score5 end ContestEffect2_2_score1: - if_random 0x14 ContestEffectEnd2 + if_random 20 ContestEffectEnd2 score -15 end ContestEffect2_2_score2: - if_random 0x28 ContestEffectEnd2 + if_random 40 ContestEffectEnd2 score -15 end ContestEffect2_2_score3: - if_random 0x3C ContestEffectEnd2 + if_random 60 ContestEffectEnd2 score -15 end ContestEffect2_2_score4: - if_random 0x50 ContestEffectEnd2 + if_random 80 ContestEffectEnd2 score -15 end ContestEffect2_2_score5: - if_random 0x14 ContestEffectEnd2 + if_random 20 ContestEffectEnd2 score +20 end @@ -799,7 +805,7 @@ AI_score2_081DCA4C: score -15 end AI_random1_081DCA4C: - if_random 0x64 ContestEffectEnd2 + if_random 100 ContestEffectEnd2 score +10 end AI_effectcheck2_081DCA4C: @@ -810,7 +816,7 @@ AI_score3_081DCA4C: score -5 end AI_random2_081DCA4C: - if_random 0x7D ContestEffectEnd2 + if_random 125 ContestEffectEnd2 score +10 end AI_effectcheck3_081DCA4C: @@ -837,7 +843,7 @@ AI_score6_081DCA4C: score -10 end AI_random3_081DCA4C: - if_random 0x7D ContestEffectEnd2 + if_random 125 ContestEffectEnd2 score +10 end AI_score7_081DCA4C: -- cgit v1.2.3 From 86dc012dfe15f5970d51d97e10cbe7cc491915d7 Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Fri, 19 Aug 2016 16:25:13 -0400 Subject: redump baserom call in contest strings --- data/contest_ai_scripts.s | 166 ++++++++++++++++++++++---------------------- data/data2.s | 4 ++ data/text/contest_strings.s | 2 - 3 files changed, 87 insertions(+), 85 deletions(-) (limited to 'data') diff --git a/data/contest_ai_scripts.s b/data/contest_ai_scripts.s index 76c8db491..dab4253bb 100644 --- a/data/contest_ai_scripts.s +++ b/data/contest_ai_scripts.s @@ -53,7 +53,7 @@ ContestUnreferenced_80: call ContestUnreferenced_0D end ContestUnreferenced_0D: - if_user_order_more_than 1 ContestUnreferenced_end + if_user_order_more_than MON_2 ContestUnreferenced_end if_effect_type_not_eq 2 ContestUnreferenced_end if_effect_type_not_eq 3 ContestUnreferenced_end score +10 @@ -66,10 +66,10 @@ ContestUnreferenced_end: if_turn_eq 4 ContestUnreferenced_0F_5 end ContestUnreferenced_0F_1: - if_user_order_not_eq 0 ContestUnreferenced_2B_1 - if_user_order_not_eq 1 ContestUnreferenced_2B_2 - if_user_order_not_eq 2 ContestUnreferenced_2B_1 - if_user_order_not_eq 3 ContestUnreferenced_2B_1 + if_user_order_not_eq MON_1 ContestUnreferenced_2B_1 + if_user_order_not_eq MON_2 ContestUnreferenced_2B_2 + if_user_order_not_eq MON_3 ContestUnreferenced_2B_1 + if_user_order_not_eq MON_4 ContestUnreferenced_2B_1 end ContestUnreferenced_2B_1: if_effect_type_eq 1 ContestUnreferenced_score @@ -80,28 +80,28 @@ ContestUnreferenced_2B_2: if_effect_type_eq 1 ContestUnreferenced_score end ContestUnreferenced_0F_2: - if_user_order_not_eq 0 ContestUnreferenced_2B_1 - if_user_order_not_eq 1 ContestUnreferenced_2B_1 - if_user_order_not_eq 2 ContestUnreferenced_2B_1 - if_user_order_not_eq 3 ContestUnreferenced_2B_1 + if_user_order_not_eq MON_1 ContestUnreferenced_2B_1 + if_user_order_not_eq MON_2 ContestUnreferenced_2B_1 + if_user_order_not_eq MON_3 ContestUnreferenced_2B_1 + if_user_order_not_eq MON_4 ContestUnreferenced_2B_1 end ContestUnreferenced_0F_3: - if_user_order_not_eq 0 ContestUnreferenced_2B_1 - if_user_order_not_eq 1 ContestUnreferenced_2B_1 - if_user_order_not_eq 2 ContestUnreferenced_2B_1 - if_user_order_not_eq 3 ContestUnreferenced_2B_1 + if_user_order_not_eq MON_1 ContestUnreferenced_2B_1 + if_user_order_not_eq MON_2 ContestUnreferenced_2B_1 + if_user_order_not_eq MON_3 ContestUnreferenced_2B_1 + if_user_order_not_eq MON_4 ContestUnreferenced_2B_1 end ContestUnreferenced_0F_4: - if_user_order_not_eq 0 ContestUnreferenced_2B_1 - if_user_order_not_eq 1 ContestUnreferenced_2B_1 - if_user_order_not_eq 2 ContestUnreferenced_2B_1 - if_user_order_not_eq 3 ContestUnreferenced_2B_1 + if_user_order_not_eq MON_1 ContestUnreferenced_2B_1 + if_user_order_not_eq MON_2 ContestUnreferenced_2B_1 + if_user_order_not_eq MON_3 ContestUnreferenced_2B_1 + if_user_order_not_eq MON_4 ContestUnreferenced_2B_1 end ContestUnreferenced_0F_5: - if_user_order_not_eq 0 ContestUnreferenced_2B_1 - if_user_order_not_eq 1 ContestUnreferenced_2B_1 - if_user_order_not_eq 2 ContestUnreferenced_2B_1 - if_user_order_not_eq 3 ContestUnreferenced_2B_1 + if_user_order_not_eq MON_1 ContestUnreferenced_2B_1 + if_user_order_not_eq MON_2 ContestUnreferenced_2B_1 + if_user_order_not_eq MON_3 ContestUnreferenced_2B_1 + if_user_order_not_eq MON_4 ContestUnreferenced_2B_1 end ContestUnreferenced_score: score +10 @@ -147,7 +147,7 @@ AI_contest09_081DC2AB: score +15 end AI_contest0F_1_081DC2AB: - if_user_order_not_eq 0 AI_contest7D_1_081DC2AB + if_user_order_not_eq MON_1 AI_contest7D_1_081DC2AB if_random 51 AI_end_081DC2AB score +20 end @@ -156,7 +156,7 @@ AI_contest7D_1_081DC2AB: score -10 end AI_contest0F_2_081DC2AB: - if_user_order_not_eq 0 AI_contest7D_3_081DC2AB + if_user_order_not_eq MON_1 AI_contest7D_3_081DC2AB if_turn_eq 4 AI_score_081DC2AB AI_contest7D_2_081DC2AB: if_random 51 AI_end_081DC2AB @@ -174,8 +174,8 @@ AI_contest7D_4_081DC2AB: score +10 end AI_contest3D_081DC2AB: - if_move_used_count_more_than 0x00 AI_contest29_081DC2AB - if_user_order_not_eq 0 AI_contest7D_5_081DC2AB + if_move_used_count_more_than 0 AI_contest29_081DC2AB + if_user_order_not_eq MON_1 AI_contest7D_5_081DC2AB if_excitement_not_eq 4 AI_contest7D_5_081DC2AB score +30 end @@ -185,7 +185,7 @@ AI_contest7D_5_081DC2AB: end AI_contest29_081DC2AB: if_effect_not_eq CONTEST_EFFECT_REPETITION_NOT_BORING AI_end_081DC2AB - if_user_order_not_eq 0 AI_contest7D_5_081DC2AB + if_user_order_not_eq MON_1 AI_contest7D_5_081DC2AB if_excitement_not_eq 4 AI_contest7D_5_081DC2AB score +30 end @@ -198,12 +198,12 @@ CheckForCombo: call AI_contest45_081DC348 end AI_contest3F_081DC348: - if_move_used_count_not_eq 0x00 AI_end_081DC348 + if_move_used_count_not_eq 0 AI_end_081DC348 if_not_combo_starter AI_end_081DC348 - if_user_order_eq 0 AI_contest04_1_081DC348 - if_user_order_eq 1 AI_contest04_2_081DC348 - if_user_order_eq 2 AI_contest04_3_081DC348 - if_user_order_eq 3 AI_contest04_4_081DC348 + if_user_order_eq MON_1 AI_contest04_1_081DC348 + if_user_order_eq MON_2 AI_contest04_2_081DC348 + if_user_order_eq MON_3 AI_contest04_3_081DC348 + if_user_order_eq MON_4 AI_contest04_4_081DC348 end AI_contest45_081DC348: if_not_combo_finisher AI_end_081DC348 @@ -289,7 +289,7 @@ ContestEffect41: end ContestEffect3: - if_user_order_not_eq 3 ContestEffectEnd + if_user_order_not_eq MON_4 ContestEffectEnd if_random 50 ContestEffectEnd score +15 end @@ -331,8 +331,8 @@ ContestEffect38_score2: ContestEffect47: if_move_used_count_eq 1 ContestEffectEnd - if_user_order_eq 0 ContestEffect47_random - if_user_order_eq 1 ContestEffect47_random + if_user_order_eq MON_1 ContestEffect47_random + if_user_order_eq MON_2 ContestEffect47_random if_turn_not_eq 4 ContestEffectEnd if_user_has_exciting_move ContestEffectEnd if_excitement_less_than 1 ContestEffectEnd @@ -344,9 +344,9 @@ ContestEffect47_random: end ContestEffect31: - if_user_order_eq 1 ContestEffect31_score1 - if_user_order_eq 2 ContestEffect31_score2 - if_user_order_eq 3 ContestEffect31_score3 + if_user_order_eq MON_2 ContestEffect31_score1 + if_user_order_eq MON_3 ContestEffect31_score2 + if_user_order_eq MON_4 ContestEffect31_score3 end ContestEffect31_score1: score +5 @@ -359,10 +359,10 @@ ContestEffect31_score3: end ContestEffect32: - if_user_order_eq 0 ContestEffect32_score1 - if_user_order_eq 1 ContestEffect32_score2 - if_user_order_eq 2 ContestEffect32_score3 - if_user_order_eq 3 ContestEffect32_score5 + if_user_order_eq MON_1 ContestEffect32_score1 + if_user_order_eq MON_2 ContestEffect32_score2 + if_user_order_eq MON_3 ContestEffect32_score3 + if_user_order_eq MON_4 ContestEffect32_score5 end ContestEffect32_score1: score -10 @@ -396,8 +396,8 @@ ContestEffect32_score7: end ContestEffect46: - if_user_order_eq 0 ContestEffect46_05 - if_user_order_more_than 0 ContestEffect46_score4 + if_user_order_eq MON_1 ContestEffect46_05 + if_user_order_more_than MON_1 ContestEffect46_score4 end ContestEffect46_05: if_turn_not_eq 0 ContestEffect46_score1 @@ -422,7 +422,7 @@ ContestEffect46_score4: end ContestEffect27: - if_user_order_eq 0 ContestEffectEnd + if_user_order_eq MON_1 ContestEffectEnd jump ContestEffect27_55_1 end ContestEffect27_55_1: @@ -435,20 +435,20 @@ ContestEffect27_55_1: ContestEffect27_score1: if_random 125 ContestEffect27_55_2 score +5 - if_user_order_more_than 1 ContestEffect27_55_2 + if_user_order_more_than MON_2 ContestEffect27_55_2 end ContestEffect27_score2: if_random 125 ContestEffect27_55_2 score +10 - if_user_order_more_than 1 ContestEffect27_55_2 + if_user_order_more_than MON_2 ContestEffect27_55_2 end ContestEffect27_score3: if_random 125 ContestEffect27_55_2 score +15 - if_user_order_more_than 1 ContestEffect27_55_2 + if_user_order_more_than MON_2 ContestEffect27_55_2 end ContestEffect27_noscore: - if_user_order_more_than 1 ContestEffect27_55_2 + if_user_order_more_than MON_2 ContestEffect27_55_2 end ContestEffect27_55_2: contest_55 0x01 ContestEffect27_noscore2 @@ -460,20 +460,20 @@ ContestEffect27_55_2: ContestEffect27_score4: if_random 125 ContestEffect27_55_3 score +5 - if_user_order_more_than 2 ContestEffect27_55_3 + if_user_order_more_than MON_3 ContestEffect27_55_3 end ContestEffect27_score5: if_random 125 ContestEffect27_55_3 score +10 - if_user_order_more_than 2 ContestEffect27_55_3 + if_user_order_more_than MON_3 ContestEffect27_55_3 end ContestEffect27_score6: if_random 125 ContestEffect27_55_3 score +15 - if_user_order_more_than 2 ContestEffect27_55_3 + if_user_order_more_than MON_3 ContestEffect27_55_3 end ContestEffect27_noscore2: - if_user_order_more_than 2 ContestEffect27_55_3 + if_user_order_more_than MON_3 ContestEffect27_55_3 end ContestEffect27_55_3: contest_55 0x02 ContestEffect27_end @@ -498,7 +498,7 @@ ContestEffect27_end: end ContestEffect16or17: - if_user_order_eq 0 ContestEffectEnd + if_user_order_eq MON_1 ContestEffectEnd jump ContestEffect16or17_55 end ContestEffect16or17_55: @@ -510,7 +510,7 @@ ContestEffect16or17_55: score +8 end ContestEffect16or17_0E_1: - if_user_order_eq 1 ContestEffectEnd + if_user_order_eq MON_2 ContestEffectEnd contest_55 0x01 ContestEffect16or17_0E_2 contest_51 0x01 0x01 ContestEffect16or17_0E_2 if_random 125 ContestEffect16or17_0E_2 @@ -519,7 +519,7 @@ ContestEffect16or17_0E_1: score +8 end ContestEffect16or17_0E_2: - if_user_order_eq 2 ContestEffectEnd + if_user_order_eq MON_3 ContestEffectEnd contest_55 0x02 ContestEffectEnd contest_51 0x02 0x01 ContestEffectEnd if_random 125 ContestEffectEnd @@ -533,7 +533,7 @@ ContestEffect16or17_0E_2: @ be encouraged. ContestEffect_FollowingMonsNervous: - if_user_order_eq 3, ContestEffectEnd + if_user_order_eq MON_4, ContestEffectEnd jump ContestEffect_FollowingMonsNervous_CheckMon3 end ContestEffect_FollowingMonsNervous_CheckMon3: @@ -544,7 +544,7 @@ ContestEffect_FollowingMonsNervous_CheckMon3: score +5 end ContestEffect_FollowingMonsNervous_CheckMon2: - if_user_order_eq 2, ContestEffectEnd + if_user_order_eq MON_3, ContestEffectEnd contest_55 2, ContestEffect_FollowingMonsNervous_CheckMon1 contest_51 2, 0, ContestEffect_FollowingMonsNervous_CheckMon1 score +5 @@ -552,7 +552,7 @@ ContestEffect_FollowingMonsNervous_CheckMon2: score +5 end ContestEffect_FollowingMonsNervous_CheckMon1: - if_user_order_eq 1, ContestEffectEnd + if_user_order_eq MON_2, ContestEffectEnd contest_55 1, ContestEffectEnd contest_51 1, 0, ContestEffectEnd score +5 @@ -569,10 +569,10 @@ ContestEffect18_score1: jump ContestEffect18_0E end ContestEffect18_0E: - if_user_order_eq 0 ContestEffect18_score2 - if_user_order_eq 1 ContestEffect18_random1 - if_user_order_eq 2 ContestEffect18_random2 - if_user_order_eq 3 ContestEffect18_random3 + if_user_order_eq MON_1 ContestEffect18_score2 + if_user_order_eq MON_2 ContestEffect18_random1 + if_user_order_eq MON_3 ContestEffect18_random2 + if_user_order_eq MON_4 ContestEffect18_random3 end ContestEffect18_score2: score -15 @@ -642,10 +642,10 @@ CheckForBadMove: end ContestEffect2_8: - if_user_order_eq 0 ContestEffect2_8_score1 - if_user_order_eq 1 ContestEffect2_8_score2 - if_user_order_eq 2 ContestEffect2_8_score3 - if_user_order_eq 3 ContestEffect2_8_score4 + if_user_order_eq MON_1 ContestEffect2_8_score1 + if_user_order_eq MON_2 ContestEffect2_8_score2 + if_user_order_eq MON_3 ContestEffect2_8_score3 + if_user_order_eq MON_4 ContestEffect2_8_score4 end ContestEffect2_8_score1: score -10 @@ -664,10 +664,10 @@ ContestEffect2_8_score4: end ContestEffect2_9: - if_user_order_eq 0 ContestEffect2_9_score1 - if_user_order_eq 1 ContestEffect2_9_score2 - if_user_order_eq 2 ContestEffect2_9_score3 - if_user_order_eq 3 ContestEffect2_9_score4 + if_user_order_eq MON_1 ContestEffect2_9_score1 + if_user_order_eq MON_2 ContestEffect2_9_score2 + if_user_order_eq MON_3 ContestEffect2_9_score3 + if_user_order_eq MON_4 ContestEffect2_9_score4 end ContestEffect2_9_score1: score -20 @@ -689,9 +689,9 @@ ContestEffect2_9_score4: end ContestEffect2_25: - if_user_order_eq 0 ContestEffect2_25_score1 - if_user_order_eq 1 ContestEffect2_25_score2 - if_user_order_eq 2 ContestEffect2_25_score3 + if_user_order_eq MON_1 ContestEffect2_25_score1 + if_user_order_eq MON_2 ContestEffect2_25_score2 + if_user_order_eq MON_3 ContestEffect2_25_score3 score -10 end ContestEffect2_25_score1: @@ -708,9 +708,9 @@ ContestEffect2_25_score3: end ContestEffect2_26: - if_user_order_eq 0 ContestEffect2_26_score1 - if_user_order_eq 1 ContestEffect2_26_score2 - if_user_order_eq 2 ContestEffect2_26_score3 + if_user_order_eq MON_1 ContestEffect2_26_score1 + if_user_order_eq MON_2 ContestEffect2_26_score2 + if_user_order_eq MON_3 ContestEffect2_26_score3 score -10 end ContestEffect2_26_score1: @@ -735,9 +735,9 @@ ContestEffect2_38: end ContestEffect2_4: - if_user_order_eq 0 ContestEffect2_4_score1 - if_user_order_eq 1 ContestEffect2_4_score2 - if_user_order_eq 2 ContestEffect2_4_score3 + if_user_order_eq MON_1 ContestEffect2_4_score1 + if_user_order_eq MON_2 ContestEffect2_4_score2 + if_user_order_eq MON_3 ContestEffect2_4_score3 score -10 end ContestEffect2_4_score1: @@ -788,10 +788,10 @@ ContestEffectEnd2: end CheckOrder: - if_user_order_eq 0 AI_effectcheck1_081DCA4C - if_user_order_eq 1 AI_effectcheck2_081DCA4C - if_user_order_eq 2 AI_effectcheck3_081DCA4C - if_user_order_eq 3 AI_effectcheck4_081DCA4C + if_user_order_eq MON_1 AI_effectcheck1_081DCA4C + if_user_order_eq MON_2 AI_effectcheck2_081DCA4C + if_user_order_eq MON_3 AI_effectcheck3_081DCA4C + if_user_order_eq MON_4 AI_effectcheck4_081DCA4C end AI_effectcheck1_081DCA4C: if_effect_eq CONTEST_EFFECT_BETTER_IF_FIRST AI_score1_081DCA4C diff --git a/data/data2.s b/data/data2.s index 5c56a5da8..127e27da8 100644 --- a/data/data2.s +++ b/data/data2.s @@ -13356,6 +13356,10 @@ gUnknown_083CA4C4:: @ 83CA4C4 gUnknown_083CA4CC:: @ 83CA4CC obj_pal gContest3Pal, 0xabe0 + .align 2 +gUnknown_083CA4D4:: @ 83CA4D4 + spr_template 0xABE0, 0xABE0, gOamData_837DF2C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + .include "data/text/contest_strings.s" gUnknown_083CC355:: @ 83CC355 diff --git a/data/text/contest_strings.s b/data/text/contest_strings.s index 137902b26..4c4f37fc4 100644 --- a/data/text/contest_strings.s +++ b/data/text/contest_strings.s @@ -1,5 +1,3 @@ -gUnknown_083CA4D4:: @ 83CA4D4 - .incbin "baserom.gba", 0x003ca4d4, 0x18 ContestString_DescHighlyAppealing: .string "A highly appealing move.$" ContestString_DescStartled1: -- cgit v1.2.3 From 20db32c13a54e982542b05b24affb0c8bb0495c3 Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Sat, 20 Aug 2016 14:49:46 -0700 Subject: name more macros --- data/contest_ai_scripts.s | 288 +++++++++++++++++++++++----------------------- 1 file changed, 142 insertions(+), 146 deletions(-) (limited to 'data') diff --git a/data/contest_ai_scripts.s b/data/contest_ai_scripts.s index dab4253bb..6e9864758 100644 --- a/data/contest_ai_scripts.s +++ b/data/contest_ai_scripts.s @@ -359,39 +359,39 @@ ContestEffect31_score3: end ContestEffect32: - if_user_order_eq MON_1 ContestEffect32_score1 - if_user_order_eq MON_2 ContestEffect32_score2 - if_user_order_eq MON_3 ContestEffect32_score3 - if_user_order_eq MON_4 ContestEffect32_score5 + if_user_order_eq MON_1, ContestEffect32_score1 + if_user_order_eq MON_2, ContestEffect32_score2 + if_user_order_eq MON_3, ContestEffect32_score3 + if_user_order_eq MON_4, ContestEffect32_score5 end ContestEffect32_score1: score -10 end ContestEffect32_score2: - contest_55 0x00 ContestEffectEnd + if_cannot_participate MON_1, ContestEffectEnd score +5 end ContestEffect32_score3: - contest_55 0x00 ContestEffect32_score4 + if_cannot_participate MON_1, ContestEffect32_score4 score +5 jump ContestEffect32_score4 end ContestEffect32_score4: - contest_55 0x01 ContestEffectEnd + if_cannot_participate MON_2, ContestEffectEnd score +5 end ContestEffect32_score5: - contest_55 0x00 ContestEffect32_score6 + if_cannot_participate MON_1, ContestEffect32_score6 score +5 jump ContestEffect32_score6 end ContestEffect32_score6: - contest_55 0x01 ContestEffect32_score7 + if_cannot_participate MON_2, ContestEffect32_score7 score +5 jump ContestEffect32_score7 end ContestEffect32_score7: - contest_55 0x02 ContestEffectEnd + if_cannot_participate MON_3, ContestEffectEnd score +5 end @@ -422,139 +422,135 @@ ContestEffect46_score4: end ContestEffect27: - if_user_order_eq MON_1 ContestEffectEnd + if_user_order_eq MON_1, ContestEffectEnd jump ContestEffect27_55_1 end ContestEffect27_55_1: - contest_55 0x00 ContestEffect27_noscore - if_condition_eq MON_1 0x00 ContestEffect27_noscore - if_condition_eq MON_1 0x01 ContestEffect27_score1 - if_condition_eq MON_1 0x02 ContestEffect27_score2 - if_condition_eq MON_1 0x03 ContestEffect27_score3 + if_cannot_participate MON_1, ContestEffect27_noscore + if_condition_eq MON_1, 0, ContestEffect27_noscore + if_condition_eq MON_1, 1, ContestEffect27_score1 + if_condition_eq MON_1, 2, ContestEffect27_score2 + if_condition_eq MON_1, 3, ContestEffect27_score3 end ContestEffect27_score1: - if_random 125 ContestEffect27_55_2 + if_random 125, ContestEffect27_55_2 score +5 - if_user_order_more_than MON_2 ContestEffect27_55_2 + if_user_order_more_than MON_2, ContestEffect27_55_2 end ContestEffect27_score2: - if_random 125 ContestEffect27_55_2 + if_random 125, ContestEffect27_55_2 score +10 - if_user_order_more_than MON_2 ContestEffect27_55_2 + if_user_order_more_than MON_2, ContestEffect27_55_2 end ContestEffect27_score3: - if_random 125 ContestEffect27_55_2 + if_random 125, ContestEffect27_55_2 score +15 - if_user_order_more_than MON_2 ContestEffect27_55_2 + if_user_order_more_than MON_2, ContestEffect27_55_2 end ContestEffect27_noscore: - if_user_order_more_than MON_2 ContestEffect27_55_2 + if_user_order_more_than MON_2, ContestEffect27_55_2 end ContestEffect27_55_2: - contest_55 0x01 ContestEffect27_noscore2 - if_condition_eq MON_2 0x00 ContestEffect27_noscore2 - if_condition_eq MON_2 0x01 ContestEffect27_score4 - if_condition_eq MON_2 0x02 ContestEffect27_score5 - if_condition_eq MON_2 0x03 ContestEffect27_score6 + if_cannot_participate MON_2, ContestEffect27_noscore2 + if_condition_eq MON_2, 0, ContestEffect27_noscore2 + if_condition_eq MON_2, 1, ContestEffect27_score4 + if_condition_eq MON_2, 2, ContestEffect27_score5 + if_condition_eq MON_2, 3, ContestEffect27_score6 end ContestEffect27_score4: - if_random 125 ContestEffect27_55_3 + if_random 125, ContestEffect27_55_3 score +5 - if_user_order_more_than MON_3 ContestEffect27_55_3 + if_user_order_more_than MON_3, ContestEffect27_55_3 end ContestEffect27_score5: - if_random 125 ContestEffect27_55_3 + if_random 125, ContestEffect27_55_3 score +10 - if_user_order_more_than MON_3 ContestEffect27_55_3 + if_user_order_more_than MON_3, ContestEffect27_55_3 end ContestEffect27_score6: - if_random 125 ContestEffect27_55_3 + if_random 125, ContestEffect27_55_3 score +15 - if_user_order_more_than MON_3 ContestEffect27_55_3 + if_user_order_more_than MON_3, ContestEffect27_55_3 end ContestEffect27_noscore2: - if_user_order_more_than MON_3 ContestEffect27_55_3 + if_user_order_more_than MON_3, ContestEffect27_55_3 end ContestEffect27_55_3: - contest_55 0x02 ContestEffect27_end - if_condition_eq MON_3 0x00 ContestEffect27_end - if_condition_eq MON_3 0x01 ContestEffect27_score7 - if_condition_eq MON_3 0x02 ContestEffect27_score8 - if_condition_eq MON_3 0x03 ContestEffect27_score9 + if_cannot_participate MON_3, ContestEffect27_end + if_condition_eq MON_3, 0, ContestEffect27_end + if_condition_eq MON_3, 1, ContestEffect27_score7 + if_condition_eq MON_3, 2, ContestEffect27_score8 + if_condition_eq MON_3, 3, ContestEffect27_score9 end ContestEffect27_score7: - if_random 125 ContestEffectEnd + if_random 125, ContestEffectEnd score +5 end ContestEffect27_score8: - if_random 125 ContestEffectEnd + if_random 125, ContestEffectEnd score +10 end ContestEffect27_score9: - if_random 125 ContestEffectEnd + if_random 125, ContestEffectEnd score +15 end ContestEffect27_end: end ContestEffect16or17: - if_user_order_eq MON_1 ContestEffectEnd + if_user_order_eq MON_1, ContestEffectEnd jump ContestEffect16or17_55 end ContestEffect16or17_55: - contest_55 0x00 ContestEffect16or17_0E_1 - contest_51 0x00 0x01 ContestEffect16or17_0E_1 - if_random 125 ContestEffect16or17_0E_1 + if_cannot_participate MON_1, ContestEffect16or17_0E_1 + if_used_combo_starter_eq MON_1, TRUE, ContestEffect16or17_0E_1 + if_random 125, ContestEffect16or17_0E_1 score +2 - contest_58 0x00 ContestEffect16or17_0E_1 + contest_58 MON_1, ContestEffect16or17_0E_1 score +8 end ContestEffect16or17_0E_1: - if_user_order_eq MON_2 ContestEffectEnd - contest_55 0x01 ContestEffect16or17_0E_2 - contest_51 0x01 0x01 ContestEffect16or17_0E_2 - if_random 125 ContestEffect16or17_0E_2 + if_user_order_eq MON_2, ContestEffectEnd + if_cannot_participate MON_2, ContestEffect16or17_0E_2 + if_used_combo_starter_eq MON_2, TRUE, ContestEffect16or17_0E_2 + if_random 125, ContestEffect16or17_0E_2 score +2 - contest_58 0x01 ContestEffect16or17_0E_2 + contest_58 MON_2, ContestEffect16or17_0E_2 score +8 end ContestEffect16or17_0E_2: - if_user_order_eq MON_3 ContestEffectEnd - contest_55 0x02 ContestEffectEnd - contest_51 0x02 0x01 ContestEffectEnd - if_random 125 ContestEffectEnd + if_user_order_eq MON_3, ContestEffectEnd + if_cannot_participate MON_3, ContestEffectEnd + if_used_combo_starter_eq MON_3, TRUE, ContestEffectEnd + if_random 125, ContestEffectEnd score +2 - contest_58 0x02 ContestEffectEnd + contest_58 MON_3, ContestEffectEnd score +8 end - @ This routine checks the following mons using contest_51 and contest_55 - @ in order to decide if moves that make the following mons nervous should - @ be encouraged. - ContestEffect_FollowingMonsNervous: if_user_order_eq MON_4, ContestEffectEnd - jump ContestEffect_FollowingMonsNervous_CheckMon3 + jump ContestEffect_FollowingMonsNervous_CheckMon4 end -ContestEffect_FollowingMonsNervous_CheckMon3: - contest_55 3, ContestEffect_FollowingMonsNervous_CheckMon2 - contest_51 3, 0, ContestEffect_FollowingMonsNervous_CheckMon2 +ContestEffect_FollowingMonsNervous_CheckMon4: + if_cannot_participate MON_4, ContestEffect_FollowingMonsNervous_CheckMon3 + if_used_combo_starter_eq MON_4, FALSE, ContestEffect_FollowingMonsNervous_CheckMon3 score +5 if_random 125, ContestEffect16or17_0E_1 score +5 end -ContestEffect_FollowingMonsNervous_CheckMon2: +ContestEffect_FollowingMonsNervous_CheckMon3: if_user_order_eq MON_3, ContestEffectEnd - contest_55 2, ContestEffect_FollowingMonsNervous_CheckMon1 - contest_51 2, 0, ContestEffect_FollowingMonsNervous_CheckMon1 + if_cannot_participate MON_3, ContestEffect_FollowingMonsNervous_CheckMon2 + if_used_combo_starter_eq MON_3, FALSE, ContestEffect_FollowingMonsNervous_CheckMon2 score +5 if_random 125, ContestEffect16or17_0E_2 score +5 end -ContestEffect_FollowingMonsNervous_CheckMon1: +ContestEffect_FollowingMonsNervous_CheckMon2: if_user_order_eq MON_2, ContestEffectEnd - contest_55 1, ContestEffectEnd - contest_51 1, 0, ContestEffectEnd + if_cannot_participate MON_2, ContestEffectEnd + if_used_combo_starter_eq MON_2, FALSE, ContestEffectEnd score +5 if_random 125, ContestEffectEnd score +5 @@ -642,145 +638,145 @@ CheckForBadMove: end ContestEffect2_8: - if_user_order_eq MON_1 ContestEffect2_8_score1 - if_user_order_eq MON_2 ContestEffect2_8_score2 - if_user_order_eq MON_3 ContestEffect2_8_score3 - if_user_order_eq MON_4 ContestEffect2_8_score4 + if_user_order_eq MON_1, ContestEffect2_8_score1 + if_user_order_eq MON_2, ContestEffect2_8_score2 + if_user_order_eq MON_3, ContestEffect2_8_score3 + if_user_order_eq MON_4, ContestEffect2_8_score4 end ContestEffect2_8_score1: score -10 end ContestEffect2_8_score2: - contest_54 0x00 ContestEffectEnd2 + if_can_participate MON_1, ContestEffectEnd2 score -10 end ContestEffect2_8_score3: - contest_54 0x01 ContestEffectEnd2 + if_can_participate MON_2, ContestEffectEnd2 score -10 end ContestEffect2_8_score4: - contest_54 0x02 ContestEffectEnd2 + if_can_participate MON_3, ContestEffectEnd2 score -10 end ContestEffect2_9: - if_user_order_eq MON_1 ContestEffect2_9_score1 - if_user_order_eq MON_2 ContestEffect2_9_score2 - if_user_order_eq MON_3 ContestEffect2_9_score3 - if_user_order_eq MON_4 ContestEffect2_9_score4 + if_user_order_eq MON_1, ContestEffect2_9_score1 + if_user_order_eq MON_2, ContestEffect2_9_score2 + if_user_order_eq MON_3, ContestEffect2_9_score3 + if_user_order_eq MON_4, ContestEffect2_9_score4 end ContestEffect2_9_score1: score -20 end ContestEffect2_9_score2: - contest_54 0x00 ContestEffectEnd2 + if_can_participate MON_1, ContestEffectEnd2 score -15 end ContestEffect2_9_score3: - contest_54 0x00 ContestEffectEnd2 - contest_54 0x01 ContestEffectEnd2 + if_can_participate MON_1, ContestEffectEnd2 + if_can_participate MON_2, ContestEffectEnd2 score -15 end ContestEffect2_9_score4: - contest_54 0x00 ContestEffectEnd2 - contest_54 0x01 ContestEffectEnd2 - contest_54 0x02 ContestEffectEnd2 + if_can_participate MON_1, ContestEffectEnd2 + if_can_participate MON_2, ContestEffectEnd2 + if_can_participate MON_3, ContestEffectEnd2 score -15 end ContestEffect2_25: - if_user_order_eq MON_1 ContestEffect2_25_score1 - if_user_order_eq MON_2 ContestEffect2_25_score2 - if_user_order_eq MON_3 ContestEffect2_25_score3 + if_user_order_eq MON_1, ContestEffect2_25_score1 + if_user_order_eq MON_2, ContestEffect2_25_score2 + if_user_order_eq MON_3, ContestEffect2_25_score3 score -10 end ContestEffect2_25_score1: - contest_54 0x01 ContestEffectEnd2 + if_can_participate MON_2, ContestEffectEnd2 score -10 end ContestEffect2_25_score2: - contest_54 0x02 ContestEffectEnd2 + if_can_participate MON_3, ContestEffectEnd2 score -10 end ContestEffect2_25_score3: - contest_54 0x03 ContestEffectEnd2 + if_can_participate MON_4, ContestEffectEnd2 score -10 end ContestEffect2_26: - if_user_order_eq MON_1 ContestEffect2_26_score1 - if_user_order_eq MON_2 ContestEffect2_26_score2 - if_user_order_eq MON_3 ContestEffect2_26_score3 + if_user_order_eq MON_1, ContestEffect2_26_score1 + if_user_order_eq MON_2, ContestEffect2_26_score2 + if_user_order_eq MON_3, ContestEffect2_26_score3 score -10 end ContestEffect2_26_score1: - contest_54 0x01 ContestEffectEnd2 - contest_54 0x02 ContestEffectEnd2 - contest_54 0x03 ContestEffectEnd2 + if_can_participate MON_2, ContestEffectEnd2 + if_can_participate MON_3, ContestEffectEnd2 + if_can_participate MON_4, ContestEffectEnd2 score -10 end ContestEffect2_26_score2: - contest_54 0x02 ContestEffectEnd2 - contest_54 0x03 ContestEffectEnd2 + if_can_participate MON_3, ContestEffectEnd2 + if_can_participate MON_4, ContestEffectEnd2 score -10 end ContestEffect2_26_score3: - contest_54 0x03 ContestEffectEnd2 + if_can_participate MON_4, ContestEffectEnd2 score -10 end ContestEffect2_38: - if_user_condition_less_than 0x03 ContestEffectEnd2 + if_user_condition_less_than 3, ContestEffectEnd2 score -20 end ContestEffect2_4: - if_user_order_eq MON_1 ContestEffect2_4_score1 - if_user_order_eq MON_2 ContestEffect2_4_score2 - if_user_order_eq MON_3 ContestEffect2_4_score3 + if_user_order_eq MON_1, ContestEffect2_4_score1 + if_user_order_eq MON_2, ContestEffect2_4_score2 + if_user_order_eq MON_3, ContestEffect2_4_score3 score -10 end ContestEffect2_4_score1: - contest_54 0x01 ContestEffectEnd2 - contest_54 0x02 ContestEffectEnd2 - contest_54 0x03 ContestEffectEnd2 + if_can_participate MON_2, ContestEffectEnd2 + if_can_participate MON_3, ContestEffectEnd2 + if_can_participate MON_4, ContestEffectEnd2 score -10 end ContestEffect2_4_score2: - contest_54 0x02 ContestEffectEnd2 - contest_54 0x03 ContestEffectEnd2 + if_can_participate MON_3, ContestEffectEnd2 + if_can_participate MON_4, ContestEffectEnd2 score -10 end ContestEffect2_4_score3: - contest_54 0x03 ContestEffectEnd2 + if_can_participate MON_4, ContestEffectEnd2 score -10 end ContestEffect2_2: - if_turn_eq 0 ContestEffect2_2_score1 - if_turn_eq 1 ContestEffect2_2_score2 - if_turn_eq 2 ContestEffect2_2_score3 - if_turn_eq 3 ContestEffect2_2_score4 - if_turn_eq 4 ContestEffect2_2_score5 + if_turn_eq 0, ContestEffect2_2_score1 + if_turn_eq 1, ContestEffect2_2_score2 + if_turn_eq 2, ContestEffect2_2_score3 + if_turn_eq 3, ContestEffect2_2_score4 + if_turn_eq 4, ContestEffect2_2_score5 end ContestEffect2_2_score1: - if_random 20 ContestEffectEnd2 + if_random 20, ContestEffectEnd2 score -15 end ContestEffect2_2_score2: - if_random 40 ContestEffectEnd2 + if_random 40, ContestEffectEnd2 score -15 end ContestEffect2_2_score3: - if_random 60 ContestEffectEnd2 + if_random 60, ContestEffectEnd2 score -15 end ContestEffect2_2_score4: - if_random 80 ContestEffectEnd2 + if_random 80, ContestEffectEnd2 score -15 end ContestEffect2_2_score5: - if_random 20 ContestEffectEnd2 + if_random 20, ContestEffectEnd2 score +20 end @@ -788,15 +784,15 @@ ContestEffectEnd2: end CheckOrder: - if_user_order_eq MON_1 AI_effectcheck1_081DCA4C - if_user_order_eq MON_2 AI_effectcheck2_081DCA4C - if_user_order_eq MON_3 AI_effectcheck3_081DCA4C - if_user_order_eq MON_4 AI_effectcheck4_081DCA4C + if_user_order_eq MON_1, AI_effectcheck1_081DCA4C + if_user_order_eq MON_2, AI_effectcheck2_081DCA4C + if_user_order_eq MON_3, AI_effectcheck3_081DCA4C + if_user_order_eq MON_4, AI_effectcheck4_081DCA4C end AI_effectcheck1_081DCA4C: - if_effect_eq CONTEST_EFFECT_BETTER_IF_FIRST AI_score1_081DCA4C - if_effect_eq CONTEST_EFFECT_BETTER_WHEN_LATER AI_score2_081DCA4C - if_effect_type_eq 1 AI_random1_081DCA4C + if_effect_eq CONTEST_EFFECT_BETTER_IF_FIRST, AI_score1_081DCA4C + if_effect_eq CONTEST_EFFECT_BETTER_WHEN_LATER, AI_score2_081DCA4C + if_effect_type_eq 1, AI_random1_081DCA4C end AI_score1_081DCA4C: score +15 @@ -805,36 +801,36 @@ AI_score2_081DCA4C: score -15 end AI_random1_081DCA4C: - if_random 100 ContestEffectEnd2 + if_random 100, ContestEffectEnd2 score +10 end AI_effectcheck2_081DCA4C: - if_effect_eq CONTEST_EFFECT_BETTER_WHEN_LATER AI_score3_081DCA4C - if_effect_type_eq 1 AI_random2_081DCA4C + if_effect_eq CONTEST_EFFECT_BETTER_WHEN_LATER, AI_score3_081DCA4C + if_effect_type_eq 1, AI_random2_081DCA4C end AI_score3_081DCA4C: score -5 end AI_random2_081DCA4C: - if_random 125 ContestEffectEnd2 + if_random 125, ContestEffectEnd2 score +10 end AI_effectcheck3_081DCA4C: - if_effect_eq CONTEST_EFFECT_BETTER_WHEN_LATER AI_score4_081DCA4C - if_effect_eq CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONES AI_score4_081DCA4C - if_effect_eq CONTEST_EFFECT_USER_MORE_EASILY_STARTLED AI_score4_081DCA4C + if_effect_eq CONTEST_EFFECT_BETTER_WHEN_LATER, AI_score4_081DCA4C + if_effect_eq CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONES, AI_score4_081DCA4C + if_effect_eq CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, AI_score4_081DCA4C end AI_score4_081DCA4C: score +5 end AI_effectcheck4_081DCA4C: - if_effect_eq CONTEST_EFFECT_BETTER_WHEN_LATER AI_score5_081DCA4C - if_effect_eq CONTEST_EFFECT_BETTER_IF_LAST AI_score5_081DCA4C - if_effect_eq CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONES AI_score5_081DCA4C - if_effect_eq CONTEST_EFFECT_USER_MORE_EASILY_STARTLED AI_score5_081DCA4C - if_effect_eq CONTEST_EFFECT_JAMS_OTHERS_BUT_MISS_ONE_TURN AI_score7_081DCA4C - if_effect_type_eq 1 AI_score6_081DCA4C - if_effect_type_eq 3 AI_random3_081DCA4C + if_effect_eq CONTEST_EFFECT_BETTER_WHEN_LATER, AI_score5_081DCA4C + if_effect_eq CONTEST_EFFECT_BETTER_IF_LAST, AI_score5_081DCA4C + if_effect_eq CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONES, AI_score5_081DCA4C + if_effect_eq CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, AI_score5_081DCA4C + if_effect_eq CONTEST_EFFECT_JAMS_OTHERS_BUT_MISS_ONE_TURN, AI_score7_081DCA4C + if_effect_type_eq 1, AI_score6_081DCA4C + if_effect_type_eq 3, AI_random3_081DCA4C end AI_score5_081DCA4C: score +15 @@ -843,7 +839,7 @@ AI_score6_081DCA4C: score -10 end AI_random3_081DCA4C: - if_random 125 ContestEffectEnd2 + if_random 125, ContestEffectEnd2 score +10 end AI_score7_081DCA4C: -- cgit v1.2.3 From 4b8d668d89e7120192ec4b3ed360f14ead0d62f9 Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Sat, 20 Aug 2016 15:39:19 -0700 Subject: formatting --- data/contest_ai_scripts.s | 207 +++++++++++++++++++++++----------------------- 1 file changed, 104 insertions(+), 103 deletions(-) (limited to 'data') diff --git a/data/contest_ai_scripts.s b/data/contest_ai_scripts.s index 6e9864758..e9a58885e 100644 --- a/data/contest_ai_scripts.s +++ b/data/contest_ai_scripts.s @@ -3,7 +3,7 @@ .include "constants/constants.s" .section script_data, "aw", %progbits - + enum_start enum MON_1 enum MON_2 @@ -12,13 +12,13 @@ .align 2 gUnknown_081DC118:: @ 81DC118 - .4byte CheckForBadMove - .4byte CheckForCombo - .4byte CheckBoring - .4byte CheckExcitement - .4byte CheckOrder - .4byte CheckForGoodMove - .4byte TryErraticInCuteSmartTough + .4byte AI_CheckForBadMove + .4byte AI_CheckForCombo + .4byte AI_CheckBoring + .4byte AI_CheckExcitement + .4byte AI_CheckOrder + .4byte AI_CheckForGoodMove + .4byte AI_Erratic .4byte AI_nothing .4byte AI_nothing .4byte AI_nothing @@ -113,7 +113,7 @@ ContestUnreferenced_score2: score +10 end -CheckBoring: +AI_CheckBoring: if_effect_eq CONTEST_EFFECT_REPETITION_NOT_BORING, AI_end_081DC27F if_move_used_count_eq 1 AI_score1_081DC27F if_move_used_count_eq 2 AI_score2_081DC27F @@ -135,75 +135,75 @@ AI_score4_081DC27F: AI_end_081DC27F: end -CheckExcitement: - if_move_excitement_less_than 0 AI_contest09_081DC2AB - if_move_excitement_eq 0 AI_contest7D_4_081DC2AB - if_move_excitement_eq 1 AI_contest3D_081DC2AB +AI_CheckExcitement: + if_move_excitement_less_than 0, AI_contest09_081DC2AB + if_move_excitement_eq 0, AI_contest7D_4_081DC2AB + if_move_excitement_eq 1, AI_contest3D_081DC2AB end AI_contest09_081DC2AB: - if_excitement_eq 4 AI_contest0F_1_081DC2AB - if_excitement_eq 3 AI_contest0F_2_081DC2AB + if_excitement_eq 4, AI_contest0F_1_081DC2AB + if_excitement_eq 3, AI_contest0F_2_081DC2AB if_user_has_exciting_move AI_end_081DC2AB score +15 end AI_contest0F_1_081DC2AB: - if_user_order_not_eq MON_1 AI_contest7D_1_081DC2AB - if_random 51 AI_end_081DC2AB + if_user_order_not_eq MON_1, AI_contest7D_1_081DC2AB + if_random 51, AI_end_081DC2AB score +20 end AI_contest7D_1_081DC2AB: - if_random 127 AI_end_081DC2AB + if_random 127, AI_end_081DC2AB score -10 end AI_contest0F_2_081DC2AB: - if_user_order_not_eq MON_1 AI_contest7D_3_081DC2AB - if_turn_eq 4 AI_score_081DC2AB + if_user_order_not_eq MON_1, AI_contest7D_3_081DC2AB + if_turn_eq 4, AI_score_081DC2AB AI_contest7D_2_081DC2AB: - if_random 51 AI_end_081DC2AB + if_random 51, AI_end_081DC2AB score +10 end AI_score_081DC2AB: score +15 end AI_contest7D_3_081DC2AB: - if_random 127 AI_end_081DC2AB + if_random 127, AI_end_081DC2AB score +10 end AI_contest7D_4_081DC2AB: - if_random 127 AI_end_081DC2AB + if_random 127, AI_end_081DC2AB score +10 end AI_contest3D_081DC2AB: - if_move_used_count_more_than 0 AI_contest29_081DC2AB - if_user_order_not_eq MON_1 AI_contest7D_5_081DC2AB - if_excitement_not_eq 4 AI_contest7D_5_081DC2AB + if_move_used_count_more_than 0, AI_contest29_081DC2AB + if_user_order_not_eq MON_1, AI_contest7D_5_081DC2AB + if_excitement_not_eq 4, AI_contest7D_5_081DC2AB score +30 end AI_contest7D_5_081DC2AB: - if_random 100 AI_end_081DC2AB + if_random 100, AI_end_081DC2AB score +10 end AI_contest29_081DC2AB: - if_effect_not_eq CONTEST_EFFECT_REPETITION_NOT_BORING AI_end_081DC2AB - if_user_order_not_eq MON_1 AI_contest7D_5_081DC2AB - if_excitement_not_eq 4 AI_contest7D_5_081DC2AB + if_effect_not_eq CONTEST_EFFECT_REPETITION_NOT_BORING, AI_end_081DC2AB + if_user_order_not_eq MON_1, AI_contest7D_5_081DC2AB + if_excitement_not_eq 4, AI_contest7D_5_081DC2AB score +30 end AI_end_081DC2AB: end -CheckForCombo: +AI_CheckForCombo: if_would_finish_combo AI_score_081DC348 call AI_contest3F_081DC348 call AI_contest45_081DC348 end AI_contest3F_081DC348: - if_move_used_count_not_eq 0 AI_end_081DC348 + if_move_used_count_not_eq 0, AI_end_081DC348 if_not_combo_starter AI_end_081DC348 - if_user_order_eq MON_1 AI_contest04_1_081DC348 - if_user_order_eq MON_2 AI_contest04_2_081DC348 - if_user_order_eq MON_3 AI_contest04_3_081DC348 - if_user_order_eq MON_4 AI_contest04_4_081DC348 + if_user_order_eq MON_1, AI_contest04_1_081DC348 + if_user_order_eq MON_2, AI_contest04_2_081DC348 + if_user_order_eq MON_3, AI_contest04_3_081DC348 + if_user_order_eq MON_4, AI_contest04_4_081DC348 end AI_contest45_081DC348: if_not_combo_finisher AI_end_081DC348 @@ -213,32 +213,32 @@ AI_score_081DC348: score +25 end AI_contest04_1_081DC348: - if_turn_eq 4 AI_contest7D_081DC348 - if_random 150 AI_end_081DC348 + if_turn_eq 4, AI_contest7D_081DC348 + if_random 150, AI_end_081DC348 score +10 end AI_contest04_2_081DC348: - if_turn_eq 4 AI_contest7D_081DC348 - if_random 125 AI_end_081DC348 + if_turn_eq 4, AI_contest7D_081DC348 + if_random 125, AI_end_081DC348 score +10 end AI_contest04_3_081DC348: - if_turn_eq 4 AI_contest7D_081DC348 - if_random 50 AI_end_081DC348 + if_turn_eq 4, AI_contest7D_081DC348 + if_random 50, AI_end_081DC348 score +10 end AI_contest04_4_081DC348: - if_turn_eq 4 AI_contest7D_081DC348 + if_turn_eq 4, AI_contest7D_081DC348 score +10 end AI_contest7D_081DC348: - if_random 125 AI_end_081DC348 + if_random 125, AI_end_081DC348 score -15 end AI_end_081DC348: end -CheckForGoodMove: +AI_CheckForGoodMove: if_effect_eq CONTEST_EFFECT_BETTER_WITH_GOOD_CONDITION, ContestEffect39 if_effect_eq CONTEST_EFFECT_NEXT_APPEAL_EARLIER, ContestEffect40 if_effect_eq CONTEST_EFFECT_NEXT_APPEAL_LATER, ContestEffect41 @@ -256,20 +256,20 @@ CheckForGoodMove: end ContestEffect39: - if_user_condition_eq 0x03 ContestEffect39_score1 - if_user_condition_eq 0x02 ContestEffect39_score2 - if_user_condition_eq 0x01 ContestEffect39_score3 - if_user_condition_eq 0x00 ContestEffect39_score4 + if_user_condition_eq 3, ContestEffect39_score1 + if_user_condition_eq 2, ContestEffect39_score2 + if_user_condition_eq 1, ContestEffect39_score3 + if_user_condition_eq 0, ContestEffect39_score4 end ContestEffect39_score1: score +20 end ContestEffect39_score2: - if_random 125 ContestEffectEnd + if_random 125, ContestEffectEnd score +15 end ContestEffect39_score3: - if_random 125 ContestEffectEnd + if_random 125, ContestEffectEnd score +5 end ContestEffect39_score4: @@ -277,28 +277,28 @@ ContestEffect39_score4: end ContestEffect40: - if_effect_in_user_moveset CONTEST_EFFECT_BETTER_IF_FIRST ContestEffectEnd - if_random 50 ContestEffectEnd + if_effect_in_user_moveset CONTEST_EFFECT_BETTER_IF_FIRST, ContestEffectEnd + if_random 50, ContestEffectEnd score +20 end ContestEffect41: - if_effect_in_user_moveset CONTEST_EFFECT_BETTER_IF_LAST ContestEffectEnd - if_random 50 ContestEffectEnd + if_effect_in_user_moveset CONTEST_EFFECT_BETTER_IF_LAST, ContestEffectEnd + if_random 50, ContestEffectEnd score +20 end ContestEffect3: - if_user_order_not_eq MON_4 ContestEffectEnd - if_random 50 ContestEffectEnd + if_user_order_not_eq MON_4, ContestEffectEnd + if_random 50, ContestEffectEnd score +15 end - if_turn_eq 4 ContestEffect3_7D - if_random 220 ContestEffect3_score + if_turn_eq 4, ContestEffect3_7D + if_random 220, ContestEffect3_score score +10 end ContestEffect3_7D: - if_random 20 ContestEffectEnd + if_random 20, ContestEffectEnd score +15 end ContestEffect3_score: @@ -306,23 +306,23 @@ ContestEffect3_score: end ContestEffect38: - if_effect_in_user_moveset CONTEST_EFFECT_BETTER_WITH_GOOD_CONDITION ContestEffect38_contest04 - if_user_condition_eq 0x03 ContestEffect38_score1 - if_random 50 ContestEffectEnd + if_effect_in_user_moveset CONTEST_EFFECT_BETTER_WITH_GOOD_CONDITION, ContestEffect38_contest04 + if_user_condition_eq 3, ContestEffect38_score1 + if_random 50, ContestEffectEnd score +15 end ContestEffect38_score1: score -10 end ContestEffect38_contest04: - if_turn_eq 4 ContestEffect38_score2 - if_turn_eq 0 ContestEffect38_random - if_move_used_count_eq 1 ContestEffectEnd - if_random 125 ContestEffectEnd + if_turn_eq 4, ContestEffect38_score2 + if_turn_eq 0, ContestEffect38_random + if_move_used_count_eq 1, ContestEffectEnd + if_random 125, ContestEffectEnd score +10 end ContestEffect38_random: - if_random 100 ContestEffectEnd + if_random 100, ContestEffectEnd score +10 end ContestEffect38_score2: @@ -330,23 +330,23 @@ ContestEffect38_score2: end ContestEffect47: - if_move_used_count_eq 1 ContestEffectEnd - if_user_order_eq MON_1 ContestEffect47_random - if_user_order_eq MON_2 ContestEffect47_random - if_turn_not_eq 4 ContestEffectEnd + if_move_used_count_eq 1, ContestEffectEnd + if_user_order_eq MON_1, ContestEffect47_random + if_user_order_eq MON_2, ContestEffect47_random + if_turn_not_eq 4, ContestEffectEnd if_user_has_exciting_move ContestEffectEnd - if_excitement_less_than 1 ContestEffectEnd + if_excitement_less_than 1, ContestEffectEnd score +10 end ContestEffect47_random: - if_random 127 ContestEffectEnd + if_random 127, ContestEffectEnd score +10 end ContestEffect31: - if_user_order_eq MON_2 ContestEffect31_score1 - if_user_order_eq MON_3 ContestEffect31_score2 - if_user_order_eq MON_4 ContestEffect31_score3 + if_user_order_eq MON_2, ContestEffect31_score1 + if_user_order_eq MON_3, ContestEffect31_score2 + if_user_order_eq MON_4, ContestEffect31_score3 end ContestEffect31_score1: score +5 @@ -396,28 +396,28 @@ ContestEffect32_score7: end ContestEffect46: - if_user_order_eq MON_1 ContestEffect46_05 - if_user_order_more_than MON_1 ContestEffect46_score4 + if_user_order_eq MON_1, ContestEffect46_05 + if_user_order_more_than MON_1, ContestEffect46_score4 end ContestEffect46_05: - if_turn_not_eq 0 ContestEffect46_score1 - if_excitement_eq 4 ContestEffect46_score2 - if_excitement_eq 3 ContestEffect46_score3 + if_turn_not_eq 0, ContestEffect46_score1 + if_excitement_eq 4, ContestEffect46_score2 + if_excitement_eq 3, ContestEffect46_score3 end ContestEffect46_score1: - if_random 125 ContestEffectEnd + if_random 125, ContestEffectEnd score -15 end ContestEffect46_score2: - if_random 125 ContestEffectEnd + if_random 125, ContestEffectEnd score +20 end ContestEffect46_score3: - if_random 125 ContestEffectEnd + if_random 125, ContestEffectEnd score +15 end ContestEffect46_score4: - if_random 178 ContestEffectEnd + if_random 178, ContestEffectEnd score +10 end @@ -557,7 +557,7 @@ ContestEffect_FollowingMonsNervous_CheckMon2: end ContestEffect18: - if_turn_eq 4 ContestEffect18_score1 + if_turn_eq 4, ContestEffect18_score1 jump ContestEffect18_0E end ContestEffect18_score1: @@ -565,43 +565,44 @@ ContestEffect18_score1: jump ContestEffect18_0E end ContestEffect18_0E: - if_user_order_eq MON_1 ContestEffect18_score2 - if_user_order_eq MON_2 ContestEffect18_random1 - if_user_order_eq MON_3 ContestEffect18_random2 - if_user_order_eq MON_4 ContestEffect18_random3 + if_user_order_eq MON_1, ContestEffect18_score2 + if_user_order_eq MON_2, ContestEffect18_random1 + if_user_order_eq MON_3, ContestEffect18_random2 + if_user_order_eq MON_4, ContestEffect18_random3 end ContestEffect18_score2: score -15 end ContestEffect18_random1: - if_random 125 ContestEffectEnd + if_random 125, ContestEffectEnd score -10 end ContestEffect18_random2: - if_random 125 ContestEffectEnd + if_random 125, ContestEffectEnd score +5 end ContestEffect18_random3: - if_random 125 ContestEffectEnd + if_random 125, ContestEffectEnd score +15 end ContestEffectEnd: end -TryErraticInCuteSmartTough: - if_contest_type_eq CONTEST_CUTE, AI_contest7D_081DC7DE - if_contest_type_eq CONTEST_SMART, AI_contest7D_081DC7DE - if_contest_type_eq CONTEST_TOUGH, AI_contest7D_081DC7DE +@ Randomly encourage moves in Cute, Smart, and Tough contests. +AI_Erratic: + if_contest_type_eq CONTEST_CUTE, Erratic_CuteSmartTough + if_contest_type_eq CONTEST_SMART, Erratic_CuteSmartTough + if_contest_type_eq CONTEST_TOUGH, Erratic_CuteSmartTough end -AI_contest7D_081DC7DE: - if_random 125 AI_end_081DC7DE +Erratic_CuteSmartTough: + if_random 125, Erratic_NoScoreIncrease score +10 end -AI_end_081DC7DE: +Erratic_NoScoreIncrease: end -CheckForBadMove: +AI_CheckForBadMove: if_effect_eq CONTEST_EFFECT_STARTLE_FRONT_MON, ContestEffect2_8 if_effect_eq CONTEST_EFFECT_STARTLE_PREV_MON, ContestEffect2_8 if_effect_eq CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, ContestEffect2_8 @@ -783,7 +784,7 @@ ContestEffect2_2_score5: ContestEffectEnd2: end -CheckOrder: +AI_CheckOrder: if_user_order_eq MON_1, AI_effectcheck1_081DCA4C if_user_order_eq MON_2, AI_effectcheck2_081DCA4C if_user_order_eq MON_3, AI_effectcheck3_081DCA4C -- cgit v1.2.3 From 4d117da8c8fd3f8f6e8dd6cc3fb7bb41c3bc9841 Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Sat, 20 Aug 2016 15:40:32 -0700 Subject: capitalization --- data/contest_ai_scripts.s | 52 +++++++++++++++++++++++------------------------ 1 file changed, 26 insertions(+), 26 deletions(-) (limited to 'data') diff --git a/data/contest_ai_scripts.s b/data/contest_ai_scripts.s index e9a58885e..f46590b53 100644 --- a/data/contest_ai_scripts.s +++ b/data/contest_ai_scripts.s @@ -19,31 +19,31 @@ gUnknown_081DC118:: @ 81DC118 .4byte AI_CheckOrder .4byte AI_CheckForGoodMove .4byte AI_Erratic - .4byte AI_nothing - .4byte AI_nothing - .4byte AI_nothing - .4byte AI_nothing - .4byte AI_nothing - .4byte AI_nothing - .4byte AI_nothing - .4byte AI_nothing - .4byte AI_nothing - .4byte AI_nothing - .4byte AI_nothing - .4byte AI_nothing - .4byte AI_nothing - .4byte AI_nothing - .4byte AI_nothing - .4byte AI_nothing - .4byte AI_nothing - .4byte AI_nothing - .4byte AI_nothing - .4byte AI_nothing - .4byte AI_nothing - .4byte AI_nothing - .4byte AI_nothing - .4byte AI_nothing - .4byte AI_nothing + .4byte AI_Nothing + .4byte AI_Nothing + .4byte AI_Nothing + .4byte AI_Nothing + .4byte AI_Nothing + .4byte AI_Nothing + .4byte AI_Nothing + .4byte AI_Nothing + .4byte AI_Nothing + .4byte AI_Nothing + .4byte AI_Nothing + .4byte AI_Nothing + .4byte AI_Nothing + .4byte AI_Nothing + .4byte AI_Nothing + .4byte AI_Nothing + .4byte AI_Nothing + .4byte AI_Nothing + .4byte AI_Nothing + .4byte AI_Nothing + .4byte AI_Nothing + .4byte AI_Nothing + .4byte AI_Nothing + .4byte AI_Nothing + .4byte AI_Nothing @ unreferenced if_turn_not_eq 0 ContestUnreferenced_80 @@ -847,5 +847,5 @@ AI_score7_081DCA4C: score +5 end -AI_nothing: +AI_Nothing: end -- cgit v1.2.3 From c49bedd91e933e8f4772f9ace5a85f95984b9755 Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Sat, 20 Aug 2016 15:55:25 -0700 Subject: try to organize the unreferenced AIs --- data/contest_ai_scripts.s | 85 +++++++++++++++++++++++++---------------------- 1 file changed, 46 insertions(+), 39 deletions(-) (limited to 'data') diff --git a/data/contest_ai_scripts.s b/data/contest_ai_scripts.s index f46590b53..1c330f635 100644 --- a/data/contest_ai_scripts.s +++ b/data/contest_ai_scripts.s @@ -45,68 +45,75 @@ gUnknown_081DC118:: @ 81DC118 .4byte AI_Nothing .4byte AI_Nothing - @ unreferenced - if_turn_not_eq 0 ContestUnreferenced_80 - if_effect_not_eq CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS ContestUnreferenced_80 +@ Unreferenced AI routine to encourage moves that improve condition on the first +@ turn. Additionally, it checks the appeal order of the user and the effect +@ type, but the code is buggy and doesn't affect the score. + if_turn_not_eq 0, ContestUnreferenced_80 + if_effect_not_eq CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, ContestUnreferenced_80 score +10 ContestUnreferenced_80: call ContestUnreferenced_0D end ContestUnreferenced_0D: - if_user_order_more_than MON_2 ContestUnreferenced_end - if_effect_type_not_eq 2 ContestUnreferenced_end - if_effect_type_not_eq 3 ContestUnreferenced_end - score +10 + if_user_order_more_than MON_2, ContestUnreferenced_end + if_effect_type_not_eq 2, ContestUnreferenced_end + if_effect_type_not_eq 3, ContestUnreferenced_end + score +10 @ unreachable ContestUnreferenced_end: end - if_turn_eq 0 ContestUnreferenced_0F_1 - if_turn_eq 1 ContestUnreferenced_0F_2 - if_turn_eq 2 ContestUnreferenced_0F_3 - if_turn_eq 3 ContestUnreferenced_0F_4 - if_turn_eq 4 ContestUnreferenced_0F_5 + +@ Unreferenced AI routine that doesn't make much sense. + if_turn_eq 0, ContestUnreferenced_0F_1 + if_turn_eq 1, ContestUnreferenced_0F_2 + if_turn_eq 2, ContestUnreferenced_0F_3 + if_turn_eq 3, ContestUnreferenced_0F_4 + if_turn_eq 4, ContestUnreferenced_0F_5 end ContestUnreferenced_0F_1: - if_user_order_not_eq MON_1 ContestUnreferenced_2B_1 - if_user_order_not_eq MON_2 ContestUnreferenced_2B_2 - if_user_order_not_eq MON_3 ContestUnreferenced_2B_1 - if_user_order_not_eq MON_4 ContestUnreferenced_2B_1 + if_user_order_not_eq MON_1, ContestUnreferenced_2B_1 + if_user_order_not_eq MON_2, ContestUnreferenced_2B_2 + if_user_order_not_eq MON_3, ContestUnreferenced_2B_1 + if_user_order_not_eq MON_4, ContestUnreferenced_2B_1 end ContestUnreferenced_2B_1: - if_effect_type_eq 1 ContestUnreferenced_score + if_effect_type_eq 1, ContestUnreferenced_score end ContestUnreferenced_2B_2: - if_effect_type_eq 1 ContestUnreferenced_score + if_effect_type_eq 1, ContestUnreferenced_score end - if_effect_type_eq 1 ContestUnreferenced_score + if_effect_type_eq 1, ContestUnreferenced_score end ContestUnreferenced_0F_2: - if_user_order_not_eq MON_1 ContestUnreferenced_2B_1 - if_user_order_not_eq MON_2 ContestUnreferenced_2B_1 - if_user_order_not_eq MON_3 ContestUnreferenced_2B_1 - if_user_order_not_eq MON_4 ContestUnreferenced_2B_1 + if_user_order_not_eq MON_1, ContestUnreferenced_2B_1 + if_user_order_not_eq MON_2, ContestUnreferenced_2B_1 + if_user_order_not_eq MON_3, ContestUnreferenced_2B_1 + if_user_order_not_eq MON_4, ContestUnreferenced_2B_1 end ContestUnreferenced_0F_3: - if_user_order_not_eq MON_1 ContestUnreferenced_2B_1 - if_user_order_not_eq MON_2 ContestUnreferenced_2B_1 - if_user_order_not_eq MON_3 ContestUnreferenced_2B_1 - if_user_order_not_eq MON_4 ContestUnreferenced_2B_1 + if_user_order_not_eq MON_1, ContestUnreferenced_2B_1 + if_user_order_not_eq MON_2, ContestUnreferenced_2B_1 + if_user_order_not_eq MON_3, ContestUnreferenced_2B_1 + if_user_order_not_eq MON_4, ContestUnreferenced_2B_1 end ContestUnreferenced_0F_4: - if_user_order_not_eq MON_1 ContestUnreferenced_2B_1 - if_user_order_not_eq MON_2 ContestUnreferenced_2B_1 - if_user_order_not_eq MON_3 ContestUnreferenced_2B_1 - if_user_order_not_eq MON_4 ContestUnreferenced_2B_1 + if_user_order_not_eq MON_1, ContestUnreferenced_2B_1 + if_user_order_not_eq MON_2, ContestUnreferenced_2B_1 + if_user_order_not_eq MON_3, ContestUnreferenced_2B_1 + if_user_order_not_eq MON_4, ContestUnreferenced_2B_1 end ContestUnreferenced_0F_5: - if_user_order_not_eq MON_1 ContestUnreferenced_2B_1 - if_user_order_not_eq MON_2 ContestUnreferenced_2B_1 - if_user_order_not_eq MON_3 ContestUnreferenced_2B_1 - if_user_order_not_eq MON_4 ContestUnreferenced_2B_1 + if_user_order_not_eq MON_1, ContestUnreferenced_2B_1 + if_user_order_not_eq MON_2, ContestUnreferenced_2B_1 + if_user_order_not_eq MON_3, ContestUnreferenced_2B_1 + if_user_order_not_eq MON_4, ContestUnreferenced_2B_1 end ContestUnreferenced_score: score +10 end + end + +@ Unreferenced AI routine to encourage the most appealing move. if_most_appealing_move ContestUnreferenced_score2 end ContestUnreferenced_score2: @@ -115,10 +122,10 @@ ContestUnreferenced_score2: AI_CheckBoring: if_effect_eq CONTEST_EFFECT_REPETITION_NOT_BORING, AI_end_081DC27F - if_move_used_count_eq 1 AI_score1_081DC27F - if_move_used_count_eq 2 AI_score2_081DC27F - if_move_used_count_eq 3 AI_score3_081DC27F - if_move_used_count_eq 4 AI_score4_081DC27F + if_move_used_count_eq 1, AI_score1_081DC27F + if_move_used_count_eq 2, AI_score2_081DC27F + if_move_used_count_eq 3, AI_score3_081DC27F + if_move_used_count_eq 4, AI_score4_081DC27F end AI_score1_081DC27F: score -5 -- cgit v1.2.3 From b98b5aa0fb35b3959d383e8f39156d476f14b5e4 Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Sat, 20 Aug 2016 16:01:17 -0700 Subject: name contest AI label --- data/contest_ai_scripts.s | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data') diff --git a/data/contest_ai_scripts.s b/data/contest_ai_scripts.s index 1c330f635..e0ca72de2 100644 --- a/data/contest_ai_scripts.s +++ b/data/contest_ai_scripts.s @@ -11,7 +11,7 @@ enum MON_4 .align 2 -gUnknown_081DC118:: @ 81DC118 +gContestAIs:: @ 81DC118 .4byte AI_CheckForBadMove .4byte AI_CheckForCombo .4byte AI_CheckBoring -- cgit v1.2.3 From 269c2ebdab0170cd30c0f12e0094e0fc30560e20 Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Sun, 28 Aug 2016 14:13:43 -0400 Subject: dump old unused battle interface gfx --- data/graphics.s | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 53 insertions(+), 1 deletion(-) (limited to 'data') diff --git a/data/graphics.s b/data/graphics.s index 5edddac3b..df597cca3 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -30,78 +30,103 @@ gSmokescreenImpactTiles:: @ 8D02410 gSmokescreenImpactPalette:: @ 8D024F0 .incbin "graphics/battle_anims/sprites/smokescreen_impact.gbapal.lz" + .align 2 gInterfaceGfx_PokeBall:: .incbin "graphics/interface/ball/poke.4bpp.lz" @ 0xBC + .align 2 gInterfacePal_PokeBall:: .incbin "graphics/interface/ball/poke.gbapal.lz" + .align 2 gInterfaceGfx_GreatBall:: .incbin "graphics/interface/ball/great.4bpp.lz" @ 0xBC + .align 2 gInterfacePal_GreatBall:: .incbin "graphics/interface/ball/great.gbapal.lz" + .align 2 gInterfaceGfx_SafariBall:: .incbin "graphics/interface/ball/safari.4bpp.lz" @ 0xBC + .align 2 gInterfacePal_SafariBall:: .incbin "graphics/interface/ball/safari.gbapal.lz" + .align 2 gInterfaceGfx_UltraBall:: .incbin "graphics/interface/ball/ultra.4bpp.lz" @ 0xBC + .align 2 gInterfacePal_UltraBall:: .incbin "graphics/interface/ball/ultra.gbapal.lz" + .align 2 gInterfaceGfx_MasterBall:: .incbin "graphics/interface/ball/master.4bpp.lz" @ 0xBC + .align 2 gInterfacePal_MasterBall:: .incbin "graphics/interface/ball/master.gbapal.lz" + .align 2 gInterfaceGfx_NetBall:: .incbin "graphics/interface/ball/net.4bpp.lz" @ 0xBC + .align 2 gInterfacePal_NetBall:: .incbin "graphics/interface/ball/net.gbapal.lz" + .align 2 gInterfaceGfx_DiveBall:: .incbin "graphics/interface/ball/dive.4bpp.lz" @ 0xBC + .align 2 gInterfacePal_DiveBall:: .incbin "graphics/interface/ball/dive.gbapal.lz" + .align 2 gInterfaceGfx_NestBall:: .incbin "graphics/interface/ball/nest.4bpp.lz" @ 0xBC + .align 2 gInterfacePal_NestBall:: .incbin "graphics/interface/ball/nest.gbapal.lz" + .align 2 gInterfaceGfx_RepeatBall:: .incbin "graphics/interface/ball/repeat.4bpp.lz" @ 0xBC + .align 2 gInterfacePal_RepeatBall:: .incbin "graphics/interface/ball/repeat.gbapal.lz" + .align 2 gInterfaceGfx_TimerBall:: .incbin "graphics/interface/ball/timer.4bpp.lz" @ 0xBC + .align 2 gInterfacePal_TimerBall:: .incbin "graphics/interface/ball/timer.gbapal.lz" + .align 2 gInterfaceGfx_LuxuryBall:: .incbin "graphics/interface/ball/luxury.4bpp.lz" @ 0xBC + .align 2 gInterfacePal_LuxuryBall:: .incbin "graphics/interface/ball/luxury.gbapal.lz" + .align 2 gInterfaceGfx_PremierBall:: .incbin "graphics/interface/ball/premier.4bpp.lz" @ 0xBC + .align 2 gInterfacePal_PremierBall:: .incbin "graphics/interface/ball/premier.gbapal.lz" + .align 2 gUnknown_08D030D0:: @ 8D030D0 .incbin "graphics/interface/ball_open.4bpp.lz" @@ -388,8 +413,35 @@ gBattleAnimSpriteSheet_036:: @ 8D07448 .align 2 gBattleAnimSpriteSheet_037:: @ 8D0781C .incbin "graphics/battle_anims/sprites/037.4bpp.lz" + +@ old battle interface data, unused - .incbin "baserom.gba", 0xd07b68, 0xb7c + .align 2 + .incbin "graphics/unknown/unknown_D07B68.4bpp.lz" + + .align 2 + .incbin "graphics/unknown/unknown_D07B68.gbapal.lz" + + .align 2 + .incbin "graphics/unknown/unknown_D07B68_2.gbapal.lz" + + .align 2 + .incbin "graphics/unused/obi1.4bpp.lz" + + .align 2 + .incbin "graphics/unused/obi_palpak1.gbapal.lz" @ palettes 1-3 + + .align 2 + .incbin "graphics/unused/obi_pal4.gbapal.lz" @ 4 is by itself + + .align 2 + .incbin "graphics/unused/obi_palpak3.gbapal.lz" @ palettes 5-7 + + .align 2 + .incbin "graphics/unused/obi2.4bpp.lz" + + .align 2 + .incbin "graphics/unused/obi_tilemap.bin.lz" .align 2 gBattleAnimSpritePalette_038:: @ 8D086E4 -- cgit v1.2.3 From 56ff8c01d814a0d457125e260cc646dde89248ba Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Sun, 28 Aug 2016 16:44:51 -0400 Subject: commit current work --- data/graphics.s | 29 +++++++++++++++++++++++++---- 1 file changed, 25 insertions(+), 4 deletions(-) (limited to 'data') diff --git a/data/graphics.s b/data/graphics.s index df597cca3..07cb50be4 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -499,8 +499,9 @@ gBattleAnimSpritePalette_045:: @ 8D099B4 gBattleAnimSpriteSheet_045:: @ 8D099DC .incbin "graphics/battle_anims/sprites/045.4bpp.lz" + .align 2 gUnknown_08D09C48:: @ 8D09C48 - .incbin "baserom.gba", 0x00d09c48, 0x214 + .incbin "graphics/interface/hp_numbers.4bpp.lz" .align 2 gBattleAnimSpriteSheet_046:: @ 8D09E5C @@ -542,7 +543,11 @@ gBattleAnimSpriteSheet_051:: @ 8D0A62C gBattleAnimSpriteSheet_052:: @ 8D0A6D8 .incbin "graphics/battle_anims/sprites/052.4bpp.lz" - .incbin "baserom.gba", 0xd0a7a4, 0x194 + .align 2 + .incbin "graphics/unused/line_sketch.4bpp.lz" @ unused + + .align 2 + .incbin "graphics/unused/line_sketch.gbapal.lz" .align 2 gBattleAnimSpriteSheet_054:: @ 8D0A938 @@ -620,7 +625,8 @@ gBattleAnimSpriteSheet_063:: @ 8D0B9D4 gBattleAnimSpritePalette_063:: @ 8D0BB90 .incbin "graphics/battle_anims/sprites/063.gbapal.lz" - .incbin "baserom.gba", 0xd0bbb8, 0x70 + .align 2 + .incbin "graphics/unused/metronome_hand_small.4bpp.lz" @ unused, was for metronome at one point .align 2 gBattleAnimSpritePalette_091:: @ 8D0BC28 @@ -933,8 +939,18 @@ gBattleAnimSpriteSheet_114:: @ 8D10F78 .align 2 gBattleAnimSpritePalette_114:: @ 8D1106C .incbin "graphics/battle_anims/sprites/114.gbapal.lz" + + .align 2 + .incbin "graphics/unused/blue_frame.bin.lz" @ P1, P2, P3 and P4 tilemaps? - .incbin "baserom.gba", 0xd11094, 0xae0 + .align 2 + .incbin "graphics/unused/redyellowgreen_frame.bin.lz" + + .align 2 + .incbin "graphics/unused/color_frames.4bpp.lz" + + .align 2 + .incbin "graphics/unused/color_frames.gbapal.lz" .align 2 gBattleAnimSpriteSheet_115:: @ 8D11B74 @@ -942,10 +958,15 @@ gBattleAnimSpriteSheet_115:: @ 8D11B74 .incbin "baserom.gba", 0xd11ca4, 0x488 + .align 2 gUnknown_08D1212C:: .incbin "graphics/interface/battle_window.gbapal" + + .align 2 gUnknown_08D1214C:: .incbin "baserom.gba", 0xd1214c, 0x20 + + .align 2 gUnknown_08D1216C:: @ 8D1216C .incbin "baserom.gba", 0xd1216c, 0x840 -- cgit v1.2.3 From 9c6ff3efa2c989d30955690a8128ff64a72f35a7 Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Sun, 28 Aug 2016 19:35:52 -0400 Subject: remerge a lot of previously lost work --- data/graphics.s | 31 ++++++++++++++++++++----------- 1 file changed, 20 insertions(+), 11 deletions(-) (limited to 'data') diff --git a/data/graphics.s b/data/graphics.s index a4189b70a..6e7a04fbe 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -275,7 +275,7 @@ gBattleAnimSpriteSheet_017:: @ 8D04368 .incbin "graphics/battle_anims/sprites/017.4bpp.lz" .align 2 - .incbin "baserom.gba", 0xD04388, 0x21 @ LZ, uncomp. size = 0x20 + .incbin "baserom.gba", 0xD04388, 0x24 @ LZ, uncomp. size = 0x20 .align 2 gBattleAnimSpritePalette_019:: @ 8D043AC @@ -302,10 +302,10 @@ gBattleAnimSpriteSheet_023:: @ 8D045A4 .incbin "graphics/battle_anims/sprites/023.4bpp.lz" .align 2 - .incbin "baserom.gba", 0xD046AC, 0x26 @ LZ, uncomp. size = 0x20 + .incbin "baserom.gba", 0xD046AC, 0x26 @ palette .align 2 - .incbin "baserom.gba", 0xD046D4, 0xFA @ LZ, uncomp. size = 0x400 + .incbin "graphics/unused/music_notes.4bpp.lz" .align 2 gBattleAnimSpritePalette_021:: @ 8D047D0 @@ -979,22 +979,22 @@ gBattleAnimSpriteSheet_115:: @ 8D11B74 .incbin "graphics/battle_anims/sprites/115.4bpp.lz" .align 2 - .incbin "baserom.gba", 0xD11CA4, 0x188 @ LZ, uncomp. size = 0x800 + .incbin "graphics/unused/water_splash.8bpp.lz" .align 2 - .incbin "baserom.gba", 0xD11E2C, 0xDD @ LZ, uncomp. size = 0x400 + .incbin "graphics/unused/water_splash.bin.lz" .align 2 - .incbin "baserom.gba", 0xD11F0C, 0x5D @ LZ, uncomp. size = 0x200 + .incbin "graphics/unused/water_splash.gbapal.lz" .align 2 - .incbin "baserom.gba", 0xD11F6C, 0x8C @ LZ, uncomp. size = 0x140 + .incbin "graphics/unused/basic_frame.4bpp.lz" .align 2 - .incbin "baserom.gba", 0xD11FF8, 0x28 @ LZ, uncomp. size = 0x20 + .incbin "graphics/unused/basic_frame.gbapal.lz" .align 2 - .incbin "baserom.gba", 0xD12020, 0x10C @ LZ, uncomp. size = 0x800 + .incbin "graphics/unused/basic_frame.bin.lz" .align 2 gUnknown_08D1212C:: @@ -1002,11 +1002,20 @@ gUnknown_08D1212C:: .align 2 gUnknown_08D1214C:: - .incbin "baserom.gba", 0xd1214c, 0x20 + .incbin "graphics/battle_interface/hpbar.gbapal" .align 2 gUnknown_08D1216C:: @ 8D1216C - .incbin "baserom.gba", 0xd1216c, 0x840 + .incbin "graphics/battle_interface/hpbar.4bpp" + .incbin "graphics/battle_interface/expbar.4bpp" + .incbin "graphics/battle_interface/status_psn.4bpp" + .incbin "graphics/battle_interface/status_par.4bpp" + .incbin "graphics/battle_interface/status_slp.4bpp" + .incbin "graphics/battle_interface/status_frz.4bpp" + .incbin "graphics/battle_interface/status_brn.4bpp" + .incbin "graphics/battle_interface/misc.4bpp" + .incbin "graphics/battle_interface/hpbar_anim.4bpp" + .incbin "graphics/battle_interface/misc_frameend.4bpp" Tiles_D129AC:: @ 8D129AC .incbin "baserom.gba", 0xd129ac, 0x680 -- cgit v1.2.3 From 4b32918195c0d1d0090d0129340adfd3bd64892a Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Sun, 28 Aug 2016 23:07:26 -0400 Subject: dump beta contest gfx --- data/graphics.s | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) (limited to 'data') diff --git a/data/graphics.s b/data/graphics.s index 6e7a04fbe..2724214f2 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -1017,8 +1017,16 @@ gUnknown_08D1216C:: @ 8D1216C .incbin "graphics/battle_interface/hpbar_anim.4bpp" .incbin "graphics/battle_interface/misc_frameend.4bpp" + .align 2 Tiles_D129AC:: @ 8D129AC - .incbin "baserom.gba", 0xd129ac, 0x680 + .incbin "graphics/battle_interface/ball_display.4bpp" + + .incbin "graphics/battle_interface/ball_display_unused_extra.4bpp" + .incbin "graphics/battle_interface/status2.4bpp" @ these three duplicate sets of graphics are for the opponent pokemon and are also for use in double battles. they use dynamic palettes so coloring them is an extreme headache and wont be done for now. + .incbin "graphics/battle_interface/status3.4bpp" + .incbin "graphics/battle_interface/status4.4bpp" + .incbin "graphics/unknown/unknown_D12FEC.4bpp" + .incbin "graphics/unknown/unknown_D1300C.4bpp" .align 2 gBattleAnimSpriteSheet_116:: @ 8D1302C @@ -1169,13 +1177,13 @@ gBattleAnimSpriteSheet_077:: @ 8D150F4 .incbin "graphics/battle_anims/sprites/077.4bpp.lz" .align 2 - .incbin "baserom.gba", 0xD151C8, 0x912 @ LZ, uncomp. size = 0x2000 + .incbin "graphics/unused/beta_contest.4bpp.lz" .align 2 - .incbin "baserom.gba", 0xD15ADC, 0x104 @ LZ, uncomp. size = 0x200 + .incbin "graphics/unused/beta_contest.gbapal.lz" .align 2 - .incbin "baserom.gba", 0xD15BE0, 0x183 @ LZ, uncomp. size = 0x800 + .incbin "graphics/unused/beta_contest.bin.lz" .align 2 .incbin "baserom.gba", 0xD15D64, 0x2C0 @ LZ, uncomp. size = 0x1000 -- cgit v1.2.3 From 005016323052e1884e2e5ef442a1d3bd391bf9fc Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Mon, 29 Aug 2016 01:14:56 -0400 Subject: fix old.png and proper dump palette and tilemap --- data/graphics.s | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'data') diff --git a/data/graphics.s b/data/graphics.s index 2724214f2..bebde2e02 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -19,8 +19,8 @@ gUnknown_08D00524:: @ 8D00524 @ 8D019E4 .incbin "graphics/unused/old.4bpp.lz" @ japanese table and bunch of stuff - .incbin "graphics/unused/unknown_D021BC.bin" - .incbin "graphics/unused/unknown_D023E8.bin" + .incbin "graphics/unused/old.bin.lz" + .incbin "graphics/unused/old.gbapal.lz" .align 2 gSmokescreenImpactTiles:: @ 8D02410 -- cgit v1.2.3 From 69ae45336f3b7c4c54a9f1289c2b6d9e1ea7915f Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Mon, 29 Aug 2016 14:10:01 -0400 Subject: rename gfx files for naming convention consistency --- data/graphics.s | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'data') diff --git a/data/graphics.s b/data/graphics.s index bebde2e02..22e91d378 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -18,9 +18,9 @@ gUnknown_08D00524:: @ 8D00524 .include "data/graphics/pokemon/circled_question_mark_graphics.s" @ 8D019E4 - .incbin "graphics/unused/old.4bpp.lz" @ japanese table and bunch of stuff - .incbin "graphics/unused/old.bin.lz" - .incbin "graphics/unused/old.gbapal.lz" + .incbin "graphics/unused/old_charmap.4bpp.lz" @ japanese table and bunch of stuff + .incbin "graphics/unused/old_charmap.bin.lz" + .incbin "graphics/unused/old_charmap.gbapal.lz" .align 2 gSmokescreenImpactTiles:: @ 8D02410 @@ -437,7 +437,7 @@ gBattleAnimSpriteSheet_037:: @ 8D0781C .incbin "graphics/unused/obi_palpak1.gbapal.lz" @ palettes 1-3 .align 2 - .incbin "graphics/unused/obi_pal4.gbapal.lz" @ 4 is by itself + .incbin "graphics/unused/old_pal4.gbapal.lz" @ 4 is by itself .align 2 .incbin "graphics/unused/obi_palpak3.gbapal.lz" @ palettes 5-7 @@ -446,7 +446,7 @@ gBattleAnimSpriteSheet_037:: @ 8D0781C .incbin "graphics/unused/obi2.4bpp.lz" .align 2 - .incbin "graphics/unused/obi_tilemap.bin.lz" + .incbin "graphics/unused/old_battle_interface_tilemap.bin.lz" .align 2 gBattleAnimSpritePalette_038:: @ 8D086E4 @@ -1177,13 +1177,13 @@ gBattleAnimSpriteSheet_077:: @ 8D150F4 .incbin "graphics/battle_anims/sprites/077.4bpp.lz" .align 2 - .incbin "graphics/unused/beta_contest.4bpp.lz" + .incbin "graphics/unused/old_contest.4bpp.lz" .align 2 - .incbin "graphics/unused/beta_contest.gbapal.lz" + .incbin "graphics/unused/old_contest.gbapal.lz" .align 2 - .incbin "graphics/unused/beta_contest.bin.lz" + .incbin "graphics/unused/old_contest.bin.lz" .align 2 .incbin "baserom.gba", 0xD15D64, 0x2C0 @ LZ, uncomp. size = 0x1000 -- cgit v1.2.3 From 4da1b5564a952b4ef62ae7538c04e2da21a19cb8 Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Mon, 29 Aug 2016 15:51:37 -0400 Subject: dump misc contest gfx and move gfx to its own folder --- data/graphics.s | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) (limited to 'data') diff --git a/data/graphics.s b/data/graphics.s index 22e91d378..1a9614897 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -302,7 +302,7 @@ gBattleAnimSpriteSheet_023:: @ 8D045A4 .incbin "graphics/battle_anims/sprites/023.4bpp.lz" .align 2 - .incbin "baserom.gba", 0xD046AC, 0x26 @ palette + .incbin "baserom.gba", 0xD046AC, 0x28 @ palette .align 2 .incbin "graphics/unused/music_notes.4bpp.lz" @@ -418,8 +418,6 @@ gBattleAnimSpriteSheet_036:: @ 8D07448 .align 2 gBattleAnimSpriteSheet_037:: @ 8D0781C .incbin "graphics/battle_anims/sprites/037.4bpp.lz" - -@ old battle interface data, unused .align 2 .incbin "graphics/unknown/unknown_D07B68.4bpp.lz" @@ -430,6 +428,8 @@ gBattleAnimSpriteSheet_037:: @ 8D0781C .align 2 .incbin "graphics/unknown/unknown_D07B68_2.gbapal.lz" +@ old battle interface data, unused + .align 2 .incbin "graphics/unused/obi1.4bpp.lz" @@ -1021,6 +1021,7 @@ gUnknown_08D1216C:: @ 8D1216C Tiles_D129AC:: @ 8D129AC .incbin "graphics/battle_interface/ball_display.4bpp" + @ extra stuff .incbin "graphics/battle_interface/ball_display_unused_extra.4bpp" .incbin "graphics/battle_interface/status2.4bpp" @ these three duplicate sets of graphics are for the opponent pokemon and are also for use in double battles. they use dynamic palettes so coloring them is an extreme headache and wont be done for now. .incbin "graphics/battle_interface/status3.4bpp" @@ -1197,15 +1198,15 @@ gContestNumbers_UnusedPal:: .incbin "graphics/unused/numbers.gbapal.lz" .align 2 - .incbin "baserom.gba", 0xD16134, 0x100F @ LZ, uncomp. size = 0x4000 + .incbin "graphics/unused/old_contest_2.4bpp.lz" .align 2 gUnknown_08D17144:: @ 8D17144 - .incbin "baserom.gba", 0xD17144, 0x116 @ LZ, uncomp. size = 0x200 + .incbin "graphics/unused/old_contest_2.gbapal.lz" .align 2 gUnknown_08D1725C:: @ 8D1725C - .incbin "baserom.gba", 0xD1725C, 0x1C5 @ LZ, uncomp. size = 0x800 + .incbin "graphics/unused/old_contest_2.bin.lz" .align 2 gUnknown_08D17424:: @ 8D17424 @@ -1224,6 +1225,7 @@ gUnknown_08D17C3C:: @ 8D17C3C .align 2 gUnknown_08D17D6C:: @ 8D17D6C .incbin "baserom.gba", 0xD17D6C, 0xAAA @ LZ, uncomp. size = 0x2000 + @.incbin "graphics/contest/misc.4bpp.lz" .align 2 gUnknown_08D18818:: @ 8D18818 @@ -1234,11 +1236,11 @@ gUnknown_08D18818:: @ 8D18818 .align 2 gContestJudgeSymbolsGfx:: @ 8D19590 - .incbin "graphics/misc/judge_symbols.4bpp.lz" + .incbin "graphics/contest/judge_symbols.4bpp.lz" .align 2 gContest3Pal:: - .incbin "graphics/misc/judge_symbols.gbapal.lz" + .incbin "graphics/contest/judge_symbols.gbapal.lz" .align 2 gTiles_8D1975C:: @ 8D1975C @@ -1521,11 +1523,11 @@ gBattleAnimSpritePalette_172:: @ 8D1C728 .align 2 gContestJudgeGfx:: - .incbin "graphics/misc/judge.4bpp.lz" + .incbin "graphics/contest/judge.4bpp.lz" .align 2 gContest2Pal:: @ 8D1CA1C - .incbin "graphics/misc/judge.gbapal.lz" + .incbin "graphics/contest/judge.gbapal.lz" .align 2 gBattleAnimSpriteSheet_001:: @ 8D1CA44 @@ -2827,7 +2829,7 @@ gBattleAnimSpritePalette_262:: @ 8E693DC .align 2 gContestNextTurnGfx:: - .incbin "graphics/misc/nextturn.4bpp.lz" + .incbin "graphics/contest/nextturn.4bpp.lz" gUnknown_08E69478:: @ 8E69478 .incbin "baserom.gba", 0x00e69478, 0x100 @@ -2864,7 +2866,7 @@ gUnknown_08E6978C:: @ 8E6978C .align 2 gContestPal:: - .incbin "graphics/misc/nextturn.gbapal" + .incbin "graphics/contest/nextturn.gbapal" .align 2 gBattleAnimSpriteSheet_272:: @ 8E6982C -- cgit v1.2.3 From de511e83ad0ee43941bac5e322094c4da96b08bb Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Mon, 29 Aug 2016 15:54:03 -0400 Subject: forgot to reinclude misc.png incbin --- data/graphics.s | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'data') diff --git a/data/graphics.s b/data/graphics.s index 1a9614897..430d8644f 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -1224,8 +1224,7 @@ gUnknown_08D17C3C:: @ 8D17C3C .align 2 gUnknown_08D17D6C:: @ 8D17D6C - .incbin "baserom.gba", 0xD17D6C, 0xAAA @ LZ, uncomp. size = 0x2000 - @.incbin "graphics/contest/misc.4bpp.lz" + .incbin "graphics/contest/misc.4bpp.lz" .align 2 gUnknown_08D18818:: @ 8D18818 -- cgit v1.2.3 From adca65dce1d4d35f3a607701112f9c16f192dbe7 Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Mon, 29 Aug 2016 20:14:17 -0400 Subject: dump gfx masks and contest gfx --- data/graphics.s | 72 ++++++++++++++++++++++++++++----------------------------- 1 file changed, 36 insertions(+), 36 deletions(-) (limited to 'data') diff --git a/data/graphics.s b/data/graphics.s index 430d8644f..ff65d5f30 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -1202,7 +1202,7 @@ gContestNumbers_UnusedPal:: .align 2 gUnknown_08D17144:: @ 8D17144 - .incbin "graphics/unused/old_contest_2.gbapal.lz" + .incbin "graphics/unused/old_contest_2.gbapal.lz" @ the tilemap and palette for unused contest assets are used. however, these two files aren't old .align 2 gUnknown_08D1725C:: @ 8D1725C @@ -1223,12 +1223,12 @@ gUnknown_08D17C3C:: @ 8D17C3C .incbin "baserom.gba", 0xD17C3C, 0x12D @ LZ, uncomp. size = 0x800 .align 2 -gUnknown_08D17D6C:: @ 8D17D6C +gContestMiscGfx:: @ 8D17D6C .incbin "graphics/contest/misc.4bpp.lz" .align 2 -gUnknown_08D18818:: @ 8D18818 - .incbin "baserom.gba", 0xD18818, 0xC59 @ LZ, uncomp. size = 0x2000 +gContestAudienceGfx:: @ 8D18818 + .incbin "graphics/contest/audience.4bpp.lz" .align 2 .incbin "baserom.gba", 0xD19474, 0x11C @ LZ, uncomp. size = 0x180 @@ -1243,27 +1243,27 @@ gContest3Pal:: .align 2 gTiles_8D1975C:: @ 8D1975C - .incbin "baserom.gba", 0x00d1975c, 0x20 + .incbin "graphics/contest/heart.4bpp" .align 2 gUnknown_08D1977C:: @ 8D1977C - .incbin "baserom.gba", 0xD1977C, 0xAD1 @ LZ, uncomp. size = 0x2400 + .incbin "graphics/contest/misc_2.4bpp.lz" .align 2 gUnknown_08D1A250:: @ 8D1A250 - .incbin "baserom.gba", 0xD1A250, 0x112 @ LZ, uncomp. size = 0x800 + .incbin "graphics/contest/misc_2_tilemap_1.bin.lz" .align 2 gUnknown_08D1A364:: @ 8D1A364 - .incbin "baserom.gba", 0xD1A364, 0x129 @ LZ, uncomp. size = 0x800 + .incbin "graphics/contest/misc_2_tilemap_2.bin.lz" .align 2 gUnknown_08D1A490:: @ 8D1A490 - .incbin "baserom.gba", 0xD1A490, 0x188 @ LZ, uncomp. size = 0x800 + .incbin "graphics/contest/misc_2_tilemap_3.bin.lz" .align 2 gUnknown_08D1A618:: @ 8D1A618 - .incbin "baserom.gba", 0xD1A618, 0xEA @ LZ, uncomp. size = 0x200 + .incbin "graphics/contest/misc_2.gbapal.lz" .align 2 gBattleAnimSpriteSheet_135:: @ 8D1A704 @@ -1326,10 +1326,10 @@ gBattleAnimSpriteSheet_142:: @ 8D1B1B8 .incbin "graphics/battle_anims/sprites/142.4bpp.lz" .align 2 - .incbin "baserom.gba", 0xD1B218, 0x9C @ LZ, uncomp. size = 0x200 + .incbin "graphics/unused/old_beatup.4bpp.lz" .align 2 - .incbin "baserom.gba", 0xD1B2B4, 0x1B @ LZ, uncomp. size = 0x20 + .incbin "graphics/unused/old_beatup.gbapal.lz" .align 2 gBattleAnimSpriteSheet_147:: @ 8D1B2D0 @@ -1448,13 +1448,13 @@ gBattleAnimSpritePalette_144:: @ 8D1C040 .incbin "graphics/battle_anims/sprites/144.gbapal.lz" .align 2 - .incbin "baserom.gba", 0xD1C060, 0x26 @ LZ, uncomp. size = 0x60 + .incbin "graphics/unused/unknown_D1C060.4bpp.lz" .align 2 - .incbin "baserom.gba", 0xD1C088, 0x16 @ LZ, uncomp. size = 0x20 + .incbin "graphics/unused/unknown_D1C060.gbapal.lz" .align 2 - .incbin "baserom.gba", 0xD1C0A0, 0x102 @ LZ, uncomp. size = 0x800 + .incbin "graphics/unused/unknown_D1C060.bin.lz" .align 2 gBattleAnimSpriteSheet_162:: @ 8D1C1A4 @@ -1554,11 +1554,11 @@ gBattleAnimBackgroundTilemap_00:: @ 8D1D1C0 .align 2 gUnknown_08D1D410:: @ 8D1D410 - .incbin "baserom.gba", 0xD1D410, 0x13A @ LZ, uncomp. size = 0x800 + .incbin "graphics/battle_anims/masks/metal_shine.4bpp.lz" .align 2 gUnknown_08D1D54C:: @ 8D1D54C - .incbin "baserom.gba", 0xD1D54C, 0x28 @ LZ, uncomp. size = 0x20 + .incbin "graphics/battle_anims/masks/metal_shine.gbapal.lz" .align 2 gUnknown_08D1D574:: @ 8D1D574 @@ -1765,11 +1765,11 @@ gBattleAnimSpritePalette_193:: @ 8D209EC .align 2 gUnknown_08D20A14:: @ 8D20A14 - .incbin "baserom.gba", 0xD20A14, 0x1A @ LZ, uncomp. size = 0x60 + .incbin "graphics/battle_anims/masks/curse.4bpp.lz" .align 2 gUnknown_08D20A30:: @ 8D20A30 - .incbin "baserom.gba", 0xD20A30, 0xFD @ LZ, uncomp. size = 0x800 + .incbin "graphics/battle_anims/masks/curse.bin.lz" .align 2 gBattleAnimSpriteSheet_002:: @ 8D20B30 @@ -2226,15 +2226,15 @@ gBattleAnimBackgroundTilemap_10:: @ 8D2A6E8 .align 2 gUnknown_08D2A9E0:: @ 8D2A9E0 - .incbin "baserom.gba", 0xD2A9E0, 0x9F @ LZ, uncomp. size = 0x280 + .incbin "graphics/battle_anims/masks/morning_sun.4bpp.lz" .align 2 gUnknown_08D2AA80:: @ 8D2AA80 - .incbin "baserom.gba", 0xD2AA80, 0x16 @ LZ, uncomp. size = 0x20 + .incbin "graphics/battle_anims/masks/morning_sun.gbapal.lz" .align 2 gUnknown_08D2AA98:: @ 8D2AA98 - .incbin "baserom.gba", 0xD2AA98, 0x11B @ LZ, uncomp. size = 0x800 + .incbin "graphics/battle_anims/masks/morning_sun.bin.lz" .align 2 gBattleAnimBackgroundTilemap_12:: @ 8D2ABB4 @@ -2338,39 +2338,39 @@ gBattleAnimSpritePalette_243:: @ 8D2DAA4 .align 2 gUnknown_08D2DACC:: @ 8D2DACC - .incbin "baserom.gba", 0xD2DACC, 0x20E @ LZ, uncomp. size = 0x800 + .incbin "graphics/battle_anims/masks/stat.4bpp.lz" .align 2 gUnknown_08D2DCDC:: @ 8D2DCDC - .incbin "baserom.gba", 0xD2DCDC, 0x11C @ LZ, uncomp. size = 0x800 + .incbin "graphics/battle_anims/masks/stat_tilemap_1.bin.lz" .align 2 gUnknown_08D2DDF8:: @ 8D2DDF8 - .incbin "baserom.gba", 0xD2DDF8, 0x11C @ LZ, uncomp. size = 0x800 + .incbin "graphics/battle_anims/masks/stat_tilemap_2.bin.lz" .align 2 gUnknown_08D2DF14:: @ 8D2DF14 - .incbin "baserom.gba", 0xD2DF14, 0x1D @ LZ, uncomp. size = 0x20 + .incbin "graphics/battle_anims/masks/stat1.gbapal.lz" .align 2 gUnknown_08D2DF34:: @ 8D2DF34 - .incbin "baserom.gba", 0xD2DF34, 0x1D @ LZ, uncomp. size = 0x20 + .incbin "graphics/battle_anims/masks/stat2.gbapal.lz" .align 2 gUnknown_08D2DF54:: @ 8D2DF54 - .incbin "baserom.gba", 0xD2DF54, 0x1F @ LZ, uncomp. size = 0x20 + .incbin "graphics/battle_anims/masks/stat3.gbapal.lz" .align 2 gUnknown_08D2DF74:: @ 8D2DF74 - .incbin "baserom.gba", 0xD2DF74, 0x1D @ LZ, uncomp. size = 0x20 + .incbin "graphics/battle_anims/masks/stat4.gbapal.lz" .align 2 gUnknown_08D2DF94:: @ 8D2DF94 - .incbin "baserom.gba", 0xD2DF94, 0x1D @ LZ, uncomp. size = 0x20 + .incbin "graphics/battle_anims/masks/stat5.gbapal.lz" .align 2 gUnknown_08D2DFB4:: @ 8D2DFB4 - .incbin "baserom.gba", 0xD2DFB4, 0x1D @ LZ, uncomp. size = 0x20 + .incbin "graphics/battle_anims/masks/stat6.gbapal.lz" .align 2 gUnknown_08D2DFD4:: @ 8D2DFD4 @@ -2382,15 +2382,15 @@ gUnknown_08D2DFF4:: @ 8D2DFF4 .align 2 gUnknown_08D2E014:: @ 8D2E014 - .incbin "baserom.gba", 0xD2E014, 0x13A @ LZ, uncomp. size = 0x200 + .incbin "graphics/battle_anims/masks/cure_bubbles.4bpp.lz" .align 2 gUnknown_08D2E150:: @ 8D2E150 - .incbin "baserom.gba", 0xD2E150, 0x1D @ LZ, uncomp. size = 0x20 + .incbin "graphics/battle_anims/masks/cure_bubbles.gbapal.lz" .align 2 gUnknown_08D2E170:: @ 8D2E170 - .incbin "baserom.gba", 0xD2E170, 0x11C @ LZ, uncomp. size = 0x800 + .incbin "graphics/battle_anims/masks/cure_bubbles.bin.lz" .align 2 gBattleAnimSpritePalette_245:: @ 8D2E28C @@ -2422,11 +2422,11 @@ gBattleAnimSpriteSheet_053:: @ 8D2EBDC .align 2 gUnknown_08D2EDFC:: @ 8D2EDFC - .incbin "baserom.gba", 0xD2EDFC, 0x4B @ LZ, uncomp. size = 0x1C0 + .incbin "graphics/battle_anims/masks/unknown_D2EDFC.4bpp.lz" .align 2 gUnknown_08D2EE48:: @ 8D2EE48 - .incbin "baserom.gba", 0xD2EE48, 0x106 @ LZ, uncomp. size = 0x800 + .incbin "graphics/battle_anims/masks/unknown_D2EDFC.bin.lz" .align 2 gBattleAnimSpriteSheet_248:: @ 8D2EF50 -- cgit v1.2.3 From 83d231dbc064c0283e4b707dce07686574733895 Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Tue, 30 Aug 2016 12:40:16 -0400 Subject: dump misc gfx and rest of battle terrain data --- data/graphics.s | 115 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 57 insertions(+), 58 deletions(-) (limited to 'data') diff --git a/data/graphics.s b/data/graphics.s index ff65d5f30..d6af0681b 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -1231,7 +1231,7 @@ gContestAudienceGfx:: @ 8D18818 .incbin "graphics/contest/audience.4bpp.lz" .align 2 - .incbin "baserom.gba", 0xD19474, 0x11C @ LZ, uncomp. size = 0x180 + .incbin "graphics/contest/faces.4bpp.lz" .align 2 gContestJudgeSymbolsGfx:: @ 8D19590 @@ -1562,16 +1562,16 @@ gUnknown_08D1D54C:: @ 8D1D54C .align 2 gUnknown_08D1D574:: @ 8D1D574 - .incbin "baserom.gba", 0xD1D574, 0x172 @ LZ, uncomp. size = 0x800 + .incbin "graphics/battle_anims/masks/metal_shine.bin.lz" .align 2 - .incbin "baserom.gba", 0xD1D6E8, 0x10E @ LZ, uncomp. size = 0x600 + .incbin "graphics/unused/goosuto.4bpp.lz" @ ghost .align 2 - .incbin "baserom.gba", 0xD1D7F8, 0x16 @ LZ, uncomp. size = 0x20 + .incbin "graphics/unused/goosuto.gbapal.lz" .align 2 - .incbin "baserom.gba", 0xD1D810, 0x14E @ LZ, uncomp. size = 0x800 + .incbin "graphics/unused/goosuto.bin.lz" .align 2 gBattleAnimSpriteSheet_174:: @ 8D1D960 @@ -1710,10 +1710,10 @@ gBattleWindowLarge2Gfx:: @ 8d1fc94 .incbin "graphics/interface/battle_window5.4bpp.lz" .align 2 - .incbin "baserom.gba", 0xD1FF0C, 0x5D @ LZ, uncomp. size = 0x100 + .incbin "graphics/unused/shadow.4bpp.lz" .align 2 - .incbin "baserom.gba", 0xD1FF6C, 0x12 @ LZ, uncomp. size = 0x20 + .incbin "graphics/unused/shadow.gbapal.lz" .align 2 gBattleAnimSpriteSheet_014:: @ 8D1FF80 @@ -1872,7 +1872,6 @@ gBattleAnimSpriteSheet_206:: @ 8D227B0 .incbin "graphics/battle_anims/sprites/206.4bpp.lz" .align 2 -gUnknown_08D229BC:: gBattleAnimSpritePalette_206:: @ 8D229BC .incbin "graphics/battle_anims/sprites/206.gbapal.lz" @@ -1929,16 +1928,16 @@ gBattleAnimSpritePalette_216:: @ 8D2366C .incbin "graphics/battle_anims/sprites/216.gbapal.lz" .align 2 -gUnknown_08D2368C:: @ 8D2368C - .incbin "baserom.gba", 0xD2368C, 0xA6E @ LZ, uncomp. size = 0x2000 +gAttractGfx:: @ 8D2368C + .incbin "graphics/battle_anims/backgrounds/attract.4bpp.lz" .align 2 -gUnknown_08D240FC:: @ 8D240FC - .incbin "baserom.gba", 0xD240FC, 0x28 @ LZ, uncomp. size = 0x20 +gAttractPal:: @ 8D240FC + .incbin "graphics/battle_anims/backgrounds/attract.gbapal.lz" .align 2 -gUnknown_08D24124:: @ 8D24124 - .incbin "baserom.gba", 0xD24124, 0x27A @ LZ, uncomp. size = 0x800 +gAttractTilemap:: @ 8D24124 + .incbin "graphics/battle_anims/backgrounds/attract.bin.lz" .align 2 gBattleAnimSpriteSheet_217:: @ 8D243A0 @@ -1977,12 +1976,12 @@ gBattleAnimSpritePalette_215:: @ 8D24D58 .incbin "graphics/battle_anims/sprites/215.gbapal.lz" .align 2 -gUnknown_08D24D7C:: @ 8D24D7C - .incbin "baserom.gba", 0xD24D7C, 0x28 @ LZ, uncomp. size = 0x20 +gScaryFacePal:: @ 8D24D7C + .incbin "graphics/battle_anims/backgrounds/scary_face.gbapal.lz" .align 2 -gUnknown_08D24DA4:: @ 8D24DA4 - .incbin "baserom.gba", 0xD24DA4, 0x22D @ LZ, uncomp. size = 0xA00 +gScaryFaceGfx:: @ 8D24DA4 + .incbin "graphics/battle_anims/backgrounds/scary_face.4bpp.lz" .align 2 gBattleAnimSpritePalette_218:: @ 8D24FD4 @@ -2293,16 +2292,16 @@ gBattleAnimSpritePalette_240:: @ 8D2D240 .incbin "graphics/battle_anims/sprites/240.gbapal.lz" .align 2 -gUnknown_08D2D268:: @ 8D2D268 - .incbin "baserom.gba", 0xD2D268, 0x24 @ LZ, uncomp. size = 0x20 +gSubstituteDollPal:: @ 8D2D268 + .incbin "graphics/battle_anims/sprites/substitute.gbapal.lz" .align 2 -gUnknown_08D2D28C:: @ 8D2D28C - .incbin "baserom.gba", 0xD2D28C, 0x23D @ LZ, uncomp. size = 0x800 +gSubstituteDollGfx:: @ 8D2D28C + .incbin "graphics/battle_anims/sprites/substitute.4bpp.lz" .align 2 -gUnknown_08D2D4CC:: @ 8D2D4CC - .incbin "baserom.gba", 0xD2D4CC, 0x225 @ LZ, uncomp. size = 0x800 +gSubstituteDollTilemap:: @ 8D2D4CC + .incbin "graphics/battle_anims/sprites/substitute.bin.lz" .align 2 gBattleAnimSpriteSheet_241:: @ 8D2D6F4 @@ -2527,16 +2526,16 @@ gMonFootprint_QuestionMark:: @ 8E5D9F0 .incbin "graphics/pokemon/question_mark/footprint.1bpp" .align 2 -gUnknown_08E5DA10:: @ 8E5DA10 - .incbin "baserom.gba", 0xE5DA10, 0xE5 @ LZ, uncomp. size = 0x200 +gVersusFrameGfx:: @ 8E5DA10 + .incbin "graphics/battle_transitions/vs_frame.4bpp.lz" .align 2 -gUnknown_08E5DAF8:: @ 8E5DAF8 - .incbin "baserom.gba", 0xE5DAF8, 0x10A @ LZ, uncomp. size = 0x800 +gVersusFrameTilemap:: @ 8E5DAF8 + .incbin "graphics/battle_transitions/vs_frame.bin.lz" .align 2 -gUnknown_08E5DC04:: @ 8E5DC04 - .incbin "baserom.gba", 0xE5DC04, 0x28 @ LZ, uncomp. size = 0x20 +gVersusFramePal:: @ 8E5DC04 + .incbin "graphics/battle_transitions/vs_frame.gbapal.lz" .align 2 gUnknown_08E5DC2C:: @ 8E5DC2C @@ -2647,68 +2646,68 @@ gBattleTerrainTiles_Building:: @ 8E62514 .incbin "graphics/battle_terrain/building/tiles.4bpp.lz" .align 2 -gUnknown_08E62AC0:: @ 8E62AC0 - .incbin "baserom.gba", 0xE62AC0, 0x3C @ LZ, uncomp. size = 0x60 +gBattleTerrainPalette_BattleTower:: @ 8E62AC0 + .incbin "graphics/battle_terrain/stadium/battle_tower.gbapal.lz" @ this is also used for link battles .align 2 gBattleTerrainTilemap_Building:: @ 8E62AFC .incbin "graphics/battle_terrain/building/map.bin.lz" .align 2 -gUnknown_08E62DAC:: @ 8E62DAC - .incbin "baserom.gba", 0xE62DAC, 0x606 @ LZ, uncomp. size = 0x2000 +gBattleTerrainTiles_Stadium:: @ 8E62DAC + .incbin "graphics/battle_terrain/stadium/tiles.4bpp.lz" .align 2 -gUnknown_08E633B4:: @ 8E633B4 - .incbin "baserom.gba", 0xE633B4, 0x2AE @ LZ, uncomp. size = 0x1000 +gBattleTerrainTilemap_Stadium:: @ 8E633B4 + .incbin "graphics/battle_terrain/stadium/map.bin.lz" .align 2 gBattleTerrainPalette_Building:: @ 8E63664 .incbin "graphics/battle_terrain/building/palette.gbapal.lz" .align 2 -gUnknown_08E636A4:: @ 8E636A4 - .incbin "baserom.gba", 0xE636A4, 0x3C @ LZ, uncomp. size = 0x60 +gBattleTerrainPalette_Kyogre:: + .incbin "graphics/battle_terrain/water/kyogre.gbapal.lz" .align 2 -gUnknown_08E636E0:: @ 8E636E0 - .incbin "baserom.gba", 0xE636E0, 0x57 @ LZ, uncomp. size = 0x60 +gBattleTerrainPalette_Groudon:: + .incbin "graphics/battle_terrain/cave/groudon.gbapal.lz" .align 2 -gUnknown_08E63738:: @ 8E63738 - .incbin "baserom.gba", 0xE63738, 0x3C @ LZ, uncomp. size = 0x60 +gBattleTerrainPalette_BuildingGym:: @ 8E63738 + .incbin "graphics/battle_terrain/building/palette2.gbapal.lz" .align 2 -gUnknown_08E63774:: @ 8E63774 - .incbin "baserom.gba", 0xE63774, 0x3C @ LZ, uncomp. size = 0x60 +gBattleTerrainPalette_BuildingLeader:: @ 8E63774 + .incbin "graphics/battle_terrain/building/palette3.gbapal.lz" .align 2 -gUnknown_08E637B0:: @ 8E637B0 - .incbin "baserom.gba", 0xE637B0, 0x5E @ LZ, uncomp. size = 0x60 +gBattleTerrainPalette_StadiumAqua:: @ 8E637B0 + .incbin "graphics/battle_terrain/stadium/palette1.gbapal.lz" .align 2 -gUnknown_08E63810:: @ 8E63810 - .incbin "baserom.gba", 0xE63810, 0x6A @ LZ, uncomp. size = 0x60 +gBattleTerrainPalette_StadiumMagma:: @ 8E63810 + .incbin "graphics/battle_terrain/stadium/palette2.gbapal.lz" .align 2 -gUnknown_08E6387C:: @ 8E6387C - .incbin "baserom.gba", 0xE6387C, 0x4E @ LZ, uncomp. size = 0x60 +gBattleTerrainPalette_StadiumSidney:: @ 8E6387C + .incbin "graphics/battle_terrain/stadium/palette3.gbapal.lz" .align 2 -gUnknown_08E638CC:: @ 8E638CC - .incbin "baserom.gba", 0xE638CC, 0x48 @ LZ, uncomp. size = 0x60 +gBattleTerrainPalette_StadiumPhoebe:: @ 8E638CC + .incbin "graphics/battle_terrain/stadium/palette4.gbapal.lz" .align 2 -gUnknown_08E63914:: @ 8E63914 - .incbin "baserom.gba", 0xE63914, 0x41 @ LZ, uncomp. size = 0x60 +gBattleTerrainPalette_StadiumGlacia:: @ 8E63914 + .incbin "graphics/battle_terrain/stadium/palette5.gbapal.lz" .align 2 -gUnknown_08E63958:: @ 8E63958 - .incbin "baserom.gba", 0xE63958, 0x4E @ LZ, uncomp. size = 0x60 +gBattleTerrainPalette_StadiumDrake:: @ 8E63958 + .incbin "graphics/battle_terrain/stadium/palette6.gbapal.lz" .align 2 -gUnknown_08E639A8:: @ 8E639A8 - .incbin "baserom.gba", 0xE639A8, 0x3B @ LZ, uncomp. size = 0x60 +gBattleTerrainPalette_StadiumSteven:: @ 8E639A8 + .incbin "graphics/battle_terrain/stadium/palette7.gbapal.lz" .align 2 gBattleTerrainAnimTiles_TallGrass:: @ 8E639E4 -- cgit v1.2.3 From d6f8ad69edcaae79e930ca1e33a5497d7c105ac1 Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Tue, 30 Aug 2016 16:10:13 -0400 Subject: more work on orphan incbins and misc gfx --- data/data2.s | 4 ++-- data/graphics.s | 44 +++++++++++++++++++++++--------------------- 2 files changed, 25 insertions(+), 23 deletions(-) (limited to 'data') diff --git a/data/data2.s b/data/data2.s index df7f91320..15eee397c 100644 --- a/data/data2.s +++ b/data/data2.s @@ -17538,8 +17538,8 @@ gBattleAnimSpriteTemplate_83D7D74:: @ 83D7D74 spr_template 10244, 10244, gOamData_837E13C, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_83D7D6C, sub_80D3014 .align 2 - .incbin "graphics/unused/unknown_3D7D8C.4bpp" - .incbin "graphics/unused/unknown_3D810C.bin" + .incbin "graphics/unknown/unknown_3D7D8C.4bpp" + .incbin "graphics/unknown/unknown_3D810C.bin" .align 2 gSpriteAnim_83D910C:: @ 83D910C diff --git a/data/graphics.s b/data/graphics.s index d6af0681b..2882de62e 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -275,7 +275,7 @@ gBattleAnimSpriteSheet_017:: @ 8D04368 .incbin "graphics/battle_anims/sprites/017.4bpp.lz" .align 2 - .incbin "baserom.gba", 0xD04388, 0x24 @ LZ, uncomp. size = 0x20 + .incbin "graphics/unknown/unknown_D04388.4bpp.lz" .align 2 gBattleAnimSpritePalette_019:: @ 8D043AC @@ -302,7 +302,7 @@ gBattleAnimSpriteSheet_023:: @ 8D045A4 .incbin "graphics/battle_anims/sprites/023.4bpp.lz" .align 2 - .incbin "baserom.gba", 0xD046AC, 0x28 @ palette + .incbin "graphics/unused/battle_anim_023.gbapal.lz" .align 2 .incbin "graphics/unused/music_notes.4bpp.lz" @@ -717,23 +717,23 @@ gBattleAnimSpriteSheet_081:: @ 8D0CF04 gBattleAnimSpritePalette_081:: @ 8D0CF88 .incbin "graphics/battle_anims/sprites/081.gbapal.lz" - .align 2 - .incbin "baserom.gba", 0xD0CFAC, 0x24 @ LZ, uncomp. size = 0x20 + .align 2 @ 8D0CFAC + .incbin "graphics/unknown/unknown_D0CFAC.bin" - .align 2 - .incbin "baserom.gba", 0xD0CFD0, 0x24 @ LZ, uncomp. size = 0x20 + .align 2 @ 8D0CFD0 + .incbin "graphics/unknown/unknown_D0CFD0.bin" - .align 2 - .incbin "baserom.gba", 0xD0CFF4, 0x24 @ LZ, uncomp. size = 0x20 + .align 2 @ 8D0CFF4 + .incbin "graphics/unknown/unknown_D0CFF4.bin" .align 2 - .incbin "baserom.gba", 0xD0D018, 0x57 @ LZ, uncomp. size = 0x240 + .incbin "graphics/unused/line_sketch_2.8bpp.lz" - .align 2 - .incbin "baserom.gba", 0xD0D070, 0x1F @ LZ, uncomp. size = 0x20 + .align 2 @ 8D0D070 + .incbin "graphics/unknown/unknown_D0D070.bin" .align 2 - .incbin "baserom.gba", 0xD0D090, 0x8F @ LZ, uncomp. size = 0x400 + .incbin "graphics/unused/line_sketch_2.bin.lz" .align 2 gBattleAnimSpriteSheet_082:: @ 8D0D120 @@ -784,7 +784,7 @@ gBattleAnimSpritePalette_094:: @ 8D0D294 .incbin "graphics/battle_anims/sprites/094.gbapal.lz" .align 2 - .incbin "baserom.gba", 0xD0D2B4, 0x1D @ LZ, uncomp. size = 0x20 + .incbin "graphics/unknown/unknown_D0D2B4.bin.lz" .align 2 gBattleAnimSpritePalette_095:: @ 8D0D2D4 @@ -1448,13 +1448,13 @@ gBattleAnimSpritePalette_144:: @ 8D1C040 .incbin "graphics/battle_anims/sprites/144.gbapal.lz" .align 2 - .incbin "graphics/unused/unknown_D1C060.4bpp.lz" + .incbin "graphics/unknown/unknown_D1C060.4bpp.lz" .align 2 - .incbin "graphics/unused/unknown_D1C060.gbapal.lz" + .incbin "graphics/unknown/unknown_D1C060.gbapal.lz" .align 2 - .incbin "graphics/unused/unknown_D1C060.bin.lz" + .incbin "graphics/unknown/unknown_D1C060.bin.lz" .align 2 gBattleAnimSpriteSheet_162:: @ 8D1C1A4 @@ -2786,14 +2786,14 @@ gBattleAnimSpriteSheet_261:: @ 8E67D6C .incbin "graphics/battle_anims/sprites/261.4bpp.lz" .align 2 -gUnknown_08E67ED8:: @ 8E67ED8 - .incbin "baserom.gba", 0xE67ED8, 0x17C @ LZ, uncomp. size = 0x800 +gBattleAnimBackgroundTilemap_SandstormBrew:: @ 8E67ED8 + .incbin "graphics/battle_anims/backgrounds/sandstorm_brew.bin.lz" .align 2 -gUnknown_08E68054:: @ 8E68054 - .incbin "baserom.gba", 0xE68054, 0x52C @ LZ, uncomp. size = 0x800 +gBattleAnimBackgroundImage_SandstormBrew:: @ 8E68054 + .incbin "graphics/battle_anims/backgrounds/sandstorm_brew.4bpp.lz" -gUnknown_08E68580:: @ 8E68580 + .align 2 gBattleAnimSpritePalette_261:: @ 8E68580 .incbin "graphics/battle_anims/sprites/261.gbapal.lz" @@ -2829,9 +2829,11 @@ gBattleAnimSpritePalette_262:: @ 8E693DC gContestNextTurnGfx:: .incbin "graphics/contest/nextturn.4bpp.lz" + .align 2 gUnknown_08E69478:: @ 8E69478 .incbin "baserom.gba", 0x00e69478, 0x100 + .align 2 gUnknown_08E69578:: @ 8E69578 .incbin "baserom.gba", 0x00e69578, 0x40 -- cgit v1.2.3 From 00a355250dda09b0bf03785e0dd56379b34a1536 Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Tue, 30 Aug 2016 21:15:57 -0400 Subject: dump type gfx and misc gfx --- data/data2.s | 8 ++--- data/graphics.s | 94 +++++++++++++++++++++++++++++---------------------------- 2 files changed, 52 insertions(+), 50 deletions(-) (limited to 'data') diff --git a/data/data2.s b/data/data2.s index 15eee397c..4d1123f7a 100644 --- a/data/data2.s +++ b/data/data2.s @@ -1606,7 +1606,7 @@ gSpriteTemplate_81FAF0C:: @ 81FAF0C .align 2 gUnknown_081FAF24:: @ 81FAF24 - obj_tiles gUnknown_08E6A728, 128, 0xD759 + obj_tiles gEnemyMonShadow_Gfx, 128, 0xD759 .align 2 gOamData_81FAF2C:: @ 81FAF2C @@ -2220,8 +2220,8 @@ gSubspriteTables_820A6EC:: @ 820A6EC .align 2 gUnknown_0820A754:: @ 820A754 - obj_tiles gUnknown_08E6A758, 512, 0xd70c - obj_tiles gUnknown_08E6A758, 512, 0xd70d + obj_tiles gBattleGfx_BallStatus, 512, 0xd70c + obj_tiles gBattleGfx_BallStatus, 512, 0xd70d .align 2 gUnknown_0820A764:: @ 820A764 @@ -12978,7 +12978,7 @@ gSpriteAnimTable_83C115C:: @ 83C115C .align 2 gUnknown_083C11B8:: @ 83C11B8 - obj_tiles gUnknown_08E71D10, 5888, 0x7532 + obj_tiles gMoveTypes_Gfx, 5888, 0x7532 .align 2 gSpriteTemplate_83C11C0:: @ 83C11C0 diff --git a/data/graphics.s b/data/graphics.s index 2882de62e..73bee4057 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -998,7 +998,7 @@ gBattleAnimSpriteSheet_115:: @ 8D11B74 .align 2 gUnknown_08D1212C:: - .incbin "graphics/interface/battle_window.gbapal" + .incbin "graphics/battle_interface/window.gbapal" .align 2 gUnknown_08D1214C:: @@ -1691,23 +1691,23 @@ gBattleAnimSpritePalette_186:: @ 8D1F508 .align 2 gBattleWindowLargeGfx:: - .incbin "graphics/interface/battle_window.4bpp.lz" + .incbin "graphics/battle_interface/window.4bpp.lz" .align 2 gBattleWindowSmallGfx:: - .incbin "graphics/interface/battle_window2.4bpp.lz" + .incbin "graphics/battle_interface/window2.4bpp.lz" .align 2 gBattleWindowSmall2Gfx:: - .incbin "graphics/interface/battle_window3.4bpp.lz" + .incbin "graphics/battle_interface/window3.4bpp.lz" .align 2 gBattleWindowSmall3Gfx:: - .incbin "graphics/interface/battle_window4.4bpp.lz" + .incbin "graphics/battle_interface/window4.4bpp.lz" .align 2 -gBattleWindowLarge2Gfx:: @ 8d1fc94 - .incbin "graphics/interface/battle_window5.4bpp.lz" +gBattleWindowLarge2Gfx:: + .incbin "graphics/battle_interface/window5.4bpp.lz" .align 2 .incbin "graphics/unused/shadow.4bpp.lz" @@ -1976,11 +1976,11 @@ gBattleAnimSpritePalette_215:: @ 8D24D58 .incbin "graphics/battle_anims/sprites/215.gbapal.lz" .align 2 -gScaryFacePal:: @ 8D24D7C +gBattleAnimBackgroundPalette_ScaryFace:: @ 8D24D7C .incbin "graphics/battle_anims/backgrounds/scary_face.gbapal.lz" .align 2 -gScaryFaceGfx:: @ 8D24DA4 +gBattleAnimBackgroundImage_ScaryFace:: @ 8D24DA4 .incbin "graphics/battle_anims/backgrounds/scary_face.4bpp.lz" .align 2 @@ -2830,12 +2830,12 @@ gContestNextTurnGfx:: .incbin "graphics/contest/nextturn.4bpp.lz" .align 2 -gUnknown_08E69478:: @ 8E69478 - .incbin "baserom.gba", 0x00e69478, 0x100 +gContestNextTurnNumbersGfx:: @ 8E69478 + .incbin "graphics/contest/nextturn_numbers.4bpp" .align 2 -gUnknown_08E69578:: @ 8E69578 - .incbin "baserom.gba", 0x00e69578, 0x40 +gContestNextTurnRandomGfx:: @ 8E69578 + .incbin "graphics/contest/nextturn_random.4bpp" .align 2 gBattleAnimSpriteSheet_264:: @ 8E695B8 @@ -2859,10 +2859,11 @@ gBattleAnimSpritePalette_068:: @ 8E69628 .align 2 gContestApplauseGfx:: - .incbin "graphics/misc/applause.4bpp.lz" + .incbin "graphics/contest/applause.4bpp.lz" -gUnknown_08E6978C:: @ 8E6978C - .incbin "baserom.gba", 0x00e6978c, 0x80 + .align 2 +gContestApplauseMeterGfx:: @ 8E6978C + .incbin "graphics/contest/applause_meter.4bpp" .align 2 gContestPal:: @@ -2929,12 +2930,12 @@ gUnknown_08E6A704:: @ 8E6A704 .incbin "baserom.gba", 0xE6A704, 0x24 @ LZ, uncomp. size = 0x20 .align 2 -gUnknown_08E6A728:: @ 8E6A728 - .incbin "baserom.gba", 0xE6A728, 0x2E @ LZ, uncomp. size = 0x80 +gEnemyMonShadow_Gfx:: @ 8E6A728 + .incbin "graphics/battle_interface/enemy_mon_shadow.4bpp.lz" .align 2 -gUnknown_08E6A758:: @ 8E6A758 - .incbin "baserom.gba", 0xE6A758, 0x81 @ LZ, uncomp. size = 0x200 +gBattleGfx_BallStatus:: @ 8E6A758 + .incbin "graphics/battle_interface/bar.4bpp.lz" .align 2 gMonIcon_Egg:: @ 8E6A7DC @@ -2996,8 +2997,8 @@ gBattleAnimSpriteSheet_277:: @ 8E6DA54 .incbin "graphics/battle_anims/sprites/277.4bpp.lz" .align 2 -gUnknown_08E6DE48:: @ 8E6DE48 - .incbin "baserom.gba", 0xE6DE48, 0x176 @ LZ, uncomp. size = 0x800 +gWeatherFog1Tilemap:: @ 8E6DE48 + .incbin "graphics/weather/fog1.bin.lz" .align 2 gBattleAnimSpritePalette_283:: @ 8E6DFC0 @@ -3008,16 +3009,16 @@ gBattleAnimSpriteSheet_283:: @ 8E6DFDC .incbin "graphics/battle_anims/sprites/283.4bpp.lz" .align 2 -gUnknown_08E6E100:: @ 8E6E100 - .incbin "baserom.gba", 0xE6E100, 0x1E4 @ LZ, uncomp. size = 0x800 +gBattleAnimBackgroundTilemap_ScaryFacePlayer:: @ 8E6E100 + .incbin "graphics/battle_anims/backgrounds/scary_face_player.bin.lz" .align 2 -gUnknown_08E6E2E4:: @ 8E6E2E4 - .incbin "baserom.gba", 0xE6E2E4, 0x1E4 @ LZ, uncomp. size = 0x800 +gBattleAnimBackgroundTilemap_ScaryFaceOpponent:: @ 8E6E2E4 + .incbin "graphics/battle_anims/backgrounds/scary_face_opponent.bin.lz" .align 2 -gUnknown_08E6E4C8:: @ 8E6E4C8 - .incbin "baserom.gba", 0xE6E4C8, 0x1E2 @ LZ, uncomp. size = 0x800 +gBattleAnimBackgroundTilemap_ScaryFaceContest:: @ 8E6E4C8 + .incbin "graphics/battle_anims/backgrounds/scary_face_contest.bin.lz" .align 2 gBattleAnimSpriteSheet_263:: @ 8E6E6AC @@ -3096,12 +3097,12 @@ gBattleAnimSpritePalette_285:: @ 8E6F5F8 .incbin "graphics/battle_anims/sprites/285.gbapal.lz" .align 2 -gUnknown_08E6F620:: @ 8E6F620 - .incbin "baserom.gba", 0xE6F620, 0x131D @ LZ, uncomp. size = 0x2000 +gBattleAnimBackgroundImage_Surf:: @ 8E6F620 + .incbin "graphics/battle_anims/backgrounds/water.4bpp.lz" .align 2 -gUnknown_08E70940:: @ 8E70940 - .incbin "baserom.gba", 0xE70940, 0x25 @ LZ, uncomp. size = 0x20 +gBattleAnimBackgroundPalette_Surf:: @ 8E70940 + .incbin "graphics/battle_anims/backgrounds/water.gbapal.lz" .align 2 gUnknown_08E70968:: @ 8E70968 @@ -3128,32 +3129,32 @@ gBattleAnimSpritePalette_188:: @ 8E7133C .incbin "graphics/battle_anims/sprites/188.gbapal.lz" .align 2 -gUnknown_08E71354:: @ 8E71354 - .incbin "baserom.gba", 0xE71354, 0x34C @ LZ, uncomp. size = 0xE80 +gPartyMenuMisc_Gfx:: @ 8E71354 + .incbin "graphics/interface/party_menu_misc.4bpp.lz" .align 2 -gUnknown_08E716A0:: @ 8E716A0 - .incbin "baserom.gba", 0xE716A0, 0xE7 @ LZ, uncomp. size = 0x160 +gPartyMenuMisc_Pal:: @ 8E716A0 + .incbin "graphics/interface/party_menu_misc.gbapal.lz" .align 2 -gUnknown_08E71788:: @ 8E71788 - .incbin "baserom.gba", 0xE71788, 0x10B @ LZ, uncomp. size = 0x800 +gPartyMenuMisc_Tilemap:: @ 8E71788 + .incbin "graphics/interface/party_menu_misc.bin.lz" .align 2 -gUnknown_08E71894:: @ 8E71894 - .incbin "baserom.gba", 0xE71894, 0x9D @ LZ, uncomp. size = 0x180 +gPartyMenuHpBar_Gfx:: @ 8E71894 + .incbin "graphics/interface/party_menu_hpbar.4bpp.lz" .align 2 -gUnknown_08E71934:: @ 8E71934 - .incbin "baserom.gba", 0xE71934, 0x3D9 @ LZ, uncomp. size = 0x1000 +gPartyMenuOrderText_Gfx:: @ 8E71934 + .incbin "graphics/interface/party_menu_ordertext.4bpp.lz" .align 2 -gUnknown_08E71D10:: @ 8E71D10 - .incbin "baserom.gba", 0xE71D10, 0x9D1 @ LZ, uncomp. size = 0x1700 +gMoveTypes_Gfx:: @ 8E71D10 + .incbin "graphics/types/move_types.4bpp.lz" .align 2 -gUnknown_08E726E4:: @ 8E726E4 - .incbin "baserom.gba", 0xE726E4, 0x67 @ LZ, uncomp. size = 0x60 +gMoveTypes_Pal:: @ 8E726E4 + .incbin "graphics/types/move_types.gbapal.lz" .align 2 gMenuSummaryGfx:: @ 8E7274C @@ -3971,6 +3972,7 @@ gUnknown_08E964B8:: @ 8E964B8 gUnknown_08E966B8:: @ 8E966B8 .incbin "baserom.gba", 0x00e966b8, 0x20 + .align 2 gMonIconPalettes:: @ 8E966D8 .incbin "graphics/pokemon_icon_palettes/0.gbapal" .incbin "graphics/pokemon_icon_palettes/1.gbapal" -- cgit v1.2.3 From 77e755033c05a39c18b53e3a74bc777113e0581b Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Wed, 31 Aug 2016 01:12:14 -0400 Subject: dump various menu frames and misc gfx --- data/data2.s | 2 +- data/graphics.s | 48 +++++++++++++++++++++++++----------------------- 2 files changed, 26 insertions(+), 24 deletions(-) (limited to 'data') diff --git a/data/data2.s b/data/data2.s index 207e9840b..e06bfaf69 100644 --- a/data/data2.s +++ b/data/data2.s @@ -10499,7 +10499,7 @@ gUnknown_08396FA8:: @ 8396FA8 .4byte DroughtPaletteData_3 .4byte DroughtPaletteData_4 .4byte DroughtPaletteData_5 - + @.4byte unk_20000000 .incbin "baserom.gba", 0x00396fc0, 0x4 @ pointer to unk_2000000? .align 2 diff --git a/data/graphics.s b/data/graphics.s index 73bee4057..e357c83dc 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -3160,6 +3160,7 @@ gMoveTypes_Pal:: @ 8E726E4 gMenuSummaryGfx:: @ 8E7274C .incbin "graphics/interface/summary_frames.4bpp.lz" @ the arrows appear to be unused. + .align 2 gMenuSummaryPal:: @ 8E72848 .incbin "graphics/interface/summary_frames.gbapal.lz" @@ -3172,19 +3173,20 @@ gStatusPal_Icons:: @ 8E72A50 .incbin "graphics/interface/status_icons.gbapal.lz" .align 2 -gUnknown_08E72A78:: @ 8E72A78 - .incbin "baserom.gba", 0xE72A78, 0x9F0 @ LZ, uncomp. size = 0x1B20 +gStatusScreen_Gfx:: @ 8E72A78 + .incbin "graphics/interface/status_screen.4bpp.lz" .align 2 -gUnknown_08E73468:: @ 8E73468 - .incbin "baserom.gba", 0xE73468, 0xA0 @ LZ, uncomp. size = 0xA0 +gStatusScreen_Pal:: @ 8E73468 + .incbin "graphics/interface/status_screen.gbapal.lz" + .align 2 gUnknown_08E73508:: @ 8E73508 - .incbin "baserom.gba", 0x00e73508, 0x800 + .incbin "baserom.gba", 0xE73508, 0x800 .align 2 -gUnknown_08E73D08:: @ 8E73D08 - .incbin "baserom.gba", 0xE73D08, 0x180 @ LZ, uncomp. size = 0x800 +gStatusScreen_Tilemap:: @ 8E73D08 + .incbin "graphics/interface/status_screen.bin.lz" gUnknown_08E73E88:: @ 8E73E88 .incbin "baserom.gba", 0x00e73e88, 0x800 @@ -3209,43 +3211,43 @@ gBagPalette:: @ 8E76700 .incbin "graphics/misc/bag.gbapal.lz" .align 2 -gUnknown_08E76728:: @ 8E76728 - .incbin "baserom.gba", 0xE76728, 0x86B @ LZ, uncomp. size = 0x2000 +gBagScreen_Gfx:: @ 8E76728 + .incbin "graphics/interface/bag_screen.4bpp.lz" .align 2 -gUnknown_08E76F94:: @ 8E76F94 - .incbin "baserom.gba", 0xE76F94, 0x38 @ LZ, uncomp. size = 0x40 +gBagScreenMale_Pal:: @ 8E76F94 + .incbin "graphics/interface/bag_screen_male.gbapal.lz" .align 2 -gUnknown_08E76FCC:: @ 8E76FCC - .incbin "baserom.gba", 0xE76FCC, 0x38 @ LZ, uncomp. size = 0x40 +gBagScreenFemale_Pal:: @ 8E76FCC + .incbin "graphics/interface/bag_screen_female.gbapal.lz" gUnknown_08E77004:: @ 8E77004 .incbin "baserom.gba", 0x00e77004, 0x800 .align 2 -gUnknown_08E77804:: @ 8E77804 - .incbin "baserom.gba", 0xE77804, 0xFA @ LZ, uncomp. size = 0x300 +gMenuMartFrame_Gfx:: @ 8E77804 + .incbin "graphics/interface/mart_frame.4bpp.lz" .align 2 gMenuMoneyPal:: @ 8E77900 .incbin "graphics/interface/money.gbapal.lz" .align 2 -gUnknown_08E77928:: @ 8E77928 - .incbin "baserom.gba", 0xE77928, 0x134 @ LZ, uncomp. size = 0x800 +gMenuMartFrame_Tilemap:: @ 8E77928 + .incbin "graphics/interface/mart_frame.bin.lz" .align 2 gMenuMoneyGfx:: @ 8E77A5C .incbin "graphics/interface/money.4bpp.lz" .align 2 -gUnknown_08E77AE4:: @ 8E77AE4 - .incbin "baserom.gba", 0xE77AE4, 0x23A @ LZ, uncomp. size = 0x800 +gMenuPokeblock_Gfx:: @ 8E77AE4 + .incbin "graphics/interface/pokeblock_case_frame.4bpp.lz" .align 2 -gUnknown_08E77D20:: @ 8E77D20 - .incbin "baserom.gba", 0xE77D20, 0x6E @ LZ, uncomp. size = 0xC0 +gMenuPokeblock_Pal:: @ 8E77D20 + .incbin "graphics/interface/pokeblock_case_frame.gbapal.lz" .align 2 gMenuPokeblockDevice_Gfx:: @ 8E77D90 @@ -3256,8 +3258,8 @@ gMenuPokeblockDevice_Pal:: @ 8E78050 .incbin "graphics/interface/pokeblock_device.gbapal.lz" .align 2 -gUnknown_08E78078:: @ 8E78078 - .incbin "baserom.gba", 0xE78078, 0x150 @ LZ, uncomp. size = 0x800 +gMenuPokeblock_Tilemap:: @ 8E78078 + .incbin "graphics/interface/pokeblock.bin.lz" .align 2 gPokeblock_Gfx:: -- cgit v1.2.3 From 479be386e5f8b863e02905334f73ba88c1702049 Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Wed, 31 Aug 2016 01:24:45 -0400 Subject: label change --- data/graphics.s | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'data') diff --git a/data/graphics.s b/data/graphics.s index e357c83dc..ea3b654aa 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -3226,7 +3226,7 @@ gUnknown_08E77004:: @ 8E77004 .incbin "baserom.gba", 0x00e77004, 0x800 .align 2 -gMenuMartFrame_Gfx:: @ 8E77804 +gBuyMenuFrame_Gfx:: @ 8E77804 .incbin "graphics/interface/mart_frame.4bpp.lz" .align 2 @@ -3234,7 +3234,7 @@ gMenuMoneyPal:: @ 8E77900 .incbin "graphics/interface/money.gbapal.lz" .align 2 -gMenuMartFrame_Tilemap:: @ 8E77928 +gBuyMenuFrame_Tilemap:: @ 8E77928 .incbin "graphics/interface/mart_frame.bin.lz" .align 2 -- cgit v1.2.3 From 2d816b0aead722a601a8b33afdc4c16141241082 Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Wed, 31 Aug 2016 23:23:08 -0400 Subject: more misc gfx work and dump pokedex menu gfx --- data/data2.s | 16 ++++++------ data/graphics.s | 75 ++++++++++++++++++++++++++++++--------------------------- 2 files changed, 47 insertions(+), 44 deletions(-) (limited to 'data') diff --git a/data/data2.s b/data/data2.s index 6a7ff7668..88a7b26e4 100644 --- a/data/data2.s +++ b/data/data2.s @@ -11831,12 +11831,12 @@ gSpriteTemplate_83A05B4:: @ 83A05B4 .align 2 gUnknown_083A05CC:: @ 83A05CC - obj_tiles gUnknown_08E874C8, 0x1F00, 0x1000 + obj_tiles gPokedexMenu2_Gfx, 0x1F00, 0x1000 null_obj_tiles .align 2 gUnknown_083A05DC:: @ 83A05DC - obj_pal gUnknown_08E87AF4, 0x1000 + obj_pal gPokedexMenu_Pal, 0x1000 null_obj_pal gUnknown_083A05EC:: @ 83A05EC @@ -13615,11 +13615,11 @@ gSpriteTemplate_83C1E04:: @ 83C1E04 .align 2 gUnknown_083C1F74:: @ 83C1F74 - obj_tiles gUnknown_08E78BB4, 2048, 0x2710 + obj_tiles gBerryCheckCircle_Gfx, 2048, 0x2710 .align 2 gUnknown_083C1F7C:: @ 83C1F7C - obj_pal gUnknown_08E7883C, 0x2710 + obj_pal gBerryCheck_Pal, 0x2710 .align 2 gOamData_83C1F84:: @ 83C1F84 @@ -25559,14 +25559,14 @@ gUnknown_08401CD4:: @ 8401CD4 .align 2 gUnknown_08401CF8:: @ 8401CF8 - obj_tiles gUnknown_08E80614, 0x800, 1 - obj_tiles gUnknown_08E80914, 0x40, 2 - obj_tiles gUnknown_08E80944, 0x80, 3 + obj_tiles gCableCar_Gfx, 0x800, 1 + obj_tiles gCableCarDoor_Gfx, 0x40, 2 + obj_tiles gCableCarCord_Gfx, 0x80, 3 .space 8 .align 2 gUnknown_08401D18:: @ 8401D18 - obj_pal Palette_08E7EC1C, 1 + obj_pal gCableCar_Pal, 1 .space 8 .align 2 diff --git a/data/graphics.s b/data/graphics.s index ea3b654aa..7c9e16275 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -3326,12 +3326,12 @@ gUnknown_08E782FC:: @ 8E782FC .incbin "baserom.gba", 0xE782FC, 0x100 @ LZ, uncomp. size = 0x800 .align 2 -gUnknown_08E783FC:: @ 8E783FC - .incbin "baserom.gba", 0xE783FC, 0x43E @ LZ, uncomp. size = 0xC00 +gBerryCheck_Gfx:: @ 8E783FC + .incbin "graphics/interface/check_berry.4bpp.lz" .align 2 -gUnknown_08E7883C:: @ 8E7883C - .incbin "graphics/battle_transitions/vs.gbapal.lz" +gBerryCheck_Pal:: @ 8E7883C + .incbin "graphics/interface/check_berry.gbapal.lz" .align 2 gUnknown_08E788E4:: @ 8E788E4 @@ -3342,8 +3342,8 @@ gUnknown_08E78A84:: @ 8E78A84 .incbin "baserom.gba", 0xE78A84, 0x12D @ LZ, uncomp. size = 0x800 .align 2 -gUnknown_08E78BB4:: @ 8E78BB4 - .incbin "baserom.gba", 0xE78BB4, 0x14C @ LZ, uncomp. size = 0x800 +gBerryCheckCircle_Gfx:: @ 8E78BB4 + .incbin "graphics/interface/check_berry_circle.4bpp.lz" @ 8E78D00 .include "data/graphics/berries/graphics.s" @@ -3372,27 +3372,29 @@ gBattleAnimSpritePalette_271:: @ 8E7EB24 gBattleAnimSpriteSheet_271:: @ 8E7EB3C .incbin "graphics/battle_anims/sprites/271.4bpp.lz" -gUnknown_08E7EB9C:: @ 8E7EB9C - .incbin "baserom.gba", 0xe7eb9c, 0x80 + .align 2 +gCableCarBG_Pal:: @ 8E7EB9C + .incbin "graphics/misc/cable_car_bg.gbapal" -Palette_08E7EC1C:: @ 8E7EC1C - .incbin "baserom.gba", 0xe7ec1c, 0x20 + .align 2 +gCableCar_Pal:: @ 8E7EC1C + .incbin "graphics/misc/cable_car.gbapal" .align 2 -gUnknown_08E7EC3C:: @ 8E7EC3C - .incbin "baserom.gba", 0xE7EC3C, 0x19D6 @ LZ, uncomp. size = 0x4000 +gCableCarBG_Gfx:: @ 8E7EC3C + .incbin "graphics/misc/cable_car_bg.4bpp.lz" .align 2 -gUnknown_08E80614:: @ 8E80614 - .incbin "baserom.gba", 0xE80614, 0x2FF @ LZ, uncomp. size = 0x800 +gCableCar_Gfx:: @ 8E80614 + .incbin "graphics/misc/cable_car.4bpp.lz" .align 2 -gUnknown_08E80914:: @ 8E80914 - .incbin "baserom.gba", 0xE80914, 0x30 @ LZ, uncomp. size = 0x40 +gCableCarDoor_Gfx:: @ 8E80914 + .incbin "graphics/misc/cable_car_door.4bpp.lz" .align 2 -gUnknown_08E80944:: @ 8E80944 - .incbin "baserom.gba", 0xE80944, 0x28 @ LZ, uncomp. size = 0x80 +gCableCarCord_Gfx:: @ 8E80944 + .incbin "graphics/misc/cable_car_cord.4bpp.lz" .align 2 gUnknown_08E8096C:: @ 8E8096C @@ -3616,10 +3618,11 @@ gNamingScreenLowerTextTiles:: @ 8E85778 gNamingScreenUpperTextTiles:: @ 8E857D8 .incbin "graphics/naming_screen/upper_text.4bpp" - .incbin "baserom.gba", 0x00e85838, 0x160 + .space 352 -gUnknown_08E85998:: @ 8E85998 - .incbin "baserom.gba", 0x00e85998, 0x800 + .align 2 +gNamingScreenMenu_Gfx:: @ 8E85998 + .incbin "graphics/naming_screen/menu.4bpp" .align 2 gNamingScreenPalettes:: @ 8E86198 @@ -3634,22 +3637,20 @@ gUnknown_08E86258:: @ 8E86258 .incbin "baserom.gba", 0x00e86258, 0x500 .align 2 -gUnknown_08E86758:: @ 8E86758 - .incbin "baserom.gba", 0xE86758, 0xD6E @ LZ, uncomp. size = 0x3000 +gPokedexMenu_Gfx:: @ 8E86758 + .incbin "graphics/pokedex/menu.4bpp.lz" .align 2 -gUnknown_08E874C8:: - .incbin "baserom.gba", 0xE874C8, 0x62C @ LZ, uncomp. size = 0x1F00 +gPokedexMenu2_Gfx:: @ E874C8 + .incbin "graphics/pokedex/menu2.4bpp.lz" .align 2 -gUnknown_08E87AF4:: - .incbin "baserom.gba", 0x00e87af4, 0x2 - -gUnknown_08E87AF6:: @ 8E87AF6 - .incbin "baserom.gba", 0x00e87af6, 0x60 +gPokedexMenu_Pal:: @ E87AF4 + .incbin "graphics/pokedex/menu1.gbapal" -gUnknown_08E87B56:: @ 8E87B56 - .incbin "baserom.gba", 0x00e87b56, 0x5e + .align 2 +gPokedexMenu2_Pal:: @ E87B54 + .incbin "graphics/pokedex/menu2.gbapal" .align 2 gAreaUnknownTiles:: @ 8E87BB4 @@ -3660,12 +3661,12 @@ gAreaUnknownPalette:: @ 8E87D90 .incbin "graphics/pokedex/area_unknown.gbapal" .align 2 -gUnknown_08E87DB0:: @ 8E87DB0 - .incbin "baserom.gba", 0xE87DB0, 0x528 @ LZ, uncomp. size = 0x1000 +gPokedexMenuSearch_Gfx:: @ 8E87DB0 + .incbin "graphics/pokedex/menu_search.4bpp.lz" .align 2 -gUnknown_08E882D8:: @ 8E882D8 - .incbin "baserom.gba", 0x00e882d8, 0x80 +gPokedexMenuSearch_Pal:: @ 8E882D8 + .incbin "graphics/pokedex/menu3.gbapal" .align 2 gUnknown_08E88358:: @ 8E88358 @@ -3679,9 +3680,11 @@ gUnknown_08E884CC:: @ 8E884CC gUnknown_08E88A28:: @ 8E88A28 .incbin "baserom.gba", 0x00e88a28, 0x20 + .align 2 gUnknown_08E88A48:: @ 8E88A48 .incbin "baserom.gba", 0xe88a48, 0x20 + .align 2 Palette_E88A68:: @ 8E88A68 .incbin "baserom.gba", 0xe88a68, 0x20 -- cgit v1.2.3 From 25406c47eb183eee2e9723eefd5873a87a82d8a6 Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Fri, 2 Sep 2016 11:15:45 -0700 Subject: whitespace --- data/graphics.s | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'data') diff --git a/data/graphics.s b/data/graphics.s index a89b6e0c8..d2e82e8cf 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -421,30 +421,30 @@ gBattleAnimSpriteSheet_037:: @ 8D0781C .align 2 .incbin "graphics/unknown/unknown_D07B68.4bpp.lz" - + .align 2 .incbin "graphics/unknown/unknown_D07B68.gbapal.lz" - + .align 2 .incbin "graphics/unknown/unknown_D07B68_2.gbapal.lz" - + @ old battle interface data, unused - + .align 2 .incbin "graphics/unused/obi1.4bpp.lz" - + .align 2 .incbin "graphics/unused/obi_palpak1.gbapal.lz" @ palettes 1-3 - + .align 2 .incbin "graphics/unused/old_pal4.gbapal.lz" @ 4 is by itself - + .align 2 .incbin "graphics/unused/obi_palpak3.gbapal.lz" @ palettes 5-7 - + .align 2 .incbin "graphics/unused/obi2.4bpp.lz" - + .align 2 .incbin "graphics/unused/old_battle_interface_tilemap.bin.lz" @@ -550,7 +550,7 @@ gBattleAnimSpriteSheet_052:: @ 8D0A6D8 .align 2 .incbin "graphics/unused/line_sketch.4bpp.lz" @ unused - + .align 2 .incbin "graphics/unused/line_sketch.gbapal.lz" @@ -961,16 +961,16 @@ gBattleAnimSpriteSheet_114:: @ 8D10F78 .align 2 gBattleAnimSpritePalette_114:: @ 8D1106C .incbin "graphics/battle_anims/sprites/114.gbapal.lz" - + .align 2 .incbin "graphics/unused/blue_frame.bin.lz" @ P1, P2, P3 and P4 tilemaps? .align 2 .incbin "graphics/unused/redyellowgreen_frame.bin.lz" - + .align 2 .incbin "graphics/unused/color_frames.4bpp.lz" - + .align 2 .incbin "graphics/unused/color_frames.gbapal.lz" @@ -1003,7 +1003,7 @@ gUnknown_08D1212C:: .align 2 gUnknown_08D1214C:: .incbin "graphics/battle_interface/hpbar.gbapal" - + .align 2 gUnknown_08D1216C:: @ 8D1216C .incbin "graphics/battle_interface/hpbar.4bpp" @@ -1020,7 +1020,7 @@ gUnknown_08D1216C:: @ 8D1216C .align 2 Tiles_D129AC:: @ 8D129AC .incbin "graphics/battle_interface/ball_display.4bpp" - + @ extra stuff .incbin "graphics/battle_interface/ball_display_unused_extra.4bpp" .incbin "graphics/battle_interface/status2.4bpp" @ these three duplicate sets of graphics are for the opponent pokemon and are also for use in double battles. they use dynamic palettes so coloring them is an extreme headache and wont be done for now. -- cgit v1.2.3 From 699d4158067b8caf4323a04be96c6b912af1f640 Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Fri, 2 Sep 2016 11:18:19 -0700 Subject: address comments --- data/graphics.s | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'data') diff --git a/data/graphics.s b/data/graphics.s index d2e82e8cf..9990ece62 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -3641,15 +3641,15 @@ gPokedexMenu_Gfx:: @ 8E86758 .incbin "graphics/pokedex/menu.4bpp.lz" .align 2 -gPokedexMenu2_Gfx:: @ E874C8 +gPokedexMenu2_Gfx:: @ 8E874C8 .incbin "graphics/pokedex/menu2.4bpp.lz" .align 2 -gPokedexMenu_Pal:: @ E87AF4 +gPokedexMenu_Pal:: @ 8E87AF4 .incbin "graphics/pokedex/menu1.gbapal" .align 2 -gPokedexMenu2_Pal:: @ E87B54 +gPokedexMenu2_Pal:: @ 8E87B54 .incbin "graphics/pokedex/menu2.gbapal" .align 2 -- cgit v1.2.3 From d62994b1d52126846437bbe04caf84f3ae7c12a0 Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Fri, 2 Sep 2016 11:21:46 -0700 Subject: BallStatus -> BallStatusBar --- data/data2.s | 4 ++-- data/graphics.s | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'data') diff --git a/data/data2.s b/data/data2.s index 128c03feb..87228011e 100644 --- a/data/data2.s +++ b/data/data2.s @@ -2358,8 +2358,8 @@ gSubspriteTables_820A6EC:: @ 820A6EC .align 2 gUnknown_0820A754:: @ 820A754 - obj_tiles gBattleGfx_BallStatus, 512, 0xd70c - obj_tiles gBattleGfx_BallStatus, 512, 0xd70d + obj_tiles gBattleGfx_BallStatusBar, 512, 0xd70c + obj_tiles gBattleGfx_BallStatusBar, 512, 0xd70d .align 2 gUnknown_0820A764:: @ 820A764 diff --git a/data/graphics.s b/data/graphics.s index 9990ece62..7a4192a01 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -2934,7 +2934,7 @@ gEnemyMonShadow_Gfx:: @ 8E6A728 .incbin "graphics/battle_interface/enemy_mon_shadow.4bpp.lz" .align 2 -gBattleGfx_BallStatus:: @ 8E6A758 +gBattleGfx_BallStatusBar:: @ 8E6A758 .incbin "graphics/battle_interface/bar.4bpp.lz" .align 2 -- cgit v1.2.3 From 4c94b11ff3d217c13430d211e29aa0c639755e68 Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Fri, 2 Sep 2016 11:32:57 -0700 Subject: fix weird ifdef --- data/graphics.s | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'data') diff --git a/data/graphics.s b/data/graphics.s index 733ee94a3..89ba9e87c 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -4342,11 +4342,14 @@ gTitleScreenLogoShinePalette:: gUnknown_08E9D8CC:: @ 8E9D8CC .ifdef SAPPHIRE .incbin "graphics/title_screen/pokemon_sapphire.8bpp.lz" -gVersionTiles:: - .incbin "graphics/title_screen/sapphireversion.8bpp.lz" .else .incbin "graphics/title_screen/pokemon_ruby.8bpp.lz" + .endif + gVersionTiles:: + .ifdef SAPPHIRE + .incbin "graphics/title_screen/sapphireversion.8bpp.lz" + .else .incbin "graphics/title_screen/rubyversion.8bpp.lz" .endif -- cgit v1.2.3 From a8274ed560fb70760526dee2bc735c9aefd0c191 Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Sat, 3 Sep 2016 00:40:42 +0100 Subject: dump rest of pokenav gfx --- data/data2.s | 43 +++++++++++++-------- data/graphics.s | 116 ++++++++++++++++++++++++++++++-------------------------- 2 files changed, 90 insertions(+), 69 deletions(-) (limited to 'data') diff --git a/data/data2.s b/data/data2.s index 019e8a874..06515cc1b 100644 --- a/data/data2.s +++ b/data/data2.s @@ -21715,31 +21715,42 @@ gUnknown_083E3270:: @ 83E3270 .4byte sub_80F0A24 .4byte sub_80F0A74 + .align 2 gPokenavIconPalette:: .incbin "graphics/pokenav/icon.gbapal" + .align 2 gUnknown_083E329C:: @ 83E329C .incbin "graphics/pokenav/icon.4bpp.lz" -gPokenavContestPokeballTiles:: - .incbin "graphics/pokenav/contest_pokeball.4bpp" + + .align 2 +gPokenavPokeballTiles:: + .incbin "graphics/pokenav/pokeball.4bpp" + + .align 2 gUnknown_083E3780: @ 83E3780 .incbin "baserom.gba", 0x3e3780, 0x20 .align 2 -gContestSparkle_Pal:: - .incbin "graphics/pokenav/contest_sparkle.gbapal" +gPokenavSparkle_Pal:: + .incbin "graphics/pokenav/sparkle.gbapal" .align 2 -gContestSparkle_Gfx:: - .incbin "graphics/pokenav/contest_sparkle.4bpp" +gPokenavSparkle_Gfx:: + .incbin "graphics/pokenav/sparkle.4bpp" + .align 2 gContestArrows_Gfx:: - .incbin "graphics/pokenav/contest_arrows.4bpp" + .incbin "graphics/pokenav/arrows.4bpp" + gUnknown_083E3BC0:: .incbin "baserom.gba", 0x003E3BC0, 0x20 + + .align 2 gTiles_083E3BE0:: .incbin "graphics/unknown/unknown_3E3BE0.4bpp" + .align 2 gUnknown_083E3C60:: @ 83E3C60 .incbin "graphics/misc/ribbons_cool.gbapal" .incbin "graphics/misc/ribbons_beauty.gbapal" @@ -21947,8 +21958,8 @@ gSpriteTemplate_83E4484:: @ 83E4484 spr_template 25, 17, gOamData_83E447C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80F2654 gUnknown_083E449C:: @ 83E449C - obj_pal Palette_E88A68, 2 - obj_pal Palette_E8ACE4, 3 + obj_pal gPokenavMenuOptions3_Pal, 2 + obj_pal gPokenavCondition5_Pal, 3 obj_pal 0x0, 0 .align 2 @@ -22100,15 +22111,15 @@ gSpriteAnimTable_83E4620:: @ 83E4620 .align 2 gUnknown_083E4628:: @ 83E4628 - obj_tiles gPokenavContestPokeballTiles, 0x100, 3 + obj_tiles gPokenavPokeballTiles, 0x100, 3 obj_tiles gUnknown_083E3780, 0x20, 4 - obj_tiles gTiles_08E8A498, 0x100, 5 + obj_tiles gPokenavConditionMenuCancel_Gfx, 0x100, 5 null_obj_tiles .align 2 gUnknown_083E4648:: @ 83E4648 - obj_pal PokenavContestPokeballPalette, 4 - obj_pal Palette_E8A5B8, 5 + obj_pal gPokenavConditionPokeball_Pal, 4 + obj_pal gPokenavCondition4_Pal, 5 .space 8 .align 2 @@ -22156,11 +22167,11 @@ gSpriteTemplate_83E476C:: @ 83E476C .align 2 gUnknown_083E4784:: @ 83E4784 - obj_tiles gContestSparkle_Gfx, 896, 0x0017 + obj_tiles gPokenavSparkle_Gfx, 896, 0x0017 .align 2 gUnknown_083E478C:: @ 83E478C - obj_pal gContestSparkle_Pal, 0x000f + obj_pal gPokenavSparkle_Pal, 0x000f gUnknown_083E4794:: @ 83E4794 .incbin "baserom.gba", 0x003e4794, 0x28 @@ -31585,9 +31596,11 @@ gUnknown_08416E34:: @ 8416E34 obj_tiles gIntro2MayTiles, 0x2000, 1003 .space 8 + .align 2 gEvoSparklePalette: @ 8416E44 .incbin "graphics/misc/evo_sparkle.gbapal" + .align 2 gEvoSparkleTiles: @ 8416E64 .incbin "graphics/misc/evo_sparkle.4bpp.lz" diff --git a/data/graphics.s b/data/graphics.s index 89ba9e87c..0c8ffba20 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -3669,106 +3669,114 @@ gPokedexMenuSearch_Pal:: @ 8E882D8 .incbin "graphics/pokedex/menu3.gbapal" .align 2 -gUnknown_08E88358:: @ 8E88358 - .incbin "baserom.gba", 0xE88358, 0x173 @ LZ, uncomp. size = 0x600 +gPokenavMainMenu_Gfx:: @ 8E88358 + .incbin "graphics/pokenav/mainmenu.4bpp.lz" .align 2 -gUnknown_08E884CC:: @ 8E884CC - .incbin "baserom.gba", 0xE884CC, 0x55A @ LZ, uncomp. size = 0x1400 +gPokenavMenuOptions_Gfx:: @ 8E884CC + .incbin "graphics/pokenav/menu_options.4bpp.lz" .align 2 -gUnknown_08E88A28:: @ 8E88A28 - .incbin "baserom.gba", 0x00e88a28, 0x20 +gPokenavMenuOptions1_Pal:: @ 8E88A28 + .incbin "graphics/pokenav/pokenav1.gbapal" .align 2 -gUnknown_08E88A48:: @ 8E88A48 - .incbin "baserom.gba", 0xe88a48, 0x20 +gPokenavMenuOptions2_Pal:: @ 8E88A48 + .incbin "graphics/pokenav/pokenav2.gbapal" .align 2 -Palette_E88A68:: @ 8E88A68 - .incbin "baserom.gba", 0xe88a68, 0x20 +gPokenavMenuOptions3_Pal:: @ 8E88A68 + .incbin "graphics/pokenav/pokenav3.gbapal" .align 2 -gUnknown_08E88A88:: @ 8E88A88 - .incbin "baserom.gba", 0xE88A88, 0x2C4 @ LZ, uncomp. size = 0xC00 +gPokenavHoennMapHeader_Gfx:: @ 8E88A88 + .incbin "graphics/pokenav/map_header.4bpp.lz" .align 2 -gUnknown_08E88D4C:: @ 8E88D4C - .incbin "baserom.gba", 0xE88D4C, 0x575 @ LZ, uncomp. size = 0x1200 +gPokenavHoennMapMisc_Gfx:: @ 8E88D4C + .incbin "graphics/pokenav/map_misc2.4bpp.lz" .align 2 -gUnknown_08E892C4:: @ 8E892C4 - .incbin "baserom.gba", 0xE892C4, 0x364 @ LZ, uncomp. size = 0x840 +gPokenavHoennMapSquares_Gfx:: @ 8E892C4 + .incbin "graphics/pokenav/map_squares.4bpp.lz" -gUnknown_08E89628:: @ 8E89628 - .incbin "baserom.gba", 0x00e89628, 0x20 + .align 2 +gPokenavHoennMap1_Pal:: @ 8E89628 + .incbin "graphics/pokenav/map_menu.gbapal" -gUnknown_08E89648:: @ 8E89648 + .align 2 +gPokenavHoennMapSquares_Pal:: @ 8E89648 .incbin "graphics/pokenav/map_squares.gbapal" .align 2 -gUnknown_08E89668:: @ 8E89668 - .incbin "baserom.gba", 0xE89668, 0x2EE @ LZ, uncomp. size = 0xC00 +gPokenavConditionMenu_Gfx:: @ 8E89668 + .incbin "graphics/pokenav/condition_menu.4bpp.lz" .align 2 -gUnknown_08E89958:: @ 8E89958 - .incbin "baserom.gba", 0x00e89958, 0x20 +gPokenavConditionMenu_Pal:: @ 8E89958 + .incbin "graphics/pokenav/condition1.gbapal" .align 2 -gUnknown_08E89978:: @ 8E89978 - .incbin "baserom.gba", 0xE89978, 0x15D @ LZ, uncomp. size = 0x600 +gPokenavConditionMenuHeader_Gfx:: @ 8E89978 + .incbin "graphics/pokenav/condition_menu_header.4bpp.lz" .align 2 -gUnknown_08E89AD8:: @ 8E89AD8 - .incbin "baserom.gba", 0xE89AD8, 0x6E6 @ LZ, uncomp. size = 0xFA0 +gPokenavConditionView_Gfx:: @ 8E89AD8 + .incbin "graphics/pokenav/condition_view.4bpp.lz" .align 2 -gUnknown_08E8A1C0:: @ 8E8A1C0 - .incbin "baserom.gba", 0x00e8a1c0, 0x20 +gPokenavConditionMenu2_Pal:: @ 8E8A1C0 + .incbin "graphics/pokenav/condition2.gbapal" .align 2 -gUnknown_08E8A1E0:: @ 8E8A1E0 - .incbin "baserom.gba", 0xE8A1E0, 0x2B8 @ LZ, uncomp. size = 0x800 +gPokenavConditionMenuOptions_Gfx:: @ 8E8A1E0 + .incbin "graphics/pokenav/condition_menu_options.4bpp.lz" -gTiles_08E8A498:: @ 8E8A498 - .incbin "baserom.gba", 0xe8a498, 0x100 + .align 2 +gPokenavConditionMenuCancel_Gfx:: @ 8E8A498 + .incbin "graphics/pokenav/condition_cancel.4bpp" -PokenavContestPokeballPalette:: @ 8E8A598 - .incbin "graphics/pokenav/contest_pokeball.gbapal" + .align 2 +gPokenavConditionPokeball_Pal:: @ 8E8A598 + .incbin "graphics/pokenav/condition3.gbapal" -Palette_E8A5B8:: @ 8E8A5B8 - .incbin "baserom.gba", 0xe8a5b8, 0x20 + .align 2 +gPokenavCondition4_Pal:: @ 8E8A5B8 + .incbin "graphics/pokenav/condition4.gbapal" .align 2 -gUnknown_08E8A5D8:: @ 8E8A5D8 - .incbin "baserom.gba", 0xE8A5D8, 0x1EB @ LZ, uncomp. size = 0x600 +gPokenavConditionMenuOptions2_Gfx:: @ 8E8A5D8 + .incbin "graphics/pokenav/condition_menu_options2.4bpp.lz" .align 2 -gUnknown_08E8A7C4:: @ 8E8A7C4 - .incbin "baserom.gba", 0xe8a7c4, 0x520 +gPokenavConditionMenuMisc_Gfx:: @ 8E8A7C4 + .incbin "graphics/pokenav/condition_menu_misc.4bpp" -Palette_E8ACE4:: @ 8E8ACE4 - .incbin "baserom.gba", 0xe8ace4, 0x20 + .align 2 +gPokenavCondition5_Pal:: @ 8E8ACE4 + .incbin "graphics/pokenav/condition5.gbapal" .align 2 -gUnknown_08E8AD04:: @ 8E8AD04 - .incbin "baserom.gba", 0xE8AD04, 0x4BE @ LZ, uncomp. size = 0x1800 +gPokenavConditionSearch_Gfx:: @ 8E8AD04 + .incbin "graphics/pokenav/condition_search.4bpp.lz" .align 2 -gUnknown_08E8B1C4:: @ 8E8B1C4 - .incbin "baserom.gba", 0x00e8b1c4, 0x20 +gPokenavCondition6_Pal:: @ 8E8B1C4 + .incbin "graphics/pokenav/condition6.gbapal" -gUnknown_08E8B1E4:: @ 8E8B1E4 - .incbin "baserom.gba", 0x00e8b1e4, 0x20 + .align 2 +gPokenavCondition7_Pal:: @ 8E8B1E4 + .incbin "graphics/pokenav/condition7.bin" @ another palette thats impossible to leave as native pal file due to 0xFFFF instead of 0x7FFF. .align 2 -gUnknown_08E8B204:: @ 8E8B204 - .incbin "baserom.gba", 0xE8B204, 0x19B @ LZ, uncomp. size = 0x600 +gPokenavTrainersEyesHeader_Gfx:: @ 8E8B204 + .incbin "graphics/pokenav/trainereyes.4bpp.lz" .align 2 -gUnknown_08E8B3A0:: @ 8E8B3A0 - .incbin "baserom.gba", 0xE8B3A0, 0x140 @ LZ, uncomp. size = 0x600 +gPokenavRibbonsHeader_Gfx:: @ 8E8B3A0 + .incbin "graphics/pokenav/ribbons.4bpp.lz" + .align 2 gUnknown_08E8B4E0:: @ 8E8B4E0 .incbin "baserom.gba", 0x00e8b4e0, 0x1400 @@ -4366,7 +4374,7 @@ gUnknown_08E9F7E4:: @ 8E9F7E4 .align 2 gPokenavContestArrowsPalette:: - .incbin "graphics/pokenav/contest_arrows.gbapal" + .incbin "graphics/pokenav/arrows.gbapal" gUnknown_08E9F988:: @ 8E9F988 .incbin "baserom.gba", 0xe9f988, 0x20 -- cgit v1.2.3 From 2b71286015c70a30f306e96156abde6868873941 Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Sat, 3 Sep 2016 01:17:11 +0100 Subject: dump trainer card and star palettes --- data/data2.s | 10 +++++----- data/graphics.s | 29 +++++++++++++++++------------ 2 files changed, 22 insertions(+), 17 deletions(-) (limited to 'data') diff --git a/data/data2.s b/data/data2.s index 0b0837564..a2ed60913 100644 --- a/data/data2.s +++ b/data/data2.s @@ -12936,11 +12936,11 @@ gUnknown_083B5EF4:: @ 83B5EF4 .align 2 gUnknown_083B5EF8:: @ 83B5EF8 - .4byte gUnknown_08E8C8E0 - .4byte gUnknown_08E8C940 - .4byte gUnknown_08E8C9A0 - .4byte gUnknown_08E8CA00 - .4byte gUnknown_08E8CA60 + .4byte gMenuTrainerCard0Star_Pal + .4byte gMenuTrainerCard1Star_Pal + .4byte gMenuTrainerCard2Star_Pal + .4byte gMenuTrainerCard3Star_Pal + .4byte gMenuTrainerCard4Star_Pal gUnknown_083B5F0C:: @ 83B5F0C .incbin "baserom.gba", 0x003b5f0c, 0x20 diff --git a/data/graphics.s b/data/graphics.s index 0c8ffba20..cab11dad6 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -3777,23 +3777,28 @@ gPokenavRibbonsHeader_Gfx:: @ 8E8B3A0 .incbin "graphics/pokenav/ribbons.4bpp.lz" .align 2 -gUnknown_08E8B4E0:: @ 8E8B4E0 - .incbin "baserom.gba", 0x00e8b4e0, 0x1400 +gMenuTrainerCard_Gfx:: @ 8E8B4E0 + .incbin "graphics/misc/trainer_card.4bpp" -gUnknown_08E8C8E0:: - .incbin "baserom.gba", 0x00e8c8e0, 0x60 + .align 2 +gMenuTrainerCard0Star_Pal:: + .incbin "graphics/misc/trainer_card_0star.gbapal" -gUnknown_08E8C940:: - .incbin "baserom.gba", 0x00e8c940, 0x60 + .align 2 +gMenuTrainerCard1Star_Pal:: + .incbin "graphics/misc/trainer_card_1star.gbapal" -gUnknown_08E8C9A0:: - .incbin "baserom.gba", 0x00e8c9a0, 0x60 + .align 2 +gMenuTrainerCard2Star_Pal:: + .incbin "graphics/misc/trainer_card_2star.gbapal" -gUnknown_08E8CA00:: - .incbin "baserom.gba", 0x00e8ca00, 0x60 + .align 2 +gMenuTrainerCard3Star_Pal:: + .incbin "graphics/misc/trainer_card_3star.gbapal" -gUnknown_08E8CA60:: - .incbin "baserom.gba", 0x00e8ca60, 0x60 + .align 2 +gMenuTrainerCard4Star_Pal:: + .incbin "graphics/misc/trainer_card_4star.gbapal" gUnknown_08E8CAC0:: .incbin "baserom.gba", 0x00e8cac0, 0x500 -- cgit v1.2.3 From 795247b217877bb049a3be7bfe23b7c44699a9db Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Sat, 3 Sep 2016 03:18:45 +0100 Subject: dump PC gfx --- data/graphics.s | 35 +++++++++++++++++++---------------- 1 file changed, 19 insertions(+), 16 deletions(-) (limited to 'data') diff --git a/data/graphics.s b/data/graphics.s index cab11dad6..1f6d541a8 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -3813,33 +3813,36 @@ gUnknown_08E8D9C0:: @ 8E8D9C0 .incbin "baserom.gba", 0x00e8d9c0, 0x500 .align 2 -gUnknown_08E8DEC0:: @ 8E8DEC0 - .incbin "baserom.gba", 0xE8DEC0, 0x226 @ LZ, uncomp. size = 0x5E0 +gPCMenuHeader_Gfx:: @ 8E8DEC0 + .incbin "graphics/pokemon_storage/header.4bpp.lz" .align 2 -gUnknown_08E8E0E8:: @ 8E8E0E8 - .incbin "baserom.gba", 0x00e8e0e8, 0x20 +gPCMenu1_Pal:: @ 8E8E0E8 + .incbin "graphics/pokemon_storage/menu1.gbapal" -gUnknown_08E8E108:: @ 8E8E108 - .incbin "baserom.gba", 0x00e8e108, 0x20 + .align 2 +gPCMenu2_Pal:: @ 8E8E108 + .incbin "graphics/pokemon_storage/menu2.bin" .align 2 -gUnknown_08E8E128:: @ 8E8E128 - .incbin "baserom.gba", 0xE8E128, 0x119 @ LZ, uncomp. size = 0x500 +gPCMenuHeader_Tilemap:: @ 8E8E128 + .incbin "graphics/pokemon_storage/header.bin.lz" .align 2 -gUnknown_08E8E244:: @ 8E8E244 - .incbin "baserom.gba", 0xE8E244, 0x464 @ LZ, uncomp. size = 0xB60 +gPCMenuMisc_Gfx:: @ 8E8E244 + .incbin "graphics/pokemon_storage/misc1.4bpp.lz" -gUnknown_08E8E6A8:: @ 8E8E6A8 - .incbin "baserom.gba", 0x00e8e6a8, 0x20 + .align 2 +gPCMenu3_Pal:: @ 8E8E6A8 + .incbin "graphics/pokemon_storage/menu3.gbapal" -gUnknown_08E8E6C8:: @ 8E8E6C8 - .incbin "baserom.gba", 0x00e8e6c8, 0x20 + .align 2 +gPCMenu4_Pal:: @ 8E8E6C8 + .incbin "graphics/pokemon_storage/menu4.gbapal" .align 2 -gUnknown_08E8E6E8:: @ 8E8E6E8 - .incbin "baserom.gba", 0xE8E6E8, 0x1C5 @ LZ, uncomp. size = 0x800 +gPCMenuMisc_Tilemap:: @ 8E8E6E8 + .incbin "graphics/pokemon_storage/misc1.bin.lz" .align 2 gUnknown_08E8E8B0:: @ 8E8E8B0 -- cgit v1.2.3 From 0ef010cb4bff33232b2a444cd03cbc334688ecd9 Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Sat, 3 Sep 2016 06:56:24 +0100 Subject: dump text window frames and misc gfx --- data/data2.s | 64 +++++-------- data/graphics.s | 293 +++++++++++++++++++++++++++++++++++--------------------- 2 files changed, 208 insertions(+), 149 deletions(-) (limited to 'data') diff --git a/data/data2.s b/data/data2.s index e2b486164..08ff6c152 100644 --- a/data/data2.s +++ b/data/data2.s @@ -7858,46 +7858,26 @@ gUnknown_083761EC:: @ 83761EC .align 2 gUnknown_083761F0:: @ 83761F0 - .4byte gUnknown_08E9ADDC - .4byte gUnknown_08E9AEFC - .4byte gUnknown_08E9AF1C - .4byte gUnknown_08E9B03C - .4byte gUnknown_08E9B05C - .4byte gUnknown_08E9B17C - .4byte gUnknown_08E9B19C - .4byte gUnknown_08E9B2BC - .4byte gUnknown_08E9B2DC - .4byte gUnknown_08E9B3FC - .4byte gUnknown_08E9B41C - .4byte gUnknown_08E9B53C - .4byte gUnknown_08E9B55C - .4byte gUnknown_08E9B67C - .4byte gUnknown_08E9B69C - .4byte gUnknown_08E9B7BC - .4byte gUnknown_08E9B7DC - .4byte gUnknown_08E9B8FC - .4byte gUnknown_08E9B91C - .4byte gUnknown_08E9BA3C - .4byte gUnknown_08E9BA5C - .4byte gUnknown_08E9BB7C - .4byte gUnknown_08E9BB9C - .4byte gUnknown_08E9BCBC - .4byte gUnknown_08E9BCDC - .4byte gUnknown_08E9BDFC - .4byte gUnknown_08E9BE1C - .4byte gUnknown_08E9BF3C - .4byte gUnknown_08E9BF5C - .4byte gUnknown_08E9C07C - .4byte gUnknown_08E9C09C - .4byte gUnknown_08E9C1BC - .4byte gUnknown_08E9C1DC - .4byte gUnknown_08E9C2FC - .4byte gUnknown_08E9C31C - .4byte gUnknown_08E9C43C - .4byte gUnknown_08E9C45C - .4byte gUnknown_08E9C57C - .4byte gUnknown_08E9C59C - .4byte gUnknown_08E9C6BC + .4byte gTextWindowFrame1_Gfx, gTextWindowFrame1_Pal + .4byte gTextWindowFrame2_Gfx, gTextWindowFrame2_Pal + .4byte gTextWindowFrame3_Gfx, gTextWindowFrame3_Pal + .4byte gTextWindowFrame4_Gfx, gTextWindowFrame4_Pal + .4byte gTextWindowFrame5_Gfx, gTextWindowFrame5_Pal + .4byte gTextWindowFrame6_Gfx, gTextWindowFrame6_Pal + .4byte gTextWindowFrame7_Gfx, gTextWindowFrame7_Pal + .4byte gTextWindowFrame8_Gfx, gTextWindowFrame8_Pal + .4byte gTextWindowFrame9_Gfx, gTextWindowFrame9_Pal + .4byte gTextWindowFrame10_Gfx, gTextWindowFrame10_Pal + .4byte gTextWindowFrame11_Gfx, gTextWindowFrame11_Pal + .4byte gTextWindowFrame12_Gfx, gTextWindowFrame12_Pal + .4byte gTextWindowFrame13_Gfx, gTextWindowFrame13_Pal + .4byte gTextWindowFrame14_Gfx, gTextWindowFrame14_Pal + .4byte gTextWindowFrame15_Gfx, gTextWindowFrame15_Pal + .4byte gTextWindowFrame16_Gfx, gTextWindowFrame16_Pal + .4byte gTextWindowFrame17_Gfx, gTextWindowFrame17_Pal + .4byte gTextWindowFrame18_Gfx, gTextWindowFrame18_Pal + .4byte gTextWindowFrame19_Gfx, gTextWindowFrame19_Pal + .4byte gTextWindowFrame20_Gfx, gTextWindowFrame20_Pal gUnknown_08376290:: @ 8376290 .incbin "baserom.gba", 0x00376290, 0x48 @@ -24888,8 +24868,8 @@ gUnknown_083F7A90:: @ 83F7A90 .space 8 gUnknown_083F7AA0:: @ 83F7AA0 - obj_pal gUnknown_08E8F804, 0x1000 - obj_pal gUnknown_08E8F824, 0x1001 + obj_pal gMiscClockMale_Pal, 0x1000 + obj_pal gMiscClockFemale_Pal, 0x1001 .space 8 .align 2 diff --git a/data/graphics.s b/data/graphics.s index 1f6d541a8..e02888ce4 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -3813,52 +3813,52 @@ gUnknown_08E8D9C0:: @ 8E8D9C0 .incbin "baserom.gba", 0x00e8d9c0, 0x500 .align 2 -gPCMenuHeader_Gfx:: @ 8E8DEC0 +gPSSMenuHeader_Gfx:: @ 8E8DEC0 .incbin "graphics/pokemon_storage/header.4bpp.lz" .align 2 -gPCMenu1_Pal:: @ 8E8E0E8 +gPSSMenu1_Pal:: @ 8E8E0E8 .incbin "graphics/pokemon_storage/menu1.gbapal" .align 2 -gPCMenu2_Pal:: @ 8E8E108 +gPSSMenu2_Pal:: @ 8E8E108 .incbin "graphics/pokemon_storage/menu2.bin" .align 2 -gPCMenuHeader_Tilemap:: @ 8E8E128 +gPSSMenuHeader_Tilemap:: @ 8E8E128 .incbin "graphics/pokemon_storage/header.bin.lz" .align 2 -gPCMenuMisc_Gfx:: @ 8E8E244 +gPSSMenuMisc_Gfx:: @ 8E8E244 .incbin "graphics/pokemon_storage/misc1.4bpp.lz" .align 2 -gPCMenu3_Pal:: @ 8E8E6A8 +gPSSMenu3_Pal:: @ 8E8E6A8 .incbin "graphics/pokemon_storage/menu3.gbapal" .align 2 -gPCMenu4_Pal:: @ 8E8E6C8 +gPSSMenu4_Pal:: @ 8E8E6C8 .incbin "graphics/pokemon_storage/menu4.gbapal" .align 2 -gPCMenuMisc_Tilemap:: @ 8E8E6E8 +gPSSMenuMisc_Tilemap:: @ 8E8E6E8 .incbin "graphics/pokemon_storage/misc1.bin.lz" .align 2 -gUnknown_08E8E8B0:: @ 8E8E8B0 - .incbin "baserom.gba", 0xE8E8B0, 0x1C7 @ LZ, uncomp. size = 0x4A0 +gPSSHallOfFameHeader_Gfx:: @ 8E8E8B0 + .incbin "graphics/pokemon_storage/hof_header.4bpp.lz" .align 2 -gUnknown_08E8EA78:: @ 8E8EA78 - .incbin "baserom.gba", 0x00e8ea78, 0x20 +gPSSHallOfFameHeader_Pal:: @ 8E8EA78 + .incbin "graphics/pokemon_storage/hof_header.gbapal" .align 2 gMenuWordGroup_Gfx:: @ 8E8EA98 .incbin "graphics/interface/wordgroup.4bpp.lz" .align 2 -gUnknown_08E8EE18:: @ 8E8EE18 - .incbin "baserom.gba", 0xE8EE18, 0x33D @ LZ, uncomp. size = 0x820 +gMenuWordGroupFrame_Gfx:: @ 8E8EE18 + .incbin "graphics/interface/wordgroup_frame.4bpp.lz" .align 2 gMenuWordGroup_Pal:: @ 8E8F158 @@ -3874,23 +3874,27 @@ gUnknown_08E8F1A0:: @ 8E8F1A0 .incbin "baserom.gba", 0x00e8f1a0, 0x18 .align 2 -gUnknown_08E8F1B8:: @ 8E8F1B8 - .incbin "baserom.gba", 0xE8F1B8, 0x649 @ LZ, uncomp. size = 0x1000 +gMiscClock_Gfx:: @ 8E8F1B8 + .incbin "graphics/misc/clock.4bpp.lz" .align 2 -gUnknown_08E8F804:: @ 8E8F804 - .incbin "graphics/misc/clock1.gbapal" +gMiscClockMale_Pal:: @ 8E8F804 + .incbin "graphics/misc/clock1.gbapal" @ male -gUnknown_08E8F824:: @ 8E8F824 - .incbin "graphics/misc/clock2.gbapal" + .align 2 +gMiscClockFemale_Pal:: @ 8E8F824 + .incbin "graphics/misc/clock2.gbapal" @ female .align 2 -gUnknown_08E8F844:: @ 8E8F844 - .incbin "baserom.gba", 0xE8F844, 0xBB3 @ LZ, uncomp. size = 0x1E00 +gSlotMachine_Gfx:: @ 8E8F844 + .incbin "graphics/slot_machine/slots.4bpp.lz" .align 2 gUnknown_08E903F8:: @ 8E903F8 - .incbin "baserom.gba", 0x00e903f8, 0x220 + .incbin "baserom.gba", 0x00e903f8, 0x20 + + @ unused + .incbin "baserom.gba", 0x00e90418, 0x200 .align 2 gBerryBlenderMarubatsuTiles:: @ 8E90618 @@ -3910,13 +3914,15 @@ gBerryBlenderCountdownNumbersTiles:: @ 8E90A18 gBerryBlenderStartTiles:: @ 8E91018 .incbin "graphics/berry_blender/start.4bpp" - .incbin "baserom.gba", 0x00e91418, 0x200 + .incbin "baserom.gba", 0x00e91418, 0x20 + + .space 0x1E0 .align 2 gBerryBlenderArrowTiles:: @ 8E91618 .incbin "graphics/berry_blender/arrow.4bpp" - .incbin "baserom.gba", 0x00e91e18, 0x2c0 + .space 0x2C0 .align 2 gBerryBlenderMiscPalette:: @ 8E920D8 @@ -4067,39 +4073,71 @@ gSlotMachineSpritePalette5:: @ 8E97768 gSlotMachineSpritePalette6:: @ 8E97788 .incbin "graphics/slot_machine/spr6.gbapal" + .align 2 gSlotMachineReelSymbol1Tiles:: .incbin "graphics/slot_machine/reel_symbols/1.4bpp" + + .align 2 gSlotMachineReelSymbol2Tiles:: .incbin "graphics/slot_machine/reel_symbols/2.4bpp" + + .align 2 gSlotMachineReelSymbol3Tiles:: .incbin "graphics/slot_machine/reel_symbols/3.4bpp" + + .align 2 gSlotMachineReelSymbol4Tiles:: .incbin "graphics/slot_machine/reel_symbols/4.4bpp" + + .align 2 gSlotMachineReelSymbol5Tiles:: .incbin "graphics/slot_machine/reel_symbols/5.4bpp" + + .align 2 gSlotMachineReelSymbol6Tiles:: .incbin "graphics/slot_machine/reel_symbols/6.4bpp" + + .align 2 gSlotMachineReelSymbol7Tiles:: .incbin "graphics/slot_machine/reel_symbols/7.4bpp" + .align 2 gSlotMachineNumber0Tiles:: .incbin "graphics/slot_machine/numbers/0.4bpp" + + .align 2 gSlotMachineNumber1Tiles:: .incbin "graphics/slot_machine/numbers/1.4bpp" + + .align 2 gSlotMachineNumber2Tiles:: .incbin "graphics/slot_machine/numbers/2.4bpp" + + .align 2 gSlotMachineNumber3Tiles:: .incbin "graphics/slot_machine/numbers/3.4bpp" + + .align 2 gSlotMachineNumber4Tiles:: .incbin "graphics/slot_machine/numbers/4.4bpp" + + .align 2 gSlotMachineNumber5Tiles:: .incbin "graphics/slot_machine/numbers/5.4bpp" + + .align 2 gSlotMachineNumber6Tiles:: .incbin "graphics/slot_machine/numbers/6.4bpp" + + .align 2 gSlotMachineNumber7Tiles:: .incbin "graphics/slot_machine/numbers/7.4bpp" + + .align 2 gSlotMachineNumber8Tiles:: .incbin "graphics/slot_machine/numbers/8.4bpp" + + .align 2 gSlotMachineNumber9Tiles:: .incbin "graphics/slot_machine/numbers/9.4bpp" @@ -4172,8 +4210,8 @@ gSpriteImage_8E99808:: @ 8E99808 .incbin "graphics/unknown_sprites/8E99808.4bpp" .align 2 -gUnknown_08E99848:: @ 8E99848 - .incbin "baserom.gba", 0xE99848, 0x766 @ LZ, uncomp. size = 0x3200 +gSlotMachineReelTimeLights_Gfx:: @ 8E99848 + .incbin "graphics/slot_machine/reel_time_lights.4bpp.lz" .align 2 gUnknown_08E99FB0:: @ 8E99FB0 @@ -4207,126 +4245,167 @@ gUnknown_08E9AC2C:: @ 8E9AC2C gUnknown_08E9AC4C:: @ 8E9AC4C .incbin "baserom.gba", 0xE9AC4C, 0x18F @ LZ, uncomp. size = 0x500 +@ text window frames + .align 2 -gUnknown_08E9ADDC:: - .incbin "baserom.gba", 0x00e9addc, 0x120 +gTextWindowFrame1_Gfx:: + .incbin "graphics/text_window/1.4bpp" -gUnknown_08E9AEFC:: - .incbin "baserom.gba", 0x00e9aefc, 0x20 + .align 2 +gTextWindowFrame1_Pal:: + .incbin "graphics/text_window/1.gbapal" -gUnknown_08E9AF1C:: - .incbin "baserom.gba", 0x00e9af1c, 0x120 + .align 2 +gTextWindowFrame2_Gfx:: + .incbin "graphics/text_window/2.4bpp" -gUnknown_08E9B03C:: - .incbin "baserom.gba", 0x00e9b03c, 0x20 + .align 2 +gTextWindowFrame2_Pal:: + .incbin "graphics/text_window/2.gbapal" -gUnknown_08E9B05C:: - .incbin "baserom.gba", 0x00e9b05c, 0x120 + .align 2 +gTextWindowFrame3_Gfx:: + .incbin "graphics/text_window/3.4bpp" -gUnknown_08E9B17C:: - .incbin "baserom.gba", 0x00e9b17c, 0x20 + .align 2 +gTextWindowFrame3_Pal:: + .incbin "graphics/text_window/3.gbapal" -gUnknown_08E9B19C:: - .incbin "baserom.gba", 0x00e9b19c, 0x120 + .align 2 +gTextWindowFrame4_Gfx:: + .incbin "graphics/text_window/4.4bpp" -gUnknown_08E9B2BC:: - .incbin "baserom.gba", 0x00e9b2bc, 0x20 + .align 2 +gTextWindowFrame4_Pal:: + .incbin "graphics/text_window/4.gbapal" -gUnknown_08E9B2DC:: - .incbin "baserom.gba", 0x00e9b2dc, 0x120 + .align 2 +gTextWindowFrame5_Gfx:: + .incbin "graphics/text_window/5.4bpp" -gUnknown_08E9B3FC:: - .incbin "baserom.gba", 0x00e9b3fc, 0x20 + .align 2 +gTextWindowFrame5_Pal:: + .incbin "graphics/text_window/5.gbapal" -gUnknown_08E9B41C:: - .incbin "baserom.gba", 0x00e9b41c, 0x120 + .align 2 +gTextWindowFrame6_Gfx:: + .incbin "graphics/text_window/6.4bpp" -gUnknown_08E9B53C:: - .incbin "baserom.gba", 0x00e9b53c, 0x20 + .align 2 +gTextWindowFrame6_Pal:: + .incbin "graphics/text_window/6.gbapal" -gUnknown_08E9B55C:: - .incbin "baserom.gba", 0x00e9b55c, 0x120 + .align 2 +gTextWindowFrame7_Gfx:: + .incbin "graphics/text_window/7.4bpp" -gUnknown_08E9B67C:: - .incbin "baserom.gba", 0x00e9b67c, 0x20 + .align 2 +gTextWindowFrame7_Pal:: + .incbin "graphics/text_window/7.gbapal" -gUnknown_08E9B69C:: - .incbin "baserom.gba", 0x00e9b69c, 0x120 + .align 2 +gTextWindowFrame8_Gfx:: + .incbin "graphics/text_window/8.4bpp" -gUnknown_08E9B7BC:: - .incbin "baserom.gba", 0x00e9b7bc, 0x20 + .align 2 +gTextWindowFrame8_Pal:: + .incbin "graphics/text_window/8.gbapal" -gUnknown_08E9B7DC:: - .incbin "baserom.gba", 0x00e9b7dc, 0x120 + .align 2 +gTextWindowFrame9_Gfx:: + .incbin "graphics/text_window/9.4bpp" -gUnknown_08E9B8FC:: - .incbin "baserom.gba", 0x00e9b8fc, 0x20 + .align 2 +gTextWindowFrame9_Pal:: + .incbin "graphics/text_window/9.gbapal" -gUnknown_08E9B91C:: - .incbin "baserom.gba", 0x00e9b91c, 0x120 + .align 2 +gTextWindowFrame10_Gfx:: + .incbin "graphics/text_window/10.4bpp" -gUnknown_08E9BA3C:: - .incbin "baserom.gba", 0x00e9ba3c, 0x20 + .align 2 +gTextWindowFrame10_Pal:: + .incbin "graphics/text_window/10.gbapal" -gUnknown_08E9BA5C:: - .incbin "baserom.gba", 0x00e9ba5c, 0x120 + .align 2 +gTextWindowFrame11_Gfx:: + .incbin "graphics/text_window/11.4bpp" -gUnknown_08E9BB7C:: - .incbin "baserom.gba", 0x00e9bb7c, 0x20 + .align 2 +gTextWindowFrame11_Pal:: + .incbin "graphics/text_window/11.gbapal" -gUnknown_08E9BB9C:: - .incbin "baserom.gba", 0x00e9bb9c, 0x120 + .align 2 +gTextWindowFrame12_Gfx:: + .incbin "graphics/text_window/12.4bpp" -gUnknown_08E9BCBC:: - .incbin "baserom.gba", 0x00e9bcbc, 0x20 + .align 2 +gTextWindowFrame12_Pal:: + .incbin "graphics/text_window/12.gbapal" -gUnknown_08E9BCDC:: - .incbin "baserom.gba", 0x00e9bcdc, 0x120 + .align 2 +gTextWindowFrame13_Gfx:: + .incbin "graphics/text_window/13.4bpp" -gUnknown_08E9BDFC:: - .incbin "baserom.gba", 0x00e9bdfc, 0x20 + .align 2 +gTextWindowFrame13_Pal:: + .incbin "graphics/text_window/13.gbapal" -gUnknown_08E9BE1C:: - .incbin "baserom.gba", 0x00e9be1c, 0x120 + .align 2 +gTextWindowFrame14_Gfx:: + .incbin "graphics/text_window/14.4bpp" -gUnknown_08E9BF3C:: - .incbin "baserom.gba", 0x00e9bf3c, 0x20 + .align 2 +gTextWindowFrame14_Pal:: + .incbin "graphics/text_window/14.gbapal" -gUnknown_08E9BF5C:: - .incbin "baserom.gba", 0x00e9bf5c, 0x120 + .align 2 +gTextWindowFrame15_Gfx:: + .incbin "graphics/text_window/15.4bpp" -gUnknown_08E9C07C:: - .incbin "baserom.gba", 0x00e9c07c, 0x20 + .align 2 +gTextWindowFrame15_Pal:: + .incbin "graphics/text_window/15.gbapal" -gUnknown_08E9C09C:: - .incbin "baserom.gba", 0x00e9c09c, 0x120 + .align 2 +gTextWindowFrame16_Gfx:: + .incbin "graphics/text_window/16.4bpp" -gUnknown_08E9C1BC:: - .incbin "baserom.gba", 0x00e9c1bc, 0x20 + .align 2 +gTextWindowFrame16_Pal:: + .incbin "graphics/text_window/16.gbapal" -gUnknown_08E9C1DC:: - .incbin "baserom.gba", 0x00e9c1dc, 0x120 + .align 2 +gTextWindowFrame17_Gfx:: + .incbin "graphics/text_window/17.4bpp" -gUnknown_08E9C2FC:: - .incbin "baserom.gba", 0x00e9c2fc, 0x20 + .align 2 +gTextWindowFrame17_Pal:: + .incbin "graphics/text_window/17.gbapal" -gUnknown_08E9C31C:: - .incbin "baserom.gba", 0x00e9c31c, 0x120 + .align 2 +gTextWindowFrame18_Gfx:: + .incbin "graphics/text_window/18.4bpp" -gUnknown_08E9C43C:: - .incbin "baserom.gba", 0x00e9c43c, 0x20 + .align 2 +gTextWindowFrame18_Pal:: + .incbin "graphics/text_window/18.gbapal" -gUnknown_08E9C45C:: - .incbin "baserom.gba", 0x00e9c45c, 0x120 + .align 2 +gTextWindowFrame19_Gfx:: + .incbin "graphics/text_window/19.4bpp" -gUnknown_08E9C57C:: - .incbin "baserom.gba", 0x00e9c57c, 0x20 + .align 2 +gTextWindowFrame19_Pal:: + .incbin "graphics/text_window/19.gbapal" -gUnknown_08E9C59C:: - .incbin "baserom.gba", 0x00e9c59c, 0x120 + .align 2 +gTextWindowFrame20_Gfx:: + .incbin "graphics/text_window/20.4bpp" -gUnknown_08E9C6BC:: - .incbin "baserom.gba", 0x00e9c6bc, 0x20 + .align 2 +gTextWindowFrame20_Pal:: + .incbin "graphics/text_window/20.gbapal" .align 2 gUnknown_08E9C6DC:: @ 8E9C6DC -- cgit v1.2.3 From da48d58ac29f53ced75c84924aa521f1424b50a2 Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Sat, 3 Sep 2016 18:22:54 +0100 Subject: finish dumping majority of gfx in graphics.s --- data/data2.s | 18 ++++++++------ data/graphics.s | 73 +++++++++++++++++++++++++++++++-------------------------- 2 files changed, 51 insertions(+), 40 deletions(-) (limited to 'data') diff --git a/data/data2.s b/data/data2.s index 08ff6c152..79b7a3827 100644 --- a/data/data2.s +++ b/data/data2.s @@ -11207,7 +11207,7 @@ gSpriteTemplate_8393F74:: @ 8393F74 .align 2 gUnknown_08393F8C:: @ 8393F8C - obj_tiles Tiles_E9D644, 0x520, 1001 + obj_tiles gTitleScreenPressStart_Gfx, 0x520, 1001 null_obj_tiles .align 2 @@ -21631,8 +21631,10 @@ gUnknown_083E0254:: @ 83E0254 gUnknown_083E0274:: @ 83E0274 .incbin "baserom.gba", 0x003e0274, 0x20 -gUnknown_083E0294:: @ 83E0294 - .incbin "baserom.gba", 0x003e0294, 0x20 + .align 2 +gPokenavConditionSearch2_Pal:: @ 83E0294 + @.incbin "graphics/pokenav/condition_search2.gbapal" + .incbin "baserom.gba", 0x3e0294, 0x20 gUnknown_083E02B4:: @ 83E02B4 .incbin "baserom.gba", 0x003e02b4, 0x60 @@ -21640,9 +21642,11 @@ gUnknown_083E02B4:: @ 83E02B4 gUnknown_083E0314:: @ 83E0314 .incbin "baserom.gba", 0x003e0314, 0x20 + .align 2 gUnknown_083E0334:: @ 83E0334 .incbin "graphics/pokenav/trainereyes_misc_pal.bin" @ the original bytes have an "FF FF" instance which is incompatible with gbagfx to produce the bytes needed to match the original ROM, so I am forced to include it as a .bin until the lowest bit is properly handled or a better workaround is produced + .align 2 gUnknown_083E0354:: @ 83E0354 .incbin "graphics/pokenav/trainereyes_misc.4bpp.lz" @@ -21842,7 +21846,7 @@ gPokenavSparkle_Gfx:: .incbin "graphics/pokenav/sparkle.4bpp" .align 2 -gContestArrows_Gfx:: +gPokenavUpDownArrows_Gfx:: .incbin "graphics/pokenav/arrows.4bpp" gUnknown_083E3BC0:: @@ -22147,13 +22151,13 @@ gUnknown_083E4588:: @ 83E4588 .align 2 gUnknown_083E4590:: @ 83E4590 - obj_tiles Tiles_E9F9A8, 0x40, 9 - obj_tiles gContestArrows_Gfx, 0x80, 10 + obj_tiles gPokenavArrow_Gfx, 0x40, 9 + obj_tiles gPokenavUpDownArrows_Gfx, 0x80, 10 null_obj_tiles .align 2 gUnknown_083E45A8:: @ 83E45A8 - obj_pal gPokenavContestArrowsPalette, 9 + obj_pal gPokenavArrowsPalette, 9 .align 2 gOamData_83E45B0:: @ 83E45B0 diff --git a/data/graphics.s b/data/graphics.s index e02888ce4..aaeb5c54a 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -3845,12 +3845,12 @@ gPSSMenuMisc_Tilemap:: @ 8E8E6E8 .incbin "graphics/pokemon_storage/misc1.bin.lz" .align 2 -gPSSHallOfFameHeader_Gfx:: @ 8E8E8B0 - .incbin "graphics/pokemon_storage/hof_header.4bpp.lz" +gHallOfFame_Gfx:: @ 8E8E8B0 + .incbin "graphics/misc/hof.4bpp.lz" .align 2 -gPSSHallOfFameHeader_Pal:: @ 8E8EA78 - .incbin "graphics/pokemon_storage/hof_header.gbapal" +gHallOfFame_Pal:: @ 8E8EA78 + .incbin "graphics/misc/hof.gbapal" .align 2 gMenuWordGroup_Gfx:: @ 8E8EA98 @@ -4412,28 +4412,30 @@ gUnknown_08E9C6DC:: @ 8E9C6DC .incbin "baserom.gba", 0xE9C6DC, 0xBC @ LZ, uncomp. size = 0x500 .align 2 -gUnknown_08E9C798:: @ 8E9C798 - .incbin "baserom.gba", 0xE9C798, 0x289 @ LZ, uncomp. size = 0x560 +gIntroCopyright_Gfx:: @ 8E9C798 + .incbin "graphics/intro/copyright.4bpp.lz" .align 2 -gUnknown_08E9CA24:: @ 8E9CA24 - .incbin "baserom.gba", 0x00e9ca24, 0x20 +gIntroCopyright_Pal:: @ 8E9CA24 + .incbin "graphics/intro/copyright.gbapal" -gUnknown_08E9CA44:: @ 8E9CA44 - .incbin "baserom.gba", 0xe9ca44, 0x500 + .align 2 +gIntroCopyright_Tilemap:: @ 8E9CA44 + .incbin "graphics/intro/copyright.bin" .align 2 gInterviewOutlineCursorTiles:: @ 8E9CF44 .incbin "graphics/misc/interview_outline_cursor.4bpp" .align 2 -Tiles_E9D644:: @ 8E9D644 - .incbin "baserom.gba", 0xE9D644, 0x265 @ LZ, uncomp. size = 0x520 +gTitleScreenPressStart_Gfx:: @ 8E9D644 + .incbin "graphics/title_screen/press_start.4bpp.lz" .align 2 -gTitleScreenLogoShinePalette:: +gTitleScreenLogoShinePalette:: @ E9D8E4 .incbin "graphics/title_screen/logo_shine.gbapal" + .align 2 gUnknown_08E9D8CC:: @ 8E9D8CC .ifdef SAPPHIRE .incbin "graphics/title_screen/pokemon_sapphire.8bpp.lz" @@ -4441,6 +4443,7 @@ gUnknown_08E9D8CC:: @ 8E9D8CC .incbin "graphics/title_screen/pokemon_ruby.8bpp.lz" .endif + .align 2 gVersionTiles:: .ifdef SAPPHIRE .incbin "graphics/title_screen/sapphireversion.8bpp.lz" @@ -4448,6 +4451,7 @@ gVersionTiles:: .incbin "graphics/title_screen/rubyversion.8bpp.lz" .endif + .align 2 gUnknown_08E9F624:: @ 8E9F624 .ifdef SAPPHIRE .incbin "graphics/title_screen/logo_sapphire.gbapal" @ for some reason, the sapphire palette is different even though the visible colors for the logo and version are not, weird @@ -4460,32 +4464,30 @@ gUnknown_08E9F7E4:: @ 8E9F7E4 .incbin "baserom.gba", 0xE9F7E4, 0x182 @ LZ, uncomp. size = 0x400 .align 2 -gPokenavContestArrowsPalette:: +gPokenavArrowsPalette:: .incbin "graphics/pokenav/arrows.gbapal" gUnknown_08E9F988:: @ 8E9F988 .incbin "baserom.gba", 0xe9f988, 0x20 -Tiles_E9F9A8:: @ 8E9F9A8 - .incbin "baserom.gba", 0xe9f9a8, 0x40 + .align 2 +gPokenavArrow_Gfx:: @ 8E9F9A8 + .incbin "graphics/pokenav/arrow2.4bpp" gUnknown_08E9F9E8:: @ 8E9F9E8 .incbin "baserom.gba", 0x00e9f9e8, 0x20 .align 2 -gUnknown_08E9FA08:: @ 8E9FA08 - .incbin "baserom.gba", 0xE9FA08, 0xF2 @ LZ, uncomp. size = 0x300 +gPokenavConditionSearch2_Gfx:: @ 8E9FA08 + .incbin "graphics/pokenav/condition_search2.4bpp.lz" .align 2 -gUnknown_08E9FAFC:: @ 8E9FAFC - .incbin "baserom.gba", 0x00e9fafc, 0x1c - -gUnknown_08E9FB18:: @ 8E9FB18 - .incbin "baserom.gba", 0x00e9fb18, 0x4 +gPokenavRibbonView_Pal:: @ 8E9FAFC + .incbin "graphics/pokenav/ribbon_view.pal.bin" .align 2 -gUnknown_08E9FB1C:: @ 8E9FB1C - .incbin "baserom.gba", 0xE9FB1C, 0x83 @ LZ, uncomp. size = 0x160 +gPokenavRibbonView_Gfx:: @ 8E9FB1C + .incbin "graphics/pokenav/ribbon_view.4bpp.lz" .align 2 gUnknown_08E9FBA0:: @ 8E9FBA0 @@ -4514,11 +4516,12 @@ gUnknown_08E9FF58:: @ 8E9FF58 .incbin "baserom.gba", 0xE9FF58, 0xCF @ LZ, uncomp. size = 0x640 .align 2 -gUnknown_08EA0028:: @ 8EA0028 - .incbin "baserom.gba", 0x00ea0028, 0xe0 +gPokenavRibbonPokeView_Gfx:: @ 8EA0028 + .incbin "graphics/pokenav/ribbon_pokeview.4bpp" -gUnknown_08EA0108:: @ 8EA0108 - .incbin "baserom.gba", 0x00ea0108, 0x1c0 + .align 2 +gTextWindowMainFrame_Gfx:: @ 8EA0108 + .incbin "graphics/text_window/main.4bpp" .align 2 gUnknown_08EA02C8:: @ 8EA02C8 @@ -4549,21 +4552,25 @@ gUnknown_08EA1DEC:: @ 8EA1DEC .incbin "baserom.gba", 0x00ea25ec, 0x20 .align 2 -gUnknown_08EA260C:: @ 8EA260C - .incbin "baserom.gba", 0xEA260C, 0x436 @ LZ, uncomp. size = 0xB40 +gCreditsCopyrightEnd_Gfx:: @ 8EA260C + .incbin "graphics/misc/end_copyright.4bpp.lz" .align 2 -gUnknown_08EA2A44:: @ 8EA2A44 - .incbin "baserom.gba", 0x00ea2a44, 0x200 +gDecoration10000_Gfx:: @ 8EA2A44 + .incbin "graphics/misc/decoration_10000.4bpp" + .align 2 gFont3LatinGlyphs:: @ 8EA2C44 .incbin "graphics/fonts/font3_lat.4bpp" + .align 2 gFont4LatinGlyphs:: @ 8EA6BC4 .incbin "graphics/fonts/font4_lat.4bpp" + .align 2 gFont3JapaneseGlyphs:: @ 8EA8744 .incbin "graphics/fonts/font3_jpn.4bpp" + .align 2 gFont4JapaneseGlyphs:: @ 8EAC6C4 .incbin "graphics/fonts/font4_jpn.4bpp" -- cgit v1.2.3 From b953d0cb3875b37cc8372c34a5605fd976b7a95e Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Sat, 3 Sep 2016 18:44:57 +0100 Subject: oops --- data/data2.s | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'data') diff --git a/data/data2.s b/data/data2.s index 79b7a3827..3963a3cba 100644 --- a/data/data2.s +++ b/data/data2.s @@ -21633,8 +21633,7 @@ gUnknown_083E0274:: @ 83E0274 .align 2 gPokenavConditionSearch2_Pal:: @ 83E0294 - @.incbin "graphics/pokenav/condition_search2.gbapal" - .incbin "baserom.gba", 0x3e0294, 0x20 + .incbin "graphics/pokenav/condition_search2.gbapal" gUnknown_083E02B4:: @ 83E02B4 .incbin "baserom.gba", 0x003e02b4, 0x60 -- cgit v1.2.3 From 828892df213c383731996783e620b4c345867a46 Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Sat, 3 Sep 2016 21:27:34 +0100 Subject: remaining work and tidy up previously dumped stuff in graphics.s --- data/data2.s | 32 +++++++-------- data/graphics.s | 119 ++++++++++++++++++++++++++++---------------------------- 2 files changed, 75 insertions(+), 76 deletions(-) (limited to 'data') diff --git a/data/data2.s b/data/data2.s index 3963a3cba..191542eed 100644 --- a/data/data2.s +++ b/data/data2.s @@ -21495,11 +21495,11 @@ gSpriteTemplate_83DBD48:: @ 83DBD48 .align 2 gUnknown_083DBD60:: @ 83DBD60 - obj_tiles gMenuWordGroup_Gfx, 4096, 0x0007 + obj_tiles gMenuWordGroupIndicator_Gfx, 4096, 0x0007 .align 2 gUnknown_083DBD68:: @ 83DBD68 - obj_pal gMenuWordGroup_Pal, 0x0005 + obj_pal gMenuWordGroupIndicator_Pal, 0x0005 .align 2 gOamData_83DBD70:: @ 83DBD70 @@ -31293,20 +31293,20 @@ gSpriteAffineAnimTable_8412050:: @ 8412050 .align 2 gUnknown_084120A4:: @ 84120A4 - .4byte gUnknown_08E781E4 - .4byte gUnknown_08E781F8 - .4byte gUnknown_08E7820C - .4byte gUnknown_08E78220 - .4byte gUnknown_08E78234 - .4byte gUnknown_08E78248 - .4byte gUnknown_08E7825C - .4byte gUnknown_08E78270 - .4byte gUnknown_08E78284 - .4byte gUnknown_08E78298 - .4byte gUnknown_08E782ac - .4byte gUnknown_08E782c0 - .4byte gUnknown_08E782d4 - .4byte gUnknown_08E782e8 + .4byte gPokeblockRed_Pal + .4byte gPokeblockBlue_Pal + .4byte gPokeblockPink_Pal + .4byte gPokeblockGreen_Pal + .4byte gPokeblockYellow_Pal + .4byte gPokeblockPurple_Pal + .4byte gPokeblockIndigo_Pal + .4byte gPokeblockBrown_Pal + .4byte gPokeblockLiteBlue_Pal + .4byte gPokeblockOlive_Pal + .4byte gPokeblockGray_Pal + .4byte gPokeblockBlack_Pal + .4byte gPokeblockWhite_Pal + .4byte gPokeblockGold_Pal .align 2 gSpriteAffineAnim_84120DC:: @ 84120DC diff --git a/data/graphics.s b/data/graphics.s index aaeb5c54a..5e57f2d8e 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -2336,48 +2336,48 @@ gBattleAnimSpritePalette_243:: @ 8D2DAA4 .incbin "graphics/battle_anims/sprites/243.gbapal.lz" .align 2 -gUnknown_08D2DACC:: @ 8D2DACC +gBattleStatMask_Gfx:: @ 8D2DACC .incbin "graphics/battle_anims/masks/stat.4bpp.lz" .align 2 -gUnknown_08D2DCDC:: @ 8D2DCDC +gBattleStatMask1_Tilemap:: @ 8D2DCDC .incbin "graphics/battle_anims/masks/stat_tilemap_1.bin.lz" .align 2 -gUnknown_08D2DDF8:: @ 8D2DDF8 +gBattleStatMask2_Tilemap:: @ 8D2DDF8 .incbin "graphics/battle_anims/masks/stat_tilemap_2.bin.lz" .align 2 -gUnknown_08D2DF14:: @ 8D2DF14 +gBattleStatMask1_Pal:: @ 8D2DF14 .incbin "graphics/battle_anims/masks/stat1.gbapal.lz" .align 2 -gUnknown_08D2DF34:: @ 8D2DF34 +gBattleStatMask2_Pal:: @ 8D2DF34 .incbin "graphics/battle_anims/masks/stat2.gbapal.lz" .align 2 -gUnknown_08D2DF54:: @ 8D2DF54 +gBattleStatMask3_Pal:: @ 8D2DF54 .incbin "graphics/battle_anims/masks/stat3.gbapal.lz" .align 2 -gUnknown_08D2DF74:: @ 8D2DF74 +gBattleStatMask4_Pal:: @ 8D2DF74 .incbin "graphics/battle_anims/masks/stat4.gbapal.lz" .align 2 -gUnknown_08D2DF94:: @ 8D2DF94 +gBattleStatMask5_Pal:: @ 8D2DF94 .incbin "graphics/battle_anims/masks/stat5.gbapal.lz" .align 2 -gUnknown_08D2DFB4:: @ 8D2DFB4 +gBattleStatMask6_Pal:: @ 8D2DFB4 .incbin "graphics/battle_anims/masks/stat6.gbapal.lz" .align 2 -gUnknown_08D2DFD4:: @ 8D2DFD4 - .incbin "baserom.gba", 0xD2DFD4, 0x1D @ LZ, uncomp. size = 0x20 +gBattleStatMask7_Pal:: @ 8D2DFD4 + .incbin "graphics/battle_anims/masks/stat7.gbapal.lz" .align 2 -gUnknown_08D2DFF4:: @ 8D2DFF4 - .incbin "baserom.gba", 0xD2DFF4, 0x1D @ LZ, uncomp. size = 0x20 +gBattleStatMask8_Pal:: @ 8D2DFF4 + .incbin "graphics/battle_anims/masks/stat8.gbapal.lz" .align 2 gUnknown_08D2E014:: @ 8D2E014 @@ -2926,8 +2926,8 @@ gBattleAnimSpritePalette_280:: @ 8E6A6E4 .incbin "graphics/battle_anims/sprites/280.gbapal.lz" .align 2 -gUnknown_08E6A704:: @ 8E6A704 - .incbin "baserom.gba", 0xE6A704, 0x24 @ LZ, uncomp. size = 0x20 +gBattleAnimBackgroundImageMuddyWater_Pal:: @ 8E6A704 + .incbin "graphics/battle_anims/backgrounds/water_muddy.gbapal.lz" .align 2 gEnemyMonShadow_Gfx:: @ 8E6A728 @@ -3263,63 +3263,63 @@ gMenuPokeblock_Tilemap:: @ 8E78078 .align 2 gPokeblock_Gfx:: - .incbin "graphics/misc/pokeblock.4bpp.lz" + .incbin "graphics/pokeblock/pokeblock.4bpp.lz" .align 2 -gUnknown_08E781E4:: - .incbin "baserom.gba", 0xE781E4, 0x14 @ LZ, uncomp. size = 0x20 +gPokeblockRed_Pal:: + .incbin "graphics/pokeblock/red.gbapal.lz" .align 2 -gUnknown_08E781F8:: - .incbin "baserom.gba", 0xE781F8, 0x14 @ LZ, uncomp. size = 0x20 +gPokeblockBlue_Pal:: + .incbin "graphics/pokeblock/blue.gbapal.lz" .align 2 -gUnknown_08E7820C:: - .incbin "baserom.gba", 0xE7820C, 0x14 @ LZ, uncomp. size = 0x20 +gPokeblockPink_Pal:: + .incbin "graphics/pokeblock/pink.gbapal.lz" .align 2 -gUnknown_08E78220:: - .incbin "baserom.gba", 0xE78220, 0x14 @ LZ, uncomp. size = 0x20 +gPokeblockGreen_Pal:: + .incbin "graphics/pokeblock/green.gbapal.lz" .align 2 -gUnknown_08E78234:: - .incbin "baserom.gba", 0xE78234, 0x14 @ LZ, uncomp. size = 0x20 +gPokeblockYellow_Pal:: + .incbin "graphics/pokeblock/yellow.gbapal.lz" .align 2 -gUnknown_08E78248:: - .incbin "baserom.gba", 0xE78248, 0x14 @ LZ, uncomp. size = 0x20 +gPokeblockPurple_Pal:: + .incbin "graphics/pokeblock/purple.gbapal.lz" .align 2 -gUnknown_08E7825C:: - .incbin "baserom.gba", 0xE7825C, 0x14 @ LZ, uncomp. size = 0x20 +gPokeblockIndigo_Pal:: + .incbin "graphics/pokeblock/indigo.gbapal.lz" .align 2 -gUnknown_08E78270:: - .incbin "baserom.gba", 0xE78270, 0x14 @ LZ, uncomp. size = 0x20 +gPokeblockBrown_Pal:: + .incbin "graphics/pokeblock/brown.gbapal.lz" .align 2 -gUnknown_08E78284:: - .incbin "baserom.gba", 0xE78284, 0x14 @ LZ, uncomp. size = 0x20 +gPokeblockLiteBlue_Pal:: + .incbin "graphics/pokeblock/liteblue.gbapal.lz" .align 2 -gUnknown_08E78298:: - .incbin "baserom.gba", 0xE78298, 0x14 @ LZ, uncomp. size = 0x20 +gPokeblockOlive_Pal:: + .incbin "graphics/pokeblock/olive.gbapal.lz" .align 2 -gUnknown_08E782ac:: - .incbin "baserom.gba", 0xE782AC, 0x14 @ LZ, uncomp. size = 0x20 +gPokeblockGray_Pal:: + .incbin "graphics/pokeblock/gray.gbapal.lz" .align 2 -gUnknown_08E782c0:: - .incbin "baserom.gba", 0xE782C0, 0x14 @ LZ, uncomp. size = 0x20 +gPokeblockBlack_Pal:: + .incbin "graphics/pokeblock/black.gbapal.lz" .align 2 -gUnknown_08E782d4:: - .incbin "baserom.gba", 0xE782D4, 0x14 @ LZ, uncomp. size = 0x20 +gPokeblockWhite_Pal:: + .incbin "graphics/pokeblock/white.gbapal.lz" .align 2 -gUnknown_08E782e8:: - .incbin "baserom.gba", 0xE782E8, 0x14 @ LZ, uncomp. size = 0x20 +gPokeblockGold_Pal:: + .incbin "graphics/pokeblock/gold.gbapal.lz" .align 2 gUnknown_08E782FC:: @ 8E782FC @@ -3853,25 +3853,24 @@ gHallOfFame_Pal:: @ 8E8EA78 .incbin "graphics/misc/hof.gbapal" .align 2 -gMenuWordGroup_Gfx:: @ 8E8EA98 - .incbin "graphics/interface/wordgroup.4bpp.lz" +gMenuWordGroupIndicator_Gfx:: @ 8E8EA98 + .incbin "graphics/interface/wordgroup_indicator.4bpp.lz" .align 2 gMenuWordGroupFrame_Gfx:: @ 8E8EE18 .incbin "graphics/interface/wordgroup_frame.4bpp.lz" .align 2 -gMenuWordGroup_Pal:: @ 8E8F158 - .incbin "graphics/interface/wordgroup.gbapal" +gMenuWordGroupIndicator_Pal:: @ 8E8F158 + .incbin "graphics/interface/wordgroup_indicator.gbapal" -gUnknown_08E8F178:: @ 8E8F178 - .incbin "baserom.gba", 0x00e8f178, 0x22 - -gUnknown_08E8F19A:: @ 8E8F19A - .incbin "baserom.gba", 0x00e8f19a, 0x6 + .align 2 +gMenuWordGroupFrame1_Pal:: @ 8E8F178 + .incbin "graphics/interface/wordgroup_pink.gbapal" -gUnknown_08E8F1A0:: @ 8E8F1A0 - .incbin "baserom.gba", 0x00e8f1a0, 0x18 + .align 2 +gMenuWordGroupFrame2_Pal:: @ 8E8F198 + .incbin "graphics/interface/wordgroup_blue.gbapal" .align 2 gMiscClock_Gfx:: @ 8E8F1B8 @@ -3890,11 +3889,11 @@ gSlotMachine_Gfx:: @ 8E8F844 .incbin "graphics/slot_machine/slots.4bpp.lz" .align 2 -gUnknown_08E903F8:: @ 8E903F8 - .incbin "baserom.gba", 0x00e903f8, 0x20 +gBattleInterfaceStatusIcons_DynPal:: @ 8E903F8 + .incbin "graphics/battle_interface/status.gbapal" @ unused - .incbin "baserom.gba", 0x00e90418, 0x200 + .incbin "graphics/unused/arrow.4bpp" .align 2 gBerryBlenderMarubatsuTiles:: @ 8E90618 @@ -3914,7 +3913,7 @@ gBerryBlenderCountdownNumbersTiles:: @ 8E90A18 gBerryBlenderStartTiles:: @ 8E91018 .incbin "graphics/berry_blender/start.4bpp" - .incbin "baserom.gba", 0x00e91418, 0x20 + .incbin "graphics/unknown/unknown_E91418.bin" .space 0x1E0 @@ -4549,7 +4548,7 @@ gTradeMonBoxTilemap:: @ 8EA1DC8 gUnknown_08EA1DEC:: @ 8EA1DEC .incbin "graphics/trade/selected_mon.4bpp" - .incbin "baserom.gba", 0x00ea25ec, 0x20 + .incbin "graphics/unused/unknown_EA25EC.bin" .align 2 gCreditsCopyrightEnd_Gfx:: @ 8EA260C -- cgit v1.2.3 From 893d4115c997e0562a99eeac528c8830605a5412 Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Sat, 3 Sep 2016 21:34:55 +0100 Subject: nuke whitespace --- data/graphics.s | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'data') diff --git a/data/graphics.s b/data/graphics.s index 5e57f2d8e..e202d344a 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -3914,7 +3914,7 @@ gBerryBlenderStartTiles:: @ 8E91018 .incbin "graphics/berry_blender/start.4bpp" .incbin "graphics/unknown/unknown_E91418.bin" - + .space 0x1E0 .align 2 @@ -4107,35 +4107,35 @@ gSlotMachineNumber0Tiles:: .align 2 gSlotMachineNumber1Tiles:: .incbin "graphics/slot_machine/numbers/1.4bpp" - + .align 2 gSlotMachineNumber2Tiles:: .incbin "graphics/slot_machine/numbers/2.4bpp" - + .align 2 gSlotMachineNumber3Tiles:: .incbin "graphics/slot_machine/numbers/3.4bpp" - + .align 2 gSlotMachineNumber4Tiles:: .incbin "graphics/slot_machine/numbers/4.4bpp" - + .align 2 gSlotMachineNumber5Tiles:: .incbin "graphics/slot_machine/numbers/5.4bpp" - + .align 2 gSlotMachineNumber6Tiles:: .incbin "graphics/slot_machine/numbers/6.4bpp" - + .align 2 gSlotMachineNumber7Tiles:: .incbin "graphics/slot_machine/numbers/7.4bpp" - + .align 2 gSlotMachineNumber8Tiles:: .incbin "graphics/slot_machine/numbers/8.4bpp" - + .align 2 gSlotMachineNumber9Tiles:: .incbin "graphics/slot_machine/numbers/9.4bpp" -- cgit v1.2.3 From 48711cdf9aed3512b7229e7c8488b3c05ff64ff9 Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Sat, 3 Sep 2016 21:39:36 +0100 Subject: fix build error and add gitignore --- data/graphics.s | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data') diff --git a/data/graphics.s b/data/graphics.s index e202d344a..bfa8a578b 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -4548,7 +4548,7 @@ gTradeMonBoxTilemap:: @ 8EA1DC8 gUnknown_08EA1DEC:: @ 8EA1DEC .incbin "graphics/trade/selected_mon.4bpp" - .incbin "graphics/unused/unknown_EA25EC.bin" + .incbin "graphics/unknown/unknown_EA25EC.bin" .align 2 gCreditsCopyrightEnd_Gfx:: @ 8EA260C -- cgit v1.2.3