From bd56bb073f87eeca6e71b14ab1ec0a11ea1ee3a4 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sun, 5 Nov 2017 12:05:07 +0100 Subject: start working on hall of fame --- data/event_scripts.s | 2 +- data/hall_of_fame.s | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'data') diff --git a/data/event_scripts.s b/data/event_scripts.s index ad1216b91..bd6210c38 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1029,7 +1029,7 @@ gUnknown_082C8845:: @ 82C8845 gUnknown_082C892A:: @ 82C892A .incbin "baserom.gba", 0x2c892a, 0x2f -gUnknown_082C8959:: @ 82C8959 +gText_SavingDontTurnOffPower:: @ 82C8959 .incbin "baserom.gba", 0x2c8959, 0x22 gUnknown_082C897B:: @ 82C897B diff --git a/data/hall_of_fame.s b/data/hall_of_fame.s index 2678d96a6..f00fc6001 100644 --- a/data/hall_of_fame.s +++ b/data/hall_of_fame.s @@ -21,13 +21,13 @@ gUnknown_085E5394:: @ 85E5394 gUnknown_085E53A4:: @ 85E53A4 .incbin "baserom.gba", 0x5e53a4, 0x10 -gUnknown_085E53B4:: @ 85E53B4 +sHallOfFame_MonsFullTeamPositions:: @ 85E53B4 .incbin "baserom.gba", 0x5e53b4, 0x6 gUnknown_085E53BA:: @ 85E53BA .incbin "baserom.gba", 0x5e53ba, 0x2a -gUnknown_085E53E4:: @ 85E53E4 +sHallOfFame_MonsHalfTeamPositions:: @ 85E53E4 .incbin "baserom.gba", 0x5e53e4, 0x18 gUnknown_085E53FC:: @ 85E53FC -- cgit v1.2.3 From 0f723f7677d52075b4798d9ec6bb4b60d752906f Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sun, 5 Nov 2017 14:55:13 +0100 Subject: halfway through hall of fame --- data/hall_of_fame.s | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data') diff --git a/data/hall_of_fame.s b/data/hall_of_fame.s index f00fc6001..29e509a49 100644 --- a/data/hall_of_fame.s +++ b/data/hall_of_fame.s @@ -42,5 +42,5 @@ gUnknown_085E54E8:: @ 85E54E8 gUnknown_085E5508:: @ 85E5508 .incbin "baserom.gba", 0x5e5508, 0x1cc -gUnknown_085E56D4:: @ 85E56D4 +sDummyFameMon:: @ 85E56D4 .incbin "baserom.gba", 0x5e56d4, 0x1c -- cgit v1.2.3 From a2263207bf64439c9ad35ad5b8f0d5c5ea289d30 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Mon, 6 Nov 2017 17:27:39 +0100 Subject: hall of fame is decompiled --- data/hall_of_fame.s | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'data') diff --git a/data/hall_of_fame.s b/data/hall_of_fame.s index 29e509a49..7771224e7 100644 --- a/data/hall_of_fame.s +++ b/data/hall_of_fame.s @@ -15,10 +15,10 @@ gUnknown_085E5388:: @ 85E5388 gUnknown_085E538C:: @ 85E538C .incbin "baserom.gba", 0x5e538c, 0x8 -gUnknown_085E5394:: @ 85E5394 +sHallOfFame_ConfettiSpriteSheet:: @ 85E5394 .incbin "baserom.gba", 0x5e5394, 0x10 -gUnknown_085E53A4:: @ 85E53A4 +sHallOfFame_ConfettiSpritePalette:: @ 85E53A4 .incbin "baserom.gba", 0x5e53a4, 0x10 sHallOfFame_MonsFullTeamPositions:: @ 85E53B4 @@ -36,7 +36,7 @@ gUnknown_085E53FC:: @ 85E53FC gUnknown_085E54D0:: @ 85E54D0 .incbin "baserom.gba", 0x5e54d0, 0x18 -gUnknown_085E54E8:: @ 85E54E8 +gHallOfFame_Pal:: @ 85E54E8 .incbin "baserom.gba", 0x5e54e8, 0x20 gUnknown_085E5508:: @ 85E5508 -- cgit v1.2.3 From a729e9838e88a982b590aafbd6330fc80c1f32e2 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Mon, 6 Nov 2017 18:41:32 +0100 Subject: move data to hall of fame c file --- data/graphics.s | 26 +++++++++++++++++++++++++- data/hall_of_fame.s | 46 ---------------------------------------------- 2 files changed, 25 insertions(+), 47 deletions(-) delete mode 100644 data/hall_of_fame.s (limited to 'data') diff --git a/data/graphics.s b/data/graphics.s index e89177a1d..c3bbdd494 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -156,7 +156,31 @@ gUnknown_08C2CEE0:: @ 8C2CEE0 .incbin "baserom.gba", 0xc2cee0, 0x240 gUnknown_08C2D120:: @ 8C2D120 - .incbin "baserom.gba", 0xc2d120, 0x600 + .incbin "baserom.gba", 0xc2d120, 552 + +gUnknown_08C2D348:: @ 8C2D348 + .incbin "baserom.gba", 0xC2D348, 196 + +gUnknown_08C2D40C:: @ 8C2D40C + .incbin "baserom.gba", 0xC2D40C, 28 + +gContestConfetti_Gfx:: @ 8C2D428 + .incbin "baserom.gba", 0xC2D428, 288 + +gContestConfetti_Pal:: @ 8C2D548 + .incbin "baserom.gba", 0xC2D548, 40 + +gUnknown_08C2D570:: @ 8C2D570 + .incbin "baserom.gba", 0xC2D570, 316 + +gUnknown_08C2D6AC:: @ 8C2D6AC + .incbin "baserom.gba", 0xC2D6AC, 36 + +gUnknown_08C2D6D0:: @ 8C2D6D0 + .incbin "baserom.gba", 0xC2D6D0, 40 + +gUnknown_08C2D6F8:: @ 8C2D6F8 + .incbin "baserom.gba", 0xC2D6F8, 40 gUnknown_08C2D720:: @ 8C2D720 .incbin "baserom.gba", 0xc2d720, 0x210 diff --git a/data/hall_of_fame.s b/data/hall_of_fame.s deleted file mode 100644 index 7771224e7..000000000 --- a/data/hall_of_fame.s +++ /dev/null @@ -1,46 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - -gUnknown_085E5374:: @ 85E5374 - .incbin "baserom.gba", 0x5e5374, 0xc - -gUnknown_085E5380:: @ 85E5380 - .incbin "baserom.gba", 0x5e5380, 0x8 - -gUnknown_085E5388:: @ 85E5388 - .incbin "baserom.gba", 0x5e5388, 0x4 - -gUnknown_085E538C:: @ 85E538C - .incbin "baserom.gba", 0x5e538c, 0x8 - -sHallOfFame_ConfettiSpriteSheet:: @ 85E5394 - .incbin "baserom.gba", 0x5e5394, 0x10 - -sHallOfFame_ConfettiSpritePalette:: @ 85E53A4 - .incbin "baserom.gba", 0x5e53a4, 0x10 - -sHallOfFame_MonsFullTeamPositions:: @ 85E53B4 - .incbin "baserom.gba", 0x5e53b4, 0x6 - -gUnknown_085E53BA:: @ 85E53BA - .incbin "baserom.gba", 0x5e53ba, 0x2a - -sHallOfFame_MonsHalfTeamPositions:: @ 85E53E4 - .incbin "baserom.gba", 0x5e53e4, 0x18 - -gUnknown_085E53FC:: @ 85E53FC - .incbin "baserom.gba", 0x5e53fc, 0xd4 - -gUnknown_085E54D0:: @ 85E54D0 - .incbin "baserom.gba", 0x5e54d0, 0x18 - -gHallOfFame_Pal:: @ 85E54E8 - .incbin "baserom.gba", 0x5e54e8, 0x20 - -gUnknown_085E5508:: @ 85E5508 - .incbin "baserom.gba", 0x5e5508, 0x1cc - -sDummyFameMon:: @ 85E56D4 - .incbin "baserom.gba", 0x5e56d4, 0x1c -- cgit v1.2.3