ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-16 19:47:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #106 from DizzyEggg/decompile_hall_of_fame

Browse Source 
Decompile hall of fame
This commit is contained in:
Diegoisawesome 2017-11-13 15:33:48 -06:00 committed by GitHub
commit 72b57b342e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
16 changed files with 1620 additions and 3675 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
asm/credits.s
View File

@ -26,7 +26,7 @@ sub_81754DC: @ 81754DC
ands r0, r1
cmp r0, 0
beq _08175522
ldr r0, =gUnknown_0203BCE4
ldr r0, =gHasHallOfFameRecords
ldrb r0, [r0]
cmp r0, 0
beq _08175522

3603
asm/hall_of_fame.s
View File

File diff suppressed because it is too large Load Diff

6
asm/link.s
View File

@ -52022,7 +52022,7 @@ _080241A6:
movs r0, 0
movs r1, 0
bl sub_81973C4
ldr r2, =gUnknown_082C8959
ldr r2, =gText_SavingDontTurnOffPower
movs r0, 0
str r0, [sp]
movs r0, 0x2
@ -64112,7 +64112,7 @@ _0802A3AE:
movs r0, 0
movs r1, 0
bl sub_81973C4
ldr r2, =gUnknown_082C8959
ldr r2, =gText_SavingDontTurnOffPower
str r4, [sp]
movs r0, 0x2
str r0, [sp, 0x4]
@ -70355,7 +70355,7 @@ _0802D516:
strh r0, [r1, 0x12]
lsls r0, 24
lsrs r0, 24
ldr r2, =gUnknown_082C8959
ldr r2, =gText_SavingDontTurnOffPower
movs r1, 0x1
str r1, [sp]
movs r1, 0xFF

8
asm/rom6.s
View File

@ -4043,12 +4043,12 @@ sub_8137734: @ 8137734
lsrs r1, r0, 24
cmp r1, 0x1
bne _08137760
ldr r0, =gUnknown_0203BCE4
ldr r0, =gHasHallOfFameRecords
strb r1, [r0]
b _0813776C
.pool
_08137760:
ldr r1, =gUnknown_0203BCE4
ldr r1, =gHasHallOfFameRecords
movs r0, 0
strb r0, [r1]
adds r0, r4, 0
@ -4165,7 +4165,7 @@ _08137838:
movs r1, 0x43
bl sub_80EE4DC
_0813785A:
ldr r0, =sub_8173694
ldr r0, =CB2_DoHallOfFameScreen
bl SetMainCallback2
movs r0, 0
add sp, 0x1C
@ -4638,7 +4638,7 @@ sub_8137C10: @ 8137C10
thumb_func_start sub_8137C28
sub_8137C28: @ 8137C28
push {lr}
ldr r0, =sub_8174194
ldr r0, =CB2_DoHallOfFamePC
bl SetMainCallback2
bl ScriptContext2_Enable
pop {r0}

2
asm/start_menu.s
View File

@ -1683,7 +1683,7 @@ _080A05AC:
movs r0, 0
movs r1, 0x11
bl FillWindowPixelBuffer
ldr r2, =gUnknown_082C8959
ldr r2, =gText_SavingDontTurnOffPower
movs r4, 0
str r4, [sp]
movs r0, 0x2

4
asm/trade.s
View File

@ -13814,7 +13814,7 @@ _0807ED98:
movs r0, 0x32
strb r0, [r1]
ldr r4, =gStringVar4
ldr r1, =gUnknown_082C8959
ldr r1, =gText_SavingDontTurnOffPower
_0807EDA6:
adds r0, r4, 0
bl StringExpandPlaceholders
@ -14668,7 +14668,7 @@ _0807F50A:
movs r1, 0x3
strb r1, [r0]
ldr r4, =gStringVar4
ldr r1, =gUnknown_082C8959
ldr r1, =gText_SavingDontTurnOffPower
adds r0, r4, 0
bl StringExpandPlaceholders
movs r0, 0

2
data/event_scripts.s
View File

@ -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

26
data/graphics.s
View File

@ -156,7 +156,31 @@ gSubstituteDollGfx:: @ 8C2CEE0
.incbin "baserom.gba", 0xc2cee0, 0x240
gSubstituteDollTilemap:: @ 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

46
data/hall_of_fame.s
View File

@ -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
gUnknown_085E5394:: @ 85E5394
.incbin "baserom.gba", 0x5e5394, 0x10
gUnknown_085E53A4:: @ 85E53A4
.incbin "baserom.gba", 0x5e53a4, 0x10
gUnknown_085E53B4:: @ 85E53B4
.incbin "baserom.gba", 0x5e53b4, 0x6
gUnknown_085E53BA:: @ 85E53BA
.incbin "baserom.gba", 0x5e53ba, 0x2a
gUnknown_085E53E4:: @ 85E53E4
.incbin "baserom.gba", 0x5e53e4, 0x18
gUnknown_085E53FC:: @ 85E53FC
.incbin "baserom.gba", 0x5e53fc, 0xd4
gUnknown_085E54D0:: @ 85E54D0
.incbin "baserom.gba", 0x5e54d0, 0x18
gUnknown_085E54E8:: @ 85E54E8
.incbin "baserom.gba", 0x5e54e8, 0x20
gUnknown_085E5508:: @ 85E5508
.incbin "baserom.gba", 0x5e5508, 0x1cc
gUnknown_085E56D4:: @ 85E56D4
.incbin "baserom.gba", 0x5e56d4, 0x1c

19
graphics/misc/japanese_hof.pal Normal file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
0 0 0
0 0 0
131 238 197
255 32 32
115 222 180
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
65 65 65
255 255 255

BIN
graphics/misc/japanese_hof.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 425 B

5
graphics_file_rules.mk
View File

@ -287,6 +287,9 @@ graphics/title_screen/pokemon_logo.gbapal: graphics/title_screen/pokemon_logo.pa
$(INTROGFXDIR)/copyright.4bpp: $(INTROGFXDIR)/copyright.png
$(GFX) $< $@ -num_tiles 39
$(interfacedir)/pkmnjump_bg.4bpp: $(interfacedir)/pkmnjump_bg.png
$(GFX) $< $@ -num_tiles 63
graphics/misc/japanese_hof.4bpp: graphics/misc/japanese_hof.png
$(GFX) $< $@ -num_tiles 29

8
include/hall_of_fame.h
View File

@ -1,9 +1,9 @@
#ifndef GUARD_HALL_OF_FAME_H
#define GUARD_HALL_OF_FAME_H
void sub_8141F90(void);
void sub_8143648(u16 paletteTag, u8 arg1);
void sub_81428CC(void);
void sub_8143680(int, u8);
void CB2_DoHallOfFameScreen(void);
void CB2_DoHallOfFameScreenDontSaveData(void);
void CB2_DoHallOfFamePC(void);
void sub_8175280(void);
#endif // GUARD_HALL_OF_FAME_H

4
ld_script.txt
View File

@ -215,7 +215,7 @@ SECTIONS {
src/reset_save_heap.o(.text);
asm/field_region_map.o(.text);
asm/battle_anim_8170478.o(.text);
asm/hall_of_fame.o(.text);
src/hall_of_fame.o(.text);
asm/credits.o(.text);
src/lottery_corner.o(.text);
src/diploma.o(.text);
@ -436,7 +436,7 @@ SECTIONS {
data/intro.o(.rodata);
data/field_region_map.o(.rodata);
data/battle_anim_8170478.o(.rodata);
data/hall_of_fame.o(.rodata);
src/hall_of_fame.o(.rodata);
data/credits.o(.rodata);
src/lottery_corner.o(.rodata);
src/diploma.o(.rodata);

1552
src/hall_of_fame.c
View File

File diff suppressed because it is too large Load Diff

8
sym_ewram.txt
View File

@ -1404,11 +1404,7 @@ gUnknown_0203BCD0: @ 203BCD0
gUnknown_0203BCD4: @ 203BCD4
.space 0x4
gUnknown_0203BCD8: @ 203BCD8
.space 0x4
gUnknown_0203BCDC: @ 203BCDC
.space 0x4
.include "src/hall_of_fame.o"
gUnknown_0203BCE0: @ 203BCE0
.space 0x2
@ -1416,7 +1412,7 @@ gUnknown_0203BCE0: @ 203BCE0
gUnknown_0203BCE2: @ 203BCE2
.space 0x2
gUnknown_0203BCE4: @ 203BCE4
gHasHallOfFameRecords: @ 203BCE4
.space 0x1
gUnknown_0203BCE5: @ 203BCE5