new game Birch pic
This commit is contained in:
+561
-561
File diff suppressed because it is too large
Load Diff
+3
-3
@@ -1407,10 +1407,10 @@ gpu_tile_obj_alloc_map_bit_op: ; 80073B8
|
|||||||
.pool
|
.pool
|
||||||
thumb_func_end gpu_tile_obj_alloc_map_bit_op
|
thumb_func_end gpu_tile_obj_alloc_map_bit_op
|
||||||
|
|
||||||
thumb_func_start nullsub_12
|
thumb_func_start DummyObjectCallback
|
||||||
nullsub_12: ; 8007428
|
DummyObjectCallback: ; 8007428
|
||||||
bx lr
|
bx lr
|
||||||
thumb_func_end nullsub_12
|
thumb_func_end DummyObjectCallback
|
||||||
|
|
||||||
thumb_func_start copy_queue_process
|
thumb_func_start copy_queue_process
|
||||||
; void copy_queue_process()
|
; void copy_queue_process()
|
||||||
|
|||||||
+12
-12
@@ -132,7 +132,7 @@ InitMainMenu: ; 802F6F4
|
|||||||
movs r1, 0
|
movs r1, 0
|
||||||
movs r2, 0x10
|
movs r2, 0x10
|
||||||
movs r3, 0
|
movs r3, 0
|
||||||
bl sub_80A1AD4
|
bl pal_fade_maybe
|
||||||
b @0802F7FE
|
b @0802F7FE
|
||||||
.pool
|
.pool
|
||||||
@0802F7EC:
|
@0802F7EC:
|
||||||
@@ -143,7 +143,7 @@ InitMainMenu: ; 802F6F4
|
|||||||
movs r1, 0
|
movs r1, 0
|
||||||
movs r2, 0x10
|
movs r2, 0x10
|
||||||
movs r3, 0
|
movs r3, 0
|
||||||
bl sub_80A1AD4
|
bl pal_fade_maybe
|
||||||
@0802F7FE:
|
@0802F7FE:
|
||||||
movs r0, 0
|
movs r0, 0
|
||||||
bl gpu_reset_bgs_and_dma3_busy_flags
|
bl gpu_reset_bgs_and_dma3_busy_flags
|
||||||
@@ -1086,7 +1086,7 @@ HandleMainMenuInput: ; 80300E0
|
|||||||
str r1, [sp]
|
str r1, [sp]
|
||||||
movs r2, 0
|
movs r2, 0
|
||||||
movs r3, 0x10
|
movs r3, 0x10
|
||||||
bl sub_80A1AD4
|
bl pal_fade_maybe
|
||||||
adds r0, r7, 0
|
adds r0, r7, 0
|
||||||
subs r0, 0x8
|
subs r0, 0x8
|
||||||
adds r0, r4, r0
|
adds r0, r4, r0
|
||||||
@@ -1110,7 +1110,7 @@ HandleMainMenuInput: ; 80300E0
|
|||||||
movs r1, 0
|
movs r1, 0
|
||||||
movs r2, 0
|
movs r2, 0
|
||||||
movs r3, 0x10
|
movs r3, 0x10
|
||||||
bl sub_80A1AD4
|
bl pal_fade_maybe
|
||||||
movs r0, 0x40
|
movs r0, 0x40
|
||||||
movs r1, 0xF0
|
movs r1, 0xF0
|
||||||
bl lcd_io_set
|
bl lcd_io_set
|
||||||
@@ -1541,7 +1541,7 @@ Task_HandleMainMenuAPressed: ; 803027C
|
|||||||
movs r1, 0
|
movs r1, 0
|
||||||
movs r2, 0x10
|
movs r2, 0x10
|
||||||
movs r3, 0
|
movs r3, 0
|
||||||
bl sub_80A1AD4
|
bl pal_fade_maybe
|
||||||
b @08030536
|
b @08030536
|
||||||
.pool
|
.pool
|
||||||
@08030514:
|
@08030514:
|
||||||
@@ -1720,7 +1720,7 @@ Task_DisplayMainMenuInvalidActionError: ; 80305A4
|
|||||||
str r1, [sp]
|
str r1, [sp]
|
||||||
movs r2, 0
|
movs r2, 0
|
||||||
movs r3, 0x10
|
movs r3, 0x10
|
||||||
bl sub_80A1AD4
|
bl pal_fade_maybe
|
||||||
ldr r0, =Task_HandleMainMenuBPressed
|
ldr r0, =Task_HandleMainMenuBPressed
|
||||||
str r0, [r4]
|
str r0, [r4]
|
||||||
@08030688:
|
@08030688:
|
||||||
@@ -1935,7 +1935,7 @@ task_new_game_prof_birch_speech_1: ; 80307B0
|
|||||||
movs r1, 0
|
movs r1, 0
|
||||||
movs r2, 0x10
|
movs r2, 0x10
|
||||||
movs r3, 0
|
movs r3, 0
|
||||||
bl sub_80A1AD4
|
bl pal_fade_maybe
|
||||||
ldr r1, =0x03005e00
|
ldr r1, =0x03005e00
|
||||||
lsls r0, r4, 2
|
lsls r0, r4, 2
|
||||||
adds r0, r4
|
adds r0, r4
|
||||||
@@ -2270,7 +2270,7 @@ sub_8030B14: ; 8030B14
|
|||||||
.pool
|
.pool
|
||||||
@08030B64:
|
@08030B64:
|
||||||
ldr r1, [r3, 0x1C]
|
ldr r1, [r3, 0x1C]
|
||||||
ldr r0, =nullsub_12
|
ldr r0, =DummyObjectCallback
|
||||||
cmp r1, r0
|
cmp r1, r0
|
||||||
bne @08030BBA
|
bne @08030BBA
|
||||||
ldrb r1, [r3, 0x1]
|
ldrb r1, [r3, 0x1]
|
||||||
@@ -2888,7 +2888,7 @@ task_new_game_prof_birch_speech_16: ; 8031040
|
|||||||
str r1, [sp]
|
str r1, [sp]
|
||||||
movs r2, 0
|
movs r2, 0
|
||||||
movs r3, 0x10
|
movs r3, 0x10
|
||||||
bl sub_80A1AD4
|
bl pal_fade_maybe
|
||||||
ldr r1, =0x03005e00
|
ldr r1, =0x03005e00
|
||||||
lsls r0, r4, 2
|
lsls r0, r4, 2
|
||||||
adds r0, r4
|
adds r0, r4
|
||||||
@@ -3471,7 +3471,7 @@ task_new_game_prof_birch_speech_part2_9: ; 80314C4
|
|||||||
movs r1, 0
|
movs r1, 0
|
||||||
movs r2, 0
|
movs r2, 0
|
||||||
movs r3, 0x10
|
movs r3, 0x10
|
||||||
bl sub_80A1AD4
|
bl pal_fade_maybe
|
||||||
movs r0, 0x4
|
movs r0, 0x4
|
||||||
bl play_sound_effect
|
bl play_sound_effect
|
||||||
ldr r0, =task_new_game_prof_birch_speech_part2_10
|
ldr r0, =task_new_game_prof_birch_speech_part2_10
|
||||||
@@ -3551,7 +3551,7 @@ task_new_game_prof_birch_speech_part2_11: ; 80315BC
|
|||||||
movs r1, 0
|
movs r1, 0
|
||||||
movs r2, 0
|
movs r2, 0
|
||||||
movs r3, 0x10
|
movs r3, 0x10
|
||||||
bl sub_80A1AD4
|
bl pal_fade_maybe
|
||||||
ldr r0, =task_new_game_prof_birch_speech_part2_12
|
ldr r0, =task_new_game_prof_birch_speech_part2_12
|
||||||
str r0, [r4]
|
str r0, [r4]
|
||||||
@0803160A:
|
@0803160A:
|
||||||
@@ -3751,7 +3751,7 @@ new_game_prof_birch_speech_part2_start: ; 8031678
|
|||||||
movs r1, 0
|
movs r1, 0
|
||||||
movs r2, 0x10
|
movs r2, 0x10
|
||||||
movs r3, 0
|
movs r3, 0
|
||||||
bl sub_80A1AD4
|
bl pal_fade_maybe
|
||||||
movs r0, 0x40
|
movs r0, 0x40
|
||||||
movs r1, 0
|
movs r1, 0
|
||||||
bl lcd_io_set
|
bl lcd_io_set
|
||||||
|
|||||||
+57
-7
@@ -3417,7 +3417,23 @@ gUnknown_08553A78: ; 8553A78
|
|||||||
.incbin "base_emerald.gba", 0x553a78, 0x4
|
.incbin "base_emerald.gba", 0x553a78, 0x4
|
||||||
|
|
||||||
gUnknown_08553A7C: ; 8553A7C
|
gUnknown_08553A7C: ; 8553A7C
|
||||||
.incbin "base_emerald.gba", 0x553a7c, 0x6f14
|
.incbin "base_emerald.gba", 0x553a7c, 0x14
|
||||||
|
|
||||||
|
.align 2, 0
|
||||||
|
|
||||||
|
gNewGameBirchPic: ; 8553A90
|
||||||
|
.incbin "data/graphics/new_game/birch.4bpp"
|
||||||
|
|
||||||
|
.incbin "base_emerald.gba", 0x554290, 0x66c0
|
||||||
|
|
||||||
|
.align 2, 0
|
||||||
|
|
||||||
|
gNewGameBirchPalette: ; 855A950
|
||||||
|
.incbin "data/graphics/new_game/birch.gbapal"
|
||||||
|
|
||||||
|
.align 2, 0
|
||||||
|
|
||||||
|
.incbin "base_emerald.gba", 0x55a970, 0x20
|
||||||
|
|
||||||
.align 2, 0
|
.align 2, 0
|
||||||
|
|
||||||
@@ -3458,14 +3474,48 @@ gUnknown_0855B630: ; 855B630
|
|||||||
gUnknown_0855C1F0: ; 855C1F0
|
gUnknown_0855C1F0: ; 855C1F0
|
||||||
.incbin "base_emerald.gba", 0x55c1f0, 0x20
|
.incbin "base_emerald.gba", 0x55c1f0, 0x20
|
||||||
|
|
||||||
gUnknown_0855C210: ; 855C210
|
.align 2, 0
|
||||||
.incbin "base_emerald.gba", 0x55c210, 0x20
|
|
||||||
|
|
||||||
gUnknown_0855C230: ; 855C230
|
; TODO: something else uses these too
|
||||||
.incbin "base_emerald.gba", 0x55c230, 0x14
|
gNewGameBirchOamAttributes: ; 855C210
|
||||||
|
.4byte OAM_SIZE_64x64
|
||||||
|
.2byte 0
|
||||||
|
|
||||||
gUnknown_0855C244: ; 855C244
|
.align 2, 0
|
||||||
.incbin "base_emerald.gba", 0x55c244, 0x18
|
|
||||||
|
.incbin "base_emerald.gba", 0x55c218, 0x10
|
||||||
|
|
||||||
|
.align 2, 0
|
||||||
|
|
||||||
|
gNewGameBirchPicTable: ; 855C228
|
||||||
|
obj_tiles gNewGameBirchPic, 0x800
|
||||||
|
|
||||||
|
.align 2, 0
|
||||||
|
|
||||||
|
gNewGameBirchObjectPaletteInfo: ; 855C230
|
||||||
|
obj_pal gNewGameBirchPalette, 0x1006
|
||||||
|
|
||||||
|
.align 2, 0
|
||||||
|
|
||||||
|
gNewGameBirchImageAnim: ; 855C238
|
||||||
|
obj_image_anim_frame 0, 1
|
||||||
|
obj_image_anim_end
|
||||||
|
|
||||||
|
.align 2, 0
|
||||||
|
|
||||||
|
gNewGameBirchImageAnimTable: ; 855C240
|
||||||
|
.4byte gNewGameBirchImageAnim
|
||||||
|
|
||||||
|
.align 2, 0
|
||||||
|
|
||||||
|
gNewGameBirchObjectTemplate: ; 855C244
|
||||||
|
.2byte 0xFFFF ; tiles tag
|
||||||
|
.2byte 0x1006 ; palette tag
|
||||||
|
.4byte gNewGameBirchOamAttributes
|
||||||
|
.4byte gNewGameBirchImageAnimTable
|
||||||
|
.4byte gNewGameBirchPicTable
|
||||||
|
.4byte gDummyObjectRotScalAnimTable
|
||||||
|
.4byte DummyObjectCallback
|
||||||
|
|
||||||
.align 2, 0
|
.align 2, 0
|
||||||
|
|
||||||
|
|||||||
@@ -299,7 +299,7 @@ gFieldEffectObjectTemplate_Arrow: ; 850CC5C
|
|||||||
.4byte gFieldEffectObjectImageAnimTable_Arrow
|
.4byte gFieldEffectObjectImageAnimTable_Arrow
|
||||||
.4byte gFieldEffectObjectPicTable_Arrow
|
.4byte gFieldEffectObjectPicTable_Arrow
|
||||||
.4byte gDummyObjectRotScalAnimTable
|
.4byte gDummyObjectRotScalAnimTable
|
||||||
.4byte nullsub_12
|
.4byte DummyObjectCallback
|
||||||
|
|
||||||
.align 2, 0
|
.align 2, 0
|
||||||
|
|
||||||
@@ -945,7 +945,7 @@ gFieldEffectObjectTemplate_Unknown21: ; 850D28C
|
|||||||
.4byte gDummyObjectImageAnimTable
|
.4byte gDummyObjectImageAnimTable
|
||||||
.4byte NULL
|
.4byte NULL
|
||||||
.4byte gFieldEffectObjectRotScalAnimTable_Unknown21
|
.4byte gFieldEffectObjectRotScalAnimTable_Unknown21
|
||||||
.4byte nullsub_12
|
.4byte DummyObjectCallback
|
||||||
|
|
||||||
.align 2, 0
|
.align 2, 0
|
||||||
|
|
||||||
@@ -1137,7 +1137,7 @@ gFieldEffectObjectTemplate_Bird: ; 850D4A8
|
|||||||
.4byte gFieldEffectObjectImageAnimTable_Bird
|
.4byte gFieldEffectObjectImageAnimTable_Bird
|
||||||
.4byte gFieldEffectObjectPicTable_Bird
|
.4byte gFieldEffectObjectPicTable_Bird
|
||||||
.4byte gDummyObjectRotScalAnimTable
|
.4byte gDummyObjectRotScalAnimTable
|
||||||
.4byte nullsub_12
|
.4byte DummyObjectCallback
|
||||||
|
|
||||||
.align 2, 0
|
.align 2, 0
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,19 @@
|
|||||||
|
JASC-PAL
|
||||||
|
0100
|
||||||
|
16
|
||||||
|
115 197 164
|
||||||
|
255 230 205
|
||||||
|
222 189 148
|
||||||
|
197 148 115
|
||||||
|
106 74 65
|
||||||
|
98 98 115
|
||||||
|
41 57 65
|
||||||
|
180 115 82
|
||||||
|
115 74 57
|
||||||
|
205 205 222
|
||||||
|
148 148 148
|
||||||
|
189 156 90
|
||||||
|
139 115 57
|
||||||
|
74 49 24
|
||||||
|
255 255 255
|
||||||
|
0 0 24
|
||||||
Binary file not shown.
|
After Width: | Height: | Size: 843 B |
Reference in New Issue
Block a user